diff --git a/importPicture/.classpath b/importPicture/.classpath
index 1687303..2061450 100644
--- a/importPicture/.classpath
+++ b/importPicture/.classpath
@@ -2,6 +2,5 @@
-
diff --git a/importPicture/MatchTime.bat b/importPicture/MatchTime.bat
index 89dee31..b68b169 100644
--- a/importPicture/MatchTime.bat
+++ b/importPicture/MatchTime.bat
@@ -1,2 +1 @@
-java -cp ./importPicture.jar osm.jp.gpx.matchtime.gui.MatchTime
-pause
+javaw -jar MatchTime.jar
\ No newline at end of file
diff --git a/importPicture/MatchTime.sh b/importPicture/MatchTime.sh
new file mode 100644
index 0000000..59e8a00
--- /dev/null
+++ b/importPicture/MatchTime.sh
@@ -0,0 +1 @@
+java -jar MatchTime.jar
diff --git a/importPicture/build.xml b/importPicture/build.xml
index 27b3f7e..9a58d4f 100644
--- a/importPicture/build.xml
+++ b/importPicture/build.xml
@@ -14,7 +14,7 @@
-
+
@@ -69,7 +69,7 @@
-
+
diff --git a/importPicture/importPictute.bat b/importPicture/importPictute.bat
deleted file mode 100644
index 4087038..0000000
--- a/importPicture/importPictute.bat
+++ /dev/null
@@ -1,7 +0,0 @@
-java -jar importPicture.jar list.csv /home/hayashi/osm/20140101/10040101 DSC01396.JPG 2014-01-01T15:46:56 "/home/hayashi/osm/20140101/2014-01-01 09.14.01 自動.gpx"
-java -jar importPicture.jar list.csv /home/hayashi/osm/20140101/10040101 DSC01396.JPG 2014-01-01T15:46:56 "/home/hayashi/osm/20140101/2014-01-01 09.59.09 自動.gpx"
-java -jar importPicture.jar list.csv /home/hayashi/osm/20140101/10040101 DSC01396.JPG 2014-01-01T15:46:56 "/home/hayashi/osm/20140101/2014-01-01 10.44.19 自動.gpx"
-java -jar importPicture.jar list.csv /home/hayashi/osm/20140101/10040101 DSC01396.JPG 2014-01-01T15:46:56 "/home/hayashi/osm/20140101/2014-01-01 11.29.22 自動.gpx"
-java -jar importPicture.jar list.csv /home/hayashi/osm/20140101/10040101 DSC01396.JPG 2014-01-01T15:46:56 "/home/hayashi/osm/20140101/2014-01-01 12.14.49 自動.gpx"
-java -jar importPicture.jar list.csv /home/hayashi/osm/20140101/10040101 DSC01396.JPG 2014-01-01T15:46:56 "/home/hayashi/osm/20140101/20140101.gpx"
-java -jar importPicture.jar list.csv /home/hayashi/osm/20140101/10040101 DSC01396.JPG 2014-01-01T15:46:56 "/home/hayashi/osm/20140101/Current.gpx"
diff --git a/importPicture/importPictute.sh b/importPicture/importPictute.sh
deleted file mode 100755
index 7306a8e..0000000
--- a/importPicture/importPictute.sh
+++ /dev/null
@@ -1 +0,0 @@
-java -jar importPicture.jar list.csv 10040101 DSC01396.JPG 2014-01-01T15:46:56
diff --git a/importPicture/list.csv b/importPicture/list.csv
new file mode 100644
index 0000000..230c703
--- /dev/null
+++ b/importPicture/list.csv
@@ -0,0 +1,64 @@
+ �����F -324(sec)
+ Target GPX�F [4-02-22 145413.gpx]
+GPX start time�F 2014-02-22T13:16:11
+ GPX end time�F 2014-02-22T14:54:21
+"name","orignal","gpstime"
+"IMG_0150.JPG","2014-02-22T13:30:20","2014-02-22T13:24:56"
+"IMG_0151.JPG","2014-02-22T13:38:04","2014-02-22T13:32:40"
+"IMG_0152.JPG","2014-02-22T13:39:06","2014-02-22T13:33:42"
+"IMG_0153.JPG","2014-02-22T13:39:12","2014-02-22T13:33:48"
+"IMG_0154.JPG","2014-02-22T13:39:16","2014-02-22T13:33:52"
+"IMG_0155.JPG","2014-02-22T13:40:16","2014-02-22T13:34:52"
+"IMG_0156.JPG","2014-02-22T13:40:44","2014-02-22T13:35:20"
+"IMG_0157.JPG","2014-02-22T13:41:46","2014-02-22T13:36:22"
+"IMG_0158.JPG","2014-02-22T13:42:32","2014-02-22T13:37:08"
+"IMG_0159.JPG","2014-02-22T13:46:20","2014-02-22T13:40:56"
+"IMG_0160.JPG","2014-02-22T13:47:06","2014-02-22T13:41:42"
+"IMG_0161.JPG","2014-02-22T13:47:12","2014-02-22T13:41:48"
+"IMG_0162.JPG","2014-02-22T13:47:40","2014-02-22T13:42:16"
+"IMG_0163.JPG","2014-02-22T13:48:56","2014-02-22T13:43:32"
+"IMG_0164.JPG","2014-02-22T13:49:24","2014-02-22T13:44:00"
+"IMG_0165.JPG","2014-02-22T13:49:34","2014-02-22T13:44:10"
+"IMG_0166.JPG","2014-02-22T13:51:02","2014-02-22T13:45:38"
+"IMG_0167.JPG","2014-02-22T13:51:44","2014-02-22T13:46:20"
+"IMG_0168.JPG","2014-02-22T13:53:56","2014-02-22T13:48:32"
+"IMG_0169.JPG","2014-02-22T13:54:06","2014-02-22T13:48:42"
+"IMG_0170.JPG","2014-02-22T13:54:40","2014-02-22T13:49:16"
+"IMG_0171.JPG","2014-02-22T14:03:34","2014-02-22T13:58:10"
+"IMG_0172.JPG","2014-02-22T14:03:38","2014-02-22T13:58:14"
+"IMG_0173.JPG","2014-02-22T14:04:24","2014-02-22T13:59:00"
+"IMG_0174.JPG","2014-02-22T14:04:44","2014-02-22T13:59:20"
+"IMG_0175.JPG","2014-02-22T14:04:58","2014-02-22T13:59:34"
+"IMG_0176.JPG","2014-02-22T14:05:10","2014-02-22T13:59:46"
+"IMG_0177.JPG","2014-02-22T14:06:04","2014-02-22T14:00:40"
+"IMG_0178.JPG","2014-02-22T14:08:12","2014-02-22T14:02:48"
+"IMG_0179.JPG","2014-02-22T14:08:24","2014-02-22T14:03:00"
+"IMG_0180.JPG","2014-02-22T14:08:30","2014-02-22T14:03:06"
+"IMG_0181.JPG","2014-02-22T14:08:46","2014-02-22T14:03:22"
+"IMG_0182.JPG","2014-02-22T14:09:02","2014-02-22T14:03:38"
+"IMG_0183.JPG","2014-02-22T14:09:10","2014-02-22T14:03:46"
+"IMG_0184.JPG","2014-02-22T14:10:14","2014-02-22T14:04:50"
+"IMG_0185.JPG","2014-02-22T14:11:34","2014-02-22T14:06:10"
+"IMG_0186.JPG","2014-02-22T14:11:54","2014-02-22T14:06:30"
+"IMG_0187.JPG","2014-02-22T14:14:24","2014-02-22T14:09:00"
+"IMG_0188.JPG","2014-02-22T14:15:02","2014-02-22T14:09:38"
+"IMG_0189.JPG","2014-02-22T14:15:12","2014-02-22T14:09:48"
+"IMG_0190.JPG","2014-02-22T14:15:16","2014-02-22T14:09:52"
+"IMG_0191.JPG","2014-02-22T14:16:02","2014-02-22T14:10:38"
+"IMG_0192.JPG","2014-02-22T14:18:46","2014-02-22T14:13:22"
+"IMG_0193.JPG","2014-02-22T14:28:04","2014-02-22T14:22:40"
+"IMG_0194.JPG","2014-02-22T14:28:30","2014-02-22T14:23:06"
+"IMG_0195.JPG","2014-02-22T14:30:56","2014-02-22T14:25:32"
+"IMG_0196.JPG","2014-02-22T14:31:00","2014-02-22T14:25:36"
+"IMG_0197.JPG","2014-02-22T14:31:44","2014-02-22T14:26:20"
+"IMG_0198.JPG","2014-02-22T14:32:12","2014-02-22T14:26:48"
+"IMG_0199.JPG","2014-02-22T14:32:20","2014-02-22T14:26:56"
+"IMG_0200.JPG","2014-02-22T14:32:32","2014-02-22T14:27:08"
+"IMG_0201.JPG","2014-02-22T14:34:54","2014-02-22T14:29:30"
+"IMG_0202.JPG","2014-02-22T14:35:12","2014-02-22T14:29:48"
+"IMG_0203.JPG","2014-02-22T14:35:28","2014-02-22T14:30:04"
+"IMG_0204.JPG","2014-02-22T14:35:44","2014-02-22T14:30:20"
+"IMG_0205.JPG","2014-02-22T14:37:18","2014-02-22T14:31:54"
+"IMG_0206.JPG","2014-02-22T14:37:32","2014-02-22T14:32:08"
+"IMG_0207.JPG","2014-02-22T14:41:18","2014-02-22T14:35:54"
+"IMG_0208.JPG","2014-02-22T14:42:42","2014-02-22T14:37:18"
diff --git a/importPicture/src/osm/jp/gpx/ImportPicture.java b/importPicture/src/osm/jp/gpx/ImportPicture.java
index de2dbd2..64774b8 100644
--- a/importPicture/src/osm/jp/gpx/ImportPicture.java
+++ b/importPicture/src/osm/jp/gpx/ImportPicture.java
@@ -86,6 +86,9 @@
*/
public static void main(String[] argv) throws IOException
{
+ Date jptime;
+
+
File csvfile = new File("ImportPicture.csv");
if (argv.length > 0) {
csvfile = new File(argv[0]);
@@ -99,6 +102,10 @@
System.out.println("> java -jar importPicture.jar