X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=importPicture%2Fsrc%2Fosm%2Fjp%2Fgpx%2FImportPicture.java;h=901ca0c07edd1e6b89a056a76e607d15311d854b;hb=554a9b170d36c7c0ab0115532564fbcdff447f33;hp=67b428a66cc61f17930649c822ae26d64cd00e2c;hpb=c5f5b0205431016215a25b1e87da0799174be247;p=importpicture%2Fimportpicture.git

diff --git a/importPicture/src/osm/jp/gpx/ImportPicture.java b/importPicture/src/osm/jp/gpx/ImportPicture.java
index 67b428a..901ca0c 100644
--- a/importPicture/src/osm/jp/gpx/ImportPicture.java
+++ b/importPicture/src/osm/jp/gpx/ImportPicture.java
@@ -1,6 +1,8 @@
 package osm.jp.gpx;
+
 import java.io.*;
 import java.nio.channels.FileChannel;
+import java.text.DateFormat;
 import java.text.DecimalFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
@@ -10,10 +12,8 @@ import java.util.Calendar;
 import java.util.Comparator;
 import java.util.Date;
 import java.util.GregorianCalendar;
-import java.util.Iterator;
-import java.util.Set;
+import java.util.Map;
 import java.util.TimeZone;
-import java.util.TreeMap;
 import java.util.logging.LogManager;
 import java.util.logging.Logger;
 
@@ -41,6 +41,11 @@ import org.w3c.dom.*;
 import org.xml.sax.SAXException;
 
 public class ImportPicture extends Thread {
+	/**
+	 * 実行中に発生したExceptionを保持する場所
+	 */
+	public Exception ex = null;
+	
     /**
      * ログ設定プロパティファイルのファイル内容
      */
@@ -90,8 +95,13 @@ public class ImportPicture extends Thread {
      * ・精確な時刻との時差を入力することで、撮影日時を補正します。
      * ・画像ファイルの更新日付リストをCSV形式のファイルとして出力する。
      * ・・結果は、取り込み元のGPXファイルとは別に、元ファイル名にアンダーバー「_」を付加した.ファイルに出力します。
+     * 
+     *  exp) $ java -cp .:AdjustTime.jar:commons-imaging-1.0-SNAPSHOT.jar [AdjustTime.ini]
+     *  exp) > java -cp .;AdjustTime.jar;commons-imaging-1.0-SNAPSHOT.jar [AdjustTime.ini]
      *
      * @param argv
+     * argv[0] = INIファイルのパス名
+     * 
      * argv[-] = dummy
      * argv[0] = 画像ファイルが格納されているディレクトリ		--> imgDir
      * argv[1] = 時刻補正の基準とする画像ファイル				--> baseFile
@@ -104,30 +114,39 @@ public class ImportPicture extends Thread {
      */
     public static void main(String[] argv) throws Exception
     {
-        Date jptime;
+        Date imgtime;
 
+    	String paramFilePath = ((argv.length < 1) ? AppParameters.FILE_PATH : argv[0]);
+        System.out.println("Param File = '"+ paramFilePath +"'");
         ImportPicture obj = new ImportPicture();
+        obj.params = new AppParameters(paramFilePath);
 
-        if (argv.length > 0) {
-            obj.imgDir = new File(argv[0]);
-        }
-
-        if (argv.length < 4) {
-            System.out.println("!!! Illigal command call. !!!");
-            System.out.println("> java -cp .:AdjustTime.jar:commons-imaging-1.0-SNAPSHOT.jar <targetDir> <time base image> <time> {EXIF/not} (gpx)");
-            System.out.println("> java -cp .:AdjustTime.jar:commons-imaging-1.0-SNAPSHOT.jar. IMG_01234.JPG 2012-06-15T12:52:22 EXIF");
-            System.out.println("> java -cp .:AdjustTime.jar . IMG_01234.JPG 2012-06-15T12:52:22 not");
-            System.out.println();
-            return;
-        }
+        System.out.println(" - param： "+ AppParameters.IMG_TIME +"="+ obj.params.getProperty(AppParameters.IMG_TIME) );
+        System.out.println(" - param： "+ AppParameters.IMG_BASE_FILE +"="+ obj.params.getProperty(AppParameters.IMG_BASE_FILE) );
+        System.out.println(" - param： "+ AppParameters.GPX_BASETIME +"="+ obj.params.getProperty(AppParameters.GPX_BASETIME) );
+        System.out.println(" - param： "+ AppParameters.IMG_SOURCE_FOLDER +"="+ obj.params.getProperty(AppParameters.IMG_SOURCE_FOLDER) );
+        System.out.println(" - param： "+ AppParameters.IMG_OUTPUT_FOLDER +"="+ obj.params.getProperty(AppParameters.IMG_OUTPUT_FOLDER) );
+        System.out.println(" - param： "+ AppParameters.IMG_OUTPUT +"="+ obj.params.getProperty(AppParameters.IMG_OUTPUT));     
+        System.out.println(" - param： "+ AppParameters.IMG_OUTPUT_ALL +"="+ obj.param_ImgOutputAll);
+        System.out.println(" - param： "+ AppParameters.IMG_OUTPUT_EXIF +"= "+ String.valueOf(obj.exif));
+        System.out.println(" - param： "+ AppParameters.GPX_SOURCE_FOLDER +"="+ obj.param_GpxSourceFolder);
+        System.out.println(" - param： "+ AppParameters.GPX_OUTPUT_WPT +"="+ obj.param_GpxOutputWpt);
+        System.out.println(" - param： "+ AppParameters.GPX_OVERWRITE_MAGVAR +"="+ Complementation.param_GpxOverwriteMagvar);
+        System.out.println(" - param： "+ AppParameters.GPX_OUTPUT_SPEED +"="+ Complementation.param_GpxOutputSpeed);
+        System.out.println(" - param： "+ AppParameters.GPX_GPXSPLIT +"="+ obj.param_GpxSplit);
+        System.out.println(" - param： "+ AppParameters.GPX_NO_FIRST_NODE +"="+ ImportPicture.param_GpxNoFirstNode);        
+        System.out.println(" - param： "+ AppParameters.GPX_REUSE +"="+ obj.param_GpxReuse);
 
-        obj.params = new AppParameters();
+        obj.ex = null;
+        // argv[0] --> AppParameters.IMG_SOURCE_FOLDER に置き換え
+        obj.imgDir = new File(obj.params.getProperty(AppParameters.IMG_SOURCE_FOLDER));
 
         // 基準時刻（ファイル更新日時 | EXIF撮影日時)
     	obj.exifBase = (obj.params.getProperty(AppParameters.GPX_BASETIME).equals("EXIF_TIME") ? true : false);
 
         // 基準時刻ファイルの「更新日時」を使って時刻合わせを行う。
-        File baseFile = new File(obj.imgDir, argv[1]);
+        // argv[1] --> AppParameters.IMG_BASE_FILE に置き換え
+        File baseFile = new File(obj.imgDir, obj.params.getProperty(AppParameters.IMG_BASE_FILE));
         if (obj.exifBase) {
             ImageMetadata meta = Imaging.getMetadata(baseFile);
             JpegImageMetadata jpegMetadata = (JpegImageMetadata)meta;
@@ -141,26 +160,16 @@ public class ImportPicture extends Thread {
                 return;
             }
         	String dateTimeOriginal = exif.getFieldValue(ExifTagConstants.EXIF_TAG_DATE_TIME_ORIGINAL)[0];
-        	long lastModifyTime = (new SimpleDateFormat("yyyy:MM:dd HH:mm:ss")).parse(dateTimeOriginal).getTime();
-        	jptime = new Date(lastModifyTime);
+        	long lastModifyTime = ImportPicture.toEXIFDate(dateTimeOriginal).getTime();
+        	imgtime = new Date(lastModifyTime);
         }
         else {
-            jptime = new Date(baseFile.lastModified());
-        }
-
-        String timeStr = argv[2];
-        try {
-            dfjp.setTimeZone(TimeZone.getTimeZone("JST"));
-            Date t = dfjp.parse(timeStr);
-            obj.delta = t.getTime() - jptime.getTime();
-        }
-        catch (ParseException e) {
-            System.out.println("'"+ timeStr +"' の書式が違います("+ TIME_FORMAT_STRING +")");
-            return;
+            imgtime = new Date(baseFile.lastModified());
         }
 
         // 出力ファイル
-        obj.outDir = new File(argv[3]);
+        // argv[3] --> AppParameters.IMG_OUTPUT に置き換え
+        obj.outDir = new File(obj.params.getProperty(AppParameters.IMG_OUTPUT_FOLDER));
 
         // その他のパラメータを読み取る
     	String paramStr = obj.params.getProperty(AppParameters.GPX_GPXSPLIT);
@@ -170,7 +179,7 @@ public class ImportPicture extends Thread {
         
     	paramStr = obj.params.getProperty(AppParameters.GPX_NO_FIRST_NODE);
     	if ((paramStr != null) && (paramStr.equals(Boolean.toString(true)))) {
-    		obj.param_GpxNoFirstNode = true;
+    		ImportPicture.param_GpxNoFirstNode = true;
     	}
     	
     	paramStr = obj.params.getProperty(AppParameters.GPX_REUSE);
@@ -224,6 +233,12 @@ public class ImportPicture extends Thread {
             	System.out.println("複数のGPXファイルがあるときには、'IMG.OUTPUT_ALL'オプションは指定できません。");
             	return;
             }
+            
+            java.util.Arrays.sort(files, new java.util.Comparator<File>() {
+        		public int compare(File file1, File file2){
+        		    return file1.getName().compareTo(file2.getName());
+        		}
+    	    });
             for (File file : files) {
                 if (file.isFile()) {
                     String filename = file.getName().toUpperCase();
@@ -243,26 +258,24 @@ public class ImportPicture extends Thread {
     	if ((paramStr != null) && (paramStr.equals(Boolean.toString(true)))) {
     		obj.exif = true;
     	}
+    	
+        String timeStr = obj.params.getProperty(AppParameters.IMG_TIME);
+        try {
+            Date t = toUTCDate(timeStr);
+            obj.delta = t.getTime() - imgtime.getTime();
+        }
+        catch (ParseException e) {
+            System.out.println("'"+ timeStr +"' の書式が違います("+ TIME_FORMAT_STRING +")");
+            return;
+        }
 
-        System.out.println(" - param： imgDir = '"+ obj.imgDir.getAbsolutePath() +"'");
-        System.out.println(" - param： outDir = '"+ (obj.outDir == null ? "" : obj.outDir.getAbsolutePath()) +"'");
-        System.out.println(" - param： gpxDir = '"+ (obj.gpxDir == null ? "" : obj.gpxDir.getAbsolutePath()) +"'");
-        System.out.println(" - param： number of gpxFiles = '"+ obj.gpxFiles.size() +"'");
-        System.out.println(" - param： "+ AppParameters.GPX_GPXSPLIT +"="+ obj.param_GpxSplit);
-        System.out.println(" - param： "+ AppParameters.GPX_NO_FIRST_NODE +"="+ obj.param_GpxNoFirstNode);        
-        System.out.println(" - param： "+ AppParameters.GPX_REUSE +"="+ obj.param_GpxReuse);        
-        System.out.println(" - param： "+ AppParameters.GPX_BASETIME +"="+ obj.params.getProperty(AppParameters.GPX_BASETIME) );
-        System.out.println(" - param： "+ AppParameters.IMG_OUTPUT +"="+ obj.params.getProperty(AppParameters.IMG_OUTPUT));     
-        System.out.println(" - param： "+ AppParameters.IMG_OUTPUT_ALL +"="+ obj.param_ImgOutputAll);
-        System.out.println(" - param： "+ AppParameters.IMG_OUTPUT_EXIF +"= "+ String.valueOf(obj.exif));
-        System.out.println(" - param： "+ AppParameters.GPX_SOURCE_FOLDER +"="+ obj.param_GpxSourceFolder);
-        System.out.println(" - param： "+ AppParameters.GPX_OUTPUT_WPT +"="+ obj.param_GpxOutputWpt);
-        System.out.println(" - param： "+ AppParameters.GPX_OVERWRITE_MAGVAR +"="+ Complementation.param_GpxOverwriteMagvar);
-        System.out.println(" - param： "+ AppParameters.GPX_OUTPUT_SPEED +"="+ Complementation.param_GpxOutputSpeed);
         obj.start();
         try {
-            obj.join();                            
+            obj.join();
         } catch(InterruptedException end) {}
+        if (obj.ex != null) {
+        	throw obj.ex;
+        }
     }
     
     public File gpxDir;
@@ -274,15 +287,16 @@ public class ImportPicture extends Thread {
     public ArrayList<File> gpxFiles = new ArrayList<>();
     public AppParameters params;
 	public boolean param_GpxSplit = false;
-	public boolean param_GpxNoFirstNode = false;
+	public static boolean param_GpxNoFirstNode = false;
 	public boolean param_GpxReuse = false;
-	//public boolean Complementation.param_GpxOutputSpeed = false;
-	//public boolean Complementation.param_GpxOverwriteMagvar = false;
 	public boolean param_GpxOutputWpt = true;
 	public boolean param_ImgOutputAll = false;
 	public String param_GpxSourceFolder = ".";
-	public static final long DIFF_MAE_TIME = 3000L;	// before 3 secound
+    Document document;
 	
+    public static final String TIME_FORMAT_STRING = "yyyy-MM-dd'T'HH:mm:ss'Z'";
+    private static final String EXIF_DATE_TIME_FORMAT_STRING = "yyyy:MM:dd HH:mm:ss";
+
     @Override
     public void run() {
         /**
@@ -313,6 +327,7 @@ public class ImportPicture extends Thread {
         }
         catch(ParserConfigurationException | DOMException | SAXException | IOException | ParseException | ImageReadException | ImageWriteException | IllegalArgumentException | TransformerException e) {
         	e.printStackTrace();
+        	this.ex = new Exception(e);
         }
     }
     
@@ -328,9 +343,12 @@ public class ImportPicture extends Thread {
      * @throws TransformerException 
      */
     void procGPXfile(File gpxFile) throws ParserConfigurationException, SAXException, IOException, ParseException, ImageReadException, ImageWriteException, TransformerException {
-        DocumentBuilderFactory factory;
-        DocumentBuilder        builder;
-        Node gpx;
+        DocumentBuilderFactory factory = null;
+        DocumentBuilder        builder = null;
+        ElementMapTRKSEG mapTRKSEG = null;
+        Node gpx = null;
+        
+        System.gc();
 
         String fileName = gpxFile.getName();
         String iStr = fileName.substring(0, fileName.length() - 4);
@@ -348,123 +366,22 @@ public class ImportPicture extends Thread {
         factory.setIgnoringComments(true);
         factory.setValidating(true);
 
+        // GPXファイルをパースする
+        mapTRKSEG = new ElementMapTRKSEG();
+        document = mapTRKSEG.parse(gpxFile);
+        
+        // パースされた mapTRKSEG の中身を出力する
+        mapTRKSEG.printinfo();
+        
         // GPX file --> Node root
-        DOMImplementation domImpl = builder.getDOMImplementation();
-        document = domImpl.createDocument("", "gpx", null);
-
-        /*
-         * <gpx>
-         *   <trk>
-         *     <name><![CDATA[Tracked with OSMTracker for Android?]]></name>
-         *     <cmt><![CDATA[警告: HDOP values aren't the HDOP as returned by the GPS device. They're approximated from the location accuracy in meters.]]></cmt>
-         *     <trkseg>
-         *       <trkpt lat="35.32123832" lon="139.56965631">
-         *         <ele>47.20000076293945</ele>
-         *         <time>2012-06-15T03:00:29Z</time>
-         *         <hdop>0.5</hdop>
-         *       </trkpt>
-         *     </trkseg>
-         *   </trk>
-         *   <wpt lat="35.2564461" lon="139.15437809"></wpt>
-         * </gpx>
-         */
-        TreeMap<Long,Element> map = new TreeMap<Long, Element>();
-        TreeMap<Long,Element> mapTRKSEG = new TreeMap<>();
-        Element trk = null;
-        //Element maeTRKPT = null;
-        gpx    = builder.parse(gpxFile).getFirstChild();
-        document = gpx.getOwnerDocument();
-        NodeList nodes = gpx.getChildNodes();
-        for (int i=0; i < nodes.getLength(); i++) {
-            Node node2 = nodes.item(i);
-            if (node2.getNodeName().equals("trk")) {
-                trk = (Element) node2;
-                
-                NodeList nodes1 = trk.getChildNodes();
-                int trksegCounter = 0;
-                for (int i1=0; i1 < nodes1.getLength(); i1++) {
-                    Node nodeTRKSEG = nodes1.item(i1);
-                    if (nodeTRKSEG.getNodeName().equals("trkseg")) {
-                    	trksegCounter++;
-                    	Element newTRKSEG = document.createElement("trkseg");
-                        Element trkseg = (Element) nodeTRKSEG;
-                        NodeList nodes2 = trkseg.getChildNodes();
-                        for (int i2=0; i2 < nodes2.getLength(); i2++) {
-                            Node nodeTRKPT = nodes2.item(i2);
-                            if (nodeTRKPT.getNodeName().equals("trkpt")) {
-                            	if (param_GpxNoFirstNode && (i2 == 0)) {
-                            		continue;
-                            	}
-                            	newTRKSEG.appendChild(getCopy(document, nodeTRKPT));
-                            }
-                        }
-                        mapTRKSEG.put(new Long(trksegCounter), getCopy(document, newTRKSEG));
+        gpx = builder.parse(gpxFile).getFirstChild();
 
-                        // <trk>から<trkseg>を削除する。
-                        trk.removeChild(nodeTRKSEG);
-                    }
-                }
-                
-                // <trkseg>毎に実行する
-                Iterator<Long> keyIte = mapTRKSEG.keySet().iterator();
-                while (keyIte.hasNext()) {    //ループ。反復子iteratorによる　キー　取得
-
-                	// <trk>に、新たな<trkseg>を追加する。
-                	Element newTRKSEG = mapTRKSEG.get(keyIte.next());
-                    trk.appendChild(newTRKSEG);
-                    
-                    // mapに、<trkpt>を割り付ける
-                    trkptMap(newTRKSEG, map);
-                }
-            }
-        }
-        
-        /*
-         * GPXへ割りつける開始時刻と終了時刻を求める
-         */
-		long gpxStartTime = (new Date()).getTime();		// 対象とする開始時刻(現在時刻)
-		long gpxEndTime = 0L;							// 対象とする終了時刻
-		Set<Long> keySet = map.keySet();  //すべてのキー値を取得
-		for (Long timeLong : keySet) {
-			long gpxTime = timeLong;
-			if (gpxStartTime > gpxTime) {
-			     gpxStartTime = gpxTime;
-			}
-			if (gpxEndTime < gpxTime) {
-			     gpxEndTime = gpxTime;
-			}
-		}
-		
-		/*
-		 * SPEEDをGPXに設定する
-		 * 条件： SPEEDを書き出すフラグがONの時
-		 * 条件： オリジナルのSPEEDがある場合「上書きする／変更しない」（GPX_OUTPUT_SPEED）
-		 */
-		/*
-        TreeMap<Long,Element> map2 = new TreeMap<Long, Element>();
-		if (Boolean.parseBoolean(params.getProperty(AppParameters.GPX_OUTPUT_SPEED))) {
-			for (Long timeL : keySet) {
-	            Element trkptE = trkpt(map, new Date(timeL));
-	            if (trkptE != null) {
-	            	map2.put(timeL, trkptE);
-	            }
-	            else {
-	            	map2.put(timeL, map.get(timeL));
-	            }
-			}
-		}
-		else {
-			map2 = (TreeMap<Long, Element>) map.clone();
-		}
-		*/
-		 
-		System.out.println("GPX start time： "+ dfjp.format(new Date(gpxStartTime)) + "\t[GMT " + dfuk.format(new Date(gpxStartTime))+"]");
-		System.out.println("  GPX end time： "+ dfjp.format(new Date(gpxEndTime)) + "\t[GMT " + dfuk.format(new Date(gpxEndTime))+"]");
-		System.out.println("------------|--------------------|--------------------|------------|------------|--------|------|------|");
-		System.out.println(" name       | UpdateTime         | GPStime            | Latitude   | Longitude  | ele    |magvar| km/h |");
-		System.out.println("------------|--------------------|--------------------|------------|------------|--------|------|------|");
-		proc(imgDir, delta, gpxStartTime, gpxEndTime, map, exif, gpx);
-		System.out.println("------------|--------------------|--------------------|------------|------------|--------|------|------|");
+        // imgDir内の画像ファイルを処理する
+		System.out.println("|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------|");
+		System.out.println("| name                           | Camera Time        | GPStime            |   Latitude   |   Longitude  | ele    |magvar| km/h |");
+		System.out.println("|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------|");
+		proc(imgDir, delta, mapTRKSEG, exif, gpx);
+		System.out.println("|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------|");
 
         // 出力
         outputFile.getParentFile().mkdirs();
@@ -480,7 +397,6 @@ public class ImportPicture extends Thread {
         os = new FileOutputStream(outputFile);
         result = new StreamResult(os);
         transformer.transform(source, result);
-
     }
     
 	
@@ -491,18 +407,14 @@ public class ImportPicture extends Thread {
      * @throws ImageReadException 
      * @throws ImageWriteException 
      */
-    boolean proc(File dir, long delta, long gpxStartTime, long gpxEndTime, TreeMap<Long,Element> map, boolean exifWrite, Node gpx) throws ParseException, ImageReadException, IOException, ImageWriteException {
-        DecimalFormat yearFormatter = new DecimalFormat("0000");
-        DecimalFormat monthFormatter = new DecimalFormat("00");
-        DecimalFormat dayFormatter = new DecimalFormat("00");
-
+    boolean proc(File dir, long delta, ElementMapTRKSEG mapTRKSEG, boolean exifWrite, Node gpx) throws ParseException, ImageReadException, IOException, ImageWriteException {
         boolean ret = false;
         File[] files = dir.listFiles(new JpegFileFilter());
         Arrays.sort(files, new FileSort());
         for (File image : files) {
-            System.out.print(String.format("%12s|", image.getName()));
+            System.out.print(String.format("|%-32s|", image.getName()));
             if (image.isDirectory()) {
-                ret = proc(image, delta, gpxStartTime, gpxEndTime, map, exifWrite, gpx);
+                ret = proc(image, delta, mapTRKSEG, exifWrite, gpx);
                 continue;
             }
             
@@ -512,374 +424,221 @@ public class ImportPicture extends Thread {
             	continue;
             }
             
-            Date itime = new Date(image.lastModified());
-            if (this.exifBase) {
-                ImageMetadata meta = Imaging.getMetadata(image);
-                JpegImageMetadata jpegMetadata = (JpegImageMetadata)meta;
-                if (jpegMetadata == null) {
-                    System.out.println("'"+ image.getAbsolutePath() +"' にEXIF情報がありません");
-                    continue;
-                }
-                TiffImageMetadata exif = jpegMetadata.getExif();
-                if (exif == null) {
-                    System.out.println("'"+ image.getAbsolutePath() +"' にEXIF情報がありません");
-                    continue;
-                }
-            	String dateTimeOriginal = exif.getFieldValue(ExifTagConstants.EXIF_TAG_DATE_TIME_ORIGINAL)[0];
-            	long lastModifyTime = (new SimpleDateFormat("yyyy:MM:dd HH:mm:ss")).parse(dateTimeOriginal).getTime();
-            	itime = new Date(lastModifyTime);
+            Discripter result = procImageFile(image, delta, mapTRKSEG, exifWrite, gpx);
+            ret |= result.ret;
+            switch (result.control) {
+            case Discripter.CONTINUE:
+            	continue;
+            case Discripter.BREAK:
+            	break;
             }
-
-            // uktime <-- 画像撮影時刻に対応するGPX時刻
-            Date uktime = new Date(itime.getTime() + delta);
-            System.out.print(String.format("%20s ", dfjp.format(itime)));
-            System.out.print(String.format("%20s|", dfjp.format(uktime)));
-            if ((uktime.getTime() < gpxStartTime) || (uktime.getTime() > gpxEndTime)) {
-                System.out.println(String.format("%20s ", "out of time."));
-                if (!this.param_ImgOutputAll) {
-                	continue;
-                }
+        }
+        return ret;
+    }
+    
+    class Discripter {
+    	static final int NEXT = 0;
+    	static final int CONTINUE = -1;
+    	static final int BREAK = 1;
+    	
+    	public boolean ret;
+    	public int control;
+    	public Discripter(boolean ret) {
+    		this.ret = ret;
+    		this.control = Discripter.NEXT;
+    	}
+    }
+    
+    Discripter procImageFile(File image, long delta, ElementMapTRKSEG mapTRKSEG, boolean exifWrite, Node gpx) throws ParseException, ImageReadException, IOException, ImageWriteException {
+        DecimalFormat yearFormatter = new DecimalFormat("0000");
+        DecimalFormat monthFormatter = new DecimalFormat("00");
+        DecimalFormat dayFormatter = new DecimalFormat("00");
+        
+        Discripter result = new Discripter(false);
+        
+        // itime <-- 画像ファイルの撮影時刻
+        //			ファイルの更新日時／EXIFの撮影日時
+        Date itime = new Date(image.lastModified());
+        if (this.exifBase) {
+            ImageMetadata meta = Imaging.getMetadata(image);
+            JpegImageMetadata jpegMetadata = (JpegImageMetadata)meta;
+            if (jpegMetadata == null) {
+                System.out.println("'"+ image.getAbsolutePath() +"' にEXIF情報がありません");
+                result.control = Discripter.CONTINUE;
+                return result;
             }
-
-    		// 時刻uktimeにおける<magver>をtrkptに追加する
-            Element trkptE = trkpt(map, uktime);
-            String eleStr = "-";
-            String magvarStr = "-";
-            String speedStr = "-";
-            double latitude = 90.5D;
-            double longitude = 180.5D;
-            TagTrkpt trkptT = null;
-            if (trkptE == null) {
-                System.out.println(String.format("%20s ", "Out of GPX logging time."));
-                if (!this.param_ImgOutputAll) {
-                	continue;
-                }
+            TiffImageMetadata exif = jpegMetadata.getExif();
+            if (exif == null) {
+                System.out.println("'"+ image.getAbsolutePath() +"' にEXIF情報がありません");
+                result.control = Discripter.CONTINUE;
+                return result;
             }
-            else {
-                trkptT = new TagTrkpt(trkptE);
-
-            	//Element wpt = createWptTag(image, uktime.getTime(), trkptE);
-                //String latStr = trkptT.lat.toString();
-                //String lonStr = trkptT.lon.toString();
-                latitude = trkptT.lat;
-                longitude = trkptT.lon;
-                
-                if (trkptT.eleStr != null) {
-                	eleStr = new String(trkptT.eleStr);
-                }
-                
-                if (trkptT.magvarStr != null) {
-                	magvarStr = new String(trkptT.magvarStr);
-                }
-                
-                if (trkptT.speedStr != null) {
-                	speedStr = new String(trkptT.speedStr);
-                }
-                System.out.print(String.format("%12s %12s|", (new Double(latitude)).toString(), (new Double(longitude)).toString()));
-                System.out.println(String.format("%8s|%6s|%6s|", eleStr, magvarStr, speedStr));
+        	String dateTimeOriginal = exif.getFieldValue(ExifTagConstants.EXIF_TAG_DATE_TIME_ORIGINAL)[0];
+        	itime = ImportPicture.toEXIFDate(dateTimeOriginal);
+        }
+        System.out.print(String.format("%20s|", toUTCString(itime)));
+
+        // uktime <-- 画像撮影時刻に対応するGPX時刻(補正日時)
+        Date correctedtime = new Date(itime.getTime() + delta);
+        System.out.print(String.format("%20s|", toUTCString(correctedtime)));
+
+		// 時刻uktimeにおける<magver>をtrkptに追加する
+        String eleStr = "-";
+        String magvarStr = "-";
+        String speedStr = "-";
+        double latitude = 90.5D;
+        double longitude = 180.5D;
+        //Element trkptE = null;
+        TagTrkpt trkptT = null;
+
+        for (Map.Entry<Date,ElementMapTRKPT> map : mapTRKSEG.entrySet()) {
+        	ElementMapTRKPT mapTRKPT = map.getValue();
+        	trkptT = mapTRKPT.getValue(correctedtime);
+            if (trkptT != null) {
+                break;
             }
+        }
 
-            ret = true;
-            FileOutputStream fos = null;
-            outDir.mkdir();
-
-            if (exifWrite) {
-                TiffOutputSet outputSet = null;
-
-                ImageMetadata meta = Imaging.getMetadata(image);
-                JpegImageMetadata jpegMetadata = (JpegImageMetadata)meta;
-                if (jpegMetadata != null) {
-                    TiffImageMetadata exif = jpegMetadata.getExif();
-                    if (exif != null) {
-                        outputSet = exif.getOutputSet();
-                    }
-                }
-
-                if (outputSet == null) {
-                    System.out.println("added : new tiff output set");
-                    outputSet = new TiffOutputSet();
-                }
-
-                //---- EXIF_TAG_DATE_TIME_ORIGINAL / 「撮影日時/オリジナル画像の生成日時」----
-                TiffOutputDirectory exifDir = outputSet.getOrCreateExifDirectory();
-                {
-                    Calendar cal = GregorianCalendar.getInstance();
-                    cal.setTime(uktime);
-                    exifDir.removeField(ExifTagConstants.EXIF_TAG_DATE_TIME_ORIGINAL);
-                    exifDir.add(ExifTagConstants.EXIF_TAG_DATE_TIME_ORIGINAL, new SimpleDateFormat("yyyy:MM:dd HH:mm:ss").format(cal.getTime()));
-                }
-
-                //---- EXIF GPS_TIME_STAMP ----
-                TiffOutputDirectory gpsDir = outputSet.getOrCreateGPSDirectory();
-                {
-                    Calendar cal = GregorianCalendar.getInstance(TimeZone.getTimeZone("UTC"));
-                    cal.setTime(uktime);
-                    final String yearStr = yearFormatter.format(cal.get(Calendar.YEAR));
-                    final String monthStr = monthFormatter.format(cal.get(Calendar.MONTH) + 1);
-                    final String dayStr = dayFormatter.format(cal.get(Calendar.DAY_OF_MONTH));
-                    final String dateStamp = yearStr +":"+ monthStr +":"+ dayStr;
-
-                    gpsDir.removeField(GpsTagConstants.GPS_TAG_GPS_TIME_STAMP);
-                    gpsDir.add(GpsTagConstants.GPS_TAG_GPS_TIME_STAMP,
-                            RationalNumber.valueOf(cal.get(Calendar.HOUR_OF_DAY)),
-                            RationalNumber.valueOf(cal.get(Calendar.MINUTE)),
-                            RationalNumber.valueOf(cal.get(Calendar.SECOND)));
-                    gpsDir.removeField(GpsTagConstants.GPS_TAG_GPS_DATE_STAMP);
-                    gpsDir.add(GpsTagConstants.GPS_TAG_GPS_DATE_STAMP, dateStamp);
-                }
-
-                if (trkptE != null) {
-	                //---- EXIF GPS elevation/ALTITUDE ----
-	                if (eleStr.equals("-") == false) {
-	                    final double altitude = Double.parseDouble(eleStr);
-	                    gpsDir.removeField(GpsTagConstants.GPS_TAG_GPS_ALTITUDE);
-	                    gpsDir.add(GpsTagConstants.GPS_TAG_GPS_ALTITUDE, RationalNumber.valueOf(altitude));
-	                }
-	
-	                //---- EXIF GPS magvar/IMG_DIRECTION ----
-	                if (magvarStr.equals("-") == false) {
-	                    final double magvar = Double.parseDouble(magvarStr);
-	                    gpsDir.removeField(GpsTagConstants.GPS_TAG_GPS_IMG_DIRECTION);
-	                    gpsDir.add(GpsTagConstants.GPS_TAG_GPS_IMG_DIRECTION, RationalNumber.valueOf(magvar));
-	                }
-	
-	                //---- EXIF GPS_ ----
-                    final String longitudeRef = (longitude < 0 ? "W" : "E");
-                    longitude = Math.abs(longitude);
-                    final String latitudeRef = (latitude < 0 ? "S" : "N");
-                    latitude = Math.abs(latitude);
-
-                    gpsDir.removeField(GpsTagConstants.GPS_TAG_GPS_LONGITUDE_REF);
-                    gpsDir.add(GpsTagConstants.GPS_TAG_GPS_LONGITUDE_REF, longitudeRef);
-                    gpsDir.removeField(GpsTagConstants.GPS_TAG_GPS_LATITUDE_REF);
-                    gpsDir.add(GpsTagConstants.GPS_TAG_GPS_LATITUDE_REF, latitudeRef);
-                    {
-                        double value = longitude;
-                        final double longitudeDegrees = (long) value;
-                        value %= 1;
-                        value *= 60.0;
-                        final double longitudeMinutes = (long) value;
-                        value %= 1;
-                        value *= 60.0;
-                        final double longitudeSeconds = value;
-                        gpsDir.removeField(GpsTagConstants.GPS_TAG_GPS_LONGITUDE);
-                        gpsDir.add(GpsTagConstants.GPS_TAG_GPS_LONGITUDE,
-                                RationalNumber.valueOf(longitudeDegrees),
-                                RationalNumber.valueOf(longitudeMinutes),
-                                RationalNumber.valueOf(longitudeSeconds));
-                    }
-                    {
-                        double value = latitude;
-                        final double latitudeDegrees = (long) value;
-                        value %= 1;
-                        value *= 60.0;
-                        final double latitudeMinutes = (long) value;
-                        value %= 1;
-                        value *= 60.0;
-                        final double latitudeSeconds = value;
-                        gpsDir.removeField(GpsTagConstants.GPS_TAG_GPS_LATITUDE);
-                        gpsDir.add(GpsTagConstants.GPS_TAG_GPS_LATITUDE,
-                                RationalNumber.valueOf(latitudeDegrees),
-                                RationalNumber.valueOf(latitudeMinutes),
-                                RationalNumber.valueOf(latitudeSeconds));
-                    }
-                }
-
-                ExifRewriter rewriter = new ExifRewriter();
-                try {
-                    fos = new FileOutputStream(new File(outDir, imageName));
-                    rewriter.updateExifMetadataLossy(image, fos, outputSet);
-                }
-                finally {
-                    if (fos != null) {
-                        fos.close();
-                    }
-                }
-
-                if (Boolean.parseBoolean(params.getProperty(AppParameters.GPX_OUTPUT_WPT))) {
-                	if (trkptT != null) {
-                    	Element temp = createWptTag(image, itime.getTime(), trkptT.trkpt);
-                        gpx.appendChild(temp);
-                	}
-                }
+        if (trkptT == null) {
+            System.out.print(String.format("%-14s|%-14s|", "", ""));
+            System.out.println(String.format("%8s|%6s|%6s|", "", "", ""));
+            if (!this.param_ImgOutputAll) {
+                result.control = Discripter.CONTINUE;
+                return result;
             }
-            else {
-            	if (this.param_ImgOutputAll) {
-                	// EXIFの変換を伴わない単純なファイルコピー
-            		FileInputStream sStream = new FileInputStream(image);
-            		FileInputStream dStream = new FileInputStream(new File(outDir, imageName));
-                    FileChannel srcChannel = sStream.getChannel();
-                    FileChannel destChannel = dStream.getChannel();
-                    try {
-                        srcChannel.transferTo(0, srcChannel.size(), destChannel);
-                    }
-                    finally {
-                        srcChannel.close();
-                        destChannel.close();
-                        sStream.close();
-                        dStream.close();
-                    }
-            	}
+        }
+        else {
+            latitude = trkptT.lat;
+            longitude = trkptT.lon;
+            
+            if (trkptT.eleStr != null) {
+            	eleStr = new String(trkptT.eleStr);
+            }
+            
+            if (trkptT.magvarStr != null) {
+            	magvarStr = new String(trkptT.magvarStr);
+            }
+            
+            if (trkptT.speedStr != null) {
+            	speedStr = new String(trkptT.speedStr);
             }
+            //System.out.print(String.format("%-14s|%-14s|", (new Double(latitude)).toString(), (new Double(longitude)).toString()));
+            System.out.print(String.format("%14.10f|%14.10f|", latitude, longitude));
+            System.out.println(String.format("%8s|%6s|%6s|", eleStr, magvarStr, speedStr));
         }
-        return ret;
-    }
-	
-    static Document document;
 
+        result.ret = true;
+        FileOutputStream fos = null;
+        outDir.mkdir();
 
-    /**
-     * 2012-06-10T05:09:46Z  （日本時間の'2012-06-10T14:09:46'）
-     */
-    public static final String TIME_FORMAT_STRING = "yyyy-MM-dd'T'HH:mm:ss";
-    public static SimpleDateFormat dfjp = new SimpleDateFormat(TIME_FORMAT_STRING);
-    public static SimpleDateFormat dfuk = new SimpleDateFormat(TIME_FORMAT_STRING +"'Z'");
-
-    /**
-     * XMLエレメント＜trkpt＞をTIMEでキー付したHashMapを生成する<br>
-     * 
-     * <trkseg>
-     * 	<trkpt lat="34.976635" lon="138.466228">
-     * 		<ele>267.291</ele>
-     * 		<magvar>359</magvar>
-     * 		<speed></speed>
-     * 		<time>2016-07-02T08:25:18Z</time>
-     * 	</trkpt>
-     * </trkseg>
-     * 
-     * @param trk
-     * @param map
-     * @throws ParseException
-     */
-    public void trkptMap(Element trkseg, TreeMap<Long,Element> map) throws ParseException {
-        dfuk.setTimeZone(TimeZone.getTimeZone("GMT"));
+        if (exifWrite) {
+            TiffOutputSet outputSet = null;
 
-        NodeList nodes2 = trkseg.getChildNodes();
-        for (int i2=0; i2 < nodes2.getLength(); i2++) {
-            Node node3 = nodes2.item(i2);
-            if (node3.getNodeName().equals("trkpt")) {
-                Element trkpt = (Element) node3;
-
-                NodeList nodes3 = trkpt.getChildNodes();
-                for (int i3=0; i3 < nodes3.getLength(); i3++) {
-                    Node node4 = nodes3.item(i3);
-                    if (node4.getNodeName().equals("time")) {
-                        Element time = (Element) node4;
-                        NodeList nodes4 = time.getChildNodes();      // 子ノードを取得
-                        for (int i4=0; i4< nodes4.getLength(); i4++) {
-                            Node node5 = nodes4.item(i4);
-                            if (node5 != null) {
-                                if (node5.getNodeType() == Node.TEXT_NODE) {
-                                    String timeStr = node5.getNodeValue();
-                                    long t = dfuk.parse(timeStr).getTime();
-                                    map.put(t, getCopy(trkseg.getOwnerDocument(), trkpt));
-                                }
-                            }
-                        }
-                    }
+            ImageMetadata meta = Imaging.getMetadata(image);
+            JpegImageMetadata jpegMetadata = (JpegImageMetadata)meta;
+            if (jpegMetadata != null) {
+                TiffImageMetadata exif = jpegMetadata.getExif();
+                if (exif != null) {
+                    outputSet = exif.getOutputSet();
                 }
             }
-        }
-    }
 
-    
-    /**
-     *	＜trkpt lat="35.32123832" lon="139.56965631">
-     *          ＜ele>47.20000076293945＜/ele>
-     *          ＜time>2012-06-15T03:00:29Z＜/time>
-     *	＜/trkpt>
-     *DIFF_MAE_TIME
-     * @return
-     * @param map
-     * @param jptime	画像ファイルの撮影日時 ミリ秒（日本時間）
-     * @throws ParseException
-     */
-    public Element trkpt(TreeMap<Long,Element> map, Date jptime) throws ParseException {
-    	// 指定した時刻のエレメント(imaTrkpt)を取得する
-        Element imaE = getTrkpt(map, jptime);
-        if (imaE != null) {
-        	Element maeE = getMaeTrkpt(map, new TagTrkpt(imaE));
-            if (maeE != null) {
-            	Complementation comp = new Complementation(imaE, maeE);
+            if (outputSet == null) {
+                System.out.println("added : new tiff output set");
+                outputSet = new TiffOutputSet();
+            }
 
-                // <MAGVAR>がなければ、
-                // 直前の位置と、現在地から進行方向を求める
-            	// 経度(longitude)と経度から進行方向を求める
-                if (Complementation.param_GpxOverwriteMagvar) {
-                	comp.complementationMagvar();
-                }
+            //---- EXIF_TAG_DATE_TIME_ORIGINAL / 「撮影日時/オリジナル画像の生成日時」----
+            TiffOutputDirectory exifDir = outputSet.getOrCreateExifDirectory();
+            {
+                Calendar cal = GregorianCalendar.getInstance();
+                cal.setTimeZone(TimeZone.getTimeZone("UTC"));
+                cal.setTime(correctedtime);
+                exifDir.removeField(ExifTagConstants.EXIF_TAG_DATE_TIME_ORIGINAL);
+                exifDir.add(ExifTagConstants.EXIF_TAG_DATE_TIME_ORIGINAL, ImportPicture.toEXIFString(cal.getTime()));
+            }
 
-                // 緯度・経度と時間差から速度(km/h)を求める
-                if (Complementation.param_GpxOutputSpeed) {
-                	comp.complementationSpeed();
-                }
-                imaE = (Element)(comp.imaTag.trkpt.cloneNode(true));
+            //---- EXIF GPS_TIME_STAMP ----
+            TiffOutputDirectory gpsDir = outputSet.getOrCreateGPSDirectory();
+            {
+                Calendar cal = GregorianCalendar.getInstance(TimeZone.getTimeZone("UTC"));
+                cal.setTimeZone(TimeZone.getTimeZone("GMT+00"));
+                cal.setTime(correctedtime);
+                final String yearStr = yearFormatter.format(cal.get(Calendar.YEAR));
+                final String monthStr = monthFormatter.format(cal.get(Calendar.MONTH) + 1);
+                final String dayStr = dayFormatter.format(cal.get(Calendar.DAY_OF_MONTH));
+                final String dateStamp = yearStr +":"+ monthStr +":"+ dayStr;
+
+                gpsDir.removeField(GpsTagConstants.GPS_TAG_GPS_TIME_STAMP);
+                gpsDir.add(GpsTagConstants.GPS_TAG_GPS_TIME_STAMP,
+                        RationalNumber.valueOf(cal.get(Calendar.HOUR_OF_DAY)),
+                        RationalNumber.valueOf(cal.get(Calendar.MINUTE)),
+                        RationalNumber.valueOf(cal.get(Calendar.SECOND)));
+                gpsDir.removeField(GpsTagConstants.GPS_TAG_GPS_DATE_STAMP);
+                gpsDir.add(GpsTagConstants.GPS_TAG_GPS_DATE_STAMP, dateStamp);
             }
-        }
-        return imaE;
-    }
 
-    /**
-     * [map]から指定した時刻の<trkpt>エレメントを取り出す。
-     * GPX時刻との差が10分以上は無効
-     * 
-     * @param map
-     * @param jptime
-     * @return
-     * @throws ParseException
-     */
-    public Element getTrkpt(TreeMap<Long,Element> map, Date jptime) throws ParseException {
-        long sa = 2L * 3600000L;
-        long jpt = jptime.getTime();
-        
-        Element ret = null;
+            if (trkptT != null) {
+                //---- EXIF GPS elevation/ALTITUDE ----
+                if (eleStr.equals("-") == false) {
+                    final double altitude = Double.parseDouble(eleStr);
+                    gpsDir.removeField(GpsTagConstants.GPS_TAG_GPS_ALTITUDE);
+                    gpsDir.add(GpsTagConstants.GPS_TAG_GPS_ALTITUDE, RationalNumber.valueOf(altitude));
+                }
 
-        Set<Long> keySet = map.keySet();  //すべてのキー値を取得
-        Iterator<Long> keyIte = keySet.iterator();
-        while (keyIte.hasNext()) {    //ループ。反復子iteratorによる　キー　取得
-            Long time = keyIte.next();
-            long t = time;
+                //---- EXIF GPS magvar/IMG_DIRECTION ----
+                if (magvarStr.equals("-") == false) {
+                    final double magvar = Double.parseDouble(magvarStr);
+                    gpsDir.removeField(GpsTagConstants.GPS_TAG_GPS_IMG_DIRECTION);
+                    gpsDir.add(GpsTagConstants.GPS_TAG_GPS_IMG_DIRECTION, RationalNumber.valueOf(magvar));
+                }
 
-            if (Math.abs(jpt - t) < sa) {
-                sa = Math.abs(jpt - t);
-                ret = map.get(time);
+                //---- EXIF GPS_ ----
+                longitude = Math.abs(longitude);
+                latitude = Math.abs(latitude);
+                outputSet.setGPSInDegrees(longitude, latitude);
             }
-        }
 
-        if (sa < (60000L * 10L)) {
-        	// GPX時刻との差が10分以内なら有効
-            return ret;
-        }
-        return null;
-    }
-
-    public Element getMaeTrkpt(TreeMap<Long,Element> map, TagTrkpt imaTrkpt) throws ParseException {
-        Element ret = null;
-        long diffTime = 2L * 3600000L;		// ２時間
-        long jpt = imaTrkpt.time.getTime() - DIFF_MAE_TIME;
-
-        Set<Long> keySet = map.keySet();  //すべてのキー値を取得
-        Iterator<Long> keyIte = keySet.iterator();
-        while (keyIte.hasNext()) {    //ループ。反復子iteratorによる　キー　取得
-            Long time = keyIte.next();
-            long t = time;
+            ExifRewriter rewriter = new ExifRewriter();
+            try {
+                fos = new FileOutputStream(new File(outDir, image.getName()));
+                rewriter.updateExifMetadataLossy(image, fos, outputSet);
+            }
+            finally {
+                if (fos != null) {
+                    fos.close();
+                }
+            }
 
-            if (Math.abs(jpt - t) < diffTime) {
-            	diffTime = Math.abs(jpt - t);
-                ret = map.get(time);
+            if (Boolean.parseBoolean(params.getProperty(AppParameters.GPX_OUTPUT_WPT))) {
+            	if (trkptT != null) {
+                	Element temp = createWptTag(image, itime.getTime(), trkptT.trkpt);
+                    gpx.appendChild(temp);
+            	}
             }
         }
-
-        if (diffTime < (60000L * 10L)) {
-        	// GPX時刻との差が10分以内なら有効
-        	if (diffTime < (imaTrkpt.time.getTime() - 1000)) {
-        		// 元の時刻との差が１秒以上あること
-                return ret;
+        else {
+        	if (this.param_ImgOutputAll) {
+            	// EXIFの変換を伴わない単純なファイルコピー
+        		FileInputStream sStream = new FileInputStream(image);
+        		FileInputStream dStream = new FileInputStream(new File(outDir, image.getName()));
+                FileChannel srcChannel = sStream.getChannel();
+                FileChannel destChannel = dStream.getChannel();
+                try {
+                    srcChannel.transferTo(0, srcChannel.size(), destChannel);
+                }
+                finally {
+                    srcChannel.close();
+                    destChannel.close();
+                    sStream.close();
+                    dStream.close();
+                }
         	}
         }
-        return null;
+        result.control = Discripter.NEXT;
+        return result;
     }
-    
+	
     /**
      * 対象は '*.JPG' のみ対象とする
      * @return 
@@ -993,7 +752,7 @@ public class ImportPicture extends Thread {
         wpt.appendChild(name);
 
         Element link = document.createElement("link");
-        link.setAttribute("href", getShortPathName(imgDir, iFile));
+        link.setAttribute("href", ImportPicture.getShortPathName(imgDir, iFile));
         Element text = document.createElement("text");
         text.setTextContent(iFile.getName());
         link.appendChild(text);
@@ -1001,6 +760,42 @@ public class ImportPicture extends Thread {
 
         return wpt;
     }
+    
+    /**
+     * DateをEXIFの文字列に変換する。
+     * 注意：EXiFの撮影時刻はUTC時間ではない
+     * @param localdate
+     * @return
+     */
+    public static String toEXIFString(Date localdate) {
+    	DateFormat dfUTC = new SimpleDateFormat(EXIF_DATE_TIME_FORMAT_STRING);
+    	return dfUTC.format(localdate);
+    }
+    
+    /**
+     * EXIFの文字列をDateに変換する。
+     * 注意：EXiFの撮影時刻はUTC時間ではない
+     * @param timeStr
+     * @return
+     * @throws ParseException
+     */
+    public static Date toEXIFDate(String timeStr) throws ParseException {
+    	DateFormat dfUTC = new SimpleDateFormat(EXIF_DATE_TIME_FORMAT_STRING);
+    	//dfUTC.setTimeZone(TimeZone.getTimeZone("UTC"));
+    	return dfUTC.parse(timeStr);
+    }
+	
+    public static String toUTCString(Date localdate) {
+    	DateFormat dfUTC = new SimpleDateFormat(TIME_FORMAT_STRING);
+    	dfUTC.setTimeZone(TimeZone.getTimeZone("UTC"));
+    	return dfUTC.format(localdate);
+    }
+	
+    public static Date toUTCDate(String timeStr) throws ParseException {
+    	DateFormat dfUTC = new SimpleDateFormat(TIME_FORMAT_STRING);
+    	dfUTC.setTimeZone(TimeZone.getTimeZone("UTC"));
+    	return dfUTC.parse(timeStr);
+    }
 	
     static String getShortPathName(File dir, File iFile) {
         String dirPath = dir.getAbsolutePath();
@@ -1012,43 +807,13 @@ public class ImportPicture extends Thread {
             return filePath;
         }
     }
-
-    public static Element getCopy(Document doc, Node node) {
-        Element root = doc.createElement(node.getNodeName());
-
-        NamedNodeMap nodeMap = node.getAttributes();
-        if (null != nodeMap) {
-            for (int j=0; j < nodeMap.getLength(); j++ ) {
-                root.setAttribute(nodeMap.item(j).getNodeName(), nodeMap.item(j).getNodeValue());
-            }
-        }
-
-        NodeList nodes = node.getChildNodes();
-        for (int i=0; i < nodes.getLength(); i++) {
-            Node node2 = nodes.item(i);
-            if (node2.getNodeType() == Node.ELEMENT_NODE) {
-                root.appendChild(getCopy(doc, node2));
-            }
-            else if (node2.getNodeType() == Node.TEXT_NODE) {
-                String str = node2.getNodeValue();
-                Text textContents = doc.createTextNode(str);
-                root.appendChild(textContents);
-            }
-            else if (node2.getNodeType() == Node.CDATA_SECTION_NODE) {
-                String str = node2.getNodeValue();
-                CDATASection cdataSection = doc.createCDATASection(str);
-                root.appendChild(cdataSection);
-            }
-        }
-        return root;
-    }
-	
+    
     /**
      * ファイル名の順序に並び替えるためのソートクラス
      * 
      * @author hayashi
      */
-    static class FileSort implements Comparator<File>{
+    static class FileSort implements Comparator<File> {
         @Override
         public int compare(File src, File target){
             int diff = src.getName().compareTo(target.getName());
@@ -1060,7 +825,7 @@ public class ImportPicture extends Thread {
      * JPEGファイルフィルター
      * @author yuu
      */
-	class JpegFileFilter implements FilenameFilter{
+	class JpegFileFilter implements FilenameFilter {
     	public boolean accept(File dir, String name) {
 			if (name.toUpperCase().matches(".*\\.JPG$")) {
 				return true;