From: haya4 Date: Sun, 10 Nov 2019 00:22:39 +0000 (+0900) Subject: MAVEN構成 X-Git-Tag: v5.3.1~13 X-Git-Url: http://git.osdn.net/view?p=importpicture%2Fimportpicture.git;a=commitdiff_plain;h=94f06bfce2a1180776e790c9b332b63955ad45a6 MAVEN構成 --- diff --git a/.gitignore b/.gitignore index a575529..cfb80cb 100644 --- a/.gitignore +++ b/.gitignore @@ -6,15 +6,17 @@ *.zip *.jar *.tar.gz -build.xml nbbuild.xml +Thumbs.db +/AdjustTime.ini +/target/ /bin/ /build/ /classes/ /deploy/ /dist/ -/testdata/*~ -/testdata/*.log -/testdata/cameradata/ -/testdata/output +/src/test/data/*~ +/src/test/data/*.log +/src/test/data/cameradata/ +/src/test/data/output /nbproject/ diff --git a/AdjustTime.ini b/AdjustTime.ini deleted file mode 100644 index d48f027..0000000 --- a/AdjustTime.ini +++ /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=true -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/AdjustTime.ini.org b/AdjustTime.ini.org deleted file mode 100644 index 57f51e3..0000000 --- a/AdjustTime.ini.org +++ /dev/null @@ -1,17 +0,0 @@ -#by AdjustTime -#Wed Jun 14 12:01:03 JST 2017 -GPX.BASETIME=EXIF_TIME -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=2017-05-29T10\:31\:46 -GPX.OVERWRITE_MAGVAR=true -GPX.REUSE=false -IMG.BASE_FILE=20170529_103146A.jpg -IMG.SOURCE_FOLDER=./testdata/cameradata/separate -GPX.SOURCE_FOLDER=./testdata/cameradata/separate.gpx -IMG.OUTPUT_FOLDER=/home/yuu/workspace/AdjustTime/importPicture/testdata/output diff --git a/doc/AdjustTime.class.violet.html b/doc/AdjustTime.class.violet.html deleted file mode 100644 index 4406ae9..0000000 --- a/doc/AdjustTime.class.violet.html +++ /dev/null @@ -1,285 +0,0 @@ - - - - - - - - - This file was generated with Violet UML Editor 2.1.0. -   ( View Source / Download Violet ) -
-
- -
-
- embedded diagram image - - \ No newline at end of file diff --git a/doc/EXiF.class.violet.html b/doc/EXiF.class.violet.html deleted file mode 100644 index dc33285..0000000 --- a/doc/EXiF.class.violet.html +++ /dev/null @@ -1,810 +0,0 @@ - - - - - - - - - This file was generated with Violet UML Editor 2.1.0. -   ( View Source / Download Violet ) -
-
- -
-
- embedded diagram image - - \ No newline at end of file diff --git a/doc/GPX.class.violet.html b/doc/GPX.class.violet.html deleted file mode 100644 index 87945ae..0000000 --- a/doc/GPX.class.violet.html +++ /dev/null @@ -1,1921 +0,0 @@ - - - - - - - - - This file was generated with Violet UML Editor 2.1.0. -   ( View Source / Download Violet ) -
-
- -
-
- embedded diagram image - - \ No newline at end of file diff --git a/doc/ImportPicture.class.violet.html b/doc/ImportPicture.class.violet.html deleted file mode 100644 index 729f5ea..0000000 --- a/doc/ImportPicture.class.violet.html +++ /dev/null @@ -1,1039 +0,0 @@ - - - - - - - - - This file was generated with Violet UML Editor 2.1.0. -   ( View Source / Download Violet ) -
-
- -
-
- embedded diagram image - - \ No newline at end of file diff --git a/manifest.mf b/manifest.mf deleted file mode 100644 index 328e8e5..0000000 --- a/manifest.mf +++ /dev/null @@ -1,3 +0,0 @@ -Manifest-Version: 1.0 -X-COMMENT: Main-Class will be added automatically by build - diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000..b785f59 --- /dev/null +++ b/pom.xml @@ -0,0 +1,78 @@ + + 4.0.0 + AdjustTime + AdjustTime + 3.1.1-SNAPSHOT + + + + UTF-8 + 1.8 + 1.8 + + + 4.12 + 1.3 + + + + + + org.apache.commons + commons-compress + 1.14 + + + + + org.apache.commons + commons-imaging + 1.0-alpha1 + + + + + junit + junit + ${junit.version} + test + + + + org.hamcrest + hamcrest-library + ${hamcrest.version} + test + + + + + + + + maven-assembly-plugin + 3.2.0 + + + + jar-with-dependencies + + + + osm.jp.gpx.matchtime.gui.AdjustTime + + + + + + make-assembly + package + + single + + + + + + + \ No newline at end of file diff --git a/src/osm/jp/gpx/AppParameters.java b/src/main/java/osm/jp/gpx/AppParameters.java similarity index 100% rename from src/osm/jp/gpx/AppParameters.java rename to src/main/java/osm/jp/gpx/AppParameters.java diff --git a/src/osm/jp/gpx/Complementation.java b/src/main/java/osm/jp/gpx/Complementation.java similarity index 100% rename from src/osm/jp/gpx/Complementation.java rename to src/main/java/osm/jp/gpx/Complementation.java diff --git a/src/osm/jp/gpx/ElementMapTRKPT.java b/src/main/java/osm/jp/gpx/ElementMapTRKPT.java similarity index 100% rename from src/osm/jp/gpx/ElementMapTRKPT.java rename to src/main/java/osm/jp/gpx/ElementMapTRKPT.java diff --git a/src/osm/jp/gpx/ElementMapTRKSEG.java b/src/main/java/osm/jp/gpx/ElementMapTRKSEG.java similarity index 100% rename from src/osm/jp/gpx/ElementMapTRKSEG.java rename to src/main/java/osm/jp/gpx/ElementMapTRKSEG.java diff --git a/src/osm/jp/gpx/GeoDistance.java b/src/main/java/osm/jp/gpx/GeoDistance.java similarity index 100% rename from src/osm/jp/gpx/GeoDistance.java rename to src/main/java/osm/jp/gpx/GeoDistance.java diff --git a/src/osm/jp/gpx/GpxFile.java b/src/main/java/osm/jp/gpx/GpxFile.java similarity index 100% rename from src/osm/jp/gpx/GpxFile.java rename to src/main/java/osm/jp/gpx/GpxFile.java diff --git a/src/osm/jp/gpx/ImportPicture.java b/src/main/java/osm/jp/gpx/ImportPicture.java similarity index 100% rename from src/osm/jp/gpx/ImportPicture.java rename to src/main/java/osm/jp/gpx/ImportPicture.java diff --git a/src/osm/jp/gpx/Restamp.java b/src/main/java/osm/jp/gpx/Restamp.java similarity index 100% rename from src/osm/jp/gpx/Restamp.java rename to src/main/java/osm/jp/gpx/Restamp.java diff --git a/src/osm/jp/gpx/TagTrkpt.java b/src/main/java/osm/jp/gpx/TagTrkpt.java similarity index 100% rename from src/osm/jp/gpx/TagTrkpt.java rename to src/main/java/osm/jp/gpx/TagTrkpt.java diff --git a/src/osm/jp/gpx/TimeComparator.java b/src/main/java/osm/jp/gpx/TimeComparator.java similarity index 100% rename from src/osm/jp/gpx/TimeComparator.java rename to src/main/java/osm/jp/gpx/TimeComparator.java diff --git a/src/osm/jp/gpx/YuuLogFormatter.java b/src/main/java/osm/jp/gpx/YuuLogFormatter.java similarity index 100% rename from src/osm/jp/gpx/YuuLogFormatter.java rename to src/main/java/osm/jp/gpx/YuuLogFormatter.java diff --git a/src/osm/jp/gpx/matchtime/gui/AboutDialog.java b/src/main/java/osm/jp/gpx/matchtime/gui/AboutDialog.java similarity index 100% rename from src/osm/jp/gpx/matchtime/gui/AboutDialog.java rename to src/main/java/osm/jp/gpx/matchtime/gui/AboutDialog.java diff --git a/src/osm/jp/gpx/matchtime/gui/AdjustTime.java b/src/main/java/osm/jp/gpx/matchtime/gui/AdjustTime.java similarity index 100% rename from src/osm/jp/gpx/matchtime/gui/AdjustTime.java rename to src/main/java/osm/jp/gpx/matchtime/gui/AdjustTime.java diff --git a/src/osm/jp/gpx/matchtime/gui/Card.java b/src/main/java/osm/jp/gpx/matchtime/gui/Card.java similarity index 100% rename from src/osm/jp/gpx/matchtime/gui/Card.java rename to src/main/java/osm/jp/gpx/matchtime/gui/Card.java diff --git a/src/osm/jp/gpx/matchtime/gui/CardExifPerform.java b/src/main/java/osm/jp/gpx/matchtime/gui/CardExifPerform.java similarity index 100% rename from src/osm/jp/gpx/matchtime/gui/CardExifPerform.java rename to src/main/java/osm/jp/gpx/matchtime/gui/CardExifPerform.java diff --git a/src/osm/jp/gpx/matchtime/gui/CardGpxFile.java b/src/main/java/osm/jp/gpx/matchtime/gui/CardGpxFile.java similarity index 100% rename from src/osm/jp/gpx/matchtime/gui/CardGpxFile.java rename to src/main/java/osm/jp/gpx/matchtime/gui/CardGpxFile.java diff --git a/src/osm/jp/gpx/matchtime/gui/Command.java b/src/main/java/osm/jp/gpx/matchtime/gui/Command.java similarity index 100% rename from src/osm/jp/gpx/matchtime/gui/Command.java rename to src/main/java/osm/jp/gpx/matchtime/gui/Command.java diff --git a/src/osm/jp/gpx/matchtime/gui/DoDialog.java b/src/main/java/osm/jp/gpx/matchtime/gui/DoDialog.java similarity index 100% rename from src/osm/jp/gpx/matchtime/gui/DoDialog.java rename to src/main/java/osm/jp/gpx/matchtime/gui/DoDialog.java diff --git a/src/osm/jp/gpx/matchtime/gui/GpxAndFolderFilter.java b/src/main/java/osm/jp/gpx/matchtime/gui/GpxAndFolderFilter.java similarity index 100% rename from src/osm/jp/gpx/matchtime/gui/GpxAndFolderFilter.java rename to src/main/java/osm/jp/gpx/matchtime/gui/GpxAndFolderFilter.java diff --git a/src/osm/jp/gpx/matchtime/gui/ImageFileView.java b/src/main/java/osm/jp/gpx/matchtime/gui/ImageFileView.java similarity index 100% rename from src/osm/jp/gpx/matchtime/gui/ImageFileView.java rename to src/main/java/osm/jp/gpx/matchtime/gui/ImageFileView.java diff --git a/src/osm/jp/gpx/matchtime/gui/ImageFilter.java b/src/main/java/osm/jp/gpx/matchtime/gui/ImageFilter.java similarity index 100% rename from src/osm/jp/gpx/matchtime/gui/ImageFilter.java rename to src/main/java/osm/jp/gpx/matchtime/gui/ImageFilter.java diff --git a/src/osm/jp/gpx/matchtime/gui/ImagePreview.java b/src/main/java/osm/jp/gpx/matchtime/gui/ImagePreview.java similarity index 100% rename from src/osm/jp/gpx/matchtime/gui/ImagePreview.java rename to src/main/java/osm/jp/gpx/matchtime/gui/ImagePreview.java diff --git a/src/osm/jp/gpx/matchtime/gui/PanelAction.java b/src/main/java/osm/jp/gpx/matchtime/gui/PanelAction.java similarity index 100% rename from src/osm/jp/gpx/matchtime/gui/PanelAction.java rename to src/main/java/osm/jp/gpx/matchtime/gui/PanelAction.java diff --git a/src/osm/jp/gpx/matchtime/gui/ParamAction.java b/src/main/java/osm/jp/gpx/matchtime/gui/ParamAction.java similarity index 100% rename from src/osm/jp/gpx/matchtime/gui/ParamAction.java rename to src/main/java/osm/jp/gpx/matchtime/gui/ParamAction.java diff --git a/src/osm/jp/gpx/matchtime/gui/ParameterData.java b/src/main/java/osm/jp/gpx/matchtime/gui/ParameterData.java similarity index 100% rename from src/osm/jp/gpx/matchtime/gui/ParameterData.java rename to src/main/java/osm/jp/gpx/matchtime/gui/ParameterData.java diff --git a/src/osm/jp/gpx/matchtime/gui/ParameterPanel.java b/src/main/java/osm/jp/gpx/matchtime/gui/ParameterPanel.java similarity index 100% rename from src/osm/jp/gpx/matchtime/gui/ParameterPanel.java rename to src/main/java/osm/jp/gpx/matchtime/gui/ParameterPanel.java diff --git a/src/osm/jp/gpx/matchtime/gui/ParameterPanelFolder.java b/src/main/java/osm/jp/gpx/matchtime/gui/ParameterPanelFolder.java similarity index 100% rename from src/osm/jp/gpx/matchtime/gui/ParameterPanelFolder.java rename to src/main/java/osm/jp/gpx/matchtime/gui/ParameterPanelFolder.java diff --git a/src/osm/jp/gpx/matchtime/gui/ParameterPanelGpx.java b/src/main/java/osm/jp/gpx/matchtime/gui/ParameterPanelGpx.java similarity index 100% rename from src/osm/jp/gpx/matchtime/gui/ParameterPanelGpx.java rename to src/main/java/osm/jp/gpx/matchtime/gui/ParameterPanelGpx.java diff --git a/src/osm/jp/gpx/matchtime/gui/ParameterPanelImageFile.java b/src/main/java/osm/jp/gpx/matchtime/gui/ParameterPanelImageFile.java similarity index 100% rename from src/osm/jp/gpx/matchtime/gui/ParameterPanelImageFile.java rename to src/main/java/osm/jp/gpx/matchtime/gui/ParameterPanelImageFile.java diff --git a/src/osm/jp/gpx/matchtime/gui/ParameterPanelOutput.java b/src/main/java/osm/jp/gpx/matchtime/gui/ParameterPanelOutput.java similarity index 100% rename from src/osm/jp/gpx/matchtime/gui/ParameterPanelOutput.java rename to src/main/java/osm/jp/gpx/matchtime/gui/ParameterPanelOutput.java diff --git a/src/osm/jp/gpx/matchtime/gui/ParameterPanelSelecter.java b/src/main/java/osm/jp/gpx/matchtime/gui/ParameterPanelSelecter.java similarity index 100% rename from src/osm/jp/gpx/matchtime/gui/ParameterPanelSelecter.java rename to src/main/java/osm/jp/gpx/matchtime/gui/ParameterPanelSelecter.java diff --git a/src/osm/jp/gpx/matchtime/gui/ParameterPanelTime.java b/src/main/java/osm/jp/gpx/matchtime/gui/ParameterPanelTime.java similarity index 100% rename from src/osm/jp/gpx/matchtime/gui/ParameterPanelTime.java rename to src/main/java/osm/jp/gpx/matchtime/gui/ParameterPanelTime.java diff --git a/src/osm/jp/gpx/matchtime/gui/QuitDialog.java b/src/main/java/osm/jp/gpx/matchtime/gui/QuitDialog.java similarity index 100% rename from src/osm/jp/gpx/matchtime/gui/QuitDialog.java rename to src/main/java/osm/jp/gpx/matchtime/gui/QuitDialog.java diff --git a/src/osm/jp/gpx/matchtime/gui/SimpleDocumentListener.java b/src/main/java/osm/jp/gpx/matchtime/gui/SimpleDocumentListener.java similarity index 100% rename from src/osm/jp/gpx/matchtime/gui/SimpleDocumentListener.java rename to src/main/java/osm/jp/gpx/matchtime/gui/SimpleDocumentListener.java diff --git a/src/osm/jp/gpx/matchtime/gui/Utils.java b/src/main/java/osm/jp/gpx/matchtime/gui/Utils.java similarity index 100% rename from src/osm/jp/gpx/matchtime/gui/Utils.java rename to src/main/java/osm/jp/gpx/matchtime/gui/Utils.java diff --git a/src/osm/jp/gpx/matchtime/gui/images/Fit16.gif b/src/main/java/osm/jp/gpx/matchtime/gui/images/Fit16.gif similarity index 100% rename from src/osm/jp/gpx/matchtime/gui/images/Fit16.gif rename to src/main/java/osm/jp/gpx/matchtime/gui/images/Fit16.gif diff --git a/src/osm/jp/gpx/matchtime/gui/images/Open16.gif b/src/main/java/osm/jp/gpx/matchtime/gui/images/Open16.gif similarity index 100% rename from src/osm/jp/gpx/matchtime/gui/images/Open16.gif rename to src/main/java/osm/jp/gpx/matchtime/gui/images/Open16.gif diff --git a/src/osm/jp/gpx/matchtime/gui/images/Original16.gif b/src/main/java/osm/jp/gpx/matchtime/gui/images/Original16.gif similarity index 100% rename from src/osm/jp/gpx/matchtime/gui/images/Original16.gif rename to src/main/java/osm/jp/gpx/matchtime/gui/images/Original16.gif diff --git a/src/osm/jp/gpx/matchtime/gui/images/Rotate16.gif b/src/main/java/osm/jp/gpx/matchtime/gui/images/Rotate16.gif similarity index 100% rename from src/osm/jp/gpx/matchtime/gui/images/Rotate16.gif rename to src/main/java/osm/jp/gpx/matchtime/gui/images/Rotate16.gif diff --git a/src/osm/jp/gpx/matchtime/gui/images/Save16.gif b/src/main/java/osm/jp/gpx/matchtime/gui/images/Save16.gif similarity index 100% rename from src/osm/jp/gpx/matchtime/gui/images/Save16.gif rename to src/main/java/osm/jp/gpx/matchtime/gui/images/Save16.gif diff --git a/src/osm/jp/gpx/matchtime/gui/images/ZoomIn16.gif b/src/main/java/osm/jp/gpx/matchtime/gui/images/ZoomIn16.gif similarity index 100% rename from src/osm/jp/gpx/matchtime/gui/images/ZoomIn16.gif rename to src/main/java/osm/jp/gpx/matchtime/gui/images/ZoomIn16.gif diff --git a/src/osm/jp/gpx/matchtime/gui/images/ZoomOut16.gif b/src/main/java/osm/jp/gpx/matchtime/gui/images/ZoomOut16.gif similarity index 100% rename from src/osm/jp/gpx/matchtime/gui/images/ZoomOut16.gif rename to src/main/java/osm/jp/gpx/matchtime/gui/images/ZoomOut16.gif diff --git a/src/osm/jp/gpx/matchtime/gui/images/gifIcon.gif b/src/main/java/osm/jp/gpx/matchtime/gui/images/gifIcon.gif similarity index 100% rename from src/osm/jp/gpx/matchtime/gui/images/gifIcon.gif rename to src/main/java/osm/jp/gpx/matchtime/gui/images/gifIcon.gif diff --git a/src/osm/jp/gpx/matchtime/gui/images/jpgIcon.gif b/src/main/java/osm/jp/gpx/matchtime/gui/images/jpgIcon.gif similarity index 100% rename from src/osm/jp/gpx/matchtime/gui/images/jpgIcon.gif rename to src/main/java/osm/jp/gpx/matchtime/gui/images/jpgIcon.gif diff --git a/src/osm/jp/gpx/matchtime/gui/images/media_playback_start.png b/src/main/java/osm/jp/gpx/matchtime/gui/images/media_playback_start.png similarity index 100% rename from src/osm/jp/gpx/matchtime/gui/images/media_playback_start.png rename to src/main/java/osm/jp/gpx/matchtime/gui/images/media_playback_start.png diff --git a/src/osm/jp/gpx/matchtime/gui/images/pngIcon.png b/src/main/java/osm/jp/gpx/matchtime/gui/images/pngIcon.png similarity index 100% rename from src/osm/jp/gpx/matchtime/gui/images/pngIcon.png rename to src/main/java/osm/jp/gpx/matchtime/gui/images/pngIcon.png diff --git a/src/osm/jp/gpx/matchtime/gui/images/tiffIcon.gif b/src/main/java/osm/jp/gpx/matchtime/gui/images/tiffIcon.gif similarity index 100% rename from src/osm/jp/gpx/matchtime/gui/images/tiffIcon.gif rename to src/main/java/osm/jp/gpx/matchtime/gui/images/tiffIcon.gif diff --git a/src/osm/jp/gpx/matchtime/gui/restamp/CardImageFile.java b/src/main/java/osm/jp/gpx/matchtime/gui/restamp/CardImageFile.java similarity index 100% rename from src/osm/jp/gpx/matchtime/gui/restamp/CardImageFile.java rename to src/main/java/osm/jp/gpx/matchtime/gui/restamp/CardImageFile.java diff --git a/src/osm/jp/gpx/matchtime/gui/restamp/CardPerformFile.java b/src/main/java/osm/jp/gpx/matchtime/gui/restamp/CardPerformFile.java similarity index 100% rename from src/osm/jp/gpx/matchtime/gui/restamp/CardPerformFile.java rename to src/main/java/osm/jp/gpx/matchtime/gui/restamp/CardPerformFile.java diff --git a/src/osm/jp/gpx/matchtime/gui/restamp/CardSourceFolder.java b/src/main/java/osm/jp/gpx/matchtime/gui/restamp/CardSourceFolder.java similarity index 100% rename from src/osm/jp/gpx/matchtime/gui/restamp/CardSourceFolder.java rename to src/main/java/osm/jp/gpx/matchtime/gui/restamp/CardSourceFolder.java diff --git a/src/osm/jp/gpx/matchtime/gui/restamp/DialogCorectTime.java b/src/main/java/osm/jp/gpx/matchtime/gui/restamp/DialogCorectTime.java similarity index 100% rename from src/osm/jp/gpx/matchtime/gui/restamp/DialogCorectTime.java rename to src/main/java/osm/jp/gpx/matchtime/gui/restamp/DialogCorectTime.java diff --git a/src/osm/jp/gpx/matchtime/gui/restamp/DoRestamp.java b/src/main/java/osm/jp/gpx/matchtime/gui/restamp/DoRestamp.java similarity index 100% rename from src/osm/jp/gpx/matchtime/gui/restamp/DoRestamp.java rename to src/main/java/osm/jp/gpx/matchtime/gui/restamp/DoRestamp.java diff --git a/src/osm/jp/gpx/matchtime/gui/restamp/RestampDialog.java b/src/main/java/osm/jp/gpx/matchtime/gui/restamp/RestampDialog.java similarity index 100% rename from src/osm/jp/gpx/matchtime/gui/restamp/RestampDialog.java rename to src/main/java/osm/jp/gpx/matchtime/gui/restamp/RestampDialog.java diff --git a/src/osm/jp/gpx/utils/TarGz.java b/src/main/java/osm/jp/gpx/utils/TarGz.java similarity index 100% rename from src/osm/jp/gpx/utils/TarGz.java rename to src/main/java/osm/jp/gpx/utils/TarGz.java diff --git a/src/AdjustTime.ini b/src/main/resources/AdjustTime.ini similarity index 100% rename from src/AdjustTime.ini rename to src/main/resources/AdjustTime.ini diff --git a/src/AdjustTime2.bat b/src/main/resources/AdjustTime2.bat similarity index 100% rename from src/AdjustTime2.bat rename to src/main/resources/AdjustTime2.bat diff --git a/src/AdjustTime2.jnlp b/src/main/resources/AdjustTime2.jnlp similarity index 100% rename from src/AdjustTime2.jnlp rename to src/main/resources/AdjustTime2.jnlp diff --git a/src/AdjustTime2.sh b/src/main/resources/AdjustTime2.sh similarity index 100% rename from src/AdjustTime2.sh rename to src/main/resources/AdjustTime2.sh diff --git a/src/LICENSE.txt b/src/main/resources/LICENSE.txt similarity index 100% rename from src/LICENSE.txt rename to src/main/resources/LICENSE.txt diff --git a/src/README.jp.txt b/src/main/resources/README.jp.txt similarity index 100% rename from src/README.jp.txt rename to src/main/resources/README.jp.txt diff --git a/src/i18n.properties b/src/main/resources/i18n.properties similarity index 100% rename from src/i18n.properties rename to src/main/resources/i18n.properties diff --git a/src/i18n_ja_JP.properties b/src/main/resources/i18n_ja_JP.properties similarity index 100% rename from src/i18n_ja_JP.properties rename to src/main/resources/i18n_ja_JP.properties diff --git a/src/osm/jp/gpx/matchtime/gui/images/Thumbs.db b/src/osm/jp/gpx/matchtime/gui/images/Thumbs.db deleted file mode 100644 index d27d66b..0000000 Binary files a/src/osm/jp/gpx/matchtime/gui/images/Thumbs.db and /dev/null differ diff --git a/testdata/20170517.gpx b/src/test/data/20170517.gpx similarity index 100% rename from testdata/20170517.gpx rename to src/test/data/20170517.gpx diff --git a/testdata/20170518.gpx b/src/test/data/20170518.gpx similarity index 100% rename from testdata/20170518.gpx rename to src/test/data/20170518.gpx diff --git a/testdata/AdjustTime.20170517.ini b/src/test/data/AdjustTime.20170517.ini similarity index 100% rename from testdata/AdjustTime.20170517.ini rename to src/test/data/AdjustTime.20170517.ini diff --git a/testdata/AdjustTime.20170518.A1.ini b/src/test/data/AdjustTime.20170518.A1.ini similarity index 100% rename from testdata/AdjustTime.20170518.A1.ini rename to src/test/data/AdjustTime.20170518.A1.ini diff --git a/testdata/AdjustTime.20170518.A2.ini b/src/test/data/AdjustTime.20170518.A2.ini similarity index 100% rename from testdata/AdjustTime.20170518.A2.ini rename to src/test/data/AdjustTime.20170518.A2.ini diff --git a/testdata/AdjustTime.20170518.B1.ini b/src/test/data/AdjustTime.20170518.B1.ini similarity index 100% rename from testdata/AdjustTime.20170518.B1.ini rename to src/test/data/AdjustTime.20170518.B1.ini diff --git a/testdata/AdjustTime.20170518.B2.ini b/src/test/data/AdjustTime.20170518.B2.ini similarity index 100% rename from testdata/AdjustTime.20170518.B2.ini rename to src/test/data/AdjustTime.20170518.B2.ini diff --git a/testdata/AdjustTime.20170518.ini b/src/test/data/AdjustTime.20170518.ini similarity index 100% rename from testdata/AdjustTime.20170518.ini rename to src/test/data/AdjustTime.20170518.ini diff --git a/testdata/AdjustTime.M1a.separate.ini b/src/test/data/AdjustTime.M1a.separate.ini similarity index 100% rename from testdata/AdjustTime.M1a.separate.ini rename to src/test/data/AdjustTime.M1a.separate.ini diff --git a/testdata/AdjustTime.M1b.separate.ini b/src/test/data/AdjustTime.M1b.separate.ini similarity index 100% rename from testdata/AdjustTime.M1b.separate.ini rename to src/test/data/AdjustTime.M1b.separate.ini diff --git a/testdata/AdjustTime.M1c.separate.ini b/src/test/data/AdjustTime.M1c.separate.ini similarity index 100% rename from testdata/AdjustTime.M1c.separate.ini rename to src/test/data/AdjustTime.M1c.separate.ini diff --git a/testdata/AdjustTime.M1d.separate.ini b/src/test/data/AdjustTime.M1d.separate.ini similarity index 100% rename from testdata/AdjustTime.M1d.separate.ini rename to src/test/data/AdjustTime.M1d.separate.ini diff --git a/testdata/AdjustTime.M2a.separate.ini b/src/test/data/AdjustTime.M2a.separate.ini similarity index 100% rename from testdata/AdjustTime.M2a.separate.ini rename to src/test/data/AdjustTime.M2a.separate.ini diff --git a/testdata/AdjustTime.M2b.separate.ini b/src/test/data/AdjustTime.M2b.separate.ini similarity index 100% rename from testdata/AdjustTime.M2b.separate.ini rename to src/test/data/AdjustTime.M2b.separate.ini diff --git a/testdata/AdjustTime.M2c.separate.ini b/src/test/data/AdjustTime.M2c.separate.ini similarity index 100% rename from testdata/AdjustTime.M2c.separate.ini rename to src/test/data/AdjustTime.M2c.separate.ini diff --git a/testdata/AdjustTime.M2d.separate.ini b/src/test/data/AdjustTime.M2d.separate.ini similarity index 100% rename from testdata/AdjustTime.M2d.separate.ini rename to src/test/data/AdjustTime.M2d.separate.ini diff --git a/testdata/AdjustTime.null.ini b/src/test/data/AdjustTime.null.ini similarity index 100% rename from testdata/AdjustTime.null.ini rename to src/test/data/AdjustTime.null.ini diff --git a/testdata/AdjustTime.off.ini b/src/test/data/AdjustTime.off.ini similarity index 100% rename from testdata/AdjustTime.off.ini rename to src/test/data/AdjustTime.off.ini diff --git a/testdata/AdjustTime.on.ini b/src/test/data/AdjustTime.on.ini similarity index 100% rename from testdata/AdjustTime.on.ini rename to src/test/data/AdjustTime.on.ini diff --git a/testdata/AdjustTime.separate.ini b/src/test/data/AdjustTime.separate.ini similarity index 100% rename from testdata/AdjustTime.separate.ini rename to src/test/data/AdjustTime.separate.ini diff --git a/testdata/muiltiTRK.GarminColorado.gpx.xml b/src/test/data/muiltiTRK.GarminColorado.gpx.xml similarity index 100% rename from testdata/muiltiTRK.GarminColorado.gpx.xml rename to src/test/data/muiltiTRK.GarminColorado.gpx.xml diff --git a/testdata/muiltiTRKSEG.GarminColorado.gpx.xml b/src/test/data/muiltiTRKSEG.GarminColorado.gpx.xml similarity index 100% rename from testdata/muiltiTRKSEG.GarminColorado.gpx.xml rename to src/test/data/muiltiTRKSEG.GarminColorado.gpx.xml diff --git a/testdata/muiltiTRKSEG.noNameSpace.gpx.xml b/src/test/data/muiltiTRKSEG.noNameSpace.gpx.xml similarity index 100% rename from testdata/muiltiTRKSEG.noNameSpace.gpx.xml rename to src/test/data/muiltiTRKSEG.noNameSpace.gpx.xml diff --git a/testdata/multiTRKSEG.eTrex_20J.gpx.xml b/src/test/data/multiTRKSEG.eTrex_20J.gpx.xml similarity index 100% rename from testdata/multiTRKSEG.eTrex_20J.gpx.xml rename to src/test/data/multiTRKSEG.eTrex_20J.gpx.xml diff --git a/testdata/multiTRKSEGreverse.eTrex_20J.gpx.xml b/src/test/data/multiTRKSEGreverse.eTrex_20J.gpx.xml similarity index 100% rename from testdata/multiTRKSEGreverse.eTrex_20J.gpx.xml rename to src/test/data/multiTRKSEGreverse.eTrex_20J.gpx.xml diff --git a/test/osm/jp/gpx/AppParametersTest.java b/src/test/java/osm/jp/gpx/AppParametersTest.java similarity index 94% rename from test/osm/jp/gpx/AppParametersTest.java rename to src/test/java/osm/jp/gpx/AppParametersTest.java index e0f9f6b..da80851 100644 --- a/test/osm/jp/gpx/AppParametersTest.java +++ b/src/test/java/osm/jp/gpx/AppParametersTest.java @@ -49,7 +49,7 @@ public class AppParametersTest { @Test public void IMG_OUTPUT_ALLが定義されていない時() { try { - params = new AppParameters("testdata/AdjustTime.off.ini"); + params = new AppParameters("src/test/data/AdjustTime.off.ini"); String valueStr = params.getProperty(AppParameters.IMG_OUTPUT_ALL); assertThat(valueStr, is("false")); } @@ -65,13 +65,13 @@ public class AppParametersTest { public void setUp() throws Exception { File iniFile = new File("AdjustTime.ini"); File orgFile = new File("AdjustTime.ini.org"); - File testFile = new File("testdata", "AdjustTime.on.ini"); + File testFile = new File("src/test/data", "AdjustTime.on.ini"); if (orgFile.exists()) { - orgFile.delete(); + orgFile.delete(); } if (iniFile.exists()) { - iniFile.renameTo(orgFile); + iniFile.renameTo(orgFile); } FileInputStream inStream = new FileInputStream(testFile); @@ -120,7 +120,6 @@ public class AppParametersTest { AppParameters params = new AppParameters(); params.setProperty(AppParameters.IMG_OUTPUT_ALL, "false"); params.store(); - params = null; AppParameters newParams = new AppParameters(); String valueStr = newParams.getProperty(AppParameters.IMG_OUTPUT_ALL); assertThat(valueStr, is("false")); @@ -137,7 +136,7 @@ public class AppParametersTest { public void setUp() throws Exception { File iniFile = new File("AdjustTime.ini"); File orgFile = new File("AdjustTime.ini.org"); - File testFile = new File("testdata", "AdjustTime.off.ini"); + File testFile = new File("src/test/data", "AdjustTime.off.ini"); if (orgFile.exists()) { orgFile.delete(); @@ -191,7 +190,6 @@ public class AppParametersTest { AppParameters params = new AppParameters(); params.setProperty(AppParameters.IMG_OUTPUT_ALL, "true"); params.store(); - params = null; AppParameters newParams = new AppParameters(); String valueStr = newParams.getProperty(AppParameters.IMG_OUTPUT_ALL); assertThat(valueStr, is("true")); diff --git a/test/osm/jp/gpx/ElementMapTRKPTTest.java b/src/test/java/osm/jp/gpx/ElementMapTRKPTTest.java similarity index 100% rename from test/osm/jp/gpx/ElementMapTRKPTTest.java rename to src/test/java/osm/jp/gpx/ElementMapTRKPTTest.java diff --git a/test/osm/jp/gpx/ElementMapTRKSEGTest.java b/src/test/java/osm/jp/gpx/ElementMapTRKSEGTest.java similarity index 81% rename from test/osm/jp/gpx/ElementMapTRKSEGTest.java rename to src/test/java/osm/jp/gpx/ElementMapTRKSEGTest.java index fb794e4..0de7aea 100644 --- a/test/osm/jp/gpx/ElementMapTRKSEGTest.java +++ b/src/test/java/osm/jp/gpx/ElementMapTRKSEGTest.java @@ -40,13 +40,13 @@ public class ElementMapTRKSEGTest { @DataPoints public static Fixture[] datas = { - new Fixture("testdata/20170517.gpx", 1), - new Fixture("testdata/20170518.gpx", 1), - new Fixture("testdata/muiltiTRK.GarminColorado.gpx.xml", 3), - new Fixture("testdata/muiltiTRKSEG.GarminColorado.gpx.xml", 3), - new Fixture("testdata/muiltiTRKSEG.noNameSpace.gpx.xml", 3), - new Fixture("testdata/multiTRKSEG.eTrex_20J.gpx.xml", 3), - new Fixture("testdata/multiTRKSEGreverse.eTrex_20J.gpx.xml", 3), + new Fixture("src/test/data/20170517.gpx", 1), + new Fixture("src/test/data/20170518.gpx", 1), + new Fixture("src/test/data/muiltiTRK.GarminColorado.gpx.xml", 3), + new Fixture("src/test/data/muiltiTRKSEG.GarminColorado.gpx.xml", 3), + new Fixture("src/test/data/muiltiTRKSEG.noNameSpace.gpx.xml", 3), + new Fixture("src/test/data/multiTRKSEG.eTrex_20J.gpx.xml", 3), + new Fixture("src/test/data/multiTRKSEGreverse.eTrex_20J.gpx.xml", 3), }; @Theory diff --git a/test/osm/jp/gpx/ImportPictureTest.java b/src/test/java/osm/jp/gpx/ImportPictureTest.java similarity index 91% rename from test/osm/jp/gpx/ImportPictureTest.java rename to src/test/java/osm/jp/gpx/ImportPictureTest.java index d20a355..233c154 100644 --- a/test/osm/jp/gpx/ImportPictureTest.java +++ b/src/test/java/osm/jp/gpx/ImportPictureTest.java @@ -88,10 +88,10 @@ public class ImportPictureTest { // 1 new Fixture( "[A1].SONYカメラの場合.FILE_UPDATE時間を基準にして時間外のファイルはコピー対象外の時", - "testdata/Sony20170518.tar.gz", - "testdata/20170518.gpx", - "testdata/cameradata/20170518.gpx", - "testdata/AdjustTime.20170518.A1.ini", + "src/test/data/Sony20170518.tar.gz", + "src/test/data/20170518.gpx", + "src/test/data/cameradata/20170518.gpx", + "src/test/data/AdjustTime.20170518.A1.ini", new Expecter[] { new Expecter("10170518/20170518_.gpx", true, null, 90.0D, 180.0D, false), new Expecter("10170518/DSC05183.JPG", false, null, 90.0D, 180.0D, false), @@ -104,10 +104,10 @@ public class ImportPictureTest { // 2 new Fixture( "[A2].SONYカメラの場合.FILE_UPDATE時間を基準にして時間外のファイルもコピーする時", - "testdata/Sony20170518.tar.gz", - "testdata/20170518.gpx", - "testdata/cameradata/20170518.gpx", - "testdata/AdjustTime.20170518.A2.ini", + "src/test/data/Sony20170518.tar.gz", + "src/test/data/20170518.gpx", + "src/test/data/cameradata/20170518.gpx", + "src/test/data/AdjustTime.20170518.A2.ini", new Expecter[] { new Expecter("10170518/20170518_.gpx", true, null, 90.0D, 180.0D, false), new Expecter("10170518/DSC05183.JPG", true, "2017:05:18 09:16:48", 90.0D, 180.0D, true), @@ -120,10 +120,10 @@ public class ImportPictureTest { // 3. new Fixture( "[B1].WiMiUSカメラの場合.FILE_UPDATE時間を基準にして時間外のファイルはコピー対象外の時", - "testdata/WiMiUS20170518.tar.gz", - "testdata/20170518.gpx", - "testdata/cameradata/20170518.gpx", - "testdata/AdjustTime.20170518.B1.ini", + "src/test/data/WiMiUS20170518.tar.gz", + "src/test/data/20170518.gpx", + "src/test/data/cameradata/20170518.gpx", + "src/test/data/AdjustTime.20170518.B1.ini", new Expecter[] { new Expecter("cameradata/20170518_.gpx", true, null, 90.0D, 180.0D, false), new Expecter("cameradata/20170518_092031A.jpg", false, null, 90.0D, 180.0D, false), @@ -135,10 +135,10 @@ public class ImportPictureTest { // 4. new Fixture( "[B2].WiMiUSカメラの場合.FILE_UPDATE時間を基準にして時間外のファイルもコピーする時", - "testdata/WiMiUS20170518.tar.gz", - "testdata/20170518.gpx", - "testdata/cameradata/20170518.gpx", - "testdata/AdjustTime.20170518.B2.ini", + "src/test/data/WiMiUS20170518.tar.gz", + "src/test/data/20170518.gpx", + "src/test/data/cameradata/20170518.gpx", + "src/test/data/AdjustTime.20170518.B2.ini", new Expecter[] { new Expecter("cameradata/20170518_.gpx", true, null, 90.0D, 180.0D, false), new Expecter("cameradata/20170518_092031A.jpg", true, "2017:05:18 09:20:30", 90.0D, 180.0D, true), @@ -150,10 +150,10 @@ public class ImportPictureTest { // 5. new Fixture( "[M1a].GPXが複数のTRKSEGに分割している場合.FILE_UPDATE時間を基準.GarminColorado", - "testdata/separate.tar.gz", - "testdata/muiltiTRK.GarminColorado.gpx.xml", - "testdata/cameradata/separate.gpx", - "testdata/AdjustTime.M1a.separate.ini", + "src/test/data/separate.tar.gz", + "src/test/data/muiltiTRK.GarminColorado.gpx.xml", + "src/test/data/cameradata/separate.gpx", + "src/test/data/AdjustTime.M1a.separate.ini", new Expecter[] { // GPX file new Expecter("separate/separate_.gpx", true, null, 90.0D, 180.0D, false), @@ -187,10 +187,10 @@ public class ImportPictureTest { new Fixture( "[M1b].GPXが複数のTRKSEGに分割している場合.FILE_UPDATE時間を基準.GarminColorado", - "testdata/separate.tar.gz", - "testdata/muiltiTRK.GarminColorado.gpx.xml", - "testdata/cameradata/separate.gpx", - "testdata/AdjustTime.M1b.separate.ini", + "src/test/data/separate.tar.gz", + "src/test/data/muiltiTRK.GarminColorado.gpx.xml", + "src/test/data/cameradata/separate.gpx", + "src/test/data/AdjustTime.M1b.separate.ini", new Expecter[] { // GPX file new Expecter("separate/separate_.gpx", true, null, 90.D, 180.0D, false), @@ -224,10 +224,10 @@ public class ImportPictureTest { new Fixture( "[M1c].GPXが複数のTRKSEGに分割している場合.EXIF時間を基準.GarminColorado", - "testdata/separate.tar.gz", - "testdata/muiltiTRK.GarminColorado.gpx.xml", - "testdata/cameradata/separate.gpx", - "testdata/AdjustTime.M1c.separate.ini", + "src/test/data/separate.tar.gz", + "src/test/data/muiltiTRK.GarminColorado.gpx.xml", + "src/test/data/cameradata/separate.gpx", + "src/test/data/AdjustTime.M1c.separate.ini", new Expecter[] { // GPX file new Expecter("separate/separate_.gpx", true, null, 90.0D, 180.0D, false), @@ -261,10 +261,10 @@ public class ImportPictureTest { new Fixture( "[M1d].GPXが複数のTRKSEGに分割している場合.EXIF時間を基準.GarminColorado", - "testdata/separate.tar.gz", - "testdata/muiltiTRK.GarminColorado.gpx.xml", - "testdata/cameradata/separate.gpx", - "testdata/AdjustTime.M1d.separate.ini", + "src/test/data/separate.tar.gz", + "src/test/data/muiltiTRK.GarminColorado.gpx.xml", + "src/test/data/cameradata/separate.gpx", + "src/test/data/AdjustTime.M1d.separate.ini", new Expecter[] { // GPX file new Expecter("separate/separate_.gpx", true, null, 90.0D, 180.0D, false), @@ -299,10 +299,10 @@ public class ImportPictureTest { new Fixture( "[M2a].GPXが複数のTRKSEGに分割している場合.FILE_UPDATE時間を基準.eTrex_20J", - "testdata/separate.tar.gz", - "testdata/multiTRKSEG.eTrex_20J.gpx.xml", - "testdata/cameradata/separate.gpx", - "testdata/AdjustTime.M2a.separate.ini", + "src/test/data/separate.tar.gz", + "src/test/data/multiTRKSEG.eTrex_20J.gpx.xml", + "src/test/data/cameradata/separate.gpx", + "src/test/data/AdjustTime.M2a.separate.ini", new Expecter[] { // GPX file new Expecter("separate/separate_.gpx", true, null, 90.0D, 180.0D, false), @@ -336,10 +336,10 @@ public class ImportPictureTest { new Fixture( "[M2b].GPXが複数のTRKSEGに分割している場合.FILE_UPDATE時間を基準.eTrex_20J", - "testdata/separate.tar.gz", - "testdata/multiTRKSEG.eTrex_20J.gpx.xml", - "testdata/cameradata/separate.gpx", - "testdata/AdjustTime.M2b.separate.ini", + "src/test/data/separate.tar.gz", + "src/test/data/multiTRKSEG.eTrex_20J.gpx.xml", + "src/test/data/cameradata/separate.gpx", + "src/test/data/AdjustTime.M2b.separate.ini", new Expecter[] { // GPX file new Expecter("separate/separate_.gpx", true, null, 90.0D, 180.0D, false), @@ -373,10 +373,10 @@ public class ImportPictureTest { new Fixture( "[M2c].GPXが複数のTRKSEGに分割している場合.EXIF時間を基準.eTrex_20J", - "testdata/separate.tar.gz", - "testdata/multiTRKSEG.eTrex_20J.gpx.xml", - "testdata/cameradata/separate.gpx", - "testdata/AdjustTime.M2c.separate.ini", + "src/test/data/separate.tar.gz", + "src/test/data/multiTRKSEG.eTrex_20J.gpx.xml", + "src/test/data/cameradata/separate.gpx", + "src/test/data/AdjustTime.M2c.separate.ini", new Expecter[] { // GPX file new Expecter("separate/separate_.gpx", true, null, 90.0D, 180.0D, false), @@ -410,10 +410,10 @@ public class ImportPictureTest { new Fixture( "[M2d].GPXが複数のTRKSEGに分割している場合.EXIF時間を基準.eTrex_20J", - "testdata/separate.tar.gz", - "testdata/multiTRKSEG.eTrex_20J.gpx.xml", - "testdata/cameradata/separate.gpx", - "testdata/AdjustTime.M2d.separate.ini", + "src/test/data/separate.tar.gz", + "src/test/data/multiTRKSEG.eTrex_20J.gpx.xml", + "src/test/data/cameradata/separate.gpx", + "src/test/data/AdjustTime.M2d.separate.ini", new Expecter[] { // GPX file new Expecter("separate/separate_.gpx", true, null, 90.0D, 180.0D, false), @@ -447,10 +447,10 @@ public class ImportPictureTest { new Fixture( "[M3a].GPXが複数のTRKSEGに分割している場合.FILE_UPDATE時間を基準.eTrex_20Jreverse", - "testdata/separate.tar.gz", - "testdata/multiTRKSEGreverse.eTrex_20J.gpx.xml", - "testdata/cameradata/separate.gpx", - "testdata/AdjustTime.M2a.separate.ini", + "src/test/data/separate.tar.gz", + "src/test/data/multiTRKSEGreverse.eTrex_20J.gpx.xml", + "src/test/data/cameradata/separate.gpx", + "src/test/data/AdjustTime.M2a.separate.ini", new Expecter[] { // GPX file new Expecter("separate/separate_.gpx", true, null, 90.0D, 180.0D, false), @@ -484,10 +484,10 @@ public class ImportPictureTest { new Fixture( "[M3b].GPXが複数のTRKSEGに分割している場合.FILE_UPDATE時間を基準.eTrex_20Jreverse", - "testdata/separate.tar.gz", - "testdata/multiTRKSEGreverse.eTrex_20J.gpx.xml", - "testdata/cameradata/separate.gpx", - "testdata/AdjustTime.M2b.separate.ini", + "src/test/data/separate.tar.gz", + "src/test/data/multiTRKSEGreverse.eTrex_20J.gpx.xml", + "src/test/data/cameradata/separate.gpx", + "src/test/data/AdjustTime.M2b.separate.ini", new Expecter[] { // GPX file new Expecter("separate/separate_.gpx", true, null, 90.0D, 180.0D, false), @@ -521,10 +521,10 @@ public class ImportPictureTest { new Fixture( "[M3c].GPXが複数のTRKSEGに分割している場合.EXIF時間を基準.eTrex_20Jreverse", - "testdata/separate.tar.gz", - "testdata/multiTRKSEGreverse.eTrex_20J.gpx.xml", - "testdata/cameradata/separate.gpx", - "testdata/AdjustTime.M2c.separate.ini", + "src/test/data/separate.tar.gz", + "src/test/data/multiTRKSEGreverse.eTrex_20J.gpx.xml", + "src/test/data/cameradata/separate.gpx", + "src/test/data/AdjustTime.M2c.separate.ini", new Expecter[] { // GPX file new Expecter("separate/separate_.gpx", true, null, 90.0D, 180.0D, false), @@ -558,10 +558,10 @@ public class ImportPictureTest { new Fixture( "[M3d].GPXが複数のTRKSEGに分割している場合.EXIF時間を基準.eTrex_20Jreverse", - "testdata/separate.tar.gz", - "testdata/multiTRKSEGreverse.eTrex_20J.gpx.xml", - "testdata/cameradata/separate.gpx", - "testdata/AdjustTime.M2d.separate.ini", + "src/test/data/separate.tar.gz", + "src/test/data/multiTRKSEGreverse.eTrex_20J.gpx.xml", + "src/test/data/cameradata/separate.gpx", + "src/test/data/AdjustTime.M2d.separate.ini", new Expecter[] { // GPX file new Expecter("separate/separate_.gpx", true, null, 90.0D, 180.0D, false), @@ -642,18 +642,18 @@ public class ImportPictureTest { System.out.println(dataset.toString()); // カメラディレクトリを削除する - File dir = new File("testdata/cameradata"); + File dir = new File("src/test/data/cameradata"); if (dir.exists()) { ImportPictureTest.delete(dir); } - File outDir = new File("testdata/output"); + File outDir = new File("src/test/data/output"); if (outDir.exists()) { ImportPictureTest.delete(outDir); } outDir.mkdir(); // カメラディレクトリを作成する - ImportPictureTest.uncompress(new File(dataset.tarFilePath), new File("testdata/cameradata")); + ImportPictureTest.uncompress(new File(dataset.tarFilePath), new File("src/test/data/cameradata")); // GPXファイルをセット try (FileInputStream inStream = new FileInputStream(new File(dataset.gpxSourcePath)); @@ -706,13 +706,12 @@ public class ImportPictureTest { destPath.createNewFile(); byte[] btoRead = new byte[1024]; try (BufferedOutputStream bout = new BufferedOutputStream(new FileOutputStream(destPath))) { - int len = 0; + int len; while ((len = tarIn.read(btoRead)) != -1) { bout.write(btoRead, 0, len); } } destPath.setLastModified(tarEntry.getLastModifiedDate().getTime()); - btoRead = null; } tarEntry = tarIn.getNextTarEntry(); } diff --git a/test/osm/jp/gpx/RestampTest.java b/src/test/java/osm/jp/gpx/RestampTest.java similarity index 100% rename from test/osm/jp/gpx/RestampTest.java rename to src/test/java/osm/jp/gpx/RestampTest.java diff --git a/test/osm/jp/gpx/UnZip.java b/src/test/java/osm/jp/gpx/UnZip.java similarity index 100% rename from test/osm/jp/gpx/UnZip.java rename to src/test/java/osm/jp/gpx/UnZip.java diff --git a/test/AdjustTime.ini b/test/AdjustTime.ini deleted file mode 100644 index 83fb9a9..0000000 --- a/test/AdjustTime.ini +++ /dev/null @@ -1,17 +0,0 @@ -#by AdjustTime -#Tue Oct 22 11:27:01 JST 2019 -GPX.OVERWRITE_MAGVAR=false -IMG.BASE_FILE=00009.jpg -GPX.SOURCE_FOLDER=/home/yuu/work/mapping/Unmapped_2019-08-24_\u4E2D\u5C71\u9053_\u7B20\u53D6\u5CE0/GPX/2019-08-24 15.44.09 Day.gpx -IMG.SOURCE_FOLDER=/home/yuu/work/mapping/Unmapped_2019-08-24_\u4E2D\u5C71\u9053_\u7B20\u53D6\u5CE0/img/20190824_132842A -GPX.OUTPUT_SPEED=false -IMG.OUTPUT_FOLDER=/home/yuu/work/mapping/Unmapped_2019-08-24_\u4E2D\u5C71\u9053_\u7B20\u53D6\u5CE0/Movie -GPX.noFirstNode=true -GPX.gpxSplit=true -IMG.OUTPUT=true -GPX.OUTPUT_WPT=false -GPX.REUSE=false -IMG.TIME=2019-08-24T04\:29\:17Z -IMG.OUTPUT_EXIF=true -IMG.OUTPUT_ALL=false -GPX.BASETIME=FILE_UPDATE