OSDN Git Service

Java11 - AdjustTime2
authorhaya4 <hayashi.yuu@gmail.com>
Sun, 18 Aug 2019 06:58:15 +0000 (15:58 +0900)
committerhaya4 <hayashi.yuu@gmail.com>
Sun, 18 Aug 2019 06:58:15 +0000 (15:58 +0900)
118 files changed:
.gitignore
AdjustTime.ini
AdjustTime.ini.org [moved from importPicture/AdjustTime.ini.org with 100% similarity]
doc/AdjustTime.class.violet.html [moved from importPicture/doc/AdjustTime.class.violet.html with 100% similarity]
doc/EXiF.class.violet.html [moved from importPicture/doc/EXiF.class.violet.html with 100% similarity]
doc/GPX.class.violet.html [moved from importPicture/doc/GPX.class.violet.html with 100% similarity]
doc/ImportPicture.class.violet.html [moved from importPicture/doc/ImportPicture.class.violet.html with 100% similarity]
git.sh [deleted file]
importPicture/.classpath [deleted file]
importPicture/.project [deleted file]
importPicture/.settings/org.eclipse.core.resources.prefs [deleted file]
importPicture/AdjustTime.ini [deleted file]
importPicture/build.xml [deleted file]
importPicture/commons-compress-1.14.jar [deleted file]
importPicture/commons-imaging-1.0-SNAPSHOT.jar [deleted file]
importPicture/hayashi_0226.jar [deleted file]
importPicture/lib/commons-imaging-1.0-20170205.201009-115.jar [deleted file]
importPicture/nbbuild.xml [deleted file]
importPicture/nbproject/build-impl.xml [deleted file]
importPicture/nbproject/genfiles.properties [deleted file]
importPicture/nbproject/project.properties [deleted file]
importPicture/nbproject/project.xml [deleted file]
importPicture/testdata/AdjustTime.20170518.A1.log [deleted file]
importPicture/testdata/AdjustTime.20170518.A2.log [deleted file]
importPicture/testdata/AdjustTime.20170518.B1.log [deleted file]
importPicture/testdata/AdjustTime.20170518.B2.log [deleted file]
importPicture/testdata/AdjustTime.M1a.separate.log [deleted file]
importPicture/testdata/AdjustTime.M1b.separate.log [deleted file]
importPicture/testdata/AdjustTime.M1c.separate.log [deleted file]
importPicture/testdata/AdjustTime.M1d.separate.log [deleted file]
importPicture/testdata/AdjustTime.M2a.separate.log [deleted file]
importPicture/testdata/AdjustTime.M2b.separate.log [deleted file]
importPicture/testdata/AdjustTime.M2c.separate.log [deleted file]
importPicture/testdata/AdjustTime.M2d.separate.log [deleted file]
importPicture/testdata/Sony20170518.tar.gz [deleted file]
importPicture/testdata/WiMiUS20170518.tar.gz [deleted file]
importPicture/testdata/separate.tar.gz [deleted file]
manifest.mf [moved from importPicture/manifest.mf with 100% similarity]
src/AdjustTime.ini [moved from importPicture/src/AdjustTime.ini with 100% similarity]
src/AdjustTime2.bat [moved from importPicture/src/AdjustTime2.bat with 100% similarity]
src/AdjustTime2.jnlp [moved from importPicture/src/AdjustTime2.jnlp with 100% similarity]
src/AdjustTime2.sh [moved from importPicture/src/AdjustTime2.sh with 100% similarity]
src/LICENSE.txt [moved from importPicture/src/LICENSE.txt with 100% similarity]
src/README.jp.txt [moved from importPicture/src/README.jp.txt with 100% similarity]
src/i18n.properties [moved from importPicture/src/i18n.properties with 100% similarity]
src/i18n_ja_JP.properties [moved from importPicture/src/i18n_ja_JP.properties with 100% similarity]
src/osm/jp/gpx/AppParameters.java [moved from importPicture/src/osm/jp/gpx/AppParameters.java with 100% similarity]
src/osm/jp/gpx/Complementation.java [moved from importPicture/src/osm/jp/gpx/Complementation.java with 100% similarity]
src/osm/jp/gpx/ElementMapTRKPT.java [moved from importPicture/src/osm/jp/gpx/ElementMapTRKPT.java with 100% similarity]
src/osm/jp/gpx/ElementMapTRKSEG.java [moved from importPicture/src/osm/jp/gpx/ElementMapTRKSEG.java with 100% similarity]
src/osm/jp/gpx/GeoDistance.java [moved from importPicture/src/osm/jp/gpx/GeoDistance.java with 100% similarity]
src/osm/jp/gpx/GpxFile.java [moved from importPicture/src/osm/jp/gpx/GpxFile.java with 100% similarity]
src/osm/jp/gpx/ImportPicture.java [moved from importPicture/src/osm/jp/gpx/ImportPicture.java with 100% similarity]
src/osm/jp/gpx/Restamp.java [moved from importPicture/src/osm/jp/gpx/Restamp.java with 100% similarity]
src/osm/jp/gpx/TagTrkpt.java [moved from importPicture/src/osm/jp/gpx/TagTrkpt.java with 100% similarity]
src/osm/jp/gpx/TimeComparator.java [moved from importPicture/src/osm/jp/gpx/TimeComparator.java with 100% similarity]
src/osm/jp/gpx/YuuLogFormatter.java [moved from importPicture/src/osm/jp/gpx/YuuLogFormatter.java with 100% similarity]
src/osm/jp/gpx/matchtime/gui/AboutDialog.java [moved from importPicture/src/osm/jp/gpx/matchtime/gui/AboutDialog.java with 100% similarity]
src/osm/jp/gpx/matchtime/gui/AdjustTime.java [moved from importPicture/src/osm/jp/gpx/matchtime/gui/AdjustTime.java with 100% similarity]
src/osm/jp/gpx/matchtime/gui/Command.java [moved from importPicture/src/osm/jp/gpx/matchtime/gui/Command.java with 100% similarity]
src/osm/jp/gpx/matchtime/gui/DoDialog.java [moved from importPicture/src/osm/jp/gpx/matchtime/gui/DoDialog.java with 100% similarity]
src/osm/jp/gpx/matchtime/gui/GpxAndFolderFilter.java [moved from importPicture/src/osm/jp/gpx/matchtime/gui/GpxAndFolderFilter.java with 100% similarity]
src/osm/jp/gpx/matchtime/gui/ImageFileView.java [moved from importPicture/src/osm/jp/gpx/matchtime/gui/ImageFileView.java with 100% similarity]
src/osm/jp/gpx/matchtime/gui/ImageFilter.java [moved from importPicture/src/osm/jp/gpx/matchtime/gui/ImageFilter.java with 100% similarity]
src/osm/jp/gpx/matchtime/gui/ImagePreview.java [moved from importPicture/src/osm/jp/gpx/matchtime/gui/ImagePreview.java with 100% similarity]
src/osm/jp/gpx/matchtime/gui/ParameterPanel.java [moved from importPicture/src/osm/jp/gpx/matchtime/gui/ParameterPanel.java with 100% similarity]
src/osm/jp/gpx/matchtime/gui/ParameterPanelFolder.java [moved from importPicture/src/osm/jp/gpx/matchtime/gui/ParameterPanelFolder.java with 100% similarity]
src/osm/jp/gpx/matchtime/gui/ParameterPanelGpx.java [moved from importPicture/src/osm/jp/gpx/matchtime/gui/ParameterPanelGpx.java with 100% similarity]
src/osm/jp/gpx/matchtime/gui/ParameterPanelImageFile.java [moved from importPicture/src/osm/jp/gpx/matchtime/gui/ParameterPanelImageFile.java with 100% similarity]
src/osm/jp/gpx/matchtime/gui/ParameterPanelSelecter.java [moved from importPicture/src/osm/jp/gpx/matchtime/gui/ParameterPanelSelecter.java with 100% similarity]
src/osm/jp/gpx/matchtime/gui/ParameterPanelTime.java [moved from importPicture/src/osm/jp/gpx/matchtime/gui/ParameterPanelTime.java with 100% similarity]
src/osm/jp/gpx/matchtime/gui/QuitDialog.java [moved from importPicture/src/osm/jp/gpx/matchtime/gui/QuitDialog.java with 100% similarity]
src/osm/jp/gpx/matchtime/gui/Utils.java [moved from importPicture/src/osm/jp/gpx/matchtime/gui/Utils.java with 100% similarity]
src/osm/jp/gpx/matchtime/gui/images/Fit16.gif [moved from importPicture/src/osm/jp/gpx/matchtime/gui/images/Fit16.gif with 100% similarity]
src/osm/jp/gpx/matchtime/gui/images/Open16.gif [moved from importPicture/src/osm/jp/gpx/matchtime/gui/images/Open16.gif with 100% similarity]
src/osm/jp/gpx/matchtime/gui/images/Original16.gif [moved from importPicture/src/osm/jp/gpx/matchtime/gui/images/Original16.gif with 100% similarity]
src/osm/jp/gpx/matchtime/gui/images/Rotate16.gif [moved from importPicture/src/osm/jp/gpx/matchtime/gui/images/Rotate16.gif with 100% similarity]
src/osm/jp/gpx/matchtime/gui/images/Save16.gif [moved from importPicture/src/osm/jp/gpx/matchtime/gui/images/Save16.gif with 100% similarity]
src/osm/jp/gpx/matchtime/gui/images/Thumbs.db [moved from importPicture/src/osm/jp/gpx/matchtime/gui/images/Thumbs.db with 100% similarity]
src/osm/jp/gpx/matchtime/gui/images/ZoomIn16.gif [moved from importPicture/src/osm/jp/gpx/matchtime/gui/images/ZoomIn16.gif with 100% similarity]
src/osm/jp/gpx/matchtime/gui/images/ZoomOut16.gif [moved from importPicture/src/osm/jp/gpx/matchtime/gui/images/ZoomOut16.gif with 100% similarity]
src/osm/jp/gpx/matchtime/gui/images/gifIcon.gif [moved from importPicture/src/osm/jp/gpx/matchtime/gui/images/gifIcon.gif with 100% similarity]
src/osm/jp/gpx/matchtime/gui/images/jpgIcon.gif [moved from importPicture/src/osm/jp/gpx/matchtime/gui/images/jpgIcon.gif with 100% similarity]
src/osm/jp/gpx/matchtime/gui/images/media_playback_start.png [moved from importPicture/src/osm/jp/gpx/matchtime/gui/images/media_playback_start.png with 100% similarity]
src/osm/jp/gpx/matchtime/gui/images/pngIcon.png [moved from importPicture/src/osm/jp/gpx/matchtime/gui/images/pngIcon.png with 100% similarity]
src/osm/jp/gpx/matchtime/gui/images/tiffIcon.gif [moved from importPicture/src/osm/jp/gpx/matchtime/gui/images/tiffIcon.gif with 100% similarity]
src/osm/jp/gpx/utils/TarGz.java [moved from importPicture/src/osm/jp/gpx/utils/TarGz.java with 100% similarity]
test/osm/jp/gpx/AppParametersTest.java [moved from importPicture/test/osm/jp/gpx/AppParametersTest.java with 100% similarity]
test/osm/jp/gpx/ElementMapTRKPTTest.java [moved from importPicture/test/osm/jp/gpx/ElementMapTRKPTTest.java with 100% similarity]
test/osm/jp/gpx/ElementMapTRKSEGTest.java [moved from importPicture/test/osm/jp/gpx/ElementMapTRKSEGTest.java with 100% similarity]
test/osm/jp/gpx/ImportPictureTest.java [moved from importPicture/test/osm/jp/gpx/ImportPictureTest.java with 100% similarity]
test/osm/jp/gpx/RestampTest.java [moved from importPicture/test/osm/jp/gpx/RestampTest.java with 100% similarity]
test/osm/jp/gpx/UnZip.java [moved from importPicture/test/osm/jp/gpx/UnZip.java with 100% similarity]
testdata/20170517.gpx [moved from importPicture/testdata/20170517.gpx with 100% similarity]
testdata/20170518.gpx [moved from importPicture/testdata/20170518.gpx with 100% similarity]
testdata/AdjustTime.20170517.ini [moved from importPicture/testdata/AdjustTime.20170517.ini with 100% similarity]
testdata/AdjustTime.20170518.A1.ini [moved from importPicture/testdata/AdjustTime.20170518.A1.ini with 100% similarity]
testdata/AdjustTime.20170518.A2.ini [moved from importPicture/testdata/AdjustTime.20170518.A2.ini with 100% similarity]
testdata/AdjustTime.20170518.B1.ini [moved from importPicture/testdata/AdjustTime.20170518.B1.ini with 100% similarity]
testdata/AdjustTime.20170518.B2.ini [moved from importPicture/testdata/AdjustTime.20170518.B2.ini with 100% similarity]
testdata/AdjustTime.20170518.ini [moved from importPicture/testdata/AdjustTime.20170518.ini with 100% similarity]
testdata/AdjustTime.M1a.separate.ini [moved from importPicture/testdata/AdjustTime.M1a.separate.ini with 100% similarity]
testdata/AdjustTime.M1b.separate.ini [moved from importPicture/testdata/AdjustTime.M1b.separate.ini with 100% similarity]
testdata/AdjustTime.M1c.separate.ini [moved from importPicture/testdata/AdjustTime.M1c.separate.ini with 100% similarity]
testdata/AdjustTime.M1d.separate.ini [moved from importPicture/testdata/AdjustTime.M1d.separate.ini with 100% similarity]
testdata/AdjustTime.M2a.separate.ini [moved from importPicture/testdata/AdjustTime.M2a.separate.ini with 100% similarity]
testdata/AdjustTime.M2b.separate.ini [moved from importPicture/testdata/AdjustTime.M2b.separate.ini with 100% similarity]
testdata/AdjustTime.M2c.separate.ini [moved from importPicture/testdata/AdjustTime.M2c.separate.ini with 100% similarity]
testdata/AdjustTime.M2d.separate.ini [moved from importPicture/testdata/AdjustTime.M2d.separate.ini with 100% similarity]
testdata/AdjustTime.null.ini [moved from importPicture/testdata/AdjustTime.null.ini with 100% similarity]
testdata/AdjustTime.off.ini [moved from importPicture/testdata/AdjustTime.off.ini with 100% similarity]
testdata/AdjustTime.on.ini [moved from importPicture/testdata/AdjustTime.on.ini with 100% similarity]
testdata/AdjustTime.separate.ini [moved from importPicture/testdata/AdjustTime.separate.ini with 100% similarity]
testdata/muiltiTRK.GarminColorado.gpx.xml [moved from importPicture/testdata/muiltiTRK.GarminColorado.gpx.xml with 100% similarity]
testdata/muiltiTRKSEG.GarminColorado.gpx.xml [moved from importPicture/testdata/muiltiTRKSEG.GarminColorado.gpx.xml with 100% similarity]
testdata/muiltiTRKSEG.noNameSpace.gpx.xml [moved from importPicture/testdata/muiltiTRKSEG.noNameSpace.gpx.xml with 100% similarity]
testdata/multiTRKSEG.eTrex_20J.gpx.xml [moved from importPicture/testdata/multiTRKSEG.eTrex_20J.gpx.xml with 100% similarity]
testdata/multiTRKSEGreverse.eTrex_20J.gpx.xml [moved from importPicture/testdata/multiTRKSEGreverse.eTrex_20J.gpx.xml with 100% similarity]

index 81d9b6d..a575529 100644 (file)
@@ -4,16 +4,17 @@
 .settings/
 *.class
 *.zip
+*.jar
+*.tar.gz
+build.xml
+nbbuild.xml
 /bin/
-/AdjustTime/
-/importPicture/AdjustTime2.jar
-/importPicture/classes/
-/importPicture/deploy/
-/importPicture/AdjustTime/nbproject/private/
-/importPicture/testdata/*~
-/importPicture/testdata/cameradata/
-/importPicture/testdata/output
-/importPicture/nbproject/private/
-/importPicture/build/
-/importPicture/dist/
-/leaflet/nbproject/private/
\ No newline at end of file
+/build/
+/classes/
+/deploy/
+/dist/
+/testdata/*~
+/testdata/*.log
+/testdata/cameradata/
+/testdata/output
+/nbproject/
index 9d854b5..fee60e4 100644 (file)
@@ -1,16 +1,17 @@
 #by AdjustTime
-#Sat Oct 29 14:05:55 JST 2016
-GPX.BASETIME=EXIF_TIME
+#Mon Mar 26 21:58:45 JST 2018
+GPX.BASETIME=FILE_UPDATE
 IMG.OUTPUT_EXIF=true
 GPX.OUTPUT_WPT=false
 GPX.OUTPUT_SPEED=true
-GPX.noFirstNode=false
+IMG.OUTPUT_ALL=false
+GPX.noFirstNode=true
 IMG.OUTPUT=true
-GPX.gpxSplit=ON
+GPX.gpxSplit=true
+IMG.TIME=2018-03-25T03\:20\:32Z
 GPX.OVERWRITE_MAGVAR=true
-IMG.TIME=2016-08-14T11\:45\:47
 GPX.REUSE=false
-IMG.BASE_FILE=IMG_0182.jpg
-IMG.SOURCE_FOLDER=/media/yuu/public/osm/GPXs/Taibousaki
-GPX.SOURCE_FOLDER=/media/yuu/public/osm/GPXs/Taibousaki
-IMG.OUTPUT_FOLDER=/media/yuu/public/osm/GPXs/Taibousaki
+IMG.BASE_FILE=000063.jpg
+IMG.SOURCE_FOLDER=/home/yuu/Desktop/OSM/20180325_\u6A2A\u6D5C\u65B0\u9053/img
+GPX.SOURCE_FOLDER=/home/yuu/Desktop/OSM/20180325_\u6A2A\u6D5C\u65B0\u9053/2018-03-25 12.15.27 Day.gpx
+IMG.OUTPUT_FOLDER=/home/yuu/Desktop/OSM/20180325_\u6A2A\u6D5C\u65B0\u9053/gpx
diff --git a/git.sh b/git.sh
deleted file mode 100755 (executable)
index 9e4937f..0000000
--- a/git.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-cd ~/workspace/AdjustTime
-gitk
diff --git a/importPicture/.classpath b/importPicture/.classpath
deleted file mode 100644 (file)
index 55c672d..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-       <classpathentry kind="src" path="src"/>
-       <classpathentry kind="src" path="test"/>
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-       <classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
-       <classpathentry kind="lib" path="hayashi_0226.jar"/>
-       <classpathentry kind="lib" path="commons-imaging-1.0-SNAPSHOT.jar"/>
-       <classpathentry kind="lib" path="commons-compress-1.14.jar"/>
-       <classpathentry kind="output" path="classes"/>
-</classpath>
diff --git a/importPicture/.project b/importPicture/.project
deleted file mode 100644 (file)
index 3ce5071..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-       <name>importPicture</name>
-       <comment></comment>
-       <projects>
-       </projects>
-       <buildSpec>
-               <buildCommand>
-                       <name>org.eclipse.jdt.core.javabuilder</name>
-                       <arguments>
-                       </arguments>
-               </buildCommand>
-       </buildSpec>
-       <natures>
-               <nature>org.eclipse.jdt.core.javanature</nature>
-       </natures>
-</projectDescription>
diff --git a/importPicture/.settings/org.eclipse.core.resources.prefs b/importPicture/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644 (file)
index ed2ca4a..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-eclipse.preferences.version=1
-encoding//src/osm/jp/gpx/ImportPicture.java=UTF-8
-encoding/<project>=UTF-8
diff --git a/importPicture/AdjustTime.ini b/importPicture/AdjustTime.ini
deleted file mode 100644 (file)
index fee60e4..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-#by AdjustTime
-#Mon Mar 26 21:58:45 JST 2018
-GPX.BASETIME=FILE_UPDATE
-IMG.OUTPUT_EXIF=true
-GPX.OUTPUT_WPT=false
-GPX.OUTPUT_SPEED=true
-IMG.OUTPUT_ALL=false
-GPX.noFirstNode=true
-IMG.OUTPUT=true
-GPX.gpxSplit=true
-IMG.TIME=2018-03-25T03\:20\:32Z
-GPX.OVERWRITE_MAGVAR=true
-GPX.REUSE=false
-IMG.BASE_FILE=000063.jpg
-IMG.SOURCE_FOLDER=/home/yuu/Desktop/OSM/20180325_\u6A2A\u6D5C\u65B0\u9053/img
-GPX.SOURCE_FOLDER=/home/yuu/Desktop/OSM/20180325_\u6A2A\u6D5C\u65B0\u9053/2018-03-25 12.15.27 Day.gpx
-IMG.OUTPUT_FOLDER=/home/yuu/Desktop/OSM/20180325_\u6A2A\u6D5C\u65B0\u9053/gpx
diff --git a/importPicture/build.xml b/importPicture/build.xml
deleted file mode 100644 (file)
index 860f088..0000000
+++ /dev/null
@@ -1,116 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>\r
-<!DOCTYPE configuration>\r
-<project name="AdjustTime" default="all" basedir=".">\r
-\r
-       <target name="all" depends="release">\r
-               \r
-       </target>\r
-\r
-       <!--\r
-       ソース以外にビルドに必要なライブラリ\r
-       -->\r
-       <tstamp>\r
-               <format property="verdate" pattern="yyyyMMdd"/>\r
-       </tstamp>\r
-    <property name="src" value="${basedir}/src" />\r
-    <property name="classes" value="${basedir}/classes" />\r
-       <property name="deploy" value="${basedir}/deploy" />\r
-       <property name="appname" value="AdjustTime2"></property>\r
-       <property name="version" value="${verdate}"></property>\r
-       \r
-    <property name="commons-imaging" value="${basedir}/lib/commons-imaging-1.0-20170205.201009-115.jar" />\r
-\r
-\r
-       <!--\r
-       Java Doc\r
-       -->\r
-       <target name="javadoc">\r
-         <javadoc sourcepath="src"\r
-           encoding="UTF-8"\r
-           packagenames="*"\r
-           Windowtitle="${appname}"\r
-           doctitle="${appname}"\r
-           docencoding="UTF-8"\r
-           bottom=""\r
-           Author="true"\r
-           destdir="api">\r
-               <classpath>\r
-                               <pathelement path="${src}"/>\r
-                       </classpath>\r
-               </javadoc>\r
-       </target>\r
-\r
-       <!--\r
-       [STEP 1] クリーンナップ\r
-        -->\r
-       <target name="clean" description="前回作成したclassファイルを削除する">\r
-               <delete dir="${classes}"></delete>\r
-               <delete dir="${deploy}" />\r
-               <delete>\r
-                       <fileset dir="${src}" includes="**/*.class" />\r
-               </delete>\r
-               <mkdir dir="${classes}"/>\r
-               <mkdir dir="${deploy}"/>\r
-       </target>\r
-\r
-       <!--\r
-       [STEP 2] コンパイル\r
-        -->\r
-       <target name="compile_src" depends="clean" description="コンパイル src">\r
-           <javac      debug="on" srcdir="${src}" destdir="${classes}" encoding="UTF-8" includeantruntime="false" target="1.8" source="1.8">\r
-                       <include name="**" />\r
-               <exclude name="**/*.smap" />\r
-               <classpath>\r
-                               <pathelement path="${src}"/>\r
-                       <pathelement path="${commons-imaging}"/>\r
-                       <pathelement path="${basedir}/commons-compress-1.14.jar"/>\r
-                       </classpath>\r
-               </javac>\r
-       </target>\r
-\r
-       <!--\r
-       [STEP 3] リンク\r
-        -->\r
-    <target name="create_run_jar" depends="compile_src" description="'${appname}.jar'を作成する">\r
-               <tstamp>\r
-                       <format property="ts" pattern="yyyy-MM-dd-HH:mm:ss-z"/>\r
-               </tstamp>\r
-               <jar destfile="${deploy}/${appname}.jar" >\r
-                       <manifest>\r
-                         <attribute name="Main-Class" value="osm.jp.gpx.matchtime.gui.AdjustTime" />\r
-                         <attribute name="Class-Path" value="${jar.runtime.classpath}" />\r
-                         <attribute name="Implementation-Title"   value="${appname}" />\r
-                         <attribute name="Implementation-Version" value="${ts}" />\r
-                         <attribute name="Implementation-Vendor"  value="${hayashi}" />\r
-                         <attribute name="Build-Id" value="${ts} (${user.name} [${os.name} ${os.version} ${os.arch}])" />\r
-                       </manifest>\r
-                       <zipfileset dir="${classes}"/>\r
-                       <zipfileset dir="${src}"/>\r
-        </jar>\r
-    </target>\r
-\r
-\r
-       <!--\r
-       [STEP 4] Deployment\r
-        -->\r
-    <target name="deploy" depends="create_run_jar" description="各ファイルを'./${deploy}/'に配置する">\r
-       <copy preservelastmodified="true" todir="${deploy}">\r
-               <fileset dir="." includes="${appname}.jar"/>\r
-               <fileset dir="${src}" includes="README.jp.txt"/>\r
-               <fileset dir="${src}" includes="LICENSE.txt"/>\r
-               <fileset dir="${src}" includes="${appname}.bat"/>\r
-               <fileset dir="${src}" includes="${appname}.sh"/>\r
-               </copy>\r
-       <copy preservelastmodified="true" file="${commons-imaging}" tofile="${deploy}/commons-imaging-1.0-SNAPSHOT.jar"/>\r
-    </target>\r
-\r
-       <!--\r
-       [STEP 5] release\r
-        -->\r
-    <target name="release" depends="deploy" description="'./${appname}.zip'を作成する">\r
-       <zip destfile="${appname}_${verdate}.zip">\r
-               <fileset dir="${deploy}" includes="**.*"/>\r
-               </zip>\r
-    </target>\r
-</project>\r
-\r
diff --git a/importPicture/commons-compress-1.14.jar b/importPicture/commons-compress-1.14.jar
deleted file mode 100644 (file)
index 7490eb8..0000000
Binary files a/importPicture/commons-compress-1.14.jar and /dev/null differ
diff --git a/importPicture/commons-imaging-1.0-SNAPSHOT.jar b/importPicture/commons-imaging-1.0-SNAPSHOT.jar
deleted file mode 100644 (file)
index 7ade0d0..0000000
Binary files a/importPicture/commons-imaging-1.0-SNAPSHOT.jar and /dev/null differ
diff --git a/importPicture/hayashi_0226.jar b/importPicture/hayashi_0226.jar
deleted file mode 100644 (file)
index 65c8b85..0000000
Binary files a/importPicture/hayashi_0226.jar and /dev/null differ
diff --git a/importPicture/lib/commons-imaging-1.0-20170205.201009-115.jar b/importPicture/lib/commons-imaging-1.0-20170205.201009-115.jar
deleted file mode 100644 (file)
index 7ade0d0..0000000
Binary files a/importPicture/lib/commons-imaging-1.0-20170205.201009-115.jar and /dev/null differ
diff --git a/importPicture/nbbuild.xml b/importPicture/nbbuild.xml
deleted file mode 100644 (file)
index 488a6cc..0000000
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- You may freely edit this file. See commented blocks below for -->
-<!-- some examples of how to customize the build. -->
-<!-- (If you delete it and reopen the project it will be recreated.) -->
-<!-- By default, only the Clean and Build commands use this build script. -->
-<!-- Commands such as Run, Debug, and Test only use this build script if -->
-<!-- the Compile on Save feature is turned off for the project. -->
-<!-- You can turn off the Compile on Save (or Deploy on Save) setting -->
-<!-- in the project's Project Properties dialog box.-->
-<project name="AdjustTime2" default="default" basedir=".">
-    <description>Builds, tests, and runs the project AdjustTime2.</description>
-    <import file="nbproject/build-impl.xml"/>
-    <!--
-
-    There exist several targets which are by default empty and which can be 
-    used for execution of your tasks. These targets are usually executed 
-    before and after some main targets. They are: 
-
-      -pre-init:                 called before initialization of project properties
-      -post-init:                called after initialization of project properties
-      -pre-compile:              called before javac compilation
-      -post-compile:             called after javac compilation
-      -pre-compile-single:       called before javac compilation of single file
-      -post-compile-single:      called after javac compilation of single file
-      -pre-compile-test:         called before javac compilation of JUnit tests
-      -post-compile-test:        called after javac compilation of JUnit tests
-      -pre-compile-test-single:  called before javac compilation of single JUnit test
-      -post-compile-test-single: called after javac compilation of single JUunit test
-      -pre-jar:                  called before JAR building
-      -post-jar:                 called after JAR building
-      -post-clean:               called after cleaning build products
-
-    (Targets beginning with '-' are not intended to be called on their own.)
-
-    Example of inserting an obfuscator after compilation could look like this:
-
-        <target name="-post-compile">
-            <obfuscate>
-                <fileset dir="${build.classes.dir}"/>
-            </obfuscate>
-        </target>
-
-    For list of available properties check the imported 
-    nbproject/build-impl.xml file. 
-
-
-    Another way to customize the build is by overriding existing main targets.
-    The targets of interest are: 
-
-      -init-macrodef-javac:     defines macro for javac compilation
-      -init-macrodef-junit:     defines macro for junit execution
-      -init-macrodef-debug:     defines macro for class debugging
-      -init-macrodef-java:      defines macro for class execution
-      -do-jar:                  JAR building
-      run:                      execution of project 
-      -javadoc-build:           Javadoc generation
-      test-report:              JUnit report generation
-
-    An example of overriding the target for project execution could look like this:
-
-        <target name="run" depends="AdjustTime2-impl.jar">
-            <exec dir="bin" executable="launcher.exe">
-                <arg file="${dist.jar}"/>
-            </exec>
-        </target>
-
-    Notice that the overridden target depends on the jar target and not only on 
-    the compile target as the regular run target does. Again, for a list of available 
-    properties which you can use, check the target you are overriding in the
-    nbproject/build-impl.xml file. 
-
-    -->
-</project>
diff --git a/importPicture/nbproject/build-impl.xml b/importPicture/nbproject/build-impl.xml
deleted file mode 100644 (file)
index f446bcf..0000000
+++ /dev/null
@@ -1,1420 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-*** GENERATED FROM project.xml - DO NOT EDIT  ***
-***         EDIT ../build.xml INSTEAD         ***
-
-For the purpose of easier reading the script
-is divided into following sections:
-
-  - initialization
-  - compilation
-  - jar
-  - execution
-  - debugging
-  - javadoc
-  - test compilation
-  - test execution
-  - test debugging
-  - applet
-  - cleanup
-
-        -->
-<project xmlns:j2seproject1="http://www.netbeans.org/ns/j2se-project/1" xmlns:j2seproject3="http://www.netbeans.org/ns/j2se-project/3" xmlns:jaxrpc="http://www.netbeans.org/ns/j2se-project/jax-rpc" basedir=".." default="default" name="AdjustTime2-impl">
-    <fail message="Please build using Ant 1.8.0 or higher.">
-        <condition>
-            <not>
-                <antversion atleast="1.8.0"/>
-            </not>
-        </condition>
-    </fail>
-    <target depends="test,jar,javadoc" description="Build and test whole project." name="default"/>
-    <!-- 
-                ======================
-                INITIALIZATION SECTION 
-                ======================
-            -->
-    <target name="-pre-init">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target depends="-pre-init" name="-init-private">
-        <property file="nbproject/private/config.properties"/>
-        <property file="nbproject/private/configs/${config}.properties"/>
-        <property file="nbproject/private/private.properties"/>
-    </target>
-    <target depends="-pre-init,-init-private" name="-init-user">
-        <property file="${user.properties.file}"/>
-        <!-- The two properties below are usually overridden -->
-        <!-- by the active platform. Just a fallback. -->
-        <property name="default.javac.source" value="1.6"/>
-        <property name="default.javac.target" value="1.6"/>
-    </target>
-    <target depends="-pre-init,-init-private,-init-user" name="-init-project">
-        <property file="nbproject/configs/${config}.properties"/>
-        <property file="nbproject/project.properties"/>
-    </target>
-    <target depends="-pre-init,-init-private,-init-user,-init-project,-init-macrodef-property" name="-do-init">
-        <property name="platform.java" value="${java.home}/bin/java"/>
-        <available file="${manifest.file}" property="manifest.available"/>
-        <condition property="splashscreen.available">
-            <and>
-                <not>
-                    <equals arg1="${application.splash}" arg2="" trim="true"/>
-                </not>
-                <available file="${application.splash}"/>
-            </and>
-        </condition>
-        <condition property="main.class.available">
-            <and>
-                <isset property="main.class"/>
-                <not>
-                    <equals arg1="${main.class}" arg2="" trim="true"/>
-                </not>
-            </and>
-        </condition>
-        <condition property="profile.available">
-            <and>
-                <isset property="javac.profile"/>
-                <length length="0" string="${javac.profile}" when="greater"/>
-                <matches pattern="((1\.[89])|9)(\..*)?" string="${javac.source}"/>
-            </and>
-        </condition>
-        <condition property="do.archive">
-            <or>
-                <not>
-                    <istrue value="${jar.archive.disabled}"/>
-                </not>
-                <istrue value="${not.archive.disabled}"/>
-            </or>
-        </condition>
-        <condition property="do.mkdist">
-            <and>
-                <isset property="do.archive"/>
-                <isset property="libs.CopyLibs.classpath"/>
-                <not>
-                    <istrue value="${mkdist.disabled}"/>
-                </not>
-            </and>
-        </condition>
-        <condition property="do.archive+manifest.available">
-            <and>
-                <isset property="manifest.available"/>
-                <istrue value="${do.archive}"/>
-            </and>
-        </condition>
-        <condition property="do.archive+main.class.available">
-            <and>
-                <isset property="main.class.available"/>
-                <istrue value="${do.archive}"/>
-            </and>
-        </condition>
-        <condition property="do.archive+splashscreen.available">
-            <and>
-                <isset property="splashscreen.available"/>
-                <istrue value="${do.archive}"/>
-            </and>
-        </condition>
-        <condition property="do.archive+profile.available">
-            <and>
-                <isset property="profile.available"/>
-                <istrue value="${do.archive}"/>
-            </and>
-        </condition>
-        <condition property="have.tests">
-            <or>
-                <available file="${test.src.dir}"/>
-            </or>
-        </condition>
-        <condition property="have.sources">
-            <or>
-                <available file="${src.dir}"/>
-            </or>
-        </condition>
-        <condition property="netbeans.home+have.tests">
-            <and>
-                <isset property="netbeans.home"/>
-                <isset property="have.tests"/>
-            </and>
-        </condition>
-        <condition property="no.javadoc.preview">
-            <and>
-                <isset property="javadoc.preview"/>
-                <isfalse value="${javadoc.preview}"/>
-            </and>
-        </condition>
-        <property name="run.jvmargs" value=""/>
-        <property name="run.jvmargs.ide" value=""/>
-        <property name="javac.compilerargs" value=""/>
-        <property name="work.dir" value="${basedir}"/>
-        <condition property="no.deps">
-            <and>
-                <istrue value="${no.dependencies}"/>
-            </and>
-        </condition>
-        <property name="javac.debug" value="true"/>
-        <property name="javadoc.preview" value="true"/>
-        <property name="application.args" value=""/>
-        <property name="source.encoding" value="${file.encoding}"/>
-        <property name="runtime.encoding" value="${source.encoding}"/>
-        <property name="manifest.encoding" value="${source.encoding}"/>
-        <condition property="javadoc.encoding.used" value="${javadoc.encoding}">
-            <and>
-                <isset property="javadoc.encoding"/>
-                <not>
-                    <equals arg1="${javadoc.encoding}" arg2=""/>
-                </not>
-            </and>
-        </condition>
-        <property name="javadoc.encoding.used" value="${source.encoding}"/>
-        <property name="includes" value="**"/>
-        <property name="excludes" value=""/>
-        <property name="do.depend" value="false"/>
-        <condition property="do.depend.true">
-            <istrue value="${do.depend}"/>
-        </condition>
-        <path id="endorsed.classpath.path" path="${endorsed.classpath}"/>
-        <condition else="" property="endorsed.classpath.cmd.line.arg" value="-Xbootclasspath/p:'${toString:endorsed.classpath.path}'">
-            <and>
-                <isset property="endorsed.classpath"/>
-                <not>
-                    <equals arg1="${endorsed.classpath}" arg2="" trim="true"/>
-                </not>
-            </and>
-        </condition>
-        <condition else="" property="javac.profile.cmd.line.arg" value="-profile ${javac.profile}">
-            <isset property="profile.available"/>
-        </condition>
-        <condition else="false" property="jdkBug6558476">
-            <and>
-                <matches pattern="1\.[56]" string="${java.specification.version}"/>
-                <not>
-                    <os family="unix"/>
-                </not>
-            </and>
-        </condition>
-        <condition else="false" property="javac.fork">
-            <or>
-                <istrue value="${jdkBug6558476}"/>
-                <istrue value="${javac.external.vm}"/>
-            </or>
-        </condition>
-        <property name="jar.index" value="false"/>
-        <property name="jar.index.metainf" value="${jar.index}"/>
-        <property name="copylibs.rebase" value="true"/>
-        <available file="${meta.inf.dir}/persistence.xml" property="has.persistence.xml"/>
-        <condition property="junit.available">
-            <or>
-                <available classname="org.junit.Test" classpath="${run.test.classpath}"/>
-                <available classname="junit.framework.Test" classpath="${run.test.classpath}"/>
-            </or>
-        </condition>
-        <condition property="testng.available">
-            <available classname="org.testng.annotations.Test" classpath="${run.test.classpath}"/>
-        </condition>
-        <condition property="junit+testng.available">
-            <and>
-                <istrue value="${junit.available}"/>
-                <istrue value="${testng.available}"/>
-            </and>
-        </condition>
-        <condition else="testng" property="testng.mode" value="mixed">
-            <istrue value="${junit+testng.available}"/>
-        </condition>
-        <condition else="" property="testng.debug.mode" value="-mixed">
-            <istrue value="${junit+testng.available}"/>
-        </condition>
-        <property name="java.failonerror" value="true"/>
-    </target>
-    <target name="-post-init">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target depends="-pre-init,-init-private,-init-user,-init-project,-do-init" name="-init-check">
-        <fail unless="src.dir">Must set src.dir</fail>
-        <fail unless="test.src.dir">Must set test.src.dir</fail>
-        <fail unless="build.dir">Must set build.dir</fail>
-        <fail unless="dist.dir">Must set dist.dir</fail>
-        <fail unless="build.classes.dir">Must set build.classes.dir</fail>
-        <fail unless="dist.javadoc.dir">Must set dist.javadoc.dir</fail>
-        <fail unless="build.test.classes.dir">Must set build.test.classes.dir</fail>
-        <fail unless="build.test.results.dir">Must set build.test.results.dir</fail>
-        <fail unless="build.classes.excludes">Must set build.classes.excludes</fail>
-        <fail unless="dist.jar">Must set dist.jar</fail>
-    </target>
-    <target name="-init-macrodef-property">
-        <macrodef name="property" uri="http://www.netbeans.org/ns/j2se-project/1">
-            <attribute name="name"/>
-            <attribute name="value"/>
-            <sequential>
-                <property name="@{name}" value="${@{value}}"/>
-            </sequential>
-        </macrodef>
-    </target>
-    <target depends="-init-ap-cmdline-properties" if="ap.supported.internal" name="-init-macrodef-javac-with-processors">
-        <macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${src.dir}" name="srcdir"/>
-            <attribute default="${build.classes.dir}" name="destdir"/>
-            <attribute default="${javac.classpath}" name="classpath"/>
-            <attribute default="${javac.processorpath}" name="processorpath"/>
-            <attribute default="${build.generated.sources.dir}/ap-source-output" name="apgeneratedsrcdir"/>
-            <attribute default="${includes}" name="includes"/>
-            <attribute default="${excludes}" name="excludes"/>
-            <attribute default="${javac.debug}" name="debug"/>
-            <attribute default="${empty.dir}" name="sourcepath"/>
-            <attribute default="${empty.dir}" name="gensrcdir"/>
-            <element name="customize" optional="true"/>
-            <sequential>
-                <property location="${build.dir}/empty" name="empty.dir"/>
-                <mkdir dir="${empty.dir}"/>
-                <mkdir dir="@{apgeneratedsrcdir}"/>
-                <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" fork="${javac.fork}" includeantruntime="false" includes="@{includes}" source="${javac.source}" sourcepath="@{sourcepath}" srcdir="@{srcdir}" target="${javac.target}" tempdir="${java.io.tmpdir}">
-                    <src>
-                        <dirset dir="@{gensrcdir}" erroronmissingdir="false">
-                            <include name="*"/>
-                        </dirset>
-                    </src>
-                    <classpath>
-                        <path path="@{classpath}"/>
-                    </classpath>
-                    <compilerarg line="${endorsed.classpath.cmd.line.arg}"/>
-                    <compilerarg line="${javac.profile.cmd.line.arg}"/>
-                    <compilerarg line="${javac.compilerargs}"/>
-                    <compilerarg value="-processorpath"/>
-                    <compilerarg path="@{processorpath}:${empty.dir}"/>
-                    <compilerarg line="${ap.processors.internal}"/>
-                    <compilerarg line="${annotation.processing.processor.options}"/>
-                    <compilerarg value="-s"/>
-                    <compilerarg path="@{apgeneratedsrcdir}"/>
-                    <compilerarg line="${ap.proc.none.internal}"/>
-                    <customize/>
-                </javac>
-            </sequential>
-        </macrodef>
-    </target>
-    <target depends="-init-ap-cmdline-properties" name="-init-macrodef-javac-without-processors" unless="ap.supported.internal">
-        <macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${src.dir}" name="srcdir"/>
-            <attribute default="${build.classes.dir}" name="destdir"/>
-            <attribute default="${javac.classpath}" name="classpath"/>
-            <attribute default="${javac.processorpath}" name="processorpath"/>
-            <attribute default="${build.generated.sources.dir}/ap-source-output" name="apgeneratedsrcdir"/>
-            <attribute default="${includes}" name="includes"/>
-            <attribute default="${excludes}" name="excludes"/>
-            <attribute default="${javac.debug}" name="debug"/>
-            <attribute default="${empty.dir}" name="sourcepath"/>
-            <attribute default="${empty.dir}" name="gensrcdir"/>
-            <element name="customize" optional="true"/>
-            <sequential>
-                <property location="${build.dir}/empty" name="empty.dir"/>
-                <mkdir dir="${empty.dir}"/>
-                <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" fork="${javac.fork}" includeantruntime="false" includes="@{includes}" source="${javac.source}" sourcepath="@{sourcepath}" srcdir="@{srcdir}" target="${javac.target}" tempdir="${java.io.tmpdir}">
-                    <src>
-                        <dirset dir="@{gensrcdir}" erroronmissingdir="false">
-                            <include name="*"/>
-                        </dirset>
-                    </src>
-                    <classpath>
-                        <path path="@{classpath}"/>
-                    </classpath>
-                    <compilerarg line="${endorsed.classpath.cmd.line.arg}"/>
-                    <compilerarg line="${javac.profile.cmd.line.arg}"/>
-                    <compilerarg line="${javac.compilerargs}"/>
-                    <customize/>
-                </javac>
-            </sequential>
-        </macrodef>
-    </target>
-    <target depends="-init-macrodef-javac-with-processors,-init-macrodef-javac-without-processors" name="-init-macrodef-javac">
-        <macrodef name="depend" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${src.dir}" name="srcdir"/>
-            <attribute default="${build.classes.dir}" name="destdir"/>
-            <attribute default="${javac.classpath}" name="classpath"/>
-            <sequential>
-                <depend cache="${build.dir}/depcache" destdir="@{destdir}" excludes="${excludes}" includes="${includes}" srcdir="@{srcdir}">
-                    <classpath>
-                        <path path="@{classpath}"/>
-                    </classpath>
-                </depend>
-            </sequential>
-        </macrodef>
-        <macrodef name="force-recompile" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${build.classes.dir}" name="destdir"/>
-            <sequential>
-                <fail unless="javac.includes">Must set javac.includes</fail>
-                <pathconvert pathsep="${line.separator}" property="javac.includes.binary">
-                    <path>
-                        <filelist dir="@{destdir}" files="${javac.includes}"/>
-                    </path>
-                    <globmapper from="*.java" to="*.class"/>
-                </pathconvert>
-                <tempfile deleteonexit="true" property="javac.includesfile.binary"/>
-                <echo file="${javac.includesfile.binary}" message="${javac.includes.binary}"/>
-                <delete>
-                    <files includesfile="${javac.includesfile.binary}"/>
-                </delete>
-                <delete>
-                    <fileset file="${javac.includesfile.binary}"/>
-                </delete>
-            </sequential>
-        </macrodef>
-    </target>
-    <target if="${junit.available}" name="-init-macrodef-junit-init">
-        <condition else="false" property="nb.junit.batch" value="true">
-            <and>
-                <istrue value="${junit.available}"/>
-                <not>
-                    <isset property="test.method"/>
-                </not>
-            </and>
-        </condition>
-        <condition else="false" property="nb.junit.single" value="true">
-            <and>
-                <istrue value="${junit.available}"/>
-                <isset property="test.method"/>
-            </and>
-        </condition>
-    </target>
-    <target name="-init-test-properties">
-        <property name="test.binaryincludes" value="&lt;nothing&gt;"/>
-        <property name="test.binarytestincludes" value=""/>
-        <property name="test.binaryexcludes" value=""/>
-    </target>
-    <target if="${nb.junit.single}" name="-init-macrodef-junit-single" unless="${nb.junit.batch}">
-        <macrodef name="junit" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${includes}" name="includes"/>
-            <attribute default="${excludes}" name="excludes"/>
-            <attribute default="**" name="testincludes"/>
-            <attribute default="" name="testmethods"/>
-            <element name="customize" optional="true"/>
-            <sequential>
-                <property name="junit.forkmode" value="perTest"/>
-                <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}">
-                    <test methods="@{testmethods}" name="@{testincludes}" todir="${build.test.results.dir}"/>
-                    <syspropertyset>
-                        <propertyref prefix="test-sys-prop."/>
-                        <mapper from="test-sys-prop.*" to="*" type="glob"/>
-                    </syspropertyset>
-                    <formatter type="brief" usefile="false"/>
-                    <formatter type="xml"/>
-                    <jvmarg value="-ea"/>
-                    <customize/>
-                </junit>
-            </sequential>
-        </macrodef>
-    </target>
-    <target depends="-init-test-properties" if="${nb.junit.batch}" name="-init-macrodef-junit-batch" unless="${nb.junit.single}">
-        <macrodef name="junit" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${includes}" name="includes"/>
-            <attribute default="${excludes}" name="excludes"/>
-            <attribute default="**" name="testincludes"/>
-            <attribute default="" name="testmethods"/>
-            <element name="customize" optional="true"/>
-            <sequential>
-                <property name="junit.forkmode" value="perTest"/>
-                <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}">
-                    <batchtest todir="${build.test.results.dir}">
-                        <fileset dir="${test.src.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
-                            <filename name="@{testincludes}"/>
-                        </fileset>
-                        <fileset dir="${build.test.classes.dir}" excludes="@{excludes},${excludes},${test.binaryexcludes}" includes="${test.binaryincludes}">
-                            <filename name="${test.binarytestincludes}"/>
-                        </fileset>
-                    </batchtest>
-                    <syspropertyset>
-                        <propertyref prefix="test-sys-prop."/>
-                        <mapper from="test-sys-prop.*" to="*" type="glob"/>
-                    </syspropertyset>
-                    <formatter type="brief" usefile="false"/>
-                    <formatter type="xml"/>
-                    <jvmarg value="-ea"/>
-                    <customize/>
-                </junit>
-            </sequential>
-        </macrodef>
-    </target>
-    <target depends="-init-macrodef-junit-init,-init-macrodef-junit-single, -init-macrodef-junit-batch" if="${junit.available}" name="-init-macrodef-junit"/>
-    <target if="${testng.available}" name="-init-macrodef-testng">
-        <macrodef name="testng" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${includes}" name="includes"/>
-            <attribute default="${excludes}" name="excludes"/>
-            <attribute default="**" name="testincludes"/>
-            <attribute default="" name="testmethods"/>
-            <element name="customize" optional="true"/>
-            <sequential>
-                <condition else="" property="testng.methods.arg" value="@{testincludes}.@{testmethods}">
-                    <isset property="test.method"/>
-                </condition>
-                <union id="test.set">
-                    <fileset dir="${test.src.dir}" excludes="@{excludes},**/*.xml,${excludes}" includes="@{includes}">
-                        <filename name="@{testincludes}"/>
-                    </fileset>
-                </union>
-                <taskdef classname="org.testng.TestNGAntTask" classpath="${run.test.classpath}" name="testng"/>
-                <testng classfilesetref="test.set" failureProperty="tests.failed" listeners="org.testng.reporters.VerboseReporter" methods="${testng.methods.arg}" mode="${testng.mode}" outputdir="${build.test.results.dir}" suitename="AdjustTime2" testname="TestNG tests" workingDir="${work.dir}">
-                    <xmlfileset dir="${build.test.classes.dir}" includes="@{testincludes}"/>
-                    <propertyset>
-                        <propertyref prefix="test-sys-prop."/>
-                        <mapper from="test-sys-prop.*" to="*" type="glob"/>
-                    </propertyset>
-                    <customize/>
-                </testng>
-            </sequential>
-        </macrodef>
-    </target>
-    <target name="-init-macrodef-test-impl">
-        <macrodef name="test-impl" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${includes}" name="includes"/>
-            <attribute default="${excludes}" name="excludes"/>
-            <attribute default="**" name="testincludes"/>
-            <attribute default="" name="testmethods"/>
-            <element implicit="true" name="customize" optional="true"/>
-            <sequential>
-                <echo>No tests executed.</echo>
-            </sequential>
-        </macrodef>
-    </target>
-    <target depends="-init-macrodef-junit" if="${junit.available}" name="-init-macrodef-junit-impl">
-        <macrodef name="test-impl" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${includes}" name="includes"/>
-            <attribute default="${excludes}" name="excludes"/>
-            <attribute default="**" name="testincludes"/>
-            <attribute default="" name="testmethods"/>
-            <element implicit="true" name="customize" optional="true"/>
-            <sequential>
-                <j2seproject3:junit excludes="@{excludes}" includes="@{includes}" testincludes="@{testincludes}" testmethods="@{testmethods}">
-                    <customize/>
-                </j2seproject3:junit>
-            </sequential>
-        </macrodef>
-    </target>
-    <target depends="-init-macrodef-testng" if="${testng.available}" name="-init-macrodef-testng-impl">
-        <macrodef name="test-impl" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${includes}" name="includes"/>
-            <attribute default="${excludes}" name="excludes"/>
-            <attribute default="**" name="testincludes"/>
-            <attribute default="" name="testmethods"/>
-            <element implicit="true" name="customize" optional="true"/>
-            <sequential>
-                <j2seproject3:testng excludes="@{excludes}" includes="@{includes}" testincludes="@{testincludes}" testmethods="@{testmethods}">
-                    <customize/>
-                </j2seproject3:testng>
-            </sequential>
-        </macrodef>
-    </target>
-    <target depends="-init-macrodef-test-impl,-init-macrodef-junit-impl,-init-macrodef-testng-impl" name="-init-macrodef-test">
-        <macrodef name="test" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${includes}" name="includes"/>
-            <attribute default="${excludes}" name="excludes"/>
-            <attribute default="**" name="testincludes"/>
-            <attribute default="" name="testmethods"/>
-            <sequential>
-                <j2seproject3:test-impl excludes="@{excludes}" includes="@{includes}" testincludes="@{testincludes}" testmethods="@{testmethods}">
-                    <customize>
-                        <classpath>
-                            <path path="${run.test.classpath}"/>
-                        </classpath>
-                        <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
-                        <jvmarg line="${run.jvmargs}"/>
-                        <jvmarg line="${run.jvmargs.ide}"/>
-                    </customize>
-                </j2seproject3:test-impl>
-            </sequential>
-        </macrodef>
-    </target>
-    <target if="${junit.available}" name="-init-macrodef-junit-debug" unless="${nb.junit.batch}">
-        <macrodef name="junit-debug" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${includes}" name="includes"/>
-            <attribute default="${excludes}" name="excludes"/>
-            <attribute default="**" name="testincludes"/>
-            <attribute default="" name="testmethods"/>
-            <element name="customize" optional="true"/>
-            <sequential>
-                <property name="junit.forkmode" value="perTest"/>
-                <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}">
-                    <test methods="@{testmethods}" name="@{testincludes}" todir="${build.test.results.dir}"/>
-                    <syspropertyset>
-                        <propertyref prefix="test-sys-prop."/>
-                        <mapper from="test-sys-prop.*" to="*" type="glob"/>
-                    </syspropertyset>
-                    <formatter type="brief" usefile="false"/>
-                    <formatter type="xml"/>
-                    <jvmarg value="-ea"/>
-                    <jvmarg line="${debug-args-line}"/>
-                    <jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/>
-                    <customize/>
-                </junit>
-            </sequential>
-        </macrodef>
-    </target>
-    <target depends="-init-test-properties" if="${nb.junit.batch}" name="-init-macrodef-junit-debug-batch">
-        <macrodef name="junit-debug" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${includes}" name="includes"/>
-            <attribute default="${excludes}" name="excludes"/>
-            <attribute default="**" name="testincludes"/>
-            <attribute default="" name="testmethods"/>
-            <element name="customize" optional="true"/>
-            <sequential>
-                <property name="junit.forkmode" value="perTest"/>
-                <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}">
-                    <batchtest todir="${build.test.results.dir}">
-                        <fileset dir="${test.src.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
-                            <filename name="@{testincludes}"/>
-                        </fileset>
-                        <fileset dir="${build.test.classes.dir}" excludes="@{excludes},${excludes},${test.binaryexcludes}" includes="${test.binaryincludes}">
-                            <filename name="${test.binarytestincludes}"/>
-                        </fileset>
-                    </batchtest>
-                    <syspropertyset>
-                        <propertyref prefix="test-sys-prop."/>
-                        <mapper from="test-sys-prop.*" to="*" type="glob"/>
-                    </syspropertyset>
-                    <formatter type="brief" usefile="false"/>
-                    <formatter type="xml"/>
-                    <jvmarg value="-ea"/>
-                    <jvmarg line="${debug-args-line}"/>
-                    <jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/>
-                    <customize/>
-                </junit>
-            </sequential>
-        </macrodef>
-    </target>
-    <target depends="-init-macrodef-junit-debug,-init-macrodef-junit-debug-batch" if="${junit.available}" name="-init-macrodef-junit-debug-impl">
-        <macrodef name="test-debug-impl" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${includes}" name="includes"/>
-            <attribute default="${excludes}" name="excludes"/>
-            <attribute default="**" name="testincludes"/>
-            <attribute default="" name="testmethods"/>
-            <element implicit="true" name="customize" optional="true"/>
-            <sequential>
-                <j2seproject3:junit-debug excludes="@{excludes}" includes="@{includes}" testincludes="@{testincludes}" testmethods="@{testmethods}">
-                    <customize/>
-                </j2seproject3:junit-debug>
-            </sequential>
-        </macrodef>
-    </target>
-    <target if="${testng.available}" name="-init-macrodef-testng-debug">
-        <macrodef name="testng-debug" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${main.class}" name="testClass"/>
-            <attribute default="" name="testMethod"/>
-            <element name="customize2" optional="true"/>
-            <sequential>
-                <condition else="-testclass @{testClass}" property="test.class.or.method" value="-methods @{testClass}.@{testMethod}">
-                    <isset property="test.method"/>
-                </condition>
-                <condition else="-suitename AdjustTime2 -testname @{testClass} ${test.class.or.method}" property="testng.cmd.args" value="@{testClass}">
-                    <matches pattern=".*\.xml" string="@{testClass}"/>
-                </condition>
-                <delete dir="${build.test.results.dir}" quiet="true"/>
-                <mkdir dir="${build.test.results.dir}"/>
-                <j2seproject3:debug classname="org.testng.TestNG" classpath="${debug.test.classpath}">
-                    <customize>
-                        <customize2/>
-                        <jvmarg value="-ea"/>
-                        <arg line="${testng.debug.mode}"/>
-                        <arg line="-d ${build.test.results.dir}"/>
-                        <arg line="-listener org.testng.reporters.VerboseReporter"/>
-                        <arg line="${testng.cmd.args}"/>
-                    </customize>
-                </j2seproject3:debug>
-            </sequential>
-        </macrodef>
-    </target>
-    <target depends="-init-macrodef-testng-debug" if="${testng.available}" name="-init-macrodef-testng-debug-impl">
-        <macrodef name="testng-debug-impl" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${main.class}" name="testClass"/>
-            <attribute default="" name="testMethod"/>
-            <element implicit="true" name="customize2" optional="true"/>
-            <sequential>
-                <j2seproject3:testng-debug testClass="@{testClass}" testMethod="@{testMethod}">
-                    <customize2/>
-                </j2seproject3:testng-debug>
-            </sequential>
-        </macrodef>
-    </target>
-    <target depends="-init-macrodef-junit-debug-impl" if="${junit.available}" name="-init-macrodef-test-debug-junit">
-        <macrodef name="test-debug" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${includes}" name="includes"/>
-            <attribute default="${excludes}" name="excludes"/>
-            <attribute default="**" name="testincludes"/>
-            <attribute default="" name="testmethods"/>
-            <attribute default="${main.class}" name="testClass"/>
-            <attribute default="" name="testMethod"/>
-            <sequential>
-                <j2seproject3:test-debug-impl excludes="@{excludes}" includes="@{includes}" testincludes="@{testincludes}" testmethods="@{testmethods}">
-                    <customize>
-                        <classpath>
-                            <path path="${run.test.classpath}"/>
-                        </classpath>
-                        <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
-                        <jvmarg line="${run.jvmargs}"/>
-                        <jvmarg line="${run.jvmargs.ide}"/>
-                    </customize>
-                </j2seproject3:test-debug-impl>
-            </sequential>
-        </macrodef>
-    </target>
-    <target depends="-init-macrodef-testng-debug-impl" if="${testng.available}" name="-init-macrodef-test-debug-testng">
-        <macrodef name="test-debug" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${includes}" name="includes"/>
-            <attribute default="${excludes}" name="excludes"/>
-            <attribute default="**" name="testincludes"/>
-            <attribute default="" name="testmethods"/>
-            <attribute default="${main.class}" name="testClass"/>
-            <attribute default="" name="testMethod"/>
-            <sequential>
-                <j2seproject3:testng-debug-impl testClass="@{testClass}" testMethod="@{testMethod}">
-                    <customize2>
-                        <syspropertyset>
-                            <propertyref prefix="test-sys-prop."/>
-                            <mapper from="test-sys-prop.*" to="*" type="glob"/>
-                        </syspropertyset>
-                    </customize2>
-                </j2seproject3:testng-debug-impl>
-            </sequential>
-        </macrodef>
-    </target>
-    <target depends="-init-macrodef-test-debug-junit,-init-macrodef-test-debug-testng" name="-init-macrodef-test-debug"/>
-    <!--
-                pre NB7.2 profiling section; consider it deprecated
-            -->
-    <target depends="-profile-pre-init, init, -profile-post-init, -profile-init-macrodef-profile, -profile-init-check" if="profiler.info.jvmargs.agent" name="profile-init"/>
-    <target if="profiler.info.jvmargs.agent" name="-profile-pre-init">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target if="profiler.info.jvmargs.agent" name="-profile-post-init">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target if="profiler.info.jvmargs.agent" name="-profile-init-macrodef-profile">
-        <macrodef name="resolve">
-            <attribute name="name"/>
-            <attribute name="value"/>
-            <sequential>
-                <property name="@{name}" value="${env.@{value}}"/>
-            </sequential>
-        </macrodef>
-        <macrodef name="profile">
-            <attribute default="${main.class}" name="classname"/>
-            <element name="customize" optional="true"/>
-            <sequential>
-                <property environment="env"/>
-                <resolve name="profiler.current.path" value="${profiler.info.pathvar}"/>
-                <java classname="@{classname}" dir="${profiler.info.dir}" failonerror="${java.failonerror}" fork="true" jvm="${profiler.info.jvm}">
-                    <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
-                    <jvmarg value="${profiler.info.jvmargs.agent}"/>
-                    <jvmarg line="${profiler.info.jvmargs}"/>
-                    <env key="${profiler.info.pathvar}" path="${profiler.info.agentpath}:${profiler.current.path}"/>
-                    <arg line="${application.args}"/>
-                    <classpath>
-                        <path path="${run.classpath}"/>
-                    </classpath>
-                    <syspropertyset>
-                        <propertyref prefix="run-sys-prop."/>
-                        <mapper from="run-sys-prop.*" to="*" type="glob"/>
-                    </syspropertyset>
-                    <customize/>
-                </java>
-            </sequential>
-        </macrodef>
-    </target>
-    <target depends="-profile-pre-init, init, -profile-post-init, -profile-init-macrodef-profile" if="profiler.info.jvmargs.agent" name="-profile-init-check">
-        <fail unless="profiler.info.jvm">Must set JVM to use for profiling in profiler.info.jvm</fail>
-        <fail unless="profiler.info.jvmargs.agent">Must set profiler agent JVM arguments in profiler.info.jvmargs.agent</fail>
-    </target>
-    <!--
-                end of pre NB7.2 profiling section
-            -->
-    <target depends="-init-debug-args" name="-init-macrodef-nbjpda">
-        <macrodef name="nbjpdastart" uri="http://www.netbeans.org/ns/j2se-project/1">
-            <attribute default="${main.class}" name="name"/>
-            <attribute default="${debug.classpath}" name="classpath"/>
-            <attribute default="" name="stopclassname"/>
-            <sequential>
-                <nbjpdastart addressproperty="jpda.address" name="@{name}" stopclassname="@{stopclassname}" transport="${debug-transport}">
-                    <classpath>
-                        <path path="@{classpath}"/>
-                    </classpath>
-                </nbjpdastart>
-            </sequential>
-        </macrodef>
-        <macrodef name="nbjpdareload" uri="http://www.netbeans.org/ns/j2se-project/1">
-            <attribute default="${build.classes.dir}" name="dir"/>
-            <sequential>
-                <nbjpdareload>
-                    <fileset dir="@{dir}" includes="${fix.classes}">
-                        <include name="${fix.includes}*.class"/>
-                    </fileset>
-                </nbjpdareload>
-            </sequential>
-        </macrodef>
-    </target>
-    <target name="-init-debug-args">
-        <property name="version-output" value="java version &quot;${ant.java.version}"/>
-        <condition property="have-jdk-older-than-1.4">
-            <or>
-                <contains string="${version-output}" substring="java version &quot;1.0"/>
-                <contains string="${version-output}" substring="java version &quot;1.1"/>
-                <contains string="${version-output}" substring="java version &quot;1.2"/>
-                <contains string="${version-output}" substring="java version &quot;1.3"/>
-            </or>
-        </condition>
-        <condition else="-Xdebug" property="debug-args-line" value="-Xdebug -Xnoagent -Djava.compiler=none">
-            <istrue value="${have-jdk-older-than-1.4}"/>
-        </condition>
-        <condition else="dt_socket" property="debug-transport-by-os" value="dt_shmem">
-            <os family="windows"/>
-        </condition>
-        <condition else="${debug-transport-by-os}" property="debug-transport" value="${debug.transport}">
-            <isset property="debug.transport"/>
-        </condition>
-    </target>
-    <target depends="-init-debug-args" name="-init-macrodef-debug">
-        <macrodef name="debug" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${main.class}" name="classname"/>
-            <attribute default="${debug.classpath}" name="classpath"/>
-            <element name="customize" optional="true"/>
-            <sequential>
-                <java classname="@{classname}" dir="${work.dir}" failonerror="${java.failonerror}" fork="true">
-                    <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
-                    <jvmarg line="${debug-args-line}"/>
-                    <jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/>
-                    <jvmarg value="-Dfile.encoding=${runtime.encoding}"/>
-                    <redirector errorencoding="${runtime.encoding}" inputencoding="${runtime.encoding}" outputencoding="${runtime.encoding}"/>
-                    <jvmarg line="${run.jvmargs}"/>
-                    <jvmarg line="${run.jvmargs.ide}"/>
-                    <classpath>
-                        <path path="@{classpath}"/>
-                    </classpath>
-                    <syspropertyset>
-                        <propertyref prefix="run-sys-prop."/>
-                        <mapper from="run-sys-prop.*" to="*" type="glob"/>
-                    </syspropertyset>
-                    <customize/>
-                </java>
-            </sequential>
-        </macrodef>
-    </target>
-    <target name="-init-macrodef-java">
-        <macrodef name="java" uri="http://www.netbeans.org/ns/j2se-project/1">
-            <attribute default="${main.class}" name="classname"/>
-            <attribute default="${run.classpath}" name="classpath"/>
-            <attribute default="jvm" name="jvm"/>
-            <element name="customize" optional="true"/>
-            <sequential>
-                <java classname="@{classname}" dir="${work.dir}" failonerror="${java.failonerror}" fork="true">
-                    <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
-                    <jvmarg value="-Dfile.encoding=${runtime.encoding}"/>
-                    <redirector errorencoding="${runtime.encoding}" inputencoding="${runtime.encoding}" outputencoding="${runtime.encoding}"/>
-                    <jvmarg line="${run.jvmargs}"/>
-                    <jvmarg line="${run.jvmargs.ide}"/>
-                    <classpath>
-                        <path path="@{classpath}"/>
-                    </classpath>
-                    <syspropertyset>
-                        <propertyref prefix="run-sys-prop."/>
-                        <mapper from="run-sys-prop.*" to="*" type="glob"/>
-                    </syspropertyset>
-                    <customize/>
-                </java>
-            </sequential>
-        </macrodef>
-    </target>
-    <target name="-init-macrodef-copylibs">
-        <macrodef name="copylibs" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${manifest.file}" name="manifest"/>
-            <element name="customize" optional="true"/>
-            <sequential>
-                <property location="${build.classes.dir}" name="build.classes.dir.resolved"/>
-                <pathconvert property="run.classpath.without.build.classes.dir">
-                    <path path="${run.classpath}"/>
-                    <map from="${build.classes.dir.resolved}" to=""/>
-                </pathconvert>
-                <pathconvert pathsep=" " property="jar.classpath">
-                    <path path="${run.classpath.without.build.classes.dir}"/>
-                    <chainedmapper>
-                        <flattenmapper/>
-                        <filtermapper>
-                            <replacestring from=" " to="%20"/>
-                        </filtermapper>
-                        <globmapper from="*" to="lib/*"/>
-                    </chainedmapper>
-                </pathconvert>
-                <taskdef classname="org.netbeans.modules.java.j2seproject.copylibstask.CopyLibs" classpath="${libs.CopyLibs.classpath}" name="copylibs"/>
-                <copylibs compress="${jar.compress}" excludeFromCopy="${copylibs.excludes}" index="${jar.index}" indexMetaInf="${jar.index.metainf}" jarfile="${dist.jar}" manifest="@{manifest}" manifestencoding="UTF-8" rebase="${copylibs.rebase}" runtimeclasspath="${run.classpath.without.build.classes.dir}">
-                    <fileset dir="${build.classes.dir}" excludes="${dist.archive.excludes}"/>
-                    <manifest>
-                        <attribute name="Class-Path" value="${jar.classpath}"/>
-                        <customize/>
-                    </manifest>
-                </copylibs>
-            </sequential>
-        </macrodef>
-    </target>
-    <target name="-init-presetdef-jar">
-        <presetdef name="jar" uri="http://www.netbeans.org/ns/j2se-project/1">
-            <jar compress="${jar.compress}" index="${jar.index}" jarfile="${dist.jar}" manifestencoding="UTF-8">
-                <j2seproject1:fileset dir="${build.classes.dir}" excludes="${dist.archive.excludes}"/>
-            </jar>
-        </presetdef>
-    </target>
-    <target name="-init-ap-cmdline-properties">
-        <property name="annotation.processing.enabled" value="true"/>
-        <property name="annotation.processing.processors.list" value=""/>
-        <property name="annotation.processing.processor.options" value=""/>
-        <property name="annotation.processing.run.all.processors" value="true"/>
-        <property name="javac.processorpath" value="${javac.classpath}"/>
-        <property name="javac.test.processorpath" value="${javac.test.classpath}"/>
-        <condition property="ap.supported.internal" value="true">
-            <not>
-                <matches pattern="1\.[0-5](\..*)?" string="${javac.source}"/>
-            </not>
-        </condition>
-    </target>
-    <target depends="-init-ap-cmdline-properties" if="ap.supported.internal" name="-init-ap-cmdline-supported">
-        <condition else="" property="ap.processors.internal" value="-processor ${annotation.processing.processors.list}">
-            <isfalse value="${annotation.processing.run.all.processors}"/>
-        </condition>
-        <condition else="" property="ap.proc.none.internal" value="-proc:none">
-            <isfalse value="${annotation.processing.enabled}"/>
-        </condition>
-    </target>
-    <target depends="-init-ap-cmdline-properties,-init-ap-cmdline-supported" name="-init-ap-cmdline">
-        <property name="ap.cmd.line.internal" value=""/>
-    </target>
-    <target depends="-pre-init,-init-private,-init-user,-init-project,-do-init,-post-init,-init-check,-init-macrodef-property,-init-macrodef-javac,-init-macrodef-test,-init-macrodef-test-debug,-init-macrodef-nbjpda,-init-macrodef-debug,-init-macrodef-java,-init-presetdef-jar,-init-ap-cmdline" name="init"/>
-    <!--
-                ===================
-                COMPILATION SECTION
-                ===================
-            -->
-    <target name="-deps-jar-init" unless="built-jar.properties">
-        <property location="${build.dir}/built-jar.properties" name="built-jar.properties"/>
-        <delete file="${built-jar.properties}" quiet="true"/>
-    </target>
-    <target if="already.built.jar.${basedir}" name="-warn-already-built-jar">
-        <echo level="warn" message="Cycle detected: AdjustTime2 was already built"/>
-    </target>
-    <target depends="init,-deps-jar-init" name="deps-jar" unless="no.deps">
-        <mkdir dir="${build.dir}"/>
-        <touch file="${built-jar.properties}" verbose="false"/>
-        <property file="${built-jar.properties}" prefix="already.built.jar."/>
-        <antcall target="-warn-already-built-jar"/>
-        <propertyfile file="${built-jar.properties}">
-            <entry key="${basedir}" value=""/>
-        </propertyfile>
-    </target>
-    <target depends="init,-check-automatic-build,-clean-after-automatic-build" name="-verify-automatic-build"/>
-    <target depends="init" name="-check-automatic-build">
-        <available file="${build.classes.dir}/.netbeans_automatic_build" property="netbeans.automatic.build"/>
-    </target>
-    <target depends="init" if="netbeans.automatic.build" name="-clean-after-automatic-build">
-        <antcall target="clean"/>
-    </target>
-    <target depends="init,deps-jar" name="-pre-pre-compile">
-        <mkdir dir="${build.classes.dir}"/>
-    </target>
-    <target name="-pre-compile">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target if="do.depend.true" name="-compile-depend">
-        <pathconvert property="build.generated.subdirs">
-            <dirset dir="${build.generated.sources.dir}" erroronmissingdir="false">
-                <include name="*"/>
-            </dirset>
-        </pathconvert>
-        <j2seproject3:depend srcdir="${src.dir}:${build.generated.subdirs}"/>
-    </target>
-    <target depends="init,deps-jar,-pre-pre-compile,-pre-compile, -copy-persistence-xml,-compile-depend" if="have.sources" name="-do-compile">
-        <j2seproject3:javac gensrcdir="${build.generated.sources.dir}"/>
-        <copy todir="${build.classes.dir}">
-            <fileset dir="${src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
-        </copy>
-    </target>
-    <target if="has.persistence.xml" name="-copy-persistence-xml">
-        <mkdir dir="${build.classes.dir}/META-INF"/>
-        <copy todir="${build.classes.dir}/META-INF">
-            <fileset dir="${meta.inf.dir}" includes="persistence.xml orm.xml"/>
-        </copy>
-    </target>
-    <target name="-post-compile">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target depends="init,deps-jar,-verify-automatic-build,-pre-pre-compile,-pre-compile,-do-compile,-post-compile" description="Compile project." name="compile"/>
-    <target name="-pre-compile-single">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target depends="init,deps-jar,-pre-pre-compile" name="-do-compile-single">
-        <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
-        <j2seproject3:force-recompile/>
-        <j2seproject3:javac excludes="" gensrcdir="${build.generated.sources.dir}" includes="${javac.includes}" sourcepath="${src.dir}"/>
-    </target>
-    <target name="-post-compile-single">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target depends="init,deps-jar,-verify-automatic-build,-pre-pre-compile,-pre-compile-single,-do-compile-single,-post-compile-single" name="compile-single"/>
-    <!--
-                ====================
-                JAR BUILDING SECTION
-                ====================
-            -->
-    <target depends="init" name="-pre-pre-jar">
-        <dirname file="${dist.jar}" property="dist.jar.dir"/>
-        <mkdir dir="${dist.jar.dir}"/>
-    </target>
-    <target name="-pre-jar">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target depends="init" if="do.archive" name="-do-jar-create-manifest" unless="manifest.available">
-        <tempfile deleteonexit="true" destdir="${build.dir}" property="tmp.manifest.file"/>
-        <touch file="${tmp.manifest.file}" verbose="false"/>
-    </target>
-    <target depends="init" if="do.archive+manifest.available" name="-do-jar-copy-manifest">
-        <tempfile deleteonexit="true" destdir="${build.dir}" property="tmp.manifest.file"/>
-        <copy encoding="${manifest.encoding}" file="${manifest.file}" outputencoding="UTF-8" tofile="${tmp.manifest.file}"/>
-    </target>
-    <target depends="init,-do-jar-create-manifest,-do-jar-copy-manifest" if="do.archive+main.class.available" name="-do-jar-set-mainclass">
-        <manifest encoding="UTF-8" file="${tmp.manifest.file}" mode="update">
-            <attribute name="Main-Class" value="${main.class}"/>
-        </manifest>
-    </target>
-    <target depends="init,-do-jar-create-manifest,-do-jar-copy-manifest" if="do.archive+profile.available" name="-do-jar-set-profile">
-        <manifest encoding="UTF-8" file="${tmp.manifest.file}" mode="update">
-            <attribute name="Profile" value="${javac.profile}"/>
-        </manifest>
-    </target>
-    <target depends="init,-do-jar-create-manifest,-do-jar-copy-manifest" if="do.archive+splashscreen.available" name="-do-jar-set-splashscreen">
-        <basename file="${application.splash}" property="splashscreen.basename"/>
-        <mkdir dir="${build.classes.dir}/META-INF"/>
-        <copy failonerror="false" file="${application.splash}" todir="${build.classes.dir}/META-INF"/>
-        <manifest encoding="UTF-8" file="${tmp.manifest.file}" mode="update">
-            <attribute name="SplashScreen-Image" value="META-INF/${splashscreen.basename}"/>
-        </manifest>
-    </target>
-    <target depends="init,-init-macrodef-copylibs,compile,-pre-pre-jar,-pre-jar,-do-jar-create-manifest,-do-jar-copy-manifest,-do-jar-set-mainclass,-do-jar-set-profile,-do-jar-set-splashscreen" if="do.mkdist" name="-do-jar-copylibs">
-        <j2seproject3:copylibs manifest="${tmp.manifest.file}"/>
-        <echo level="info">To run this application from the command line without Ant, try:</echo>
-        <property location="${dist.jar}" name="dist.jar.resolved"/>
-        <echo level="info">java -jar "${dist.jar.resolved}"</echo>
-    </target>
-    <target depends="init,compile,-pre-pre-jar,-pre-jar,-do-jar-create-manifest,-do-jar-copy-manifest,-do-jar-set-mainclass,-do-jar-set-profile,-do-jar-set-splashscreen" if="do.archive" name="-do-jar-jar" unless="do.mkdist">
-        <j2seproject1:jar manifest="${tmp.manifest.file}"/>
-        <property location="${build.classes.dir}" name="build.classes.dir.resolved"/>
-        <property location="${dist.jar}" name="dist.jar.resolved"/>
-        <pathconvert property="run.classpath.with.dist.jar">
-            <path path="${run.classpath}"/>
-            <map from="${build.classes.dir.resolved}" to="${dist.jar.resolved}"/>
-        </pathconvert>
-        <condition else="" property="jar.usage.message" value="To run this application from the command line without Ant, try:${line.separator}${platform.java} -cp ${run.classpath.with.dist.jar} ${main.class}">
-            <isset property="main.class.available"/>
-        </condition>
-        <condition else="debug" property="jar.usage.level" value="info">
-            <isset property="main.class.available"/>
-        </condition>
-        <echo level="${jar.usage.level}" message="${jar.usage.message}"/>
-    </target>
-    <target depends="-do-jar-copylibs" if="do.archive" name="-do-jar-delete-manifest">
-        <delete>
-            <fileset file="${tmp.manifest.file}"/>
-        </delete>
-    </target>
-    <target depends="init,compile,-pre-pre-jar,-pre-jar,-do-jar-create-manifest,-do-jar-copy-manifest,-do-jar-set-mainclass,-do-jar-set-profile,-do-jar-set-splashscreen,-do-jar-jar,-do-jar-delete-manifest" name="-do-jar-without-libraries"/>
-    <target depends="init,compile,-pre-pre-jar,-pre-jar,-do-jar-create-manifest,-do-jar-copy-manifest,-do-jar-set-mainclass,-do-jar-set-profile,-do-jar-set-splashscreen,-do-jar-copylibs,-do-jar-delete-manifest" name="-do-jar-with-libraries"/>
-    <target name="-post-jar">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target depends="init,compile,-pre-jar,-do-jar-without-libraries,-do-jar-with-libraries,-post-jar" name="-do-jar"/>
-    <target depends="init,compile,-pre-jar,-do-jar,-post-jar" description="Build JAR." name="jar"/>
-    <!--
-                =================
-                EXECUTION SECTION
-                =================
-            -->
-    <target depends="init,compile" description="Run a main class." name="run">
-        <j2seproject1:java>
-            <customize>
-                <arg line="${application.args}"/>
-            </customize>
-        </j2seproject1:java>
-    </target>
-    <target name="-do-not-recompile">
-        <property name="javac.includes.binary" value=""/>
-    </target>
-    <target depends="init,compile-single" name="run-single">
-        <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
-        <j2seproject1:java classname="${run.class}"/>
-    </target>
-    <target depends="init,compile-test-single" name="run-test-with-main">
-        <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
-        <j2seproject1:java classname="${run.class}" classpath="${run.test.classpath}"/>
-    </target>
-    <!--
-                =================
-                DEBUGGING SECTION
-                =================
-            -->
-    <target depends="init" if="netbeans.home" name="-debug-start-debugger">
-        <j2seproject1:nbjpdastart name="${debug.class}"/>
-    </target>
-    <target depends="init" if="netbeans.home" name="-debug-start-debugger-main-test">
-        <j2seproject1:nbjpdastart classpath="${debug.test.classpath}" name="${debug.class}"/>
-    </target>
-    <target depends="init,compile" name="-debug-start-debuggee">
-        <j2seproject3:debug>
-            <customize>
-                <arg line="${application.args}"/>
-            </customize>
-        </j2seproject3:debug>
-    </target>
-    <target depends="init,compile,-debug-start-debugger,-debug-start-debuggee" description="Debug project in IDE." if="netbeans.home" name="debug"/>
-    <target depends="init" if="netbeans.home" name="-debug-start-debugger-stepinto">
-        <j2seproject1:nbjpdastart stopclassname="${main.class}"/>
-    </target>
-    <target depends="init,compile,-debug-start-debugger-stepinto,-debug-start-debuggee" if="netbeans.home" name="debug-stepinto"/>
-    <target depends="init,compile-single" if="netbeans.home" name="-debug-start-debuggee-single">
-        <fail unless="debug.class">Must select one file in the IDE or set debug.class</fail>
-        <j2seproject3:debug classname="${debug.class}"/>
-    </target>
-    <target depends="init,compile-single,-debug-start-debugger,-debug-start-debuggee-single" if="netbeans.home" name="debug-single"/>
-    <target depends="init,compile-test-single" if="netbeans.home" name="-debug-start-debuggee-main-test">
-        <fail unless="debug.class">Must select one file in the IDE or set debug.class</fail>
-        <j2seproject3:debug classname="${debug.class}" classpath="${debug.test.classpath}"/>
-    </target>
-    <target depends="init,compile-test-single,-debug-start-debugger-main-test,-debug-start-debuggee-main-test" if="netbeans.home" name="debug-test-with-main"/>
-    <target depends="init" name="-pre-debug-fix">
-        <fail unless="fix.includes">Must set fix.includes</fail>
-        <property name="javac.includes" value="${fix.includes}.java"/>
-    </target>
-    <target depends="init,-pre-debug-fix,compile-single" if="netbeans.home" name="-do-debug-fix">
-        <j2seproject1:nbjpdareload/>
-    </target>
-    <target depends="init,-pre-debug-fix,-do-debug-fix" if="netbeans.home" name="debug-fix"/>
-    <!--
-                =================
-                PROFILING SECTION
-                =================
-            -->
-    <!--
-                pre NB7.2 profiler integration
-            -->
-    <target depends="profile-init,compile" description="Profile a project in the IDE." if="profiler.info.jvmargs.agent" name="-profile-pre72">
-        <fail unless="netbeans.home">This target only works when run from inside the NetBeans IDE.</fail>
-        <nbprofiledirect>
-            <classpath>
-                <path path="${run.classpath}"/>
-            </classpath>
-        </nbprofiledirect>
-        <profile/>
-    </target>
-    <target depends="profile-init,compile-single" description="Profile a selected class in the IDE." if="profiler.info.jvmargs.agent" name="-profile-single-pre72">
-        <fail unless="profile.class">Must select one file in the IDE or set profile.class</fail>
-        <fail unless="netbeans.home">This target only works when run from inside the NetBeans IDE.</fail>
-        <nbprofiledirect>
-            <classpath>
-                <path path="${run.classpath}"/>
-            </classpath>
-        </nbprofiledirect>
-        <profile classname="${profile.class}"/>
-    </target>
-    <target depends="profile-init,compile-single" if="profiler.info.jvmargs.agent" name="-profile-applet-pre72">
-        <fail unless="netbeans.home">This target only works when run from inside the NetBeans IDE.</fail>
-        <nbprofiledirect>
-            <classpath>
-                <path path="${run.classpath}"/>
-            </classpath>
-        </nbprofiledirect>
-        <profile classname="sun.applet.AppletViewer">
-            <customize>
-                <arg value="${applet.url}"/>
-            </customize>
-        </profile>
-    </target>
-    <target depends="profile-init,compile-test-single" if="profiler.info.jvmargs.agent" name="-profile-test-single-pre72">
-        <fail unless="netbeans.home">This target only works when run from inside the NetBeans IDE.</fail>
-        <nbprofiledirect>
-            <classpath>
-                <path path="${run.test.classpath}"/>
-            </classpath>
-        </nbprofiledirect>
-        <junit dir="${profiler.info.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" jvm="${profiler.info.jvm}" showoutput="true">
-            <env key="${profiler.info.pathvar}" path="${profiler.info.agentpath}:${profiler.current.path}"/>
-            <jvmarg value="${profiler.info.jvmargs.agent}"/>
-            <jvmarg line="${profiler.info.jvmargs}"/>
-            <test name="${profile.class}"/>
-            <classpath>
-                <path path="${run.test.classpath}"/>
-            </classpath>
-            <syspropertyset>
-                <propertyref prefix="test-sys-prop."/>
-                <mapper from="test-sys-prop.*" to="*" type="glob"/>
-            </syspropertyset>
-            <formatter type="brief" usefile="false"/>
-            <formatter type="xml"/>
-        </junit>
-    </target>
-    <!--
-                end of pre NB72 profiling section
-            -->
-    <target if="netbeans.home" name="-profile-check">
-        <condition property="profiler.configured">
-            <or>
-                <contains casesensitive="true" string="${run.jvmargs.ide}" substring="-agentpath:"/>
-                <contains casesensitive="true" string="${run.jvmargs.ide}" substring="-javaagent:"/>
-            </or>
-        </condition>
-    </target>
-    <target depends="-profile-check,-profile-pre72" description="Profile a project in the IDE." if="profiler.configured" name="profile" unless="profiler.info.jvmargs.agent">
-        <startprofiler/>
-        <antcall target="run"/>
-    </target>
-    <target depends="-profile-check,-profile-single-pre72" description="Profile a selected class in the IDE." if="profiler.configured" name="profile-single" unless="profiler.info.jvmargs.agent">
-        <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
-        <startprofiler/>
-        <antcall target="run-single"/>
-    </target>
-    <target depends="-profile-test-single-pre72" description="Profile a selected test in the IDE." name="profile-test-single"/>
-    <target depends="-profile-check" description="Profile a selected test in the IDE." if="profiler.configured" name="profile-test" unless="profiler.info.jvmargs">
-        <fail unless="test.includes">Must select some files in the IDE or set test.includes</fail>
-        <startprofiler/>
-        <antcall target="test-single"/>
-    </target>
-    <target depends="-profile-check" description="Profile a selected class in the IDE." if="profiler.configured" name="profile-test-with-main">
-        <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
-        <startprofiler/>
-        <antcall target="run-test-with-main"/>
-    </target>
-    <target depends="-profile-check,-profile-applet-pre72" if="profiler.configured" name="profile-applet" unless="profiler.info.jvmargs.agent">
-        <fail unless="applet.url">Must select one file in the IDE or set applet.url</fail>
-        <startprofiler/>
-        <antcall target="run-applet"/>
-    </target>
-    <!--
-                ===============
-                JAVADOC SECTION
-                ===============
-            -->
-    <target depends="init" if="have.sources" name="-javadoc-build">
-        <mkdir dir="${dist.javadoc.dir}"/>
-        <condition else="" property="javadoc.endorsed.classpath.cmd.line.arg" value="-J${endorsed.classpath.cmd.line.arg}">
-            <and>
-                <isset property="endorsed.classpath.cmd.line.arg"/>
-                <not>
-                    <equals arg1="${endorsed.classpath.cmd.line.arg}" arg2=""/>
-                </not>
-            </and>
-        </condition>
-        <condition else="" property="bug5101868workaround" value="*.java">
-            <matches pattern="1\.[56](\..*)?" string="${java.version}"/>
-        </condition>
-        <javadoc additionalparam="-J-Dfile.encoding=${file.encoding} ${javadoc.additionalparam}" author="${javadoc.author}" charset="UTF-8" destdir="${dist.javadoc.dir}" docencoding="UTF-8" encoding="${javadoc.encoding.used}" failonerror="true" noindex="${javadoc.noindex}" nonavbar="${javadoc.nonavbar}" notree="${javadoc.notree}" private="${javadoc.private}" source="${javac.source}" splitindex="${javadoc.splitindex}" use="${javadoc.use}" useexternalfile="true" version="${javadoc.version}" windowtitle="${javadoc.windowtitle}">
-            <classpath>
-                <path path="${javac.classpath}"/>
-            </classpath>
-            <fileset dir="${src.dir}" excludes="${bug5101868workaround},${excludes}" includes="${includes}">
-                <filename name="**/*.java"/>
-            </fileset>
-            <fileset dir="${build.generated.sources.dir}" erroronmissingdir="false">
-                <include name="**/*.java"/>
-                <exclude name="*.java"/>
-            </fileset>
-            <arg line="${javadoc.endorsed.classpath.cmd.line.arg}"/>
-        </javadoc>
-        <copy todir="${dist.javadoc.dir}">
-            <fileset dir="${src.dir}" excludes="${excludes}" includes="${includes}">
-                <filename name="**/doc-files/**"/>
-            </fileset>
-            <fileset dir="${build.generated.sources.dir}" erroronmissingdir="false">
-                <include name="**/doc-files/**"/>
-            </fileset>
-        </copy>
-    </target>
-    <target depends="init,-javadoc-build" if="netbeans.home" name="-javadoc-browse" unless="no.javadoc.preview">
-        <nbbrowse file="${dist.javadoc.dir}/index.html"/>
-    </target>
-    <target depends="init,-javadoc-build,-javadoc-browse" description="Build Javadoc." name="javadoc"/>
-    <!--
-                =========================
-                TEST COMPILATION SECTION
-                =========================
-            -->
-    <target depends="init,compile" if="have.tests" name="-pre-pre-compile-test">
-        <mkdir dir="${build.test.classes.dir}"/>
-    </target>
-    <target name="-pre-compile-test">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target if="do.depend.true" name="-compile-test-depend">
-        <j2seproject3:depend classpath="${javac.test.classpath}" destdir="${build.test.classes.dir}" srcdir="${test.src.dir}"/>
-    </target>
-    <target depends="init,deps-jar,compile,-pre-pre-compile-test,-pre-compile-test,-compile-test-depend" if="have.tests" name="-do-compile-test">
-        <j2seproject3:javac apgeneratedsrcdir="${build.test.classes.dir}" classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" processorpath="${javac.test.processorpath}" srcdir="${test.src.dir}"/>
-        <copy todir="${build.test.classes.dir}">
-            <fileset dir="${test.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
-        </copy>
-    </target>
-    <target name="-post-compile-test">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test,-do-compile-test,-post-compile-test" name="compile-test"/>
-    <target name="-pre-compile-test-single">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target depends="init,deps-jar,compile,-pre-pre-compile-test,-pre-compile-test-single" if="have.tests" name="-do-compile-test-single">
-        <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
-        <j2seproject3:force-recompile destdir="${build.test.classes.dir}"/>
-        <j2seproject3:javac apgeneratedsrcdir="${build.test.classes.dir}" classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" excludes="" includes="${javac.includes}" processorpath="${javac.test.processorpath}" sourcepath="${test.src.dir}" srcdir="${test.src.dir}"/>
-        <copy todir="${build.test.classes.dir}">
-            <fileset dir="${test.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
-        </copy>
-    </target>
-    <target name="-post-compile-test-single">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single,-do-compile-test-single,-post-compile-test-single" name="compile-test-single"/>
-    <!--
-                =======================
-                TEST EXECUTION SECTION
-                =======================
-            -->
-    <target depends="init" if="have.tests" name="-pre-test-run">
-        <mkdir dir="${build.test.results.dir}"/>
-    </target>
-    <target depends="init,compile-test,-pre-test-run" if="have.tests" name="-do-test-run">
-        <j2seproject3:test includes="${includes}" testincludes="**/*Test.java"/>
-    </target>
-    <target depends="init,compile-test,-pre-test-run,-do-test-run" if="have.tests" name="-post-test-run">
-        <fail if="tests.failed" unless="ignore.failing.tests">Some tests failed; see details above.</fail>
-    </target>
-    <target depends="init" if="have.tests" name="test-report"/>
-    <target depends="init" if="netbeans.home+have.tests" name="-test-browse"/>
-    <target depends="init,compile-test,-pre-test-run,-do-test-run,test-report,-post-test-run,-test-browse" description="Run unit tests." name="test"/>
-    <target depends="init" if="have.tests" name="-pre-test-run-single">
-        <mkdir dir="${build.test.results.dir}"/>
-    </target>
-    <target depends="init,compile-test-single,-pre-test-run-single" if="have.tests" name="-do-test-run-single">
-        <fail unless="test.includes">Must select some files in the IDE or set test.includes</fail>
-        <j2seproject3:test excludes="" includes="${test.includes}" testincludes="${test.includes}"/>
-    </target>
-    <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single" if="have.tests" name="-post-test-run-single">
-        <fail if="tests.failed" unless="ignore.failing.tests">Some tests failed; see details above.</fail>
-    </target>
-    <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single,-post-test-run-single" description="Run single unit test." name="test-single"/>
-    <target depends="init,compile-test-single,-pre-test-run-single" if="have.tests" name="-do-test-run-single-method">
-        <fail unless="test.class">Must select some files in the IDE or set test.class</fail>
-        <fail unless="test.method">Must select some method in the IDE or set test.method</fail>
-        <j2seproject3:test excludes="" includes="${javac.includes}" testincludes="${test.class}" testmethods="${test.method}"/>
-    </target>
-    <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single-method" if="have.tests" name="-post-test-run-single-method">
-        <fail if="tests.failed" unless="ignore.failing.tests">Some tests failed; see details above.</fail>
-    </target>
-    <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single-method,-post-test-run-single-method" description="Run single unit test." name="test-single-method"/>
-    <!--
-                =======================
-                TEST DEBUGGING SECTION
-                =======================
-            -->
-    <target depends="init,compile-test-single,-pre-test-run-single" if="have.tests" name="-debug-start-debuggee-test">
-        <fail unless="test.class">Must select one file in the IDE or set test.class</fail>
-        <j2seproject3:test-debug excludes="" includes="${javac.includes}" testClass="${test.class}" testincludes="${javac.includes}"/>
-    </target>
-    <target depends="init,compile-test-single,-pre-test-run-single" if="have.tests" name="-debug-start-debuggee-test-method">
-        <fail unless="test.class">Must select one file in the IDE or set test.class</fail>
-        <fail unless="test.method">Must select some method in the IDE or set test.method</fail>
-        <j2seproject3:test-debug excludes="" includes="${javac.includes}" testClass="${test.class}" testMethod="${test.method}" testincludes="${test.class}" testmethods="${test.method}"/>
-    </target>
-    <target depends="init,compile-test" if="netbeans.home+have.tests" name="-debug-start-debugger-test">
-        <j2seproject1:nbjpdastart classpath="${debug.test.classpath}" name="${test.class}"/>
-    </target>
-    <target depends="init,compile-test-single,-debug-start-debugger-test,-debug-start-debuggee-test" name="debug-test"/>
-    <target depends="init,compile-test-single,-debug-start-debugger-test,-debug-start-debuggee-test-method" name="debug-test-method"/>
-    <target depends="init,-pre-debug-fix,compile-test-single" if="netbeans.home" name="-do-debug-fix-test">
-        <j2seproject1:nbjpdareload dir="${build.test.classes.dir}"/>
-    </target>
-    <target depends="init,-pre-debug-fix,-do-debug-fix-test" if="netbeans.home" name="debug-fix-test"/>
-    <!--
-                =========================
-                APPLET EXECUTION SECTION
-                =========================
-            -->
-    <target depends="init,compile-single" name="run-applet">
-        <fail unless="applet.url">Must select one file in the IDE or set applet.url</fail>
-        <j2seproject1:java classname="sun.applet.AppletViewer">
-            <customize>
-                <arg value="${applet.url}"/>
-            </customize>
-        </j2seproject1:java>
-    </target>
-    <!--
-                =========================
-                APPLET DEBUGGING  SECTION
-                =========================
-            -->
-    <target depends="init,compile-single" if="netbeans.home" name="-debug-start-debuggee-applet">
-        <fail unless="applet.url">Must select one file in the IDE or set applet.url</fail>
-        <j2seproject3:debug classname="sun.applet.AppletViewer">
-            <customize>
-                <arg value="${applet.url}"/>
-            </customize>
-        </j2seproject3:debug>
-    </target>
-    <target depends="init,compile-single,-debug-start-debugger,-debug-start-debuggee-applet" if="netbeans.home" name="debug-applet"/>
-    <!--
-                ===============
-                CLEANUP SECTION
-                ===============
-            -->
-    <target name="-deps-clean-init" unless="built-clean.properties">
-        <property location="${build.dir}/built-clean.properties" name="built-clean.properties"/>
-        <delete file="${built-clean.properties}" quiet="true"/>
-    </target>
-    <target if="already.built.clean.${basedir}" name="-warn-already-built-clean">
-        <echo level="warn" message="Cycle detected: AdjustTime2 was already built"/>
-    </target>
-    <target depends="init,-deps-clean-init" name="deps-clean" unless="no.deps">
-        <mkdir dir="${build.dir}"/>
-        <touch file="${built-clean.properties}" verbose="false"/>
-        <property file="${built-clean.properties}" prefix="already.built.clean."/>
-        <antcall target="-warn-already-built-clean"/>
-        <propertyfile file="${built-clean.properties}">
-            <entry key="${basedir}" value=""/>
-        </propertyfile>
-    </target>
-    <target depends="init" name="-do-clean">
-        <delete dir="${build.dir}"/>
-        <delete dir="${dist.dir}" followsymlinks="false" includeemptydirs="true"/>
-    </target>
-    <target name="-post-clean">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target depends="init,deps-clean,-do-clean,-post-clean" description="Clean build products." name="clean"/>
-    <target name="-check-call-dep">
-        <property file="${call.built.properties}" prefix="already.built."/>
-        <condition property="should.call.dep">
-            <and>
-                <not>
-                    <isset property="already.built.${call.subproject}"/>
-                </not>
-                <available file="${call.script}"/>
-            </and>
-        </condition>
-    </target>
-    <target depends="-check-call-dep" if="should.call.dep" name="-maybe-call-dep">
-        <ant antfile="${call.script}" inheritall="false" target="${call.target}">
-            <propertyset>
-                <propertyref prefix="transfer."/>
-                <mapper from="transfer.*" to="*" type="glob"/>
-            </propertyset>
-        </ant>
-    </target>
-</project>
diff --git a/importPicture/nbproject/genfiles.properties b/importPicture/nbproject/genfiles.properties
deleted file mode 100644 (file)
index 62dd9fb..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-nbbuild.xml.data.CRC32=d1f6ec78
-nbbuild.xml.script.CRC32=fbdc2007
-nbbuild.xml.stylesheet.CRC32=8064a381@1.80.1.48
-# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
-# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
-nbproject/build-impl.xml.data.CRC32=d1f6ec78
-nbproject/build-impl.xml.script.CRC32=68294fbb
-nbproject/build-impl.xml.stylesheet.CRC32=830a3534@1.80.1.48
diff --git a/importPicture/nbproject/project.properties b/importPicture/nbproject/project.properties
deleted file mode 100644 (file)
index f3a5b38..0000000
+++ /dev/null
@@ -1,63 +0,0 @@
-#Mon Sep 17 14:44:31 JST 2018
-excludes=
-javac.deprecation=false
-build.test.results.dir=${build.dir}/test/results
-javac.external.vm=true
-run.classpath=${javac.classpath}\:${build.classes.dir}
-javadoc.nonavbar=false
-run.test.classpath=${javac.test.classpath}\:${build.test.classes.dir}
-annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output
-javac.processorpath=${javac.classpath}
-javac.target=1.8
-file.reference.importPicture-src=src
-annotation.processing.processors.list=
-javadoc.noindex=false
-javadoc.additionalparam=
-file.reference.commons-imaging-1.0-20170205.201009-115.jar=lib/commons-imaging-1.0-20170205.201009-115.jar
-includes=**
-build.classes.dir=${build.dir}/classes
-source.encoding=UTF-8
-javadoc.author=false
-test.src.dir=${file.reference.importPicture-test}
-build.dir=build
-build.test.classes.dir=${build.dir}/test/classes
-platform.active=default_platform
-javac.compilerargs=
-main.class=osm.jp.gpx.matchtime.gui.AdjustTime
-dist.jar=${dist.dir}/AdjustTime2.jar
-javac.test.processorpath=${javac.test.classpath}
-javadoc.use=true
-file.reference.importPicture-test=test
-dist.archive.excludes=
-build.sysclasspath=ignore
-debug.test.classpath=${run.test.classpath}
-dist.dir=dist
-build.classes.excludes=**/*.java,**/*.form
-javadoc.splitindex=true
-javadoc.encoding=${source.encoding}
-javac.source=1.8
-application.vendor=yuu
-junit.selected.version=3
-debug.classpath=${run.classpath}
-run.jvmargs=-Duser.language\=en\n-Duser.country\=US
-build.generated.dir=${build.dir}/generated
-jar.compress=false
-javac.test.classpath=${javac.classpath}\:${build.classes.dir}\:\:${libs.junit_4.classpath}\:${libs.hamcrest.classpath}
-javadoc.private=false
-annotation.processing.run.all.processors=true
-file.reference.commons-compress-1.14.jar=commons-compress-1.14.jar
-application.title=AdjustTime2
-meta.inf.dir=${src.dir}/META-INF
-manifest.file=manifest.mf
-annotation.processing.enabled=true
-dist.javadoc.dir=${dist.dir}/javadoc
-src.dir=${file.reference.importPicture-src}
-endorsed.classpath=
-mkdist.disabled=false
-javac.classpath=${file.reference.commons-imaging-1.0-20170205.201009-115.jar}\:${file.reference.commons-compress-1.14.jar}
-annotation.processing.enabled.in.editor=false
-build.generated.sources.dir=${build.dir}/generated-sources
-javadoc.version=false
-javadoc.windowtitle=
-buildfile=nbbuild.xml
-javadoc.notree=false
diff --git a/importPicture/nbproject/project.xml b/importPicture/nbproject/project.xml
deleted file mode 100644 (file)
index debd575..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://www.netbeans.org/ns/project/1">
-    <type>org.netbeans.modules.java.j2seproject</type>
-    <configuration>
-        <data xmlns="http://www.netbeans.org/ns/j2se-project/3">
-            <name>AdjustTime2</name>
-            <source-roots>
-                <root id="src.dir"/>
-            </source-roots>
-            <test-roots>
-                <root id="test.src.dir"/>
-            </test-roots>
-        </data>
-    </configuration>
-</project>
diff --git a/importPicture/testdata/AdjustTime.20170518.A1.log b/importPicture/testdata/AdjustTime.20170518.A1.log
deleted file mode 100644 (file)
index a8a04a4..0000000
+++ /dev/null
@@ -1,69 +0,0 @@
-テストパターン : [A1].SONYカメラの場合.FILE_UPDATE時間を基準にして時間外のファイルはコピー対象外の時
-       tarFilePath = testdata/Sony20170518.tar.gz
-       gpxSourcePath = testdata/20170518.gpx
-       gpxDestinationPath = testdata/cameradata/20170518.gpx
-       iniFilePath = testdata/AdjustTime.20170518.A1.ini
-Param File = 'testdata/AdjustTime.20170518.A1.ini'
- - param: IMG.TIME=2017-05-18T00:16:48Z
- - param: IMG.BASE_FILE=DSC05183.JPG
- - param: GPX.BASETIME=FILE_UPDATE
- - param: IMG.SOURCE_FOLDER=testdata/cameradata/10170518
- - param: IMG.OUTPUT_FOLDER=/home/yuu/workspace/AdjustTime/importPicture/testdata/output
- - param: IMG.OUTPUT=true
- - param: IMG.OUTPUT_ALL=false
- - param: IMG.OUTPUT_EXIF= false
- - param: GPX.SOURCE_FOLDER=.
- - param: GPX.OUTPUT_WPT=true
- - param: GPX.OVERWRITE_MAGVAR=false
- - param: GPX.OUTPUT_SPEED=false
- - param: GPX.gpxSplit=false
- - param: GPX.noFirstNode=false
- - param: GPX.REUSE=false
-/home/yuu/workspace/AdjustTime/importPicture/testdata/cameradata/20170518.gpx => /home/yuu/workspace/AdjustTime/importPicture/testdata/output/10170518/20170518_.gpx
-           時差: -32420(sec)
-    Target GPX: [/home/yuu/workspace/AdjustTime/importPicture/testdata/cameradata/20170518.gpx]
-          EXIF: convert to '/home/yuu/workspace/AdjustTime/importPicture/testdata/output/10170518'
-
-                                 +--------------------+--------------------|
-  GPS logging time               | First Time         | Last Time          |
-|--------------------------------+--------------------+--------------------|
-|                      <trkseg/> |2017-05-18T00:21:25Z|2017-05-18T00:47:46Z|
-|--------------------------------+--------------------+--------------------|
-
-|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------|
-| name                           | Camera Time        | GPStime            |   Latitude   |   Longitude  | ele    |magvar| km/h |
-|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------|
-|DSC05183.JPG                    |2017-05-18T09:17:08Z|2017-05-18T00:16:48Z|              |              |        |      |      |
-|DSC05184.JPG                    |2017-05-18T09:35:04Z|2017-05-18T00:34:44Z| 35.4367520000|139.4082730000|  63.087|     -|     -|
-|DSC05185.JPG                    |2017-05-18T09:35:08Z|2017-05-18T00:34:48Z| 35.4367360000|139.4082530000|  62.760|     -|     -|
-|DSC05186.JPG                    |2017-05-18T09:35:10Z|2017-05-18T00:34:50Z| 35.4367340000|139.4082440000|  62.313|     -|     -|
-|DSC05187.JPG                    |2017-05-18T09:35:20Z|2017-05-18T00:35:00Z| 35.4367720000|139.4082390000|  63.060|     -|     -|
-|DSC05188.JPG                    |2017-05-18T09:35:28Z|2017-05-18T00:35:08Z| 35.4367940000|139.4082300000|  63.612|     -|     -|
-|DSC05189.JPG                    |2017-05-18T09:35:40Z|2017-05-18T00:35:20Z| 35.4368380000|139.4081910000|  59.427|     -|     -|
-|DSC05190.JPG                    |2017-05-18T09:36:10Z|2017-05-18T00:35:50Z| 35.4371180000|139.4083070000|  59.608|     -|     -|
-|DSC05191.JPG                    |2017-05-18T09:36:20Z|2017-05-18T00:36:00Z| 35.4371710000|139.4083370000|  61.142|     -|     -|
-|DSC05192.JPG                    |2017-05-18T09:36:26Z|2017-05-18T00:36:06Z| 35.4372020000|139.4083510000|  61.727|     -|     -|
-|DSC05193.JPG                    |2017-05-18T09:36:52Z|2017-05-18T00:36:32Z| 35.4374490000|139.4084050000|  67.747|     -|     -|
-|DSC05194.JPG                    |2017-05-18T09:37:10Z|2017-05-18T00:36:50Z| 35.4375190000|139.4084670000|  68.156|     -|     -|
-|DSC05195.JPG                    |2017-05-18T09:37:24Z|2017-05-18T00:37:04Z| 35.4376190000|139.4084540000|  67.816|     -|     -|
-|DSC05196.JPG                    |2017-05-18T09:37:52Z|2017-05-18T00:37:32Z| 35.4376820000|139.4085150000|  68.610|     -|     -|
-|DSC05197.JPG                    |2017-05-18T09:38:18Z|2017-05-18T00:37:58Z| 35.4377770000|139.4086780000|  66.243|     -|     -|
-|DSC05198.JPG                    |2017-05-18T09:38:22Z|2017-05-18T00:38:02Z| 35.4377680000|139.4086840000|  67.086|     -|     -|
-|DSC05199.JPG                    |2017-05-18T09:38:28Z|2017-05-18T00:38:08Z| 35.4377680000|139.4086970000|  67.788|     -|     -|
-|DSC05200.JPG                    |2017-05-18T09:38:48Z|2017-05-18T00:38:28Z| 35.4376200000|139.4087570000|  69.652|     -|     -|
-|DSC05201.JPG                    |2017-05-18T09:38:52Z|2017-05-18T00:38:32Z| 35.4375980000|139.4087640000|  69.565|     -|     -|
-|DSC05202.JPG                    |2017-05-18T09:39:00Z|2017-05-18T00:38:40Z| 35.4375630000|139.4087800000|  68.890|     -|     -|
-|DSC05203.JPG                    |2017-05-18T09:39:24Z|2017-05-18T00:39:04Z| 35.4372650000|139.4087430000|  69.999|     -|     -|
-|DSC05204.JPG                    |2017-05-18T09:47:08Z|2017-05-18T00:46:48Z| 35.4368560000|139.4082190000|  68.637|     -|     -|
-|DSC05205.JPG                    |2017-05-18T09:48:24Z|2017-05-18T00:48:04Z|              |              |        |      |      |
-|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------|
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/10170518/20170518_.gpx'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/10170518/DSC05183.JPG'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/10170518/DSC05184.JPG'
-[debug] exifTime = '2017:05:18 09:34:44' <--> '2017:05:18 09:34:44'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/10170518/DSC05196.JPG'
-[debug] exifTime = '2017:05:18 09:37:32' <--> '2017:05:18 09:37:32'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/10170518/DSC05204.JPG'
-[debug] exifTime = '2017:05:18 09:46:48' <--> '2017:05:18 09:46:48'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/10170518/DSC05205.JPG'
-
diff --git a/importPicture/testdata/AdjustTime.20170518.A2.log b/importPicture/testdata/AdjustTime.20170518.A2.log
deleted file mode 100644 (file)
index b8b0439..0000000
+++ /dev/null
@@ -1,71 +0,0 @@
-テストパターン : [A2].SONYカメラの場合.FILE_UPDATE時間を基準にして時間外のファイルもコピーする時
-       tarFilePath = testdata/Sony20170518.tar.gz
-       gpxSourcePath = testdata/20170518.gpx
-       gpxDestinationPath = testdata/cameradata/20170518.gpx
-       iniFilePath = testdata/AdjustTime.20170518.A2.ini
-Param File = 'testdata/AdjustTime.20170518.A2.ini'
- - param: IMG.TIME=2017-05-18T00:16:48Z
- - param: IMG.BASE_FILE=DSC05183.JPG
- - param: GPX.BASETIME=FILE_UPDATE
- - param: IMG.SOURCE_FOLDER=testdata/cameradata/10170518
- - param: IMG.OUTPUT_FOLDER=/home/yuu/workspace/AdjustTime/importPicture/testdata/output
- - param: IMG.OUTPUT=true
- - param: IMG.OUTPUT_ALL=false
- - param: IMG.OUTPUT_EXIF= false
- - param: GPX.SOURCE_FOLDER=.
- - param: GPX.OUTPUT_WPT=true
- - param: GPX.OVERWRITE_MAGVAR=false
- - param: GPX.OUTPUT_SPEED=false
- - param: GPX.gpxSplit=false
- - param: GPX.noFirstNode=true
- - param: GPX.REUSE=false
-/home/yuu/workspace/AdjustTime/importPicture/testdata/cameradata/20170518.gpx => /home/yuu/workspace/AdjustTime/importPicture/testdata/output/10170518/20170518_.gpx
-           時差: -32420(sec)
-    Target GPX: [/home/yuu/workspace/AdjustTime/importPicture/testdata/cameradata/20170518.gpx]
-          EXIF: convert to '/home/yuu/workspace/AdjustTime/importPicture/testdata/output/10170518'
-
-                                 +--------------------+--------------------|
-  GPS logging time               | First Time         | Last Time          |
-|--------------------------------+--------------------+--------------------|
-|                      <trkseg/> |2017-05-18T00:21:25Z|2017-05-18T00:47:46Z|
-|--------------------------------+--------------------+--------------------|
-
-|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------|
-| name                           | Camera Time        | GPStime            |   Latitude   |   Longitude  | ele    |magvar| km/h |
-|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------|
-|DSC05183.JPG                    |2017-05-18T09:17:08Z|2017-05-18T00:16:48Z|              |              |        |      |      |
-|DSC05184.JPG                    |2017-05-18T09:35:04Z|2017-05-18T00:34:44Z| 35.4367520000|139.4082730000|  63.087|     -|     -|
-|DSC05185.JPG                    |2017-05-18T09:35:08Z|2017-05-18T00:34:48Z| 35.4367360000|139.4082530000|  62.760|     -|     -|
-|DSC05186.JPG                    |2017-05-18T09:35:10Z|2017-05-18T00:34:50Z| 35.4367340000|139.4082440000|  62.313|     -|     -|
-|DSC05187.JPG                    |2017-05-18T09:35:20Z|2017-05-18T00:35:00Z| 35.4367720000|139.4082390000|  63.060|     -|     -|
-|DSC05188.JPG                    |2017-05-18T09:35:28Z|2017-05-18T00:35:08Z| 35.4367940000|139.4082300000|  63.612|     -|     -|
-|DSC05189.JPG                    |2017-05-18T09:35:40Z|2017-05-18T00:35:20Z| 35.4368380000|139.4081910000|  59.427|     -|     -|
-|DSC05190.JPG                    |2017-05-18T09:36:10Z|2017-05-18T00:35:50Z| 35.4371180000|139.4083070000|  59.608|     -|     -|
-|DSC05191.JPG                    |2017-05-18T09:36:20Z|2017-05-18T00:36:00Z| 35.4371710000|139.4083370000|  61.142|     -|     -|
-|DSC05192.JPG                    |2017-05-18T09:36:26Z|2017-05-18T00:36:06Z| 35.4372020000|139.4083510000|  61.727|     -|     -|
-|DSC05193.JPG                    |2017-05-18T09:36:52Z|2017-05-18T00:36:32Z| 35.4374490000|139.4084050000|  67.747|     -|     -|
-|DSC05194.JPG                    |2017-05-18T09:37:10Z|2017-05-18T00:36:50Z| 35.4375190000|139.4084670000|  68.156|     -|     -|
-|DSC05195.JPG                    |2017-05-18T09:37:24Z|2017-05-18T00:37:04Z| 35.4376190000|139.4084540000|  67.816|     -|     -|
-|DSC05196.JPG                    |2017-05-18T09:37:52Z|2017-05-18T00:37:32Z| 35.4376820000|139.4085150000|  68.610|     -|     -|
-|DSC05197.JPG                    |2017-05-18T09:38:18Z|2017-05-18T00:37:58Z| 35.4377770000|139.4086780000|  66.243|     -|     -|
-|DSC05198.JPG                    |2017-05-18T09:38:22Z|2017-05-18T00:38:02Z| 35.4377680000|139.4086840000|  67.086|     -|     -|
-|DSC05199.JPG                    |2017-05-18T09:38:28Z|2017-05-18T00:38:08Z| 35.4377680000|139.4086970000|  67.788|     -|     -|
-|DSC05200.JPG                    |2017-05-18T09:38:48Z|2017-05-18T00:38:28Z| 35.4376200000|139.4087570000|  69.652|     -|     -|
-|DSC05201.JPG                    |2017-05-18T09:38:52Z|2017-05-18T00:38:32Z| 35.4375980000|139.4087640000|  69.565|     -|     -|
-|DSC05202.JPG                    |2017-05-18T09:39:00Z|2017-05-18T00:38:40Z| 35.4375630000|139.4087800000|  68.890|     -|     -|
-|DSC05203.JPG                    |2017-05-18T09:39:24Z|2017-05-18T00:39:04Z| 35.4372650000|139.4087430000|  69.999|     -|     -|
-|DSC05204.JPG                    |2017-05-18T09:47:08Z|2017-05-18T00:46:48Z| 35.4368560000|139.4082190000|  68.637|     -|     -|
-|DSC05205.JPG                    |2017-05-18T09:48:24Z|2017-05-18T00:48:04Z|              |              |        |      |      |
-|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------|
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/10170518/20170518_.gpx'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/10170518/DSC05183.JPG'
-[debug] exifTime = '2017:05:18 09:16:48' <--> '2017:05:18 09:16:48'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/10170518/DSC05184.JPG'
-[debug] exifTime = '2017:05:18 09:34:44' <--> '2017:05:18 09:34:44'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/10170518/DSC05196.JPG'
-[debug] exifTime = '2017:05:18 09:37:32' <--> '2017:05:18 09:37:32'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/10170518/DSC05204.JPG'
-[debug] exifTime = '2017:05:18 09:46:48' <--> '2017:05:18 09:46:48'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/10170518/DSC05205.JPG'
-[debug] exifTime = '2017:05:18 09:48:04' <--> '2017:05:18 09:48:04'
-
diff --git a/importPicture/testdata/AdjustTime.20170518.B1.log b/importPicture/testdata/AdjustTime.20170518.B1.log
deleted file mode 100644 (file)
index acb2d9b..0000000
+++ /dev/null
@@ -1,93 +0,0 @@
-テストパターン : [B1].WiMiUSカメラの場合.FILE_UPDATE時間を基準にして時間外のファイルはコピー対象外の時
-       tarFilePath = testdata/WiMiUS20170518.tar.gz
-       gpxSourcePath = testdata/20170518.gpx
-       gpxDestinationPath = testdata/cameradata/20170518.gpx
-       iniFilePath = testdata/AdjustTime.20170518.B1.ini
-Param File = 'testdata/AdjustTime.20170518.B1.ini'
- - param: IMG.TIME=2017-05-18T00:20:30Z
- - param: IMG.BASE_FILE=20170518_092031A.jpg
- - param: GPX.BASETIME=FILE_UPDATE
- - param: IMG.SOURCE_FOLDER=testdata/cameradata
- - param: IMG.OUTPUT_FOLDER=/home/yuu/workspace/AdjustTime/importPicture/testdata/output
- - param: IMG.OUTPUT=true
- - param: IMG.OUTPUT_ALL=false
- - param: IMG.OUTPUT_EXIF= false
- - param: GPX.SOURCE_FOLDER=.
- - param: GPX.OUTPUT_WPT=true
- - param: GPX.OVERWRITE_MAGVAR=false
- - param: GPX.OUTPUT_SPEED=false
- - param: GPX.gpxSplit=false
- - param: GPX.noFirstNode=true
- - param: GPX.REUSE=false
-/home/yuu/workspace/AdjustTime/importPicture/testdata/cameradata/20170518.gpx => /home/yuu/workspace/AdjustTime/importPicture/testdata/output/cameradata/20170518_.gpx
-           時差: -32400(sec)
-    Target GPX: [/home/yuu/workspace/AdjustTime/importPicture/testdata/cameradata/20170518.gpx]
-          EXIF: convert to '/home/yuu/workspace/AdjustTime/importPicture/testdata/output/cameradata'
-
-                                 +--------------------+--------------------|
-  GPS logging time               | First Time         | Last Time          |
-|--------------------------------+--------------------+--------------------|
-|                      <trkseg/> |2017-05-18T00:21:25Z|2017-05-18T00:47:46Z|
-|--------------------------------+--------------------+--------------------|
-
-|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------|
-| name                           | Camera Time        | GPStime            |   Latitude   |   Longitude  | ele    |magvar| km/h |
-|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------|
-|20170517_153708A.jpg            |2017-05-17T15:37:08Z|2017-05-17T06:37:08Z|              |              |        |      |      |
-|20170518_092031A.jpg            |2017-05-18T09:20:30Z|2017-05-18T00:20:30Z|              |              |        |      |      |
-|20170518_094226A_snap.jpg       |2017-05-18T09:42:26Z|2017-05-18T00:42:26Z| 35.4366860000|139.4082650000|  61.958|     -|     -|
-|20170518_094230A.jpg            |2017-05-18T09:42:30Z|2017-05-18T00:42:30Z| 35.4366840000|139.4082500000|  61.700|     -|     -|
-|20170518_094235A.jpg            |2017-05-18T09:42:34Z|2017-05-18T00:42:34Z| 35.4366880000|139.4082510000|  60.970|     -|     -|
-|20170518_094239A.jpg            |2017-05-18T09:42:38Z|2017-05-18T00:42:38Z| 35.4366920000|139.4082490000|  60.564|     -|     -|
-|20170518_094243A.jpg            |2017-05-18T09:42:42Z|2017-05-18T00:42:42Z| 35.4367100000|139.4082430000|  60.497|     -|     -|
-|20170518_094248A.jpg            |2017-05-18T09:42:48Z|2017-05-18T00:42:48Z| 35.4367510000|139.4082460000|  60.755|     -|     -|
-|20170518_094252A.jpg            |2017-05-18T09:42:52Z|2017-05-18T00:42:52Z| 35.4367750000|139.4082250000|  60.034|     -|     -|
-|20170518_094256A.jpg            |2017-05-18T09:42:56Z|2017-05-18T00:42:56Z| 35.4368010000|139.4082140000|  59.186|     -|     -|
-|20170518_094300A.jpg            |2017-05-18T09:43:00Z|2017-05-18T00:43:00Z| 35.4368290000|139.4082170000|  59.608|     -|     -|
-|20170518_094305A.jpg            |2017-05-18T09:43:04Z|2017-05-18T00:43:04Z| 35.4368690000|139.4082180000|  59.641|     -|     -|
-|20170518_094309A.jpg            |2017-05-18T09:43:08Z|2017-05-18T00:43:08Z| 35.4369020000|139.4082280000|  60.149|     -|     -|
-|20170518_094313A.jpg            |2017-05-18T09:43:12Z|2017-05-18T00:43:12Z| 35.4369510000|139.4082380000|  61.838|     -|     -|
-|20170518_094318A.jpg            |2017-05-18T09:43:18Z|2017-05-18T00:43:18Z| 35.4370030000|139.4082700000|  64.454|     -|     -|
-|20170518_094322A.jpg            |2017-05-18T09:43:22Z|2017-05-18T00:43:22Z| 35.4370310000|139.4082910000|  66.074|     -|     -|
-|20170518_094326A.jpg            |2017-05-18T09:43:26Z|2017-05-18T00:43:26Z| 35.4370530000|139.4083160000|  66.428|     -|     -|
-|20170518_094332A.jpg            |2017-05-18T09:43:32Z|2017-05-18T00:43:32Z| 35.4370790000|139.4083410000|  66.419|     -|     -|
-|20170518_094336A.jpg            |2017-05-18T09:43:36Z|2017-05-18T00:43:36Z| 35.4371070000|139.4083470000|  66.384|     -|     -|
-|20170518_094340A.jpg            |2017-05-18T09:43:40Z|2017-05-18T00:43:40Z| 35.4371310000|139.4083400000|  66.488|     -|     -|
-|20170518_094352A.jpg            |2017-05-18T09:43:52Z|2017-05-18T00:43:52Z| 35.4371940000|139.4083500000|  68.267|     -|     -|
-|20170518_094357A.jpg            |2017-05-18T09:43:56Z|2017-05-18T00:43:56Z| 35.4372240000|139.4083580000|  69.006|     -|     -|
-|20170518_094401A.jpg            |2017-05-18T09:44:00Z|2017-05-18T00:44:00Z| 35.4372560000|139.4083600000|  68.477|     -|     -|
-|20170518_094405A.jpg            |2017-05-18T09:44:04Z|2017-05-18T00:44:04Z| 35.4372910000|139.4083820000|  68.966|     -|     -|
-|20170518_094410A.jpg            |2017-05-18T09:44:10Z|2017-05-18T00:44:10Z| 35.4373480000|139.4084020000|  71.281|     -|     -|
-|20170518_094418A.jpg            |2017-05-18T09:44:18Z|2017-05-18T00:44:18Z| 35.4373910000|139.4084280000|  72.327|     -|     -|
-|20170518_094422A.jpg            |2017-05-18T09:44:22Z|2017-05-18T00:44:22Z| 35.4374130000|139.4084290000|  72.864|     -|     -|
-|20170518_094427A.jpg            |2017-05-18T09:44:26Z|2017-05-18T00:44:26Z| 35.4374290000|139.4084330000|  73.037|     -|     -|
-|20170518_094431A.jpg            |2017-05-18T09:44:30Z|2017-05-18T00:44:30Z| 35.4374440000|139.4084380000|  74.372|     -|     -|
-|20170518_094435A.jpg            |2017-05-18T09:44:34Z|2017-05-18T00:44:34Z| 35.4374640000|139.4084300000|  74.478|     -|     -|
-|20170518_094440A.jpg            |2017-05-18T09:44:40Z|2017-05-18T00:44:40Z| 35.4374820000|139.4084610000|  74.989|     -|     -|
-|20170518_094444A.jpg            |2017-05-18T09:44:44Z|2017-05-18T00:44:44Z| 35.4374660000|139.4084760000|  75.505|     -|     -|
-|20170518_094448A.jpg            |2017-05-18T09:44:48Z|2017-05-18T00:44:48Z| 35.4374590000|139.4084720000|  77.319|     -|     -|
-|20170518_094452A.jpg            |2017-05-18T09:44:52Z|2017-05-18T00:44:52Z| 35.4374410000|139.4084730000|  78.333|     -|     -|
-|20170518_094457A.jpg            |2017-05-18T09:44:56Z|2017-05-18T00:44:56Z| 35.4374170000|139.4084750000|  78.086|     -|     -|
-|20170518_094501A.jpg            |2017-05-18T09:45:00Z|2017-05-18T00:45:00Z| 35.4373940000|139.4084600000|  77.169|     -|     -|
-|20170518_094505A.jpg            |2017-05-18T09:45:04Z|2017-05-18T00:45:04Z| 35.4373720000|139.4084510000|  77.476|     -|     -|
-|20170518_094509A.jpg            |2017-05-18T09:45:10Z|2017-05-18T00:45:10Z| 35.4373380000|139.4084390000|  76.312|     -|     -|
-|20170518_094514A.jpg            |2017-05-18T09:45:14Z|2017-05-18T00:45:14Z| 35.4372990000|139.4084320000|  76.043|     -|     -|
-|20170518_094518A.jpg            |2017-05-18T09:45:18Z|2017-05-18T00:45:18Z| 35.4372460000|139.4084230000|  75.330|     -|     -|
-|20170518_094522A.jpg            |2017-05-18T09:45:22Z|2017-05-18T00:45:22Z| 35.4371980000|139.4084180000|  75.431|     -|     -|
-|20170518_094527A.jpg            |2017-05-18T09:45:26Z|2017-05-18T00:45:26Z| 35.4371630000|139.4084100000|  76.060|     -|     -|
-|20170518_094531A.jpg            |2017-05-18T09:45:30Z|2017-05-18T00:45:30Z| 35.4371360000|139.4083960000|  76.469|     -|     -|
-|20170518_094535A.jpg            |2017-05-18T09:45:34Z|2017-05-18T00:45:34Z| 35.4371100000|139.4083820000|  76.606|     -|     -|
-|20170518_094539A.jpg            |2017-05-18T09:45:40Z|2017-05-18T00:45:40Z| 35.4370480000|139.4083650000|  75.932|     -|     -|
-|20170518_094544A.jpg            |2017-05-18T09:45:44Z|2017-05-18T00:45:44Z| 35.4370160000|139.4083570000|  76.083|     -|     -|
-|20170518_094733A_snap.jpg       |2017-05-18T09:47:32Z|2017-05-18T00:47:32Z| 35.4368190000|139.4082730000|  65.510|     -|     -|
-|20170518_094737A.jpg            |2017-05-18T09:47:36Z|2017-05-18T00:47:36Z| 35.4368200000|139.4082810000|  65.185|     -|     -|
-|20170518_094827A.jpg            |2017-05-18T09:48:26Z|2017-05-18T00:48:26Z|              |              |        |      |      |
-|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------|
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/cameradata/20170518_.gpx'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/cameradata/20170518_092031A.jpg'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/cameradata/20170518_094226A_snap.jpg'
-[debug] exifTime = '2017:05:18 09:42:26' <--> '2017:05:18 09:42:26'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/cameradata/20170518_094737A.jpg'
-[debug] exifTime = '2017:05:18 09:47:36' <--> '2017:05:18 09:47:36'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/cameradata/20170518_094827A.jpg'
-
diff --git a/importPicture/testdata/AdjustTime.20170518.B2.log b/importPicture/testdata/AdjustTime.20170518.B2.log
deleted file mode 100644 (file)
index 32dfd3b..0000000
+++ /dev/null
@@ -1,95 +0,0 @@
-テストパターン : [B2].WiMiUSカメラの場合.FILE_UPDATE時間を基準にして時間外のファイルもコピーする時
-       tarFilePath = testdata/WiMiUS20170518.tar.gz
-       gpxSourcePath = testdata/20170518.gpx
-       gpxDestinationPath = testdata/cameradata/20170518.gpx
-       iniFilePath = testdata/AdjustTime.20170518.B2.ini
-Param File = 'testdata/AdjustTime.20170518.B2.ini'
- - param: IMG.TIME=2017-05-18T00:20:30Z
- - param: IMG.BASE_FILE=20170518_092031A.jpg
- - param: GPX.BASETIME=FILE_UPDATE
- - param: IMG.SOURCE_FOLDER=testdata/cameradata
- - param: IMG.OUTPUT_FOLDER=/home/yuu/workspace/AdjustTime/importPicture/testdata/output
- - param: IMG.OUTPUT=true
- - param: IMG.OUTPUT_ALL=false
- - param: IMG.OUTPUT_EXIF= false
- - param: GPX.SOURCE_FOLDER=.
- - param: GPX.OUTPUT_WPT=true
- - param: GPX.OVERWRITE_MAGVAR=false
- - param: GPX.OUTPUT_SPEED=false
- - param: GPX.gpxSplit=false
- - param: GPX.noFirstNode=true
- - param: GPX.REUSE=false
-/home/yuu/workspace/AdjustTime/importPicture/testdata/cameradata/20170518.gpx => /home/yuu/workspace/AdjustTime/importPicture/testdata/output/cameradata/20170518_.gpx
-           時差: -32400(sec)
-    Target GPX: [/home/yuu/workspace/AdjustTime/importPicture/testdata/cameradata/20170518.gpx]
-          EXIF: convert to '/home/yuu/workspace/AdjustTime/importPicture/testdata/output/cameradata'
-
-                                 +--------------------+--------------------|
-  GPS logging time               | First Time         | Last Time          |
-|--------------------------------+--------------------+--------------------|
-|                      <trkseg/> |2017-05-18T00:21:25Z|2017-05-18T00:47:46Z|
-|--------------------------------+--------------------+--------------------|
-
-|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------|
-| name                           | Camera Time        | GPStime            |   Latitude   |   Longitude  | ele    |magvar| km/h |
-|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------|
-|20170517_153708A.jpg            |2017-05-17T15:37:08Z|2017-05-17T06:37:08Z|              |              |        |      |      |
-|20170518_092031A.jpg            |2017-05-18T09:20:30Z|2017-05-18T00:20:30Z|              |              |        |      |      |
-|20170518_094226A_snap.jpg       |2017-05-18T09:42:26Z|2017-05-18T00:42:26Z| 35.4366860000|139.4082650000|  61.958|     -|     -|
-|20170518_094230A.jpg            |2017-05-18T09:42:30Z|2017-05-18T00:42:30Z| 35.4366840000|139.4082500000|  61.700|     -|     -|
-|20170518_094235A.jpg            |2017-05-18T09:42:34Z|2017-05-18T00:42:34Z| 35.4366880000|139.4082510000|  60.970|     -|     -|
-|20170518_094239A.jpg            |2017-05-18T09:42:38Z|2017-05-18T00:42:38Z| 35.4366920000|139.4082490000|  60.564|     -|     -|
-|20170518_094243A.jpg            |2017-05-18T09:42:42Z|2017-05-18T00:42:42Z| 35.4367100000|139.4082430000|  60.497|     -|     -|
-|20170518_094248A.jpg            |2017-05-18T09:42:48Z|2017-05-18T00:42:48Z| 35.4367510000|139.4082460000|  60.755|     -|     -|
-|20170518_094252A.jpg            |2017-05-18T09:42:52Z|2017-05-18T00:42:52Z| 35.4367750000|139.4082250000|  60.034|     -|     -|
-|20170518_094256A.jpg            |2017-05-18T09:42:56Z|2017-05-18T00:42:56Z| 35.4368010000|139.4082140000|  59.186|     -|     -|
-|20170518_094300A.jpg            |2017-05-18T09:43:00Z|2017-05-18T00:43:00Z| 35.4368290000|139.4082170000|  59.608|     -|     -|
-|20170518_094305A.jpg            |2017-05-18T09:43:04Z|2017-05-18T00:43:04Z| 35.4368690000|139.4082180000|  59.641|     -|     -|
-|20170518_094309A.jpg            |2017-05-18T09:43:08Z|2017-05-18T00:43:08Z| 35.4369020000|139.4082280000|  60.149|     -|     -|
-|20170518_094313A.jpg            |2017-05-18T09:43:12Z|2017-05-18T00:43:12Z| 35.4369510000|139.4082380000|  61.838|     -|     -|
-|20170518_094318A.jpg            |2017-05-18T09:43:18Z|2017-05-18T00:43:18Z| 35.4370030000|139.4082700000|  64.454|     -|     -|
-|20170518_094322A.jpg            |2017-05-18T09:43:22Z|2017-05-18T00:43:22Z| 35.4370310000|139.4082910000|  66.074|     -|     -|
-|20170518_094326A.jpg            |2017-05-18T09:43:26Z|2017-05-18T00:43:26Z| 35.4370530000|139.4083160000|  66.428|     -|     -|
-|20170518_094332A.jpg            |2017-05-18T09:43:32Z|2017-05-18T00:43:32Z| 35.4370790000|139.4083410000|  66.419|     -|     -|
-|20170518_094336A.jpg            |2017-05-18T09:43:36Z|2017-05-18T00:43:36Z| 35.4371070000|139.4083470000|  66.384|     -|     -|
-|20170518_094340A.jpg            |2017-05-18T09:43:40Z|2017-05-18T00:43:40Z| 35.4371310000|139.4083400000|  66.488|     -|     -|
-|20170518_094352A.jpg            |2017-05-18T09:43:52Z|2017-05-18T00:43:52Z| 35.4371940000|139.4083500000|  68.267|     -|     -|
-|20170518_094357A.jpg            |2017-05-18T09:43:56Z|2017-05-18T00:43:56Z| 35.4372240000|139.4083580000|  69.006|     -|     -|
-|20170518_094401A.jpg            |2017-05-18T09:44:00Z|2017-05-18T00:44:00Z| 35.4372560000|139.4083600000|  68.477|     -|     -|
-|20170518_094405A.jpg            |2017-05-18T09:44:04Z|2017-05-18T00:44:04Z| 35.4372910000|139.4083820000|  68.966|     -|     -|
-|20170518_094410A.jpg            |2017-05-18T09:44:10Z|2017-05-18T00:44:10Z| 35.4373480000|139.4084020000|  71.281|     -|     -|
-|20170518_094418A.jpg            |2017-05-18T09:44:18Z|2017-05-18T00:44:18Z| 35.4373910000|139.4084280000|  72.327|     -|     -|
-|20170518_094422A.jpg            |2017-05-18T09:44:22Z|2017-05-18T00:44:22Z| 35.4374130000|139.4084290000|  72.864|     -|     -|
-|20170518_094427A.jpg            |2017-05-18T09:44:26Z|2017-05-18T00:44:26Z| 35.4374290000|139.4084330000|  73.037|     -|     -|
-|20170518_094431A.jpg            |2017-05-18T09:44:30Z|2017-05-18T00:44:30Z| 35.4374440000|139.4084380000|  74.372|     -|     -|
-|20170518_094435A.jpg            |2017-05-18T09:44:34Z|2017-05-18T00:44:34Z| 35.4374640000|139.4084300000|  74.478|     -|     -|
-|20170518_094440A.jpg            |2017-05-18T09:44:40Z|2017-05-18T00:44:40Z| 35.4374820000|139.4084610000|  74.989|     -|     -|
-|20170518_094444A.jpg            |2017-05-18T09:44:44Z|2017-05-18T00:44:44Z| 35.4374660000|139.4084760000|  75.505|     -|     -|
-|20170518_094448A.jpg            |2017-05-18T09:44:48Z|2017-05-18T00:44:48Z| 35.4374590000|139.4084720000|  77.319|     -|     -|
-|20170518_094452A.jpg            |2017-05-18T09:44:52Z|2017-05-18T00:44:52Z| 35.4374410000|139.4084730000|  78.333|     -|     -|
-|20170518_094457A.jpg            |2017-05-18T09:44:56Z|2017-05-18T00:44:56Z| 35.4374170000|139.4084750000|  78.086|     -|     -|
-|20170518_094501A.jpg            |2017-05-18T09:45:00Z|2017-05-18T00:45:00Z| 35.4373940000|139.4084600000|  77.169|     -|     -|
-|20170518_094505A.jpg            |2017-05-18T09:45:04Z|2017-05-18T00:45:04Z| 35.4373720000|139.4084510000|  77.476|     -|     -|
-|20170518_094509A.jpg            |2017-05-18T09:45:10Z|2017-05-18T00:45:10Z| 35.4373380000|139.4084390000|  76.312|     -|     -|
-|20170518_094514A.jpg            |2017-05-18T09:45:14Z|2017-05-18T00:45:14Z| 35.4372990000|139.4084320000|  76.043|     -|     -|
-|20170518_094518A.jpg            |2017-05-18T09:45:18Z|2017-05-18T00:45:18Z| 35.4372460000|139.4084230000|  75.330|     -|     -|
-|20170518_094522A.jpg            |2017-05-18T09:45:22Z|2017-05-18T00:45:22Z| 35.4371980000|139.4084180000|  75.431|     -|     -|
-|20170518_094527A.jpg            |2017-05-18T09:45:26Z|2017-05-18T00:45:26Z| 35.4371630000|139.4084100000|  76.060|     -|     -|
-|20170518_094531A.jpg            |2017-05-18T09:45:30Z|2017-05-18T00:45:30Z| 35.4371360000|139.4083960000|  76.469|     -|     -|
-|20170518_094535A.jpg            |2017-05-18T09:45:34Z|2017-05-18T00:45:34Z| 35.4371100000|139.4083820000|  76.606|     -|     -|
-|20170518_094539A.jpg            |2017-05-18T09:45:40Z|2017-05-18T00:45:40Z| 35.4370480000|139.4083650000|  75.932|     -|     -|
-|20170518_094544A.jpg            |2017-05-18T09:45:44Z|2017-05-18T00:45:44Z| 35.4370160000|139.4083570000|  76.083|     -|     -|
-|20170518_094733A_snap.jpg       |2017-05-18T09:47:32Z|2017-05-18T00:47:32Z| 35.4368190000|139.4082730000|  65.510|     -|     -|
-|20170518_094737A.jpg            |2017-05-18T09:47:36Z|2017-05-18T00:47:36Z| 35.4368200000|139.4082810000|  65.185|     -|     -|
-|20170518_094827A.jpg            |2017-05-18T09:48:26Z|2017-05-18T00:48:26Z|              |              |        |      |      |
-|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------|
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/cameradata/20170518_.gpx'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/cameradata/20170518_092031A.jpg'
-[debug] exifTime = '2017:05:18 09:20:30' <--> '2017:05:18 09:20:30'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/cameradata/20170518_094226A_snap.jpg'
-[debug] exifTime = '2017:05:18 09:42:26' <--> '2017:05:18 09:42:26'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/cameradata/20170518_094737A.jpg'
-[debug] exifTime = '2017:05:18 09:47:36' <--> '2017:05:18 09:47:36'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/cameradata/20170518_094827A.jpg'
-[debug] exifTime = '2017:05:18 09:48:26' <--> '2017:05:18 09:48:26'
-
diff --git a/importPicture/testdata/AdjustTime.M1a.separate.log b/importPicture/testdata/AdjustTime.M1a.separate.log
deleted file mode 100644 (file)
index 3f2c98e..0000000
+++ /dev/null
@@ -1,104 +0,0 @@
-テストパターン : [M1a].GPXが複数のTRKSEGに分割している場合.FILE_UPDATE時間を基準.GarminColorado
-       tarFilePath = testdata/separate.tar.gz
-       gpxSourcePath = testdata/muiltiTRK.GarminColorado.gpx.xml
-       gpxDestinationPath = testdata/cameradata/separate.gpx
-       iniFilePath = testdata/AdjustTime.M1a.separate.ini
-Param File = 'testdata/AdjustTime.M1a.separate.ini'
- - param: IMG.TIME=2017-05-29T01:31:46Z
- - param: IMG.BASE_FILE=20170529_103146A.jpg
- - param: GPX.BASETIME=FILE_UPDATE
- - param: IMG.SOURCE_FOLDER=testdata/cameradata/separate
- - param: IMG.OUTPUT_FOLDER=/home/yuu/workspace/AdjustTime/importPicture/testdata/output
- - param: IMG.OUTPUT=true
- - param: IMG.OUTPUT_ALL=false
- - param: IMG.OUTPUT_EXIF= false
- - param: GPX.SOURCE_FOLDER=.
- - param: GPX.OUTPUT_WPT=true
- - param: GPX.OVERWRITE_MAGVAR=false
- - param: GPX.OUTPUT_SPEED=false
- - param: GPX.gpxSplit=false
- - param: GPX.noFirstNode=true
- - param: GPX.REUSE=false
-/home/yuu/workspace/AdjustTime/importPicture/testdata/cameradata/separate.gpx => /home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/separate_.gpx
-           時差: -32400(sec)
-    Target GPX: [/home/yuu/workspace/AdjustTime/importPicture/testdata/cameradata/separate.gpx]
-          EXIF: convert to '/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate'
-
-                                 +--------------------+--------------------|
-  GPS logging time               | First Time         | Last Time          |
-|--------------------------------+--------------------+--------------------|
-|                      <trkseg/> |2017-05-29T01:23:18Z|2017-05-29T01:24:05Z|
-|                      <trkseg/> |2017-05-29T01:24:37Z|2017-05-29T01:33:03Z|
-|                      <trkseg/> |2017-05-29T01:35:53Z|2017-05-29T01:47:35Z|
-|--------------------------------+--------------------+--------------------|
-
-|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------|
-| name                           | Camera Time        | GPStime            |   Latitude   |   Longitude  | ele    |magvar| km/h |
-|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------|
-|20170529_102305A.jpg            |2017-05-29T10:23:06Z|2017-05-29T01:23:06Z|              |              |        |      |      |
-|20170529_102310A.jpg            |2017-05-29T10:23:10Z|2017-05-29T01:23:10Z|              |              |        |      |      |
-|20170529_102314A.jpg            |2017-05-29T10:23:14Z|2017-05-29T01:23:14Z|              |              |        |      |      |
-|20170529_102318A.jpg            |2017-05-29T10:23:18Z|2017-05-29T01:23:18Z| 35.8812697884|137.9952202085|  686.52|     -|     -|
-|20170529_102322A.jpg            |2017-05-29T10:23:22Z|2017-05-29T01:23:22Z| 35.8810500987|137.9951669835|  684.60|     -|     -|
-|20170529_102401A.jpg            |2017-05-29T10:24:00Z|2017-05-29T01:24:00Z| 35.8809497673|137.9972837493|  685.56|     -|     -|
-|20170529_102405A.jpg            |2017-05-29T10:24:04Z|2017-05-29T01:24:04Z| 35.8808881603|137.9979396332|  687.00|     -|     -|
-|20170529_102409A.jpg            |2017-05-29T10:24:10Z|2017-05-29T01:24:10Z|              |              |        |      |      |
-|20170529_102414A.jpg            |2017-05-29T10:24:14Z|2017-05-29T01:24:14Z|              |              |        |      |      |
-|20170529_102418A.jpg            |2017-05-29T10:24:18Z|2017-05-29T01:24:18Z|              |              |        |      |      |
-|20170529_102448A.jpg            |2017-05-29T10:24:48Z|2017-05-29T01:24:48Z| 35.8788877353|138.0039562471|  713.92|     -|     -|
-|20170529_102518A.jpg            |2017-05-29T10:25:18Z|2017-05-29T01:25:18Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
-|20170529_102547A.jpg            |2017-05-29T10:25:48Z|2017-05-29T01:25:48Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
-|20170529_102618A.jpg            |2017-05-29T10:26:18Z|2017-05-29T01:26:18Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
-|20170529_102647A.jpg            |2017-05-29T10:26:46Z|2017-05-29T01:26:46Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
-|20170529_102717A.jpg            |2017-05-29T10:27:16Z|2017-05-29T01:27:16Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
-|20170529_102747A.jpg            |2017-05-29T10:27:46Z|2017-05-29T01:27:46Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
-|20170529_102817A.jpg            |2017-05-29T10:28:16Z|2017-05-29T01:28:16Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
-|20170529_102847A.jpg            |2017-05-29T10:28:46Z|2017-05-29T01:28:46Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
-|20170529_102917A.jpg            |2017-05-29T10:29:16Z|2017-05-29T01:29:16Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
-|20170529_102947A.jpg            |2017-05-29T10:29:46Z|2017-05-29T01:29:46Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
-|20170529_103016A.jpg            |2017-05-29T10:30:16Z|2017-05-29T01:30:16Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
-|20170529_103046A.jpg            |2017-05-29T10:30:46Z|2017-05-29T01:30:46Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
-|20170529_103116A.jpg            |2017-05-29T10:31:16Z|2017-05-29T01:31:16Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
-|20170529_103146A.jpg            |2017-05-29T10:31:46Z|2017-05-29T01:31:46Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
-|20170529_103216A.jpg            |2017-05-29T10:32:16Z|2017-05-29T01:32:16Z| 35.8408248425|138.0341358762|  748.52|     -|     -|
-|20170529_103246A.jpg            |2017-05-29T10:32:46Z|2017-05-29T01:32:46Z| 35.8405660931|138.0353022180|  747.56|     -|     -|
-|20170529_103315A.jpg            |2017-05-29T10:33:14Z|2017-05-29T01:33:14Z|              |              |        |      |      |
-|20170529_103345A.jpg            |2017-05-29T10:33:44Z|2017-05-29T01:33:44Z|              |              |        |      |      |
-|20170529_103415A.jpg            |2017-05-29T10:34:14Z|2017-05-29T01:34:14Z|              |              |        |      |      |
-|20170529_103445A.jpg            |2017-05-29T10:34:44Z|2017-05-29T01:34:44Z|              |              |        |      |      |
-|20170529_103515A.jpg            |2017-05-29T10:35:14Z|2017-05-29T01:35:14Z|              |              |        |      |      |
-|20170529_103545A.jpg            |2017-05-29T10:35:44Z|2017-05-29T01:35:44Z|              |              |        |      |      |
-|20170529_103615A.jpg            |2017-05-29T10:36:14Z|2017-05-29T01:36:14Z| 35.8359798510|138.0600296706|  750.93|     -|     -|
-|20170529_103645A.jpg            |2017-05-29T10:36:44Z|2017-05-29T01:36:44Z| 35.8357221074|138.0602352787|  745.64|     -|     -|
-|20170529_103714A.jpg            |2017-05-29T10:37:14Z|2017-05-29T01:37:14Z| 35.8346095774|138.0594111700|  751.89|     -|     -|
-|20170529_103744A.jpg            |2017-05-29T10:37:44Z|2017-05-29T01:37:44Z| 35.8353867475|138.0606593192|  760.06|     -|     -|
-|20170529_103814A.jpg            |2017-05-29T10:38:14Z|2017-05-29T01:38:14Z| 35.8344272710|138.0610287096|  774.96|     -|     -|
-|20170529_103844A.jpg            |2017-05-29T10:38:44Z|2017-05-29T01:38:44Z| 35.8348886948|138.0618377309|  792.74|     -|     -|
-|20170529_103914A.jpg            |2017-05-29T10:39:14Z|2017-05-29T01:39:14Z| 35.8344262652|138.0623432435|  799.95|     -|     -|
-|20170529_103944A.jpg            |2017-05-29T10:39:44Z|2017-05-29T01:39:44Z| 35.8338732272|138.0621989910|  796.59|     -|     -|
-|20170529_104014A.jpg            |2017-05-29T10:40:14Z|2017-05-29T01:40:14Z| 35.8334153239|138.0617078952|  794.67|     -|     -|
-|20170529_104048A.jpg            |2017-05-29T10:40:48Z|2017-05-29T01:40:48Z| 35.8345361520|138.0619776249|  795.15|     -|     -|
-|20170529_104119A.jpg            |2017-05-29T10:41:18Z|2017-05-29T01:41:18Z| 35.8339846227|138.0625408050|  793.71|     -|     -|
-|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------|
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/separate_.gpx'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102305A.jpg'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102314A.jpg'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102318A.jpg'
-[debug] exifTime = '2017:05:29 10:23:18' <--> '2017:05:29 10:23:18'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102322A.jpg'
-[debug] exifTime = '2017:05:29 10:23:22' <--> '2017:05:29 10:23:22'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102405A.jpg'
-[debug] exifTime = '2017:05:29 10:24:04' <--> '2017:05:29 10:24:04'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102409A.jpg'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102418A.jpg'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102448A.jpg'
-[debug] exifTime = '2017:05:29 10:24:48' <--> '2017:05:29 10:24:48'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103246A.jpg'
-[debug] exifTime = '2017:05:29 10:32:46' <--> '2017:05:29 10:32:46'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103315A.jpg'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103545A.jpg'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103615A.jpg'
-[debug] exifTime = '2017:05:29 10:36:14' <--> '2017:05:29 10:36:14'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_104119A.jpg'
-[debug] exifTime = '2017:05:29 10:41:18' <--> '2017:05:29 10:41:18'
-
diff --git a/importPicture/testdata/AdjustTime.M1b.separate.log b/importPicture/testdata/AdjustTime.M1b.separate.log
deleted file mode 100644 (file)
index f6b7c95..0000000
+++ /dev/null
@@ -1,110 +0,0 @@
-テストパターン : [M1b].GPXが複数のTRKSEGに分割している場合.FILE_UPDATE時間を基準.GarminColorado
-       tarFilePath = testdata/separate.tar.gz
-       gpxSourcePath = testdata/muiltiTRK.GarminColorado.gpx.xml
-       gpxDestinationPath = testdata/cameradata/separate.gpx
-       iniFilePath = testdata/AdjustTime.M1b.separate.ini
-Param File = 'testdata/AdjustTime.M1b.separate.ini'
- - param: IMG.TIME=2017-05-29T01:31:46Z
- - param: IMG.BASE_FILE=20170529_103146A.jpg
- - param: GPX.BASETIME=FILE_UPDATE
- - param: IMG.SOURCE_FOLDER=testdata/cameradata/separate
- - param: IMG.OUTPUT_FOLDER=/home/yuu/workspace/AdjustTime/importPicture/testdata/output
- - param: IMG.OUTPUT=true
- - param: IMG.OUTPUT_ALL=false
- - param: IMG.OUTPUT_EXIF= false
- - param: GPX.SOURCE_FOLDER=.
- - param: GPX.OUTPUT_WPT=true
- - param: GPX.OVERWRITE_MAGVAR=true
- - param: GPX.OUTPUT_SPEED=true
- - param: GPX.gpxSplit=false
- - param: GPX.noFirstNode=true
- - param: GPX.REUSE=false
-/home/yuu/workspace/AdjustTime/importPicture/testdata/cameradata/separate.gpx => /home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/separate_.gpx
-           時差: -32400(sec)
-    Target GPX: [/home/yuu/workspace/AdjustTime/importPicture/testdata/cameradata/separate.gpx]
-          EXIF: convert to '/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate'
-
-                                 +--------------------+--------------------|
-  GPS logging time               | First Time         | Last Time          |
-|--------------------------------+--------------------+--------------------|
-|                      <trkseg/> |2017-05-29T01:23:18Z|2017-05-29T01:24:05Z|
-|                      <trkseg/> |2017-05-29T01:24:37Z|2017-05-29T01:33:03Z|
-|                      <trkseg/> |2017-05-29T01:35:53Z|2017-05-29T01:47:35Z|
-|--------------------------------+--------------------+--------------------|
-
-|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------|
-| name                           | Camera Time        | GPStime            |   Latitude   |   Longitude  | ele    |magvar| km/h |
-|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------|
-|20170529_102305A.jpg            |2017-05-29T10:23:06Z|2017-05-29T01:23:06Z|              |              |        |      |      |
-|20170529_102310A.jpg            |2017-05-29T10:23:10Z|2017-05-29T01:23:10Z|              |              |        |      |      |
-|20170529_102314A.jpg            |2017-05-29T10:23:14Z|2017-05-29T01:23:14Z|              |              |        |      |      |
-|20170529_102318A.jpg            |2017-05-29T10:23:18Z|2017-05-29T01:23:18Z| 35.8812697884|137.9952202085|  686.52|     -|     -|
-|20170529_102322A.jpg            |2017-05-29T10:23:22Z|2017-05-29T01:23:22Z| 35.8810500987|137.9951669835|  684.60|     -|     -|
-|20170529_102401A.jpg            |2017-05-29T10:24:00Z|2017-05-29T01:24:00Z| 35.8809497673|137.9972837493|  685.56|     -|     -|
-|20170529_102405A.jpg            |2017-05-29T10:24:04Z|2017-05-29T01:24:04Z| 35.8808881603|137.9979396332|  687.00|     -|     -|
-|20170529_102409A.jpg            |2017-05-29T10:24:10Z|2017-05-29T01:24:10Z|              |              |        |      |      |
-|20170529_102414A.jpg            |2017-05-29T10:24:14Z|2017-05-29T01:24:14Z|              |              |        |      |      |
-|20170529_102418A.jpg            |2017-05-29T10:24:18Z|2017-05-29T01:24:18Z|              |              |        |      |      |
-|20170529_102448A.jpg            |2017-05-29T10:24:48Z|2017-05-29T01:24:48Z| 35.8788877353|138.0039562471|  713.92|     -|     -|
-|20170529_102518A.jpg            |2017-05-29T10:25:18Z|2017-05-29T01:25:18Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
-|20170529_102547A.jpg            |2017-05-29T10:25:48Z|2017-05-29T01:25:48Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
-|20170529_102618A.jpg            |2017-05-29T10:26:18Z|2017-05-29T01:26:18Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
-|20170529_102647A.jpg            |2017-05-29T10:26:46Z|2017-05-29T01:26:46Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
-|20170529_102717A.jpg            |2017-05-29T10:27:16Z|2017-05-29T01:27:16Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
-|20170529_102747A.jpg            |2017-05-29T10:27:46Z|2017-05-29T01:27:46Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
-|20170529_102817A.jpg            |2017-05-29T10:28:16Z|2017-05-29T01:28:16Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
-|20170529_102847A.jpg            |2017-05-29T10:28:46Z|2017-05-29T01:28:46Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
-|20170529_102917A.jpg            |2017-05-29T10:29:16Z|2017-05-29T01:29:16Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
-|20170529_102947A.jpg            |2017-05-29T10:29:46Z|2017-05-29T01:29:46Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
-|20170529_103016A.jpg            |2017-05-29T10:30:16Z|2017-05-29T01:30:16Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
-|20170529_103046A.jpg            |2017-05-29T10:30:46Z|2017-05-29T01:30:46Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
-|20170529_103116A.jpg            |2017-05-29T10:31:16Z|2017-05-29T01:31:16Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
-|20170529_103146A.jpg            |2017-05-29T10:31:46Z|2017-05-29T01:31:46Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
-|20170529_103216A.jpg            |2017-05-29T10:32:16Z|2017-05-29T01:32:16Z| 35.8408248425|138.0341358762|  748.52|     -|     -|
-|20170529_103246A.jpg            |2017-05-29T10:32:46Z|2017-05-29T01:32:46Z| 35.8405660931|138.0353022180|  747.56|     -|     -|
-|20170529_103315A.jpg            |2017-05-29T10:33:14Z|2017-05-29T01:33:14Z|              |              |        |      |      |
-|20170529_103345A.jpg            |2017-05-29T10:33:44Z|2017-05-29T01:33:44Z|              |              |        |      |      |
-|20170529_103415A.jpg            |2017-05-29T10:34:14Z|2017-05-29T01:34:14Z|              |              |        |      |      |
-|20170529_103445A.jpg            |2017-05-29T10:34:44Z|2017-05-29T01:34:44Z|              |              |        |      |      |
-|20170529_103515A.jpg            |2017-05-29T10:35:14Z|2017-05-29T01:35:14Z|              |              |        |      |      |
-|20170529_103545A.jpg            |2017-05-29T10:35:44Z|2017-05-29T01:35:44Z|              |              |        |      |      |
-|20170529_103615A.jpg            |2017-05-29T10:36:14Z|2017-05-29T01:36:14Z| 35.8359798510|138.0600296706|  750.93|     -|     -|
-|20170529_103645A.jpg            |2017-05-29T10:36:44Z|2017-05-29T01:36:44Z| 35.8357221074|138.0602352787|  745.64|     -|     -|
-|20170529_103714A.jpg            |2017-05-29T10:37:14Z|2017-05-29T01:37:14Z| 35.8346095774|138.0594111700|  751.89|     -|     -|
-|20170529_103744A.jpg            |2017-05-29T10:37:44Z|2017-05-29T01:37:44Z| 35.8353867475|138.0606593192|  760.06|     -|     -|
-|20170529_103814A.jpg            |2017-05-29T10:38:14Z|2017-05-29T01:38:14Z| 35.8344272710|138.0610287096|  774.96|     -|     -|
-|20170529_103844A.jpg            |2017-05-29T10:38:44Z|2017-05-29T01:38:44Z| 35.8348886948|138.0618377309|  792.74|     -|     -|
-|20170529_103914A.jpg            |2017-05-29T10:39:14Z|2017-05-29T01:39:14Z| 35.8344262652|138.0623432435|  799.95|     -|     -|
-|20170529_103944A.jpg            |2017-05-29T10:39:44Z|2017-05-29T01:39:44Z| 35.8338732272|138.0621989910|  796.59|     -|     -|
-|20170529_104014A.jpg            |2017-05-29T10:40:14Z|2017-05-29T01:40:14Z| 35.8334153239|138.0617078952|  794.67|     -|     -|
-|20170529_104048A.jpg            |2017-05-29T10:40:48Z|2017-05-29T01:40:48Z| 35.8345361520|138.0619776249|  795.15|     -|     -|
-|20170529_104119A.jpg            |2017-05-29T10:41:18Z|2017-05-29T01:41:18Z| 35.8339846227|138.0625408050|  793.71|     -|     -|
-|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------|
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/separate_.gpx'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102305A.jpg'
-[debug] exifTime = '2017:05:29 10:23:06' <--> '2017:05:29 10:23:06'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102314A.jpg'
-[debug] exifTime = '2017:05:29 10:23:14' <--> '2017:05:29 10:23:14'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102318A.jpg'
-[debug] exifTime = '2017:05:29 10:23:18' <--> '2017:05:29 10:23:18'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102322A.jpg'
-[debug] exifTime = '2017:05:29 10:23:22' <--> '2017:05:29 10:23:22'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102405A.jpg'
-[debug] exifTime = '2017:05:29 10:24:04' <--> '2017:05:29 10:24:04'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102409A.jpg'
-[debug] exifTime = '2017:05:29 10:24:10' <--> '2017:05:29 10:24:10'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102418A.jpg'
-[debug] exifTime = '2017:05:29 10:24:18' <--> '2017:05:29 10:24:18'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102448A.jpg'
-[debug] exifTime = '2017:05:29 10:24:48' <--> '2017:05:29 10:24:48'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103246A.jpg'
-[debug] exifTime = '2017:05:29 10:32:46' <--> '2017:05:29 10:32:46'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103315A.jpg'
-[debug] exifTime = '2017:05:29 10:33:14' <--> '2017:05:29 10:33:14'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103545A.jpg'
-[debug] exifTime = '2017:05:29 10:35:44' <--> '2017:05:29 10:35:44'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103615A.jpg'
-[debug] exifTime = '2017:05:29 10:36:14' <--> '2017:05:29 10:36:14'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_104119A.jpg'
-[debug] exifTime = '2017:05:29 10:41:18' <--> '2017:05:29 10:41:18'
-
diff --git a/importPicture/testdata/AdjustTime.M1c.separate.log b/importPicture/testdata/AdjustTime.M1c.separate.log
deleted file mode 100644 (file)
index 92f0f3b..0000000
+++ /dev/null
@@ -1,104 +0,0 @@
-テストパターン : [M1c].GPXが複数のTRKSEGに分割している場合.EXIF時間を基準.GarminColorado
-       tarFilePath = testdata/separate.tar.gz
-       gpxSourcePath = testdata/muiltiTRK.GarminColorado.gpx.xml
-       gpxDestinationPath = testdata/cameradata/separate.gpx
-       iniFilePath = testdata/AdjustTime.M1c.separate.ini
-Param File = 'testdata/AdjustTime.M1c.separate.ini'
- - param: IMG.TIME=2017-05-29T01:31:46Z
- - param: IMG.BASE_FILE=20170529_103146A.jpg
- - param: GPX.BASETIME=EXIF_TIME
- - param: IMG.SOURCE_FOLDER=testdata/cameradata/separate
- - param: IMG.OUTPUT_FOLDER=/home/yuu/workspace/AdjustTime/importPicture/testdata/output
- - param: IMG.OUTPUT=true
- - param: IMG.OUTPUT_ALL=false
- - param: IMG.OUTPUT_EXIF= false
- - param: GPX.SOURCE_FOLDER=.
- - param: GPX.OUTPUT_WPT=true
- - param: GPX.OVERWRITE_MAGVAR=true
- - param: GPX.OUTPUT_SPEED=true
- - param: GPX.gpxSplit=false
- - param: GPX.noFirstNode=true
- - param: GPX.REUSE=false
-/home/yuu/workspace/AdjustTime/importPicture/testdata/cameradata/separate.gpx => /home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/separate_.gpx
-           時差: 0(sec)
-    Target GPX: [/home/yuu/workspace/AdjustTime/importPicture/testdata/cameradata/separate.gpx]
-          EXIF: convert to '/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate'
-
-                                 +--------------------+--------------------|
-  GPS logging time               | First Time         | Last Time          |
-|--------------------------------+--------------------+--------------------|
-|                      <trkseg/> |2017-05-29T01:23:18Z|2017-05-29T01:24:05Z|
-|                      <trkseg/> |2017-05-29T01:24:37Z|2017-05-29T01:33:03Z|
-|                      <trkseg/> |2017-05-29T01:35:53Z|2017-05-29T01:47:35Z|
-|--------------------------------+--------------------+--------------------|
-
-|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------|
-| name                           | Camera Time        | GPStime            |   Latitude   |   Longitude  | ele    |magvar| km/h |
-|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------|
-|20170529_102305A.jpg            |2017-05-29T01:23:05Z|2017-05-29T01:23:05Z|              |              |        |      |      |
-|20170529_102310A.jpg            |2017-05-29T01:23:10Z|2017-05-29T01:23:10Z|              |              |        |      |      |
-|20170529_102314A.jpg            |2017-05-29T01:23:14Z|2017-05-29T01:23:14Z|              |              |        |      |      |
-|20170529_102318A.jpg            |2017-05-29T01:23:18Z|2017-05-29T01:23:18Z| 35.8812697884|137.9952202085|  686.52|     -|     -|
-|20170529_102322A.jpg            |2017-05-29T01:23:22Z|2017-05-29T01:23:22Z| 35.8810500987|137.9951669835|  684.60|     -|     -|
-|20170529_102401A.jpg            |2017-05-29T01:24:01Z|2017-05-29T01:24:01Z| 35.8809490129|137.9974513035|  685.56|     -|     -|
-|20170529_102405A.jpg            |2017-05-29T01:24:05Z|2017-05-29T01:24:05Z| 35.8808641881|137.9981065169|  687.48|     -|     -|
-|20170529_102409A.jpg            |2017-05-29T01:24:09Z|2017-05-29T01:24:09Z|              |              |        |      |      |
-|20170529_102414A.jpg            |2017-05-29T01:24:14Z|2017-05-29T01:24:14Z|              |              |        |      |      |
-|20170529_102418A.jpg            |2017-05-29T01:24:18Z|2017-05-29T01:24:18Z|              |              |        |      |      |
-|20170529_102448A.jpg            |2017-05-29T01:24:48Z|2017-05-29T01:24:48Z| 35.8788877353|138.0039562471|  713.92|     -|     -|
-|20170529_102518A.jpg            |2017-05-29T01:25:18Z|2017-05-29T01:25:18Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
-|20170529_102547A.jpg            |2017-05-29T01:25:47Z|2017-05-29T01:25:47Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
-|20170529_102618A.jpg            |2017-05-29T01:26:17Z|2017-05-29T01:26:17Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
-|20170529_102647A.jpg            |2017-05-29T01:26:47Z|2017-05-29T01:26:47Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
-|20170529_102717A.jpg            |2017-05-29T01:27:17Z|2017-05-29T01:27:17Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
-|20170529_102747A.jpg            |2017-05-29T01:27:47Z|2017-05-29T01:27:47Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
-|20170529_102817A.jpg            |2017-05-29T01:28:17Z|2017-05-29T01:28:17Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
-|20170529_102847A.jpg            |2017-05-29T01:28:47Z|2017-05-29T01:28:47Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
-|20170529_102917A.jpg            |2017-05-29T01:29:17Z|2017-05-29T01:29:17Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
-|20170529_102947A.jpg            |2017-05-29T01:29:47Z|2017-05-29T01:29:47Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
-|20170529_103016A.jpg            |2017-05-29T01:30:16Z|2017-05-29T01:30:16Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
-|20170529_103046A.jpg            |2017-05-29T01:30:46Z|2017-05-29T01:30:46Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
-|20170529_103116A.jpg            |2017-05-29T01:31:16Z|2017-05-29T01:31:16Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
-|20170529_103146A.jpg            |2017-05-29T01:31:46Z|2017-05-29T01:31:46Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
-|20170529_103216A.jpg            |2017-05-29T01:32:16Z|2017-05-29T01:32:16Z| 35.8408248425|138.0341358762|  748.52|     -|     -|
-|20170529_103246A.jpg            |2017-05-29T01:32:46Z|2017-05-29T01:32:46Z| 35.8405660931|138.0353022180|  747.56|     -|     -|
-|20170529_103315A.jpg            |2017-05-29T01:33:15Z|2017-05-29T01:33:15Z|              |              |        |      |      |
-|20170529_103345A.jpg            |2017-05-29T01:33:45Z|2017-05-29T01:33:45Z|              |              |        |      |      |
-|20170529_103415A.jpg            |2017-05-29T01:34:15Z|2017-05-29T01:34:15Z|              |              |        |      |      |
-|20170529_103445A.jpg            |2017-05-29T01:34:45Z|2017-05-29T01:34:45Z|              |              |        |      |      |
-|20170529_103515A.jpg            |2017-05-29T01:35:15Z|2017-05-29T01:35:15Z|              |              |        |      |      |
-|20170529_103545A.jpg            |2017-05-29T01:35:45Z|2017-05-29T01:35:45Z|              |              |        |      |      |
-|20170529_103615A.jpg            |2017-05-29T01:36:14Z|2017-05-29T01:36:14Z| 35.8359798510|138.0600296706|  750.93|     -|     -|
-|20170529_103645A.jpg            |2017-05-29T01:36:44Z|2017-05-29T01:36:44Z| 35.8357221074|138.0602352787|  745.64|     -|     -|
-|20170529_103714A.jpg            |2017-05-29T01:37:14Z|2017-05-29T01:37:14Z| 35.8346095774|138.0594111700|  751.89|     -|     -|
-|20170529_103744A.jpg            |2017-05-29T01:37:44Z|2017-05-29T01:37:44Z| 35.8353867475|138.0606593192|  760.06|     -|     -|
-|20170529_103814A.jpg            |2017-05-29T01:38:14Z|2017-05-29T01:38:14Z| 35.8344272710|138.0610287096|  774.96|     -|     -|
-|20170529_103844A.jpg            |2017-05-29T01:38:44Z|2017-05-29T01:38:44Z| 35.8348886948|138.0618377309|  792.74|     -|     -|
-|20170529_103914A.jpg            |2017-05-29T01:39:14Z|2017-05-29T01:39:14Z| 35.8344262652|138.0623432435|  799.95|     -|     -|
-|20170529_103944A.jpg            |2017-05-29T01:39:44Z|2017-05-29T01:39:44Z| 35.8338732272|138.0621989910|  796.59|     -|     -|
-|20170529_104014A.jpg            |2017-05-29T01:40:14Z|2017-05-29T01:40:14Z| 35.8334153239|138.0617078952|  794.67|     -|     -|
-|20170529_104048A.jpg            |2017-05-29T01:40:48Z|2017-05-29T01:40:48Z| 35.8345361520|138.0619776249|  795.15|     -|     -|
-|20170529_104119A.jpg            |2017-05-29T01:41:19Z|2017-05-29T01:41:19Z| 35.8339889813|138.0625394639|  793.71|     -|     -|
-|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------|
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/separate_.gpx'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102305A.jpg'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102314A.jpg'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102318A.jpg'
-[debug] exifTime = '2017:05:29 10:23:18' <--> '2017:05:29 10:23:18'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102322A.jpg'
-[debug] exifTime = '2017:05:29 10:23:22' <--> '2017:05:29 10:23:22'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102405A.jpg'
-[debug] exifTime = '2017:05:29 10:24:05' <--> '2017:05:29 10:24:05'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102409A.jpg'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102418A.jpg'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102448A.jpg'
-[debug] exifTime = '2017:05:29 10:24:48' <--> '2017:05:29 10:24:48'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103246A.jpg'
-[debug] exifTime = '2017:05:29 10:32:46' <--> '2017:05:29 10:32:46'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103315A.jpg'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103545A.jpg'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103615A.jpg'
-[debug] exifTime = '2017:05:29 10:36:14' <--> '2017:05:29 10:36:14'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_104119A.jpg'
-[debug] exifTime = '2017:05:29 10:41:19' <--> '2017:05:29 10:41:19'
-
diff --git a/importPicture/testdata/AdjustTime.M1d.separate.log b/importPicture/testdata/AdjustTime.M1d.separate.log
deleted file mode 100644 (file)
index 0a41943..0000000
+++ /dev/null
@@ -1,110 +0,0 @@
-テストパターン : [M1d].GPXが複数のTRKSEGに分割している場合.EXIF時間を基準.GarminColorado
-       tarFilePath = testdata/separate.tar.gz
-       gpxSourcePath = testdata/muiltiTRK.GarminColorado.gpx.xml
-       gpxDestinationPath = testdata/cameradata/separate.gpx
-       iniFilePath = testdata/AdjustTime.M1d.separate.ini
-Param File = 'testdata/AdjustTime.M1d.separate.ini'
- - param: IMG.TIME=2017-05-29T01:31:46Z
- - param: IMG.BASE_FILE=20170529_103146A.jpg
- - param: GPX.BASETIME=EXIF_TIME
- - param: IMG.SOURCE_FOLDER=testdata/cameradata/separate
- - param: IMG.OUTPUT_FOLDER=/home/yuu/workspace/AdjustTime/importPicture/testdata/output
- - param: IMG.OUTPUT=true
- - param: IMG.OUTPUT_ALL=false
- - param: IMG.OUTPUT_EXIF= false
- - param: GPX.SOURCE_FOLDER=.
- - param: GPX.OUTPUT_WPT=true
- - param: GPX.OVERWRITE_MAGVAR=true
- - param: GPX.OUTPUT_SPEED=true
- - param: GPX.gpxSplit=false
- - param: GPX.noFirstNode=true
- - param: GPX.REUSE=false
-/home/yuu/workspace/AdjustTime/importPicture/testdata/cameradata/separate.gpx => /home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/separate_.gpx
-           時差: 0(sec)
-    Target GPX: [/home/yuu/workspace/AdjustTime/importPicture/testdata/cameradata/separate.gpx]
-          EXIF: convert to '/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate'
-
-                                 +--------------------+--------------------|
-  GPS logging time               | First Time         | Last Time          |
-|--------------------------------+--------------------+--------------------|
-|                      <trkseg/> |2017-05-29T01:23:18Z|2017-05-29T01:24:05Z|
-|                      <trkseg/> |2017-05-29T01:24:37Z|2017-05-29T01:33:03Z|
-|                      <trkseg/> |2017-05-29T01:35:53Z|2017-05-29T01:47:35Z|
-|--------------------------------+--------------------+--------------------|
-
-|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------|
-| name                           | Camera Time        | GPStime            |   Latitude   |   Longitude  | ele    |magvar| km/h |
-|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------|
-|20170529_102305A.jpg            |2017-05-29T01:23:05Z|2017-05-29T01:23:05Z|              |              |        |      |      |
-|20170529_102310A.jpg            |2017-05-29T01:23:10Z|2017-05-29T01:23:10Z|              |              |        |      |      |
-|20170529_102314A.jpg            |2017-05-29T01:23:14Z|2017-05-29T01:23:14Z|              |              |        |      |      |
-|20170529_102318A.jpg            |2017-05-29T01:23:18Z|2017-05-29T01:23:18Z| 35.8812697884|137.9952202085|  686.52|     -|     -|
-|20170529_102322A.jpg            |2017-05-29T01:23:22Z|2017-05-29T01:23:22Z| 35.8810500987|137.9951669835|  684.60|     -|     -|
-|20170529_102401A.jpg            |2017-05-29T01:24:01Z|2017-05-29T01:24:01Z| 35.8809490129|137.9974513035|  685.56|     -|     -|
-|20170529_102405A.jpg            |2017-05-29T01:24:05Z|2017-05-29T01:24:05Z| 35.8808641881|137.9981065169|  687.48|     -|     -|
-|20170529_102409A.jpg            |2017-05-29T01:24:09Z|2017-05-29T01:24:09Z|              |              |        |      |      |
-|20170529_102414A.jpg            |2017-05-29T01:24:14Z|2017-05-29T01:24:14Z|              |              |        |      |      |
-|20170529_102418A.jpg            |2017-05-29T01:24:18Z|2017-05-29T01:24:18Z|              |              |        |      |      |
-|20170529_102448A.jpg            |2017-05-29T01:24:48Z|2017-05-29T01:24:48Z| 35.8788877353|138.0039562471|  713.92|     -|     -|
-|20170529_102518A.jpg            |2017-05-29T01:25:18Z|2017-05-29T01:25:18Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
-|20170529_102547A.jpg            |2017-05-29T01:25:47Z|2017-05-29T01:25:47Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
-|20170529_102618A.jpg            |2017-05-29T01:26:17Z|2017-05-29T01:26:17Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
-|20170529_102647A.jpg            |2017-05-29T01:26:47Z|2017-05-29T01:26:47Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
-|20170529_102717A.jpg            |2017-05-29T01:27:17Z|2017-05-29T01:27:17Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
-|20170529_102747A.jpg            |2017-05-29T01:27:47Z|2017-05-29T01:27:47Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
-|20170529_102817A.jpg            |2017-05-29T01:28:17Z|2017-05-29T01:28:17Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
-|20170529_102847A.jpg            |2017-05-29T01:28:47Z|2017-05-29T01:28:47Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
-|20170529_102917A.jpg            |2017-05-29T01:29:17Z|2017-05-29T01:29:17Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
-|20170529_102947A.jpg            |2017-05-29T01:29:47Z|2017-05-29T01:29:47Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
-|20170529_103016A.jpg            |2017-05-29T01:30:16Z|2017-05-29T01:30:16Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
-|20170529_103046A.jpg            |2017-05-29T01:30:46Z|2017-05-29T01:30:46Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
-|20170529_103116A.jpg            |2017-05-29T01:31:16Z|2017-05-29T01:31:16Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
-|20170529_103146A.jpg            |2017-05-29T01:31:46Z|2017-05-29T01:31:46Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
-|20170529_103216A.jpg            |2017-05-29T01:32:16Z|2017-05-29T01:32:16Z| 35.8408248425|138.0341358762|  748.52|     -|     -|
-|20170529_103246A.jpg            |2017-05-29T01:32:46Z|2017-05-29T01:32:46Z| 35.8405660931|138.0353022180|  747.56|     -|     -|
-|20170529_103315A.jpg            |2017-05-29T01:33:15Z|2017-05-29T01:33:15Z|              |              |        |      |      |
-|20170529_103345A.jpg            |2017-05-29T01:33:45Z|2017-05-29T01:33:45Z|              |              |        |      |      |
-|20170529_103415A.jpg            |2017-05-29T01:34:15Z|2017-05-29T01:34:15Z|              |              |        |      |      |
-|20170529_103445A.jpg            |2017-05-29T01:34:45Z|2017-05-29T01:34:45Z|              |              |        |      |      |
-|20170529_103515A.jpg            |2017-05-29T01:35:15Z|2017-05-29T01:35:15Z|              |              |        |      |      |
-|20170529_103545A.jpg            |2017-05-29T01:35:45Z|2017-05-29T01:35:45Z|              |              |        |      |      |
-|20170529_103615A.jpg            |2017-05-29T01:36:14Z|2017-05-29T01:36:14Z| 35.8359798510|138.0600296706|  750.93|     -|     -|
-|20170529_103645A.jpg            |2017-05-29T01:36:44Z|2017-05-29T01:36:44Z| 35.8357221074|138.0602352787|  745.64|     -|     -|
-|20170529_103714A.jpg            |2017-05-29T01:37:14Z|2017-05-29T01:37:14Z| 35.8346095774|138.0594111700|  751.89|     -|     -|
-|20170529_103744A.jpg            |2017-05-29T01:37:44Z|2017-05-29T01:37:44Z| 35.8353867475|138.0606593192|  760.06|     -|     -|
-|20170529_103814A.jpg            |2017-05-29T01:38:14Z|2017-05-29T01:38:14Z| 35.8344272710|138.0610287096|  774.96|     -|     -|
-|20170529_103844A.jpg            |2017-05-29T01:38:44Z|2017-05-29T01:38:44Z| 35.8348886948|138.0618377309|  792.74|     -|     -|
-|20170529_103914A.jpg            |2017-05-29T01:39:14Z|2017-05-29T01:39:14Z| 35.8344262652|138.0623432435|  799.95|     -|     -|
-|20170529_103944A.jpg            |2017-05-29T01:39:44Z|2017-05-29T01:39:44Z| 35.8338732272|138.0621989910|  796.59|     -|     -|
-|20170529_104014A.jpg            |2017-05-29T01:40:14Z|2017-05-29T01:40:14Z| 35.8334153239|138.0617078952|  794.67|     -|     -|
-|20170529_104048A.jpg            |2017-05-29T01:40:48Z|2017-05-29T01:40:48Z| 35.8345361520|138.0619776249|  795.15|     -|     -|
-|20170529_104119A.jpg            |2017-05-29T01:41:19Z|2017-05-29T01:41:19Z| 35.8339889813|138.0625394639|  793.71|     -|     -|
-|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------|
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/separate_.gpx'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102305A.jpg'
-[debug] exifTime = '2017:05:29 10:23:05' <--> '2017:05:29 10:23:05'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102314A.jpg'
-[debug] exifTime = '2017:05:29 10:23:14' <--> '2017:05:29 10:23:14'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102318A.jpg'
-[debug] exifTime = '2017:05:29 10:23:18' <--> '2017:05:29 10:23:18'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102322A.jpg'
-[debug] exifTime = '2017:05:29 10:23:22' <--> '2017:05:29 10:23:22'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102405A.jpg'
-[debug] exifTime = '2017:05:29 10:24:05' <--> '2017:05:29 10:24:05'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102409A.jpg'
-[debug] exifTime = '2017:05:29 10:24:09' <--> '2017:05:29 10:24:09'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102418A.jpg'
-[debug] exifTime = '2017:05:29 10:24:18' <--> '2017:05:29 10:24:18'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102448A.jpg'
-[debug] exifTime = '2017:05:29 10:24:48' <--> '2017:05:29 10:24:48'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103246A.jpg'
-[debug] exifTime = '2017:05:29 10:32:46' <--> '2017:05:29 10:32:46'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103315A.jpg'
-[debug] exifTime = '2017:05:29 10:33:15' <--> '2017:05:29 10:33:15'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103545A.jpg'
-[debug] exifTime = '2017:05:29 10:35:45' <--> '2017:05:29 10:35:45'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103615A.jpg'
-[debug] exifTime = '2017:05:29 10:36:14' <--> '2017:05:29 10:36:14'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_104119A.jpg'
-[debug] exifTime = '2017:05:29 10:41:19' <--> '2017:05:29 10:41:19'
-
diff --git a/importPicture/testdata/AdjustTime.M2a.separate.log b/importPicture/testdata/AdjustTime.M2a.separate.log
deleted file mode 100644 (file)
index 5e7d117..0000000
+++ /dev/null
@@ -1,210 +0,0 @@
-テストパターン : [M2a].GPXが複数のTRKSEGに分割している場合.FILE_UPDATE時間を基準.eTrex_20J
-       tarFilePath = testdata/separate.tar.gz
-       gpxSourcePath = testdata/multiTRKSEG.eTrex_20J.gpx.xml
-       gpxDestinationPath = testdata/cameradata/separate.gpx
-       iniFilePath = testdata/AdjustTime.M2a.separate.ini
-Param File = 'testdata/AdjustTime.M2a.separate.ini'
- - param: IMG.TIME=2017-05-29T01:31:46Z
- - param: IMG.BASE_FILE=20170529_103146A.jpg
- - param: GPX.BASETIME=FILE_UPDATE
- - param: IMG.SOURCE_FOLDER=testdata/cameradata/separate
- - param: IMG.OUTPUT_FOLDER=/home/yuu/workspace/AdjustTime/importPicture/testdata/output
- - param: IMG.OUTPUT=true
- - param: IMG.OUTPUT_ALL=false
- - param: IMG.OUTPUT_EXIF= false
- - param: GPX.SOURCE_FOLDER=.
- - param: GPX.OUTPUT_WPT=true
- - param: GPX.OVERWRITE_MAGVAR=true
- - param: GPX.OUTPUT_SPEED=true
- - param: GPX.gpxSplit=false
- - param: GPX.noFirstNode=true
- - param: GPX.REUSE=false
-/home/yuu/workspace/AdjustTime/importPicture/testdata/cameradata/separate.gpx => /home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/separate_.gpx
-           時差: -32400(sec)
-    Target GPX: [/home/yuu/workspace/AdjustTime/importPicture/testdata/cameradata/separate.gpx]
-          EXIF: convert to '/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate'
-
-                                 +--------------------+--------------------|
-  GPS logging time               | First Time         | Last Time          |
-|--------------------------------+--------------------+--------------------|
-|                      <trkseg/> |2017-05-29T01:23:18Z|2017-05-29T01:24:05Z|
-|                      <trkseg/> |2017-05-29T01:24:37Z|2017-05-29T01:33:03Z|
-|                      <trkseg/> |2017-05-29T01:35:53Z|2017-05-29T01:47:35Z|
-|--------------------------------+--------------------+--------------------|
-
-|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------|
-| name                           | Camera Time        | GPStime            |   Latitude   |   Longitude  | ele    |magvar| km/h |
-|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------|
-|20170529_102305A.jpg            |2017-05-29T10:23:06Z|2017-05-29T01:23:06Z|              |              |        |      |      |
-|20170529_102310A.jpg            |2017-05-29T10:23:10Z|2017-05-29T01:23:10Z|              |              |        |      |      |
-|20170529_102314A.jpg            |2017-05-29T10:23:14Z|2017-05-29T01:23:14Z|              |              |        |      |      |
-|20170529_102318A.jpg            |2017-05-29T10:23:18Z|2017-05-29T01:23:18Z| 35.8812697884|137.9952202085|  686.52|     -|     -|
-|20170529_102322A.jpg            |2017-05-29T10:23:22Z|2017-05-29T01:23:22Z| 35.8810500987|137.9951669835|  684.60|     -|     -|
-|20170529_102401A.jpg            |2017-05-29T10:24:00Z|2017-05-29T01:24:00Z| 35.8809497673|137.9972837493|  685.56|     -|     -|
-|20170529_102405A.jpg            |2017-05-29T10:24:04Z|2017-05-29T01:24:04Z| 35.8808881603|137.9979396332|  687.00|     -|     -|
-|20170529_102409A.jpg            |2017-05-29T10:24:10Z|2017-05-29T01:24:10Z|              |              |        |      |      |
-|20170529_102414A.jpg            |2017-05-29T10:24:14Z|2017-05-29T01:24:14Z|              |              |        |      |      |
-|20170529_102418A.jpg            |2017-05-29T10:24:18Z|2017-05-29T01:24:18Z|              |              |        |      |      |
-|20170529_102448A.jpg            |2017-05-29T10:24:48Z|2017-05-29T01:24:48Z| 35.8788877353|138.0039562471|  713.92|     -|     -|
-|20170529_102518A.jpg            |2017-05-29T10:25:18Z|2017-05-29T01:25:18Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
-|20170529_102547A.jpg            |2017-05-29T10:25:48Z|2017-05-29T01:25:48Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
-|20170529_102618A.jpg            |2017-05-29T10:26:18Z|2017-05-29T01:26:18Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
-|20170529_102647A.jpg            |2017-05-29T10:26:46Z|2017-05-29T01:26:46Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
-|20170529_102717A.jpg            |2017-05-29T10:27:16Z|2017-05-29T01:27:16Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
-|20170529_102747A.jpg            |2017-05-29T10:27:46Z|2017-05-29T01:27:46Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
-|20170529_102817A.jpg            |2017-05-29T10:28:16Z|2017-05-29T01:28:16Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
-|20170529_102847A.jpg            |2017-05-29T10:28:46Z|2017-05-29T01:28:46Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
-|20170529_102917A.jpg            |2017-05-29T10:29:16Z|2017-05-29T01:29:16Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
-|20170529_102947A.jpg            |2017-05-29T10:29:46Z|2017-05-29T01:29:46Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
-|20170529_103016A.jpg            |2017-05-29T10:30:16Z|2017-05-29T01:30:16Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
-|20170529_103046A.jpg            |2017-05-29T10:30:46Z|2017-05-29T01:30:46Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
-|20170529_103116A.jpg            |2017-05-29T10:31:16Z|2017-05-29T01:31:16Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
-|20170529_103146A.jpg            |2017-05-29T10:31:46Z|2017-05-29T01:31:46Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
-|20170529_103216A.jpg            |2017-05-29T10:32:16Z|2017-05-29T01:32:16Z| 35.8408248425|138.0341358762|  748.52|     -|     -|
-|20170529_103246A.jpg            |2017-05-29T10:32:46Z|2017-05-29T01:32:46Z| 35.8405660931|138.0353022180|  747.56|     -|     -|
-|20170529_103315A.jpg            |2017-05-29T10:33:14Z|2017-05-29T01:33:14Z|              |              |        |      |      |
-|20170529_103345A.jpg            |2017-05-29T10:33:44Z|2017-05-29T01:33:44Z|              |              |        |      |      |
-|20170529_103415A.jpg            |2017-05-29T10:34:14Z|2017-05-29T01:34:14Z|              |              |        |      |      |
-|20170529_103445A.jpg            |2017-05-29T10:34:44Z|2017-05-29T01:34:44Z|              |              |        |      |      |
-|20170529_103515A.jpg            |2017-05-29T10:35:14Z|2017-05-29T01:35:14Z|              |              |        |      |      |
-|20170529_103545A.jpg            |2017-05-29T10:35:44Z|2017-05-29T01:35:44Z|              |              |        |      |      |
-|20170529_103615A.jpg            |2017-05-29T10:36:14Z|2017-05-29T01:36:14Z| 35.8359798510|138.0600296706|  750.93|     -|     -|
-|20170529_103645A.jpg            |2017-05-29T10:36:44Z|2017-05-29T01:36:44Z| 35.8357221074|138.0602352787|  745.64|     -|     -|
-|20170529_103714A.jpg            |2017-05-29T10:37:14Z|2017-05-29T01:37:14Z| 35.8346095774|138.0594111700|  751.89|     -|     -|
-|20170529_103744A.jpg            |2017-05-29T10:37:44Z|2017-05-29T01:37:44Z| 35.8353867475|138.0606593192|  760.06|     -|     -|
-|20170529_103814A.jpg            |2017-05-29T10:38:14Z|2017-05-29T01:38:14Z| 35.8344272710|138.0610287096|  774.96|     -|     -|
-|20170529_103844A.jpg            |2017-05-29T10:38:44Z|2017-05-29T01:38:44Z| 35.8348886948|138.0618377309|  792.74|     -|     -|
-|20170529_103914A.jpg            |2017-05-29T10:39:14Z|2017-05-29T01:39:14Z| 35.8344262652|138.0623432435|  799.95|     -|     -|
-|20170529_103944A.jpg            |2017-05-29T10:39:44Z|2017-05-29T01:39:44Z| 35.8338732272|138.0621989910|  796.59|     -|     -|
-|20170529_104014A.jpg            |2017-05-29T10:40:14Z|2017-05-29T01:40:14Z| 35.8334153239|138.0617078952|  794.67|     -|     -|
-|20170529_104048A.jpg            |2017-05-29T10:40:48Z|2017-05-29T01:40:48Z| 35.8345361520|138.0619776249|  795.15|     -|     -|
-|20170529_104119A.jpg            |2017-05-29T10:41:18Z|2017-05-29T01:41:18Z| 35.8339846227|138.0625408050|  793.71|     -|     -|
-|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------|
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/separate_.gpx'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102305A.jpg'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102314A.jpg'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102318A.jpg'
-[debug] exifTime = '2017:05:29 10:23:18' <--> '2017:05:29 10:23:18'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102322A.jpg'
-[debug] exifTime = '2017:05:29 10:23:22' <--> '2017:05:29 10:23:22'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102405A.jpg'
-[debug] exifTime = '2017:05:29 10:24:04' <--> '2017:05:29 10:24:04'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102409A.jpg'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102418A.jpg'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102448A.jpg'
-[debug] exifTime = '2017:05:29 10:24:48' <--> '2017:05:29 10:24:48'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103246A.jpg'
-[debug] exifTime = '2017:05:29 10:32:46' <--> '2017:05:29 10:32:46'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103315A.jpg'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103545A.jpg'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103615A.jpg'
-[debug] exifTime = '2017:05:29 10:36:14' <--> '2017:05:29 10:36:14'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_104119A.jpg'
-[debug] exifTime = '2017:05:29 10:41:18' <--> '2017:05:29 10:41:18'
-
-
-
-テストパターン : [M3a].GPXが複数のTRKSEGに分割している場合.FILE_UPDATE時間を基準.eTrex_20Jreverse
-       tarFilePath = testdata/separate.tar.gz
-       gpxSourcePath = testdata/multiTRKSEGreverse.eTrex_20J.gpx.xml
-       gpxDestinationPath = testdata/cameradata/separate.gpx
-       iniFilePath = testdata/AdjustTime.M2a.separate.ini
-Param File = 'testdata/AdjustTime.M2a.separate.ini'
- - param: IMG.TIME=2017-05-29T01:31:46Z
- - param: IMG.BASE_FILE=20170529_103146A.jpg
- - param: GPX.BASETIME=FILE_UPDATE
- - param: IMG.SOURCE_FOLDER=testdata/cameradata/separate
- - param: IMG.OUTPUT_FOLDER=/home/yuu/workspace/AdjustTime/importPicture/testdata/output
- - param: IMG.OUTPUT=true
- - param: IMG.OUTPUT_ALL=false
- - param: IMG.OUTPUT_EXIF= false
- - param: GPX.SOURCE_FOLDER=.
- - param: GPX.OUTPUT_WPT=true
- - param: GPX.OVERWRITE_MAGVAR=true
- - param: GPX.OUTPUT_SPEED=true
- - param: GPX.gpxSplit=false
- - param: GPX.noFirstNode=true
- - param: GPX.REUSE=false
-/home/yuu/workspace/AdjustTime/importPicture/testdata/cameradata/separate.gpx => /home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/separate_.gpx
-           時差: -32400(sec)
-    Target GPX: [/home/yuu/workspace/AdjustTime/importPicture/testdata/cameradata/separate.gpx]
-          EXIF: convert to '/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate'
-
-                                 +--------------------+--------------------|
-  GPS logging time               | First Time         | Last Time          |
-|--------------------------------+--------------------+--------------------|
-|                      <trkseg/> |2017-05-29T01:23:18Z|2017-05-29T01:24:05Z|
-|                      <trkseg/> |2017-05-29T01:24:37Z|2017-05-29T01:33:03Z|
-|                      <trkseg/> |2017-05-29T01:35:53Z|2017-05-29T01:47:35Z|
-|--------------------------------+--------------------+--------------------|
-
-|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------|
-| name                           | Camera Time        | GPStime            |   Latitude   |   Longitude  | ele    |magvar| km/h |
-|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------|
-|20170529_102305A.jpg            |2017-05-29T10:23:06Z|2017-05-29T01:23:06Z|              |              |        |      |      |
-|20170529_102310A.jpg            |2017-05-29T10:23:10Z|2017-05-29T01:23:10Z|              |              |        |      |      |
-|20170529_102314A.jpg            |2017-05-29T10:23:14Z|2017-05-29T01:23:14Z|              |              |        |      |      |
-|20170529_102318A.jpg            |2017-05-29T10:23:18Z|2017-05-29T01:23:18Z| 35.8812697884|137.9952202085|  686.52|     -|     -|
-|20170529_102322A.jpg            |2017-05-29T10:23:22Z|2017-05-29T01:23:22Z| 35.8810500987|137.9951669835|  684.60|     -|     -|
-|20170529_102401A.jpg            |2017-05-29T10:24:00Z|2017-05-29T01:24:00Z| 35.8809497673|137.9972837493|  685.56|     -|     -|
-|20170529_102405A.jpg            |2017-05-29T10:24:04Z|2017-05-29T01:24:04Z| 35.8808881603|137.9979396332|  687.00|     -|     -|
-|20170529_102409A.jpg            |2017-05-29T10:24:10Z|2017-05-29T01:24:10Z|              |              |        |      |      |
-|20170529_102414A.jpg            |2017-05-29T10:24:14Z|2017-05-29T01:24:14Z|              |              |        |      |      |
-|20170529_102418A.jpg            |2017-05-29T10:24:18Z|2017-05-29T01:24:18Z|              |              |        |      |      |
-|20170529_102448A.jpg            |2017-05-29T10:24:48Z|2017-05-29T01:24:48Z| 35.8788877353|138.0039562471|  713.92|     -|     -|
-|20170529_102518A.jpg            |2017-05-29T10:25:18Z|2017-05-29T01:25:18Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
-|20170529_102547A.jpg            |2017-05-29T10:25:48Z|2017-05-29T01:25:48Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
-|20170529_102618A.jpg            |2017-05-29T10:26:18Z|2017-05-29T01:26:18Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
-|20170529_102647A.jpg            |2017-05-29T10:26:46Z|2017-05-29T01:26:46Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
-|20170529_102717A.jpg            |2017-05-29T10:27:16Z|2017-05-29T01:27:16Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
-|20170529_102747A.jpg            |2017-05-29T10:27:46Z|2017-05-29T01:27:46Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
-|20170529_102817A.jpg            |2017-05-29T10:28:16Z|2017-05-29T01:28:16Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
-|20170529_102847A.jpg            |2017-05-29T10:28:46Z|2017-05-29T01:28:46Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
-|20170529_102917A.jpg            |2017-05-29T10:29:16Z|2017-05-29T01:29:16Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
-|20170529_102947A.jpg            |2017-05-29T10:29:46Z|2017-05-29T01:29:46Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
-|20170529_103016A.jpg            |2017-05-29T10:30:16Z|2017-05-29T01:30:16Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
-|20170529_103046A.jpg            |2017-05-29T10:30:46Z|2017-05-29T01:30:46Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
-|20170529_103116A.jpg            |2017-05-29T10:31:16Z|2017-05-29T01:31:16Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
-|20170529_103146A.jpg            |2017-05-29T10:31:46Z|2017-05-29T01:31:46Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
-|20170529_103216A.jpg            |2017-05-29T10:32:16Z|2017-05-29T01:32:16Z| 35.8408248425|138.0341358762|  748.52|     -|     -|
-|20170529_103246A.jpg            |2017-05-29T10:32:46Z|2017-05-29T01:32:46Z| 35.8405660931|138.0353022180|  747.56|     -|     -|
-|20170529_103315A.jpg            |2017-05-29T10:33:14Z|2017-05-29T01:33:14Z|              |              |        |      |      |
-|20170529_103345A.jpg            |2017-05-29T10:33:44Z|2017-05-29T01:33:44Z|              |              |        |      |      |
-|20170529_103415A.jpg            |2017-05-29T10:34:14Z|2017-05-29T01:34:14Z|              |              |        |      |      |
-|20170529_103445A.jpg            |2017-05-29T10:34:44Z|2017-05-29T01:34:44Z|              |              |        |      |      |
-|20170529_103515A.jpg            |2017-05-29T10:35:14Z|2017-05-29T01:35:14Z|              |              |        |      |      |
-|20170529_103545A.jpg            |2017-05-29T10:35:44Z|2017-05-29T01:35:44Z|              |              |        |      |      |
-|20170529_103615A.jpg            |2017-05-29T10:36:14Z|2017-05-29T01:36:14Z| 35.8359798510|138.0600296706|  750.93|     -|     -|
-|20170529_103645A.jpg            |2017-05-29T10:36:44Z|2017-05-29T01:36:44Z| 35.8357221074|138.0602352787|  745.64|     -|     -|
-|20170529_103714A.jpg            |2017-05-29T10:37:14Z|2017-05-29T01:37:14Z| 35.8346095774|138.0594111700|  751.89|     -|     -|
-|20170529_103744A.jpg            |2017-05-29T10:37:44Z|2017-05-29T01:37:44Z| 35.8353867475|138.0606593192|  760.06|     -|     -|
-|20170529_103814A.jpg            |2017-05-29T10:38:14Z|2017-05-29T01:38:14Z| 35.8344272710|138.0610287096|  774.96|     -|     -|
-|20170529_103844A.jpg            |2017-05-29T10:38:44Z|2017-05-29T01:38:44Z| 35.8348886948|138.0618377309|  792.74|     -|     -|
-|20170529_103914A.jpg            |2017-05-29T10:39:14Z|2017-05-29T01:39:14Z| 35.8344262652|138.0623432435|  799.95|     -|     -|
-|20170529_103944A.jpg            |2017-05-29T10:39:44Z|2017-05-29T01:39:44Z| 35.8338732272|138.0621989910|  796.59|     -|     -|
-|20170529_104014A.jpg            |2017-05-29T10:40:14Z|2017-05-29T01:40:14Z| 35.8334153239|138.0617078952|  794.67|     -|     -|
-|20170529_104048A.jpg            |2017-05-29T10:40:48Z|2017-05-29T01:40:48Z| 35.8345361520|138.0619776249|  795.15|     -|     -|
-|20170529_104119A.jpg            |2017-05-29T10:41:18Z|2017-05-29T01:41:18Z| 35.8339846227|138.0625408050|  793.71|     -|     -|
-|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------|
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/separate_.gpx'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102305A.jpg'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102314A.jpg'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102318A.jpg'
-[debug] exifTime = '2017:05:29 10:23:18' <--> '2017:05:29 10:23:18'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102322A.jpg'
-[debug] exifTime = '2017:05:29 10:23:22' <--> '2017:05:29 10:23:22'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102405A.jpg'
-[debug] exifTime = '2017:05:29 10:24:04' <--> '2017:05:29 10:24:04'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102409A.jpg'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102418A.jpg'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102448A.jpg'
-[debug] exifTime = '2017:05:29 10:24:48' <--> '2017:05:29 10:24:48'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103246A.jpg'
-[debug] exifTime = '2017:05:29 10:32:46' <--> '2017:05:29 10:32:46'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103315A.jpg'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103545A.jpg'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103615A.jpg'
-[debug] exifTime = '2017:05:29 10:36:14' <--> '2017:05:29 10:36:14'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_104119A.jpg'
-[debug] exifTime = '2017:05:29 10:41:18' <--> '2017:05:29 10:41:18'
-
diff --git a/importPicture/testdata/AdjustTime.M2b.separate.log b/importPicture/testdata/AdjustTime.M2b.separate.log
deleted file mode 100644 (file)
index 188ac42..0000000
+++ /dev/null
@@ -1,222 +0,0 @@
-テストパターン : [M2b].GPXが複数のTRKSEGに分割している場合.FILE_UPDATE時間を基準.eTrex_20J
-       tarFilePath = testdata/separate.tar.gz
-       gpxSourcePath = testdata/multiTRKSEG.eTrex_20J.gpx.xml
-       gpxDestinationPath = testdata/cameradata/separate.gpx
-       iniFilePath = testdata/AdjustTime.M2b.separate.ini
-Param File = 'testdata/AdjustTime.M2b.separate.ini'
- - param: IMG.TIME=2017-05-29T01:31:46Z
- - param: IMG.BASE_FILE=20170529_103146A.jpg
- - param: GPX.BASETIME=FILE_UPDATE
- - param: IMG.SOURCE_FOLDER=testdata/cameradata/separate
- - param: IMG.OUTPUT_FOLDER=/home/yuu/workspace/AdjustTime/importPicture/testdata/output
- - param: IMG.OUTPUT=true
- - param: IMG.OUTPUT_ALL=false
- - param: IMG.OUTPUT_EXIF= false
- - param: GPX.SOURCE_FOLDER=.
- - param: GPX.OUTPUT_WPT=true
- - param: GPX.OVERWRITE_MAGVAR=true
- - param: GPX.OUTPUT_SPEED=true
- - param: GPX.gpxSplit=false
- - param: GPX.noFirstNode=true
- - param: GPX.REUSE=false
-/home/yuu/workspace/AdjustTime/importPicture/testdata/cameradata/separate.gpx => /home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/separate_.gpx
-           時差: -32400(sec)
-    Target GPX: [/home/yuu/workspace/AdjustTime/importPicture/testdata/cameradata/separate.gpx]
-          EXIF: convert to '/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate'
-
-                                 +--------------------+--------------------|
-  GPS logging time               | First Time         | Last Time          |
-|--------------------------------+--------------------+--------------------|
-|                      <trkseg/> |2017-05-29T01:23:18Z|2017-05-29T01:24:05Z|
-|                      <trkseg/> |2017-05-29T01:24:37Z|2017-05-29T01:33:03Z|
-|                      <trkseg/> |2017-05-29T01:35:53Z|2017-05-29T01:47:35Z|
-|--------------------------------+--------------------+--------------------|
-
-|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------|
-| name                           | Camera Time        | GPStime            |   Latitude   |   Longitude  | ele    |magvar| km/h |
-|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------|
-|20170529_102305A.jpg            |2017-05-29T10:23:06Z|2017-05-29T01:23:06Z|              |              |        |      |      |
-|20170529_102310A.jpg            |2017-05-29T10:23:10Z|2017-05-29T01:23:10Z|              |              |        |      |      |
-|20170529_102314A.jpg            |2017-05-29T10:23:14Z|2017-05-29T01:23:14Z|              |              |        |      |      |
-|20170529_102318A.jpg            |2017-05-29T10:23:18Z|2017-05-29T01:23:18Z| 35.8812697884|137.9952202085|  686.52|     -|     -|
-|20170529_102322A.jpg            |2017-05-29T10:23:22Z|2017-05-29T01:23:22Z| 35.8810500987|137.9951669835|  684.60|     -|     -|
-|20170529_102401A.jpg            |2017-05-29T10:24:00Z|2017-05-29T01:24:00Z| 35.8809497673|137.9972837493|  685.56|     -|     -|
-|20170529_102405A.jpg            |2017-05-29T10:24:04Z|2017-05-29T01:24:04Z| 35.8808881603|137.9979396332|  687.00|     -|     -|
-|20170529_102409A.jpg            |2017-05-29T10:24:10Z|2017-05-29T01:24:10Z|              |              |        |      |      |
-|20170529_102414A.jpg            |2017-05-29T10:24:14Z|2017-05-29T01:24:14Z|              |              |        |      |      |
-|20170529_102418A.jpg            |2017-05-29T10:24:18Z|2017-05-29T01:24:18Z|              |              |        |      |      |
-|20170529_102448A.jpg            |2017-05-29T10:24:48Z|2017-05-29T01:24:48Z| 35.8788877353|138.0039562471|  713.92|     -|     -|
-|20170529_102518A.jpg            |2017-05-29T10:25:18Z|2017-05-29T01:25:18Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
-|20170529_102547A.jpg            |2017-05-29T10:25:48Z|2017-05-29T01:25:48Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
-|20170529_102618A.jpg            |2017-05-29T10:26:18Z|2017-05-29T01:26:18Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
-|20170529_102647A.jpg            |2017-05-29T10:26:46Z|2017-05-29T01:26:46Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
-|20170529_102717A.jpg            |2017-05-29T10:27:16Z|2017-05-29T01:27:16Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
-|20170529_102747A.jpg            |2017-05-29T10:27:46Z|2017-05-29T01:27:46Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
-|20170529_102817A.jpg            |2017-05-29T10:28:16Z|2017-05-29T01:28:16Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
-|20170529_102847A.jpg            |2017-05-29T10:28:46Z|2017-05-29T01:28:46Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
-|20170529_102917A.jpg            |2017-05-29T10:29:16Z|2017-05-29T01:29:16Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
-|20170529_102947A.jpg            |2017-05-29T10:29:46Z|2017-05-29T01:29:46Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
-|20170529_103016A.jpg            |2017-05-29T10:30:16Z|2017-05-29T01:30:16Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
-|20170529_103046A.jpg            |2017-05-29T10:30:46Z|2017-05-29T01:30:46Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
-|20170529_103116A.jpg            |2017-05-29T10:31:16Z|2017-05-29T01:31:16Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
-|20170529_103146A.jpg            |2017-05-29T10:31:46Z|2017-05-29T01:31:46Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
-|20170529_103216A.jpg            |2017-05-29T10:32:16Z|2017-05-29T01:32:16Z| 35.8408248425|138.0341358762|  748.52|     -|     -|
-|20170529_103246A.jpg            |2017-05-29T10:32:46Z|2017-05-29T01:32:46Z| 35.8405660931|138.0353022180|  747.56|     -|     -|
-|20170529_103315A.jpg            |2017-05-29T10:33:14Z|2017-05-29T01:33:14Z|              |              |        |      |      |
-|20170529_103345A.jpg            |2017-05-29T10:33:44Z|2017-05-29T01:33:44Z|              |              |        |      |      |
-|20170529_103415A.jpg            |2017-05-29T10:34:14Z|2017-05-29T01:34:14Z|              |              |        |      |      |
-|20170529_103445A.jpg            |2017-05-29T10:34:44Z|2017-05-29T01:34:44Z|              |              |        |      |      |
-|20170529_103515A.jpg            |2017-05-29T10:35:14Z|2017-05-29T01:35:14Z|              |              |        |      |      |
-|20170529_103545A.jpg            |2017-05-29T10:35:44Z|2017-05-29T01:35:44Z|              |              |        |      |      |
-|20170529_103615A.jpg            |2017-05-29T10:36:14Z|2017-05-29T01:36:14Z| 35.8359798510|138.0600296706|  750.93|     -|     -|
-|20170529_103645A.jpg            |2017-05-29T10:36:44Z|2017-05-29T01:36:44Z| 35.8357221074|138.0602352787|  745.64|     -|     -|
-|20170529_103714A.jpg            |2017-05-29T10:37:14Z|2017-05-29T01:37:14Z| 35.8346095774|138.0594111700|  751.89|     -|     -|
-|20170529_103744A.jpg            |2017-05-29T10:37:44Z|2017-05-29T01:37:44Z| 35.8353867475|138.0606593192|  760.06|     -|     -|
-|20170529_103814A.jpg            |2017-05-29T10:38:14Z|2017-05-29T01:38:14Z| 35.8344272710|138.0610287096|  774.96|     -|     -|
-|20170529_103844A.jpg            |2017-05-29T10:38:44Z|2017-05-29T01:38:44Z| 35.8348886948|138.0618377309|  792.74|     -|     -|
-|20170529_103914A.jpg            |2017-05-29T10:39:14Z|2017-05-29T01:39:14Z| 35.8344262652|138.0623432435|  799.95|     -|     -|
-|20170529_103944A.jpg            |2017-05-29T10:39:44Z|2017-05-29T01:39:44Z| 35.8338732272|138.0621989910|  796.59|     -|     -|
-|20170529_104014A.jpg            |2017-05-29T10:40:14Z|2017-05-29T01:40:14Z| 35.8334153239|138.0617078952|  794.67|     -|     -|
-|20170529_104048A.jpg            |2017-05-29T10:40:48Z|2017-05-29T01:40:48Z| 35.8345361520|138.0619776249|  795.15|     -|     -|
-|20170529_104119A.jpg            |2017-05-29T10:41:18Z|2017-05-29T01:41:18Z| 35.8339846227|138.0625408050|  793.71|     -|     -|
-|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------|
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/separate_.gpx'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102305A.jpg'
-[debug] exifTime = '2017:05:29 10:23:06' <--> '2017:05:29 10:23:06'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102314A.jpg'
-[debug] exifTime = '2017:05:29 10:23:14' <--> '2017:05:29 10:23:14'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102318A.jpg'
-[debug] exifTime = '2017:05:29 10:23:18' <--> '2017:05:29 10:23:18'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102322A.jpg'
-[debug] exifTime = '2017:05:29 10:23:22' <--> '2017:05:29 10:23:22'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102405A.jpg'
-[debug] exifTime = '2017:05:29 10:24:04' <--> '2017:05:29 10:24:04'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102409A.jpg'
-[debug] exifTime = '2017:05:29 10:24:10' <--> '2017:05:29 10:24:10'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102418A.jpg'
-[debug] exifTime = '2017:05:29 10:24:18' <--> '2017:05:29 10:24:18'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102448A.jpg'
-[debug] exifTime = '2017:05:29 10:24:48' <--> '2017:05:29 10:24:48'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103246A.jpg'
-[debug] exifTime = '2017:05:29 10:32:46' <--> '2017:05:29 10:32:46'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103315A.jpg'
-[debug] exifTime = '2017:05:29 10:33:14' <--> '2017:05:29 10:33:14'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103545A.jpg'
-[debug] exifTime = '2017:05:29 10:35:44' <--> '2017:05:29 10:35:44'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103615A.jpg'
-[debug] exifTime = '2017:05:29 10:36:14' <--> '2017:05:29 10:36:14'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_104119A.jpg'
-[debug] exifTime = '2017:05:29 10:41:18' <--> '2017:05:29 10:41:18'
-
-
-
-テストパターン : [M3b].GPXが複数のTRKSEGに分割している場合.FILE_UPDATE時間を基準.eTrex_20Jreverse
-       tarFilePath = testdata/separate.tar.gz
-       gpxSourcePath = testdata/multiTRKSEGreverse.eTrex_20J.gpx.xml
-       gpxDestinationPath = testdata/cameradata/separate.gpx
-       iniFilePath = testdata/AdjustTime.M2b.separate.ini
-Param File = 'testdata/AdjustTime.M2b.separate.ini'
- - param: IMG.TIME=2017-05-29T01:31:46Z
- - param: IMG.BASE_FILE=20170529_103146A.jpg
- - param: GPX.BASETIME=FILE_UPDATE
- - param: IMG.SOURCE_FOLDER=testdata/cameradata/separate
- - param: IMG.OUTPUT_FOLDER=/home/yuu/workspace/AdjustTime/importPicture/testdata/output
- - param: IMG.OUTPUT=true
- - param: IMG.OUTPUT_ALL=false
- - param: IMG.OUTPUT_EXIF= false
- - param: GPX.SOURCE_FOLDER=.
- - param: GPX.OUTPUT_WPT=true
- - param: GPX.OVERWRITE_MAGVAR=true
- - param: GPX.OUTPUT_SPEED=true
- - param: GPX.gpxSplit=false
- - param: GPX.noFirstNode=true
- - param: GPX.REUSE=false
-/home/yuu/workspace/AdjustTime/importPicture/testdata/cameradata/separate.gpx => /home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/separate_.gpx
-           時差: -32400(sec)
-    Target GPX: [/home/yuu/workspace/AdjustTime/importPicture/testdata/cameradata/separate.gpx]
-          EXIF: convert to '/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate'
-
-                                 +--------------------+--------------------|
-  GPS logging time               | First Time         | Last Time          |
-|--------------------------------+--------------------+--------------------|
-|                      <trkseg/> |2017-05-29T01:23:18Z|2017-05-29T01:24:05Z|
-|                      <trkseg/> |2017-05-29T01:24:37Z|2017-05-29T01:33:03Z|
-|                      <trkseg/> |2017-05-29T01:35:53Z|2017-05-29T01:47:35Z|
-|--------------------------------+--------------------+--------------------|
-
-|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------|
-| name                           | Camera Time        | GPStime            |   Latitude   |   Longitude  | ele    |magvar| km/h |
-|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------|
-|20170529_102305A.jpg            |2017-05-29T10:23:06Z|2017-05-29T01:23:06Z|              |              |        |      |      |
-|20170529_102310A.jpg            |2017-05-29T10:23:10Z|2017-05-29T01:23:10Z|              |              |        |      |      |
-|20170529_102314A.jpg            |2017-05-29T10:23:14Z|2017-05-29T01:23:14Z|              |              |        |      |      |
-|20170529_102318A.jpg            |2017-05-29T10:23:18Z|2017-05-29T01:23:18Z| 35.8812697884|137.9952202085|  686.52|     -|     -|
-|20170529_102322A.jpg            |2017-05-29T10:23:22Z|2017-05-29T01:23:22Z| 35.8810500987|137.9951669835|  684.60|     -|     -|
-|20170529_102401A.jpg            |2017-05-29T10:24:00Z|2017-05-29T01:24:00Z| 35.8809497673|137.9972837493|  685.56|     -|     -|
-|20170529_102405A.jpg            |2017-05-29T10:24:04Z|2017-05-29T01:24:04Z| 35.8808881603|137.9979396332|  687.00|     -|     -|
-|20170529_102409A.jpg            |2017-05-29T10:24:10Z|2017-05-29T01:24:10Z|              |              |        |      |      |
-|20170529_102414A.jpg            |2017-05-29T10:24:14Z|2017-05-29T01:24:14Z|              |              |        |      |      |
-|20170529_102418A.jpg            |2017-05-29T10:24:18Z|2017-05-29T01:24:18Z|              |              |        |      |      |
-|20170529_102448A.jpg            |2017-05-29T10:24:48Z|2017-05-29T01:24:48Z| 35.8788877353|138.0039562471|  713.92|     -|     -|
-|20170529_102518A.jpg            |2017-05-29T10:25:18Z|2017-05-29T01:25:18Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
-|20170529_102547A.jpg            |2017-05-29T10:25:48Z|2017-05-29T01:25:48Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
-|20170529_102618A.jpg            |2017-05-29T10:26:18Z|2017-05-29T01:26:18Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
-|20170529_102647A.jpg            |2017-05-29T10:26:46Z|2017-05-29T01:26:46Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
-|20170529_102717A.jpg            |2017-05-29T10:27:16Z|2017-05-29T01:27:16Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
-|20170529_102747A.jpg            |2017-05-29T10:27:46Z|2017-05-29T01:27:46Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
-|20170529_102817A.jpg            |2017-05-29T10:28:16Z|2017-05-29T01:28:16Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
-|20170529_102847A.jpg            |2017-05-29T10:28:46Z|2017-05-29T01:28:46Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
-|20170529_102917A.jpg            |2017-05-29T10:29:16Z|2017-05-29T01:29:16Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
-|20170529_102947A.jpg            |2017-05-29T10:29:46Z|2017-05-29T01:29:46Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
-|20170529_103016A.jpg            |2017-05-29T10:30:16Z|2017-05-29T01:30:16Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
-|20170529_103046A.jpg            |2017-05-29T10:30:46Z|2017-05-29T01:30:46Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
-|20170529_103116A.jpg            |2017-05-29T10:31:16Z|2017-05-29T01:31:16Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
-|20170529_103146A.jpg            |2017-05-29T10:31:46Z|2017-05-29T01:31:46Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
-|20170529_103216A.jpg            |2017-05-29T10:32:16Z|2017-05-29T01:32:16Z| 35.8408248425|138.0341358762|  748.52|     -|     -|
-|20170529_103246A.jpg            |2017-05-29T10:32:46Z|2017-05-29T01:32:46Z| 35.8405660931|138.0353022180|  747.56|     -|     -|
-|20170529_103315A.jpg            |2017-05-29T10:33:14Z|2017-05-29T01:33:14Z|              |              |        |      |      |
-|20170529_103345A.jpg            |2017-05-29T10:33:44Z|2017-05-29T01:33:44Z|              |              |        |      |      |
-|20170529_103415A.jpg            |2017-05-29T10:34:14Z|2017-05-29T01:34:14Z|              |              |        |      |      |
-|20170529_103445A.jpg            |2017-05-29T10:34:44Z|2017-05-29T01:34:44Z|              |              |        |      |      |
-|20170529_103515A.jpg            |2017-05-29T10:35:14Z|2017-05-29T01:35:14Z|              |              |        |      |      |
-|20170529_103545A.jpg            |2017-05-29T10:35:44Z|2017-05-29T01:35:44Z|              |              |        |      |      |
-|20170529_103615A.jpg            |2017-05-29T10:36:14Z|2017-05-29T01:36:14Z| 35.8359798510|138.0600296706|  750.93|     -|     -|
-|20170529_103645A.jpg            |2017-05-29T10:36:44Z|2017-05-29T01:36:44Z| 35.8357221074|138.0602352787|  745.64|     -|     -|
-|20170529_103714A.jpg            |2017-05-29T10:37:14Z|2017-05-29T01:37:14Z| 35.8346095774|138.0594111700|  751.89|     -|     -|
-|20170529_103744A.jpg            |2017-05-29T10:37:44Z|2017-05-29T01:37:44Z| 35.8353867475|138.0606593192|  760.06|     -|     -|
-|20170529_103814A.jpg            |2017-05-29T10:38:14Z|2017-05-29T01:38:14Z| 35.8344272710|138.0610287096|  774.96|     -|     -|
-|20170529_103844A.jpg            |2017-05-29T10:38:44Z|2017-05-29T01:38:44Z| 35.8348886948|138.0618377309|  792.74|     -|     -|
-|20170529_103914A.jpg            |2017-05-29T10:39:14Z|2017-05-29T01:39:14Z| 35.8344262652|138.0623432435|  799.95|     -|     -|
-|20170529_103944A.jpg            |2017-05-29T10:39:44Z|2017-05-29T01:39:44Z| 35.8338732272|138.0621989910|  796.59|     -|     -|
-|20170529_104014A.jpg            |2017-05-29T10:40:14Z|2017-05-29T01:40:14Z| 35.8334153239|138.0617078952|  794.67|     -|     -|
-|20170529_104048A.jpg            |2017-05-29T10:40:48Z|2017-05-29T01:40:48Z| 35.8345361520|138.0619776249|  795.15|     -|     -|
-|20170529_104119A.jpg            |2017-05-29T10:41:18Z|2017-05-29T01:41:18Z| 35.8339846227|138.0625408050|  793.71|     -|     -|
-|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------|
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/separate_.gpx'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102305A.jpg'
-[debug] exifTime = '2017:05:29 10:23:06' <--> '2017:05:29 10:23:06'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102314A.jpg'
-[debug] exifTime = '2017:05:29 10:23:14' <--> '2017:05:29 10:23:14'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102318A.jpg'
-[debug] exifTime = '2017:05:29 10:23:18' <--> '2017:05:29 10:23:18'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102322A.jpg'
-[debug] exifTime = '2017:05:29 10:23:22' <--> '2017:05:29 10:23:22'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102405A.jpg'
-[debug] exifTime = '2017:05:29 10:24:04' <--> '2017:05:29 10:24:04'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102409A.jpg'
-[debug] exifTime = '2017:05:29 10:24:10' <--> '2017:05:29 10:24:10'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102418A.jpg'
-[debug] exifTime = '2017:05:29 10:24:18' <--> '2017:05:29 10:24:18'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102448A.jpg'
-[debug] exifTime = '2017:05:29 10:24:48' <--> '2017:05:29 10:24:48'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103246A.jpg'
-[debug] exifTime = '2017:05:29 10:32:46' <--> '2017:05:29 10:32:46'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103315A.jpg'
-[debug] exifTime = '2017:05:29 10:33:14' <--> '2017:05:29 10:33:14'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103545A.jpg'
-[debug] exifTime = '2017:05:29 10:35:44' <--> '2017:05:29 10:35:44'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103615A.jpg'
-[debug] exifTime = '2017:05:29 10:36:14' <--> '2017:05:29 10:36:14'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_104119A.jpg'
-[debug] exifTime = '2017:05:29 10:41:18' <--> '2017:05:29 10:41:18'
-
diff --git a/importPicture/testdata/AdjustTime.M2c.separate.log b/importPicture/testdata/AdjustTime.M2c.separate.log
deleted file mode 100644 (file)
index 2a3c808..0000000
+++ /dev/null
@@ -1,210 +0,0 @@
-テストパターン : [M2c].GPXが複数のTRKSEGに分割している場合.EXIF時間を基準.eTrex_20J
-       tarFilePath = testdata/separate.tar.gz
-       gpxSourcePath = testdata/multiTRKSEG.eTrex_20J.gpx.xml
-       gpxDestinationPath = testdata/cameradata/separate.gpx
-       iniFilePath = testdata/AdjustTime.M2c.separate.ini
-Param File = 'testdata/AdjustTime.M2c.separate.ini'
- - param: IMG.TIME=2017-05-29T01:31:46Z
- - param: IMG.BASE_FILE=20170529_103146A.jpg
- - param: GPX.BASETIME=EXIF_TIME
- - param: IMG.SOURCE_FOLDER=testdata/cameradata/separate
- - param: IMG.OUTPUT_FOLDER=/home/yuu/workspace/AdjustTime/importPicture/testdata/output
- - param: IMG.OUTPUT=true
- - param: IMG.OUTPUT_ALL=false
- - param: IMG.OUTPUT_EXIF= false
- - param: GPX.SOURCE_FOLDER=.
- - param: GPX.OUTPUT_WPT=true
- - param: GPX.OVERWRITE_MAGVAR=true
- - param: GPX.OUTPUT_SPEED=true
- - param: GPX.gpxSplit=false
- - param: GPX.noFirstNode=true
- - param: GPX.REUSE=false
-/home/yuu/workspace/AdjustTime/importPicture/testdata/cameradata/separate.gpx => /home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/separate_.gpx
-           時差: 0(sec)
-    Target GPX: [/home/yuu/workspace/AdjustTime/importPicture/testdata/cameradata/separate.gpx]
-          EXIF: convert to '/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate'
-
-                                 +--------------------+--------------------|
-  GPS logging time               | First Time         | Last Time          |
-|--------------------------------+--------------------+--------------------|
-|                      <trkseg/> |2017-05-29T01:23:18Z|2017-05-29T01:24:05Z|
-|                      <trkseg/> |2017-05-29T01:24:37Z|2017-05-29T01:33:03Z|
-|                      <trkseg/> |2017-05-29T01:35:53Z|2017-05-29T01:47:35Z|
-|--------------------------------+--------------------+--------------------|
-
-|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------|
-| name                           | Camera Time        | GPStime            |   Latitude   |   Longitude  | ele    |magvar| km/h |
-|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------|
-|20170529_102305A.jpg            |2017-05-29T01:23:05Z|2017-05-29T01:23:05Z|              |              |        |      |      |
-|20170529_102310A.jpg            |2017-05-29T01:23:10Z|2017-05-29T01:23:10Z|              |              |        |      |      |
-|20170529_102314A.jpg            |2017-05-29T01:23:14Z|2017-05-29T01:23:14Z|              |              |        |      |      |
-|20170529_102318A.jpg            |2017-05-29T01:23:18Z|2017-05-29T01:23:18Z| 35.8812697884|137.9952202085|  686.52|     -|     -|
-|20170529_102322A.jpg            |2017-05-29T01:23:22Z|2017-05-29T01:23:22Z| 35.8810500987|137.9951669835|  684.60|     -|     -|
-|20170529_102401A.jpg            |2017-05-29T01:24:01Z|2017-05-29T01:24:01Z| 35.8809490129|137.9974513035|  685.56|     -|     -|
-|20170529_102405A.jpg            |2017-05-29T01:24:05Z|2017-05-29T01:24:05Z| 35.8808641881|137.9981065169|  687.48|     -|     -|
-|20170529_102409A.jpg            |2017-05-29T01:24:09Z|2017-05-29T01:24:09Z|              |              |        |      |      |
-|20170529_102414A.jpg            |2017-05-29T01:24:14Z|2017-05-29T01:24:14Z|              |              |        |      |      |
-|20170529_102418A.jpg            |2017-05-29T01:24:18Z|2017-05-29T01:24:18Z|              |              |        |      |      |
-|20170529_102448A.jpg            |2017-05-29T01:24:48Z|2017-05-29T01:24:48Z| 35.8788877353|138.0039562471|  713.92|     -|     -|
-|20170529_102518A.jpg            |2017-05-29T01:25:18Z|2017-05-29T01:25:18Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
-|20170529_102547A.jpg            |2017-05-29T01:25:47Z|2017-05-29T01:25:47Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
-|20170529_102618A.jpg            |2017-05-29T01:26:17Z|2017-05-29T01:26:17Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
-|20170529_102647A.jpg            |2017-05-29T01:26:47Z|2017-05-29T01:26:47Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
-|20170529_102717A.jpg            |2017-05-29T01:27:17Z|2017-05-29T01:27:17Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
-|20170529_102747A.jpg            |2017-05-29T01:27:47Z|2017-05-29T01:27:47Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
-|20170529_102817A.jpg            |2017-05-29T01:28:17Z|2017-05-29T01:28:17Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
-|20170529_102847A.jpg            |2017-05-29T01:28:47Z|2017-05-29T01:28:47Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
-|20170529_102917A.jpg            |2017-05-29T01:29:17Z|2017-05-29T01:29:17Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
-|20170529_102947A.jpg            |2017-05-29T01:29:47Z|2017-05-29T01:29:47Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
-|20170529_103016A.jpg            |2017-05-29T01:30:16Z|2017-05-29T01:30:16Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
-|20170529_103046A.jpg            |2017-05-29T01:30:46Z|2017-05-29T01:30:46Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
-|20170529_103116A.jpg            |2017-05-29T01:31:16Z|2017-05-29T01:31:16Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
-|20170529_103146A.jpg            |2017-05-29T01:31:46Z|2017-05-29T01:31:46Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
-|20170529_103216A.jpg            |2017-05-29T01:32:16Z|2017-05-29T01:32:16Z| 35.8408248425|138.0341358762|  748.52|     -|     -|
-|20170529_103246A.jpg            |2017-05-29T01:32:46Z|2017-05-29T01:32:46Z| 35.8405660931|138.0353022180|  747.56|     -|     -|
-|20170529_103315A.jpg            |2017-05-29T01:33:15Z|2017-05-29T01:33:15Z|              |              |        |      |      |
-|20170529_103345A.jpg            |2017-05-29T01:33:45Z|2017-05-29T01:33:45Z|              |              |        |      |      |
-|20170529_103415A.jpg            |2017-05-29T01:34:15Z|2017-05-29T01:34:15Z|              |              |        |      |      |
-|20170529_103445A.jpg            |2017-05-29T01:34:45Z|2017-05-29T01:34:45Z|              |              |        |      |      |
-|20170529_103515A.jpg            |2017-05-29T01:35:15Z|2017-05-29T01:35:15Z|              |              |        |      |      |
-|20170529_103545A.jpg            |2017-05-29T01:35:45Z|2017-05-29T01:35:45Z|              |              |        |      |      |
-|20170529_103615A.jpg            |2017-05-29T01:36:14Z|2017-05-29T01:36:14Z| 35.8359798510|138.0600296706|  750.93|     -|     -|
-|20170529_103645A.jpg            |2017-05-29T01:36:44Z|2017-05-29T01:36:44Z| 35.8357221074|138.0602352787|  745.64|     -|     -|
-|20170529_103714A.jpg            |2017-05-29T01:37:14Z|2017-05-29T01:37:14Z| 35.8346095774|138.0594111700|  751.89|     -|     -|
-|20170529_103744A.jpg            |2017-05-29T01:37:44Z|2017-05-29T01:37:44Z| 35.8353867475|138.0606593192|  760.06|     -|     -|
-|20170529_103814A.jpg            |2017-05-29T01:38:14Z|2017-05-29T01:38:14Z| 35.8344272710|138.0610287096|  774.96|     -|     -|
-|20170529_103844A.jpg            |2017-05-29T01:38:44Z|2017-05-29T01:38:44Z| 35.8348886948|138.0618377309|  792.74|     -|     -|
-|20170529_103914A.jpg            |2017-05-29T01:39:14Z|2017-05-29T01:39:14Z| 35.8344262652|138.0623432435|  799.95|     -|     -|
-|20170529_103944A.jpg            |2017-05-29T01:39:44Z|2017-05-29T01:39:44Z| 35.8338732272|138.0621989910|  796.59|     -|     -|
-|20170529_104014A.jpg            |2017-05-29T01:40:14Z|2017-05-29T01:40:14Z| 35.8334153239|138.0617078952|  794.67|     -|     -|
-|20170529_104048A.jpg            |2017-05-29T01:40:48Z|2017-05-29T01:40:48Z| 35.8345361520|138.0619776249|  795.15|     -|     -|
-|20170529_104119A.jpg            |2017-05-29T01:41:19Z|2017-05-29T01:41:19Z| 35.8339889813|138.0625394639|  793.71|     -|     -|
-|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------|
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/separate_.gpx'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102305A.jpg'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102314A.jpg'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102318A.jpg'
-[debug] exifTime = '2017:05:29 10:23:18' <--> '2017:05:29 10:23:18'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102322A.jpg'
-[debug] exifTime = '2017:05:29 10:23:22' <--> '2017:05:29 10:23:22'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102405A.jpg'
-[debug] exifTime = '2017:05:29 10:24:05' <--> '2017:05:29 10:24:05'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102409A.jpg'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102418A.jpg'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102448A.jpg'
-[debug] exifTime = '2017:05:29 10:24:48' <--> '2017:05:29 10:24:48'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103246A.jpg'
-[debug] exifTime = '2017:05:29 10:32:46' <--> '2017:05:29 10:32:46'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103315A.jpg'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103545A.jpg'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103615A.jpg'
-[debug] exifTime = '2017:05:29 10:36:14' <--> '2017:05:29 10:36:14'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_104119A.jpg'
-[debug] exifTime = '2017:05:29 10:41:19' <--> '2017:05:29 10:41:19'
-
-
-
-テストパターン : [M3c].GPXが複数のTRKSEGに分割している場合.EXIF時間を基準.eTrex_20Jreverse
-       tarFilePath = testdata/separate.tar.gz
-       gpxSourcePath = testdata/multiTRKSEGreverse.eTrex_20J.gpx.xml
-       gpxDestinationPath = testdata/cameradata/separate.gpx
-       iniFilePath = testdata/AdjustTime.M2c.separate.ini
-Param File = 'testdata/AdjustTime.M2c.separate.ini'
- - param: IMG.TIME=2017-05-29T01:31:46Z
- - param: IMG.BASE_FILE=20170529_103146A.jpg
- - param: GPX.BASETIME=EXIF_TIME
- - param: IMG.SOURCE_FOLDER=testdata/cameradata/separate
- - param: IMG.OUTPUT_FOLDER=/home/yuu/workspace/AdjustTime/importPicture/testdata/output
- - param: IMG.OUTPUT=true
- - param: IMG.OUTPUT_ALL=false
- - param: IMG.OUTPUT_EXIF= false
- - param: GPX.SOURCE_FOLDER=.
- - param: GPX.OUTPUT_WPT=true
- - param: GPX.OVERWRITE_MAGVAR=true
- - param: GPX.OUTPUT_SPEED=true
- - param: GPX.gpxSplit=false
- - param: GPX.noFirstNode=true
- - param: GPX.REUSE=false
-/home/yuu/workspace/AdjustTime/importPicture/testdata/cameradata/separate.gpx => /home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/separate_.gpx
-           時差: 0(sec)
-    Target GPX: [/home/yuu/workspace/AdjustTime/importPicture/testdata/cameradata/separate.gpx]
-          EXIF: convert to '/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate'
-
-                                 +--------------------+--------------------|
-  GPS logging time               | First Time         | Last Time          |
-|--------------------------------+--------------------+--------------------|
-|                      <trkseg/> |2017-05-29T01:23:18Z|2017-05-29T01:24:05Z|
-|                      <trkseg/> |2017-05-29T01:24:37Z|2017-05-29T01:33:03Z|
-|                      <trkseg/> |2017-05-29T01:35:53Z|2017-05-29T01:47:35Z|
-|--------------------------------+--------------------+--------------------|
-
-|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------|
-| name                           | Camera Time        | GPStime            |   Latitude   |   Longitude  | ele    |magvar| km/h |
-|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------|
-|20170529_102305A.jpg            |2017-05-29T01:23:05Z|2017-05-29T01:23:05Z|              |              |        |      |      |
-|20170529_102310A.jpg            |2017-05-29T01:23:10Z|2017-05-29T01:23:10Z|              |              |        |      |      |
-|20170529_102314A.jpg            |2017-05-29T01:23:14Z|2017-05-29T01:23:14Z|              |              |        |      |      |
-|20170529_102318A.jpg            |2017-05-29T01:23:18Z|2017-05-29T01:23:18Z| 35.8812697884|137.9952202085|  686.52|     -|     -|
-|20170529_102322A.jpg            |2017-05-29T01:23:22Z|2017-05-29T01:23:22Z| 35.8810500987|137.9951669835|  684.60|     -|     -|
-|20170529_102401A.jpg            |2017-05-29T01:24:01Z|2017-05-29T01:24:01Z| 35.8809490129|137.9974513035|  685.56|     -|     -|
-|20170529_102405A.jpg            |2017-05-29T01:24:05Z|2017-05-29T01:24:05Z| 35.8808641881|137.9981065169|  687.48|     -|     -|
-|20170529_102409A.jpg            |2017-05-29T01:24:09Z|2017-05-29T01:24:09Z|              |              |        |      |      |
-|20170529_102414A.jpg            |2017-05-29T01:24:14Z|2017-05-29T01:24:14Z|              |              |        |      |      |
-|20170529_102418A.jpg            |2017-05-29T01:24:18Z|2017-05-29T01:24:18Z|              |              |        |      |      |
-|20170529_102448A.jpg            |2017-05-29T01:24:48Z|2017-05-29T01:24:48Z| 35.8788877353|138.0039562471|  713.92|     -|     -|
-|20170529_102518A.jpg            |2017-05-29T01:25:18Z|2017-05-29T01:25:18Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
-|20170529_102547A.jpg            |2017-05-29T01:25:47Z|2017-05-29T01:25:47Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
-|20170529_102618A.jpg            |2017-05-29T01:26:17Z|2017-05-29T01:26:17Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
-|20170529_102647A.jpg            |2017-05-29T01:26:47Z|2017-05-29T01:26:47Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
-|20170529_102717A.jpg            |2017-05-29T01:27:17Z|2017-05-29T01:27:17Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
-|20170529_102747A.jpg            |2017-05-29T01:27:47Z|2017-05-29T01:27:47Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
-|20170529_102817A.jpg            |2017-05-29T01:28:17Z|2017-05-29T01:28:17Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
-|20170529_102847A.jpg            |2017-05-29T01:28:47Z|2017-05-29T01:28:47Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
-|20170529_102917A.jpg            |2017-05-29T01:29:17Z|2017-05-29T01:29:17Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
-|20170529_102947A.jpg            |2017-05-29T01:29:47Z|2017-05-29T01:29:47Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
-|20170529_103016A.jpg            |2017-05-29T01:30:16Z|2017-05-29T01:30:16Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
-|20170529_103046A.jpg            |2017-05-29T01:30:46Z|2017-05-29T01:30:46Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
-|20170529_103116A.jpg            |2017-05-29T01:31:16Z|2017-05-29T01:31:16Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
-|20170529_103146A.jpg            |2017-05-29T01:31:46Z|2017-05-29T01:31:46Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
-|20170529_103216A.jpg            |2017-05-29T01:32:16Z|2017-05-29T01:32:16Z| 35.8408248425|138.0341358762|  748.52|     -|     -|
-|20170529_103246A.jpg            |2017-05-29T01:32:46Z|2017-05-29T01:32:46Z| 35.8405660931|138.0353022180|  747.56|     -|     -|
-|20170529_103315A.jpg            |2017-05-29T01:33:15Z|2017-05-29T01:33:15Z|              |              |        |      |      |
-|20170529_103345A.jpg            |2017-05-29T01:33:45Z|2017-05-29T01:33:45Z|              |              |        |      |      |
-|20170529_103415A.jpg            |2017-05-29T01:34:15Z|2017-05-29T01:34:15Z|              |              |        |      |      |
-|20170529_103445A.jpg            |2017-05-29T01:34:45Z|2017-05-29T01:34:45Z|              |              |        |      |      |
-|20170529_103515A.jpg            |2017-05-29T01:35:15Z|2017-05-29T01:35:15Z|              |              |        |      |      |
-|20170529_103545A.jpg            |2017-05-29T01:35:45Z|2017-05-29T01:35:45Z|              |              |        |      |      |
-|20170529_103615A.jpg            |2017-05-29T01:36:14Z|2017-05-29T01:36:14Z| 35.8359798510|138.0600296706|  750.93|     -|     -|
-|20170529_103645A.jpg            |2017-05-29T01:36:44Z|2017-05-29T01:36:44Z| 35.8357221074|138.0602352787|  745.64|     -|     -|
-|20170529_103714A.jpg            |2017-05-29T01:37:14Z|2017-05-29T01:37:14Z| 35.8346095774|138.0594111700|  751.89|     -|     -|
-|20170529_103744A.jpg            |2017-05-29T01:37:44Z|2017-05-29T01:37:44Z| 35.8353867475|138.0606593192|  760.06|     -|     -|
-|20170529_103814A.jpg            |2017-05-29T01:38:14Z|2017-05-29T01:38:14Z| 35.8344272710|138.0610287096|  774.96|     -|     -|
-|20170529_103844A.jpg            |2017-05-29T01:38:44Z|2017-05-29T01:38:44Z| 35.8348886948|138.0618377309|  792.74|     -|     -|
-|20170529_103914A.jpg            |2017-05-29T01:39:14Z|2017-05-29T01:39:14Z| 35.8344262652|138.0623432435|  799.95|     -|     -|
-|20170529_103944A.jpg            |2017-05-29T01:39:44Z|2017-05-29T01:39:44Z| 35.8338732272|138.0621989910|  796.59|     -|     -|
-|20170529_104014A.jpg            |2017-05-29T01:40:14Z|2017-05-29T01:40:14Z| 35.8334153239|138.0617078952|  794.67|     -|     -|
-|20170529_104048A.jpg            |2017-05-29T01:40:48Z|2017-05-29T01:40:48Z| 35.8345361520|138.0619776249|  795.15|     -|     -|
-|20170529_104119A.jpg            |2017-05-29T01:41:19Z|2017-05-29T01:41:19Z| 35.8339889813|138.0625394639|  793.71|     -|     -|
-|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------|
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/separate_.gpx'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102305A.jpg'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102314A.jpg'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102318A.jpg'
-[debug] exifTime = '2017:05:29 10:23:18' <--> '2017:05:29 10:23:18'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102322A.jpg'
-[debug] exifTime = '2017:05:29 10:23:22' <--> '2017:05:29 10:23:22'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102405A.jpg'
-[debug] exifTime = '2017:05:29 10:24:05' <--> '2017:05:29 10:24:05'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102409A.jpg'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102418A.jpg'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102448A.jpg'
-[debug] exifTime = '2017:05:29 10:24:48' <--> '2017:05:29 10:24:48'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103246A.jpg'
-[debug] exifTime = '2017:05:29 10:32:46' <--> '2017:05:29 10:32:46'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103315A.jpg'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103545A.jpg'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103615A.jpg'
-[debug] exifTime = '2017:05:29 10:36:14' <--> '2017:05:29 10:36:14'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_104119A.jpg'
-[debug] exifTime = '2017:05:29 10:41:19' <--> '2017:05:29 10:41:19'
-
diff --git a/importPicture/testdata/AdjustTime.M2d.separate.log b/importPicture/testdata/AdjustTime.M2d.separate.log
deleted file mode 100644 (file)
index e816976..0000000
+++ /dev/null
@@ -1,222 +0,0 @@
-テストパターン : [M2d].GPXが複数のTRKSEGに分割している場合.EXIF時間を基準.eTrex_20J
-       tarFilePath = testdata/separate.tar.gz
-       gpxSourcePath = testdata/multiTRKSEG.eTrex_20J.gpx.xml
-       gpxDestinationPath = testdata/cameradata/separate.gpx
-       iniFilePath = testdata/AdjustTime.M2d.separate.ini
-Param File = 'testdata/AdjustTime.M2d.separate.ini'
- - param: IMG.TIME=2017-05-29T01:31:46Z
- - param: IMG.BASE_FILE=20170529_103146A.jpg
- - param: GPX.BASETIME=EXIF_TIME
- - param: IMG.SOURCE_FOLDER=testdata/cameradata/separate
- - param: IMG.OUTPUT_FOLDER=/home/yuu/workspace/AdjustTime/importPicture/testdata/output
- - param: IMG.OUTPUT=true
- - param: IMG.OUTPUT_ALL=false
- - param: IMG.OUTPUT_EXIF= false
- - param: GPX.SOURCE_FOLDER=.
- - param: GPX.OUTPUT_WPT=true
- - param: GPX.OVERWRITE_MAGVAR=true
- - param: GPX.OUTPUT_SPEED=true
- - param: GPX.gpxSplit=false
- - param: GPX.noFirstNode=true
- - param: GPX.REUSE=false
-/home/yuu/workspace/AdjustTime/importPicture/testdata/cameradata/separate.gpx => /home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/separate_.gpx
-           時差: 0(sec)
-    Target GPX: [/home/yuu/workspace/AdjustTime/importPicture/testdata/cameradata/separate.gpx]
-          EXIF: convert to '/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate'
-
-                                 +--------------------+--------------------|
-  GPS logging time               | First Time         | Last Time          |
-|--------------------------------+--------------------+--------------------|
-|                      <trkseg/> |2017-05-29T01:23:18Z|2017-05-29T01:24:05Z|
-|                      <trkseg/> |2017-05-29T01:24:37Z|2017-05-29T01:33:03Z|
-|                      <trkseg/> |2017-05-29T01:35:53Z|2017-05-29T01:47:35Z|
-|--------------------------------+--------------------+--------------------|
-
-|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------|
-| name                           | Camera Time        | GPStime            |   Latitude   |   Longitude  | ele    |magvar| km/h |
-|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------|
-|20170529_102305A.jpg            |2017-05-29T01:23:05Z|2017-05-29T01:23:05Z|              |              |        |      |      |
-|20170529_102310A.jpg            |2017-05-29T01:23:10Z|2017-05-29T01:23:10Z|              |              |        |      |      |
-|20170529_102314A.jpg            |2017-05-29T01:23:14Z|2017-05-29T01:23:14Z|              |              |        |      |      |
-|20170529_102318A.jpg            |2017-05-29T01:23:18Z|2017-05-29T01:23:18Z| 35.8812697884|137.9952202085|  686.52|     -|     -|
-|20170529_102322A.jpg            |2017-05-29T01:23:22Z|2017-05-29T01:23:22Z| 35.8810500987|137.9951669835|  684.60|     -|     -|
-|20170529_102401A.jpg            |2017-05-29T01:24:01Z|2017-05-29T01:24:01Z| 35.8809490129|137.9974513035|  685.56|     -|     -|
-|20170529_102405A.jpg            |2017-05-29T01:24:05Z|2017-05-29T01:24:05Z| 35.8808641881|137.9981065169|  687.48|     -|     -|
-|20170529_102409A.jpg            |2017-05-29T01:24:09Z|2017-05-29T01:24:09Z|              |              |        |      |      |
-|20170529_102414A.jpg            |2017-05-29T01:24:14Z|2017-05-29T01:24:14Z|              |              |        |      |      |
-|20170529_102418A.jpg            |2017-05-29T01:24:18Z|2017-05-29T01:24:18Z|              |              |        |      |      |
-|20170529_102448A.jpg            |2017-05-29T01:24:48Z|2017-05-29T01:24:48Z| 35.8788877353|138.0039562471|  713.92|     -|     -|
-|20170529_102518A.jpg            |2017-05-29T01:25:18Z|2017-05-29T01:25:18Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
-|20170529_102547A.jpg            |2017-05-29T01:25:47Z|2017-05-29T01:25:47Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
-|20170529_102618A.jpg            |2017-05-29T01:26:17Z|2017-05-29T01:26:17Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
-|20170529_102647A.jpg            |2017-05-29T01:26:47Z|2017-05-29T01:26:47Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
-|20170529_102717A.jpg            |2017-05-29T01:27:17Z|2017-05-29T01:27:17Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
-|20170529_102747A.jpg            |2017-05-29T01:27:47Z|2017-05-29T01:27:47Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
-|20170529_102817A.jpg            |2017-05-29T01:28:17Z|2017-05-29T01:28:17Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
-|20170529_102847A.jpg            |2017-05-29T01:28:47Z|2017-05-29T01:28:47Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
-|20170529_102917A.jpg            |2017-05-29T01:29:17Z|2017-05-29T01:29:17Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
-|20170529_102947A.jpg            |2017-05-29T01:29:47Z|2017-05-29T01:29:47Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
-|20170529_103016A.jpg            |2017-05-29T01:30:16Z|2017-05-29T01:30:16Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
-|20170529_103046A.jpg            |2017-05-29T01:30:46Z|2017-05-29T01:30:46Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
-|20170529_103116A.jpg            |2017-05-29T01:31:16Z|2017-05-29T01:31:16Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
-|20170529_103146A.jpg            |2017-05-29T01:31:46Z|2017-05-29T01:31:46Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
-|20170529_103216A.jpg            |2017-05-29T01:32:16Z|2017-05-29T01:32:16Z| 35.8408248425|138.0341358762|  748.52|     -|     -|
-|20170529_103246A.jpg            |2017-05-29T01:32:46Z|2017-05-29T01:32:46Z| 35.8405660931|138.0353022180|  747.56|     -|     -|
-|20170529_103315A.jpg            |2017-05-29T01:33:15Z|2017-05-29T01:33:15Z|              |              |        |      |      |
-|20170529_103345A.jpg            |2017-05-29T01:33:45Z|2017-05-29T01:33:45Z|              |              |        |      |      |
-|20170529_103415A.jpg            |2017-05-29T01:34:15Z|2017-05-29T01:34:15Z|              |              |        |      |      |
-|20170529_103445A.jpg            |2017-05-29T01:34:45Z|2017-05-29T01:34:45Z|              |              |        |      |      |
-|20170529_103515A.jpg            |2017-05-29T01:35:15Z|2017-05-29T01:35:15Z|              |              |        |      |      |
-|20170529_103545A.jpg            |2017-05-29T01:35:45Z|2017-05-29T01:35:45Z|              |              |        |      |      |
-|20170529_103615A.jpg            |2017-05-29T01:36:14Z|2017-05-29T01:36:14Z| 35.8359798510|138.0600296706|  750.93|     -|     -|
-|20170529_103645A.jpg            |2017-05-29T01:36:44Z|2017-05-29T01:36:44Z| 35.8357221074|138.0602352787|  745.64|     -|     -|
-|20170529_103714A.jpg            |2017-05-29T01:37:14Z|2017-05-29T01:37:14Z| 35.8346095774|138.0594111700|  751.89|     -|     -|
-|20170529_103744A.jpg            |2017-05-29T01:37:44Z|2017-05-29T01:37:44Z| 35.8353867475|138.0606593192|  760.06|     -|     -|
-|20170529_103814A.jpg            |2017-05-29T01:38:14Z|2017-05-29T01:38:14Z| 35.8344272710|138.0610287096|  774.96|     -|     -|
-|20170529_103844A.jpg            |2017-05-29T01:38:44Z|2017-05-29T01:38:44Z| 35.8348886948|138.0618377309|  792.74|     -|     -|
-|20170529_103914A.jpg            |2017-05-29T01:39:14Z|2017-05-29T01:39:14Z| 35.8344262652|138.0623432435|  799.95|     -|     -|
-|20170529_103944A.jpg            |2017-05-29T01:39:44Z|2017-05-29T01:39:44Z| 35.8338732272|138.0621989910|  796.59|     -|     -|
-|20170529_104014A.jpg            |2017-05-29T01:40:14Z|2017-05-29T01:40:14Z| 35.8334153239|138.0617078952|  794.67|     -|     -|
-|20170529_104048A.jpg            |2017-05-29T01:40:48Z|2017-05-29T01:40:48Z| 35.8345361520|138.0619776249|  795.15|     -|     -|
-|20170529_104119A.jpg            |2017-05-29T01:41:19Z|2017-05-29T01:41:19Z| 35.8339889813|138.0625394639|  793.71|     -|     -|
-|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------|
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/separate_.gpx'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102305A.jpg'
-[debug] exifTime = '2017:05:29 10:23:05' <--> '2017:05:29 10:23:05'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102314A.jpg'
-[debug] exifTime = '2017:05:29 10:23:14' <--> '2017:05:29 10:23:14'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102318A.jpg'
-[debug] exifTime = '2017:05:29 10:23:18' <--> '2017:05:29 10:23:18'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102322A.jpg'
-[debug] exifTime = '2017:05:29 10:23:22' <--> '2017:05:29 10:23:22'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102405A.jpg'
-[debug] exifTime = '2017:05:29 10:24:05' <--> '2017:05:29 10:24:05'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102409A.jpg'
-[debug] exifTime = '2017:05:29 10:24:09' <--> '2017:05:29 10:24:09'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102418A.jpg'
-[debug] exifTime = '2017:05:29 10:24:18' <--> '2017:05:29 10:24:18'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102448A.jpg'
-[debug] exifTime = '2017:05:29 10:24:48' <--> '2017:05:29 10:24:48'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103246A.jpg'
-[debug] exifTime = '2017:05:29 10:32:46' <--> '2017:05:29 10:32:46'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103315A.jpg'
-[debug] exifTime = '2017:05:29 10:33:15' <--> '2017:05:29 10:33:15'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103545A.jpg'
-[debug] exifTime = '2017:05:29 10:35:45' <--> '2017:05:29 10:35:45'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103615A.jpg'
-[debug] exifTime = '2017:05:29 10:36:14' <--> '2017:05:29 10:36:14'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_104119A.jpg'
-[debug] exifTime = '2017:05:29 10:41:19' <--> '2017:05:29 10:41:19'
-
-
-
-
-テストパターン : [M3d].GPXが複数のTRKSEGに分割している場合.EXIF時間を基準.eTrex_20Jreverse
-       tarFilePath = testdata/separate.tar.gz
-       gpxSourcePath = testdata/multiTRKSEGreverse.eTrex_20J.gpx.xml
-       gpxDestinationPath = testdata/cameradata/separate.gpx
-       iniFilePath = testdata/AdjustTime.M2d.separate.ini
-Param File = 'testdata/AdjustTime.M2d.separate.ini'
- - param: IMG.TIME=2017-05-29T01:31:46Z
- - param: IMG.BASE_FILE=20170529_103146A.jpg
- - param: GPX.BASETIME=EXIF_TIME
- - param: IMG.SOURCE_FOLDER=testdata/cameradata/separate
- - param: IMG.OUTPUT_FOLDER=/home/yuu/workspace/AdjustTime/importPicture/testdata/output
- - param: IMG.OUTPUT=true
- - param: IMG.OUTPUT_ALL=false
- - param: IMG.OUTPUT_EXIF= false
- - param: GPX.SOURCE_FOLDER=.
- - param: GPX.OUTPUT_WPT=true
- - param: GPX.OVERWRITE_MAGVAR=true
- - param: GPX.OUTPUT_SPEED=true
- - param: GPX.gpxSplit=false
- - param: GPX.noFirstNode=true
- - param: GPX.REUSE=false
-/home/yuu/workspace/AdjustTime/importPicture/testdata/cameradata/separate.gpx => /home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/separate_.gpx
-           時差: 0(sec)
-    Target GPX: [/home/yuu/workspace/AdjustTime/importPicture/testdata/cameradata/separate.gpx]
-          EXIF: convert to '/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate'
-
-                                 +--------------------+--------------------|
-  GPS logging time               | First Time         | Last Time          |
-|--------------------------------+--------------------+--------------------|
-|                      <trkseg/> |2017-05-29T01:23:18Z|2017-05-29T01:24:05Z|
-|                      <trkseg/> |2017-05-29T01:24:37Z|2017-05-29T01:33:03Z|
-|                      <trkseg/> |2017-05-29T01:35:53Z|2017-05-29T01:47:35Z|
-|--------------------------------+--------------------+--------------------|
-
-|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------|
-| name                           | Camera Time        | GPStime            |   Latitude   |   Longitude  | ele    |magvar| km/h |
-|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------|
-|20170529_102305A.jpg            |2017-05-29T01:23:05Z|2017-05-29T01:23:05Z|              |              |        |      |      |
-|20170529_102310A.jpg            |2017-05-29T01:23:10Z|2017-05-29T01:23:10Z|              |              |        |      |      |
-|20170529_102314A.jpg            |2017-05-29T01:23:14Z|2017-05-29T01:23:14Z|              |              |        |      |      |
-|20170529_102318A.jpg            |2017-05-29T01:23:18Z|2017-05-29T01:23:18Z| 35.8812697884|137.9952202085|  686.52|     -|     -|
-|20170529_102322A.jpg            |2017-05-29T01:23:22Z|2017-05-29T01:23:22Z| 35.8810500987|137.9951669835|  684.60|     -|     -|
-|20170529_102401A.jpg            |2017-05-29T01:24:01Z|2017-05-29T01:24:01Z| 35.8809490129|137.9974513035|  685.56|     -|     -|
-|20170529_102405A.jpg            |2017-05-29T01:24:05Z|2017-05-29T01:24:05Z| 35.8808641881|137.9981065169|  687.48|     -|     -|
-|20170529_102409A.jpg            |2017-05-29T01:24:09Z|2017-05-29T01:24:09Z|              |              |        |      |      |
-|20170529_102414A.jpg            |2017-05-29T01:24:14Z|2017-05-29T01:24:14Z|              |              |        |      |      |
-|20170529_102418A.jpg            |2017-05-29T01:24:18Z|2017-05-29T01:24:18Z|              |              |        |      |      |
-|20170529_102448A.jpg            |2017-05-29T01:24:48Z|2017-05-29T01:24:48Z| 35.8788877353|138.0039562471|  713.92|     -|     -|
-|20170529_102518A.jpg            |2017-05-29T01:25:18Z|2017-05-29T01:25:18Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
-|20170529_102547A.jpg            |2017-05-29T01:25:47Z|2017-05-29T01:25:47Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
-|20170529_102618A.jpg            |2017-05-29T01:26:17Z|2017-05-29T01:26:17Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
-|20170529_102647A.jpg            |2017-05-29T01:26:47Z|2017-05-29T01:26:47Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
-|20170529_102717A.jpg            |2017-05-29T01:27:17Z|2017-05-29T01:27:17Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
-|20170529_102747A.jpg            |2017-05-29T01:27:47Z|2017-05-29T01:27:47Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
-|20170529_102817A.jpg            |2017-05-29T01:28:17Z|2017-05-29T01:28:17Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
-|20170529_102847A.jpg            |2017-05-29T01:28:47Z|2017-05-29T01:28:47Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
-|20170529_102917A.jpg            |2017-05-29T01:29:17Z|2017-05-29T01:29:17Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
-|20170529_102947A.jpg            |2017-05-29T01:29:47Z|2017-05-29T01:29:47Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
-|20170529_103016A.jpg            |2017-05-29T01:30:16Z|2017-05-29T01:30:16Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
-|20170529_103046A.jpg            |2017-05-29T01:30:46Z|2017-05-29T01:30:46Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
-|20170529_103116A.jpg            |2017-05-29T01:31:16Z|2017-05-29T01:31:16Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
-|20170529_103146A.jpg            |2017-05-29T01:31:46Z|2017-05-29T01:31:46Z| 35.8761689812|138.0041732546|  711.51|     -|     -|
-|20170529_103216A.jpg            |2017-05-29T01:32:16Z|2017-05-29T01:32:16Z| 35.8408248425|138.0341358762|  748.52|     -|     -|
-|20170529_103246A.jpg            |2017-05-29T01:32:46Z|2017-05-29T01:32:46Z| 35.8405660931|138.0353022180|  747.56|     -|     -|
-|20170529_103315A.jpg            |2017-05-29T01:33:15Z|2017-05-29T01:33:15Z|              |              |        |      |      |
-|20170529_103345A.jpg            |2017-05-29T01:33:45Z|2017-05-29T01:33:45Z|              |              |        |      |      |
-|20170529_103415A.jpg            |2017-05-29T01:34:15Z|2017-05-29T01:34:15Z|              |              |        |      |      |
-|20170529_103445A.jpg            |2017-05-29T01:34:45Z|2017-05-29T01:34:45Z|              |              |        |      |      |
-|20170529_103515A.jpg            |2017-05-29T01:35:15Z|2017-05-29T01:35:15Z|              |              |        |      |      |
-|20170529_103545A.jpg            |2017-05-29T01:35:45Z|2017-05-29T01:35:45Z|              |              |        |      |      |
-|20170529_103615A.jpg            |2017-05-29T01:36:14Z|2017-05-29T01:36:14Z| 35.8359798510|138.0600296706|  750.93|     -|     -|
-|20170529_103645A.jpg            |2017-05-29T01:36:44Z|2017-05-29T01:36:44Z| 35.8357221074|138.0602352787|  745.64|     -|     -|
-|20170529_103714A.jpg            |2017-05-29T01:37:14Z|2017-05-29T01:37:14Z| 35.8346095774|138.0594111700|  751.89|     -|     -|
-|20170529_103744A.jpg            |2017-05-29T01:37:44Z|2017-05-29T01:37:44Z| 35.8353867475|138.0606593192|  760.06|     -|     -|
-|20170529_103814A.jpg            |2017-05-29T01:38:14Z|2017-05-29T01:38:14Z| 35.8344272710|138.0610287096|  774.96|     -|     -|
-|20170529_103844A.jpg            |2017-05-29T01:38:44Z|2017-05-29T01:38:44Z| 35.8348886948|138.0618377309|  792.74|     -|     -|
-|20170529_103914A.jpg            |2017-05-29T01:39:14Z|2017-05-29T01:39:14Z| 35.8344262652|138.0623432435|  799.95|     -|     -|
-|20170529_103944A.jpg            |2017-05-29T01:39:44Z|2017-05-29T01:39:44Z| 35.8338732272|138.0621989910|  796.59|     -|     -|
-|20170529_104014A.jpg            |2017-05-29T01:40:14Z|2017-05-29T01:40:14Z| 35.8334153239|138.0617078952|  794.67|     -|     -|
-|20170529_104048A.jpg            |2017-05-29T01:40:48Z|2017-05-29T01:40:48Z| 35.8345361520|138.0619776249|  795.15|     -|     -|
-|20170529_104119A.jpg            |2017-05-29T01:41:19Z|2017-05-29T01:41:19Z| 35.8339889813|138.0625394639|  793.71|     -|     -|
-|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------|
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/separate_.gpx'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102305A.jpg'
-[debug] exifTime = '2017:05:29 10:23:05' <--> '2017:05:29 10:23:05'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102314A.jpg'
-[debug] exifTime = '2017:05:29 10:23:14' <--> '2017:05:29 10:23:14'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102318A.jpg'
-[debug] exifTime = '2017:05:29 10:23:18' <--> '2017:05:29 10:23:18'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102322A.jpg'
-[debug] exifTime = '2017:05:29 10:23:22' <--> '2017:05:29 10:23:22'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102405A.jpg'
-[debug] exifTime = '2017:05:29 10:24:05' <--> '2017:05:29 10:24:05'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102409A.jpg'
-[debug] exifTime = '2017:05:29 10:24:09' <--> '2017:05:29 10:24:09'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102418A.jpg'
-[debug] exifTime = '2017:05:29 10:24:18' <--> '2017:05:29 10:24:18'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102448A.jpg'
-[debug] exifTime = '2017:05:29 10:24:48' <--> '2017:05:29 10:24:48'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103246A.jpg'
-[debug] exifTime = '2017:05:29 10:32:46' <--> '2017:05:29 10:32:46'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103315A.jpg'
-[debug] exifTime = '2017:05:29 10:33:15' <--> '2017:05:29 10:33:15'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103545A.jpg'
-[debug] exifTime = '2017:05:29 10:35:45' <--> '2017:05:29 10:35:45'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103615A.jpg'
-[debug] exifTime = '2017:05:29 10:36:14' <--> '2017:05:29 10:36:14'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_104119A.jpg'
-[debug] exifTime = '2017:05:29 10:41:19' <--> '2017:05:29 10:41:19'
diff --git a/importPicture/testdata/Sony20170518.tar.gz b/importPicture/testdata/Sony20170518.tar.gz
deleted file mode 100644 (file)
index dc7294c..0000000
Binary files a/importPicture/testdata/Sony20170518.tar.gz and /dev/null differ
diff --git a/importPicture/testdata/WiMiUS20170518.tar.gz b/importPicture/testdata/WiMiUS20170518.tar.gz
deleted file mode 100644 (file)
index cd69b56..0000000
Binary files a/importPicture/testdata/WiMiUS20170518.tar.gz and /dev/null differ
diff --git a/importPicture/testdata/separate.tar.gz b/importPicture/testdata/separate.tar.gz
deleted file mode 100644 (file)
index e351848..0000000
Binary files a/importPicture/testdata/separate.tar.gz and /dev/null differ
similarity index 100%
rename from importPicture/manifest.mf
rename to manifest.mf