From c5f5b0205431016215a25b1e87da0799174be247 Mon Sep 17 00:00:00 2001
From: hayashi <hayashi.yuu@gmail.com>
Date: Fri, 26 May 2017 13:01:49 +0900
Subject: [PATCH] =?utf8?q?fixed:=202017-05-23=20'IMG.OUTPUT=5FALL'?=
 =?utf8?q?=E3=81=8COFF=E3=81=AB=E3=82=82=E3=81=8B=E3=81=8B=E3=82=8F?=
 =?utf8?q?=E3=82=89=E3=81=9A=E6=99=82=E9=96=93=E5=A4=96=E3=81=AE=E3=83=95?=
 =?utf8?q?=E3=82=A1=E3=82=A4=E3=83=AB=E3=82=82=E5=87=BA=E5=8A=9B=E3=81=95?=
 =?utf8?q?=E3=82=8C=E3=82=8B=E4=B8=8D=E5=85=B7=E5=90=88=E3=82=92=E4=BF=AE?=
 =?utf8?q?=E6=AD=A3=E3=81=97=E3=81=BE=E3=81=97=E3=81=9F=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 importPicture/src/osm/jp/gpx/ImportPicture.java            | 7 +++++--
 importPicture/src/osm/jp/gpx/matchtime/gui/AdjustTime.java | 6 +++++-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/importPicture/src/osm/jp/gpx/ImportPicture.java b/importPicture/src/osm/jp/gpx/ImportPicture.java
index 5fe635e..67b428a 100644
--- a/importPicture/src/osm/jp/gpx/ImportPicture.java
+++ b/importPicture/src/osm/jp/gpx/ImportPicture.java
@@ -220,6 +220,10 @@ public class ImportPicture extends Thread {
             	System.out.println("対象となるGPXファイルがありませんでした。('"+ obj.gpxDir.getAbsolutePath() +"')");
             	return;
             }
+            if (obj.param_ImgOutputAll && (files.length > 1)) {
+            	System.out.println("複数のGPXファイルがあるときには、'IMG.OUTPUT_ALL'オプションは指定できません。");
+            	return;
+            }
             for (File file : files) {
                 if (file.isFile()) {
                     String filename = file.getName().toUpperCase();
@@ -463,6 +467,7 @@ public class ImportPicture extends Thread {
 		System.out.println("------------|--------------------|--------------------|------------|------------|--------|------|------|");
 
         // 出力
+        outputFile.getParentFile().mkdirs();
         DOMSource source = new DOMSource(gpx);
         FileOutputStream os = new FileOutputStream(outputFile);
         StreamResult result = new StreamResult(os);
@@ -472,8 +477,6 @@ public class ImportPicture extends Thread {
         transformer.setOutputProperty(OutputKeys.METHOD, "xml");
         transformer.transform(source, result);         
 
-        outputFile = new File(outDir, iStr +"_.gpx");
-        outputFile.mkdirs();
         os = new FileOutputStream(outputFile);
         result = new StreamResult(os);
         transformer.transform(source, result);
diff --git a/importPicture/src/osm/jp/gpx/matchtime/gui/AdjustTime.java b/importPicture/src/osm/jp/gpx/matchtime/gui/AdjustTime.java
index b22ee16..92327fd 100644
--- a/importPicture/src/osm/jp/gpx/matchtime/gui/AdjustTime.java
+++ b/importPicture/src/osm/jp/gpx/matchtime/gui/AdjustTime.java
@@ -560,6 +560,10 @@ public class AdjustTime extends JFrame
 		arg5_outputFolder.setEnabled(outputIMG.isEnabled());
     }
 
+    /**
+     * checkbox[GPXファイル時間外のファイルもコピーする]を変更した場合のアクション
+     * @param event
+     */
     void outputIMGall_Action (ActionEvent event) {
     }
 
@@ -615,7 +619,7 @@ public class AdjustTime extends JFrame
         this.params.setProperty(AppParameters.IMG_TIME, arg3_basetiome.getText());
         this.params.setProperty(AppParameters.IMG_OUTPUT, String.valueOf(outputIMG.isSelected()));
         this.params.setProperty(AppParameters.IMG_OUTPUT_FOLDER, arg5_outputFolder.getText());
-        this.params.setProperty(AppParameters.IMG_OUTPUT_ALL, String.valueOf(exifON.isSelected()));
+        this.params.setProperty(AppParameters.IMG_OUTPUT_ALL, String.valueOf(outputIMG_all.isSelected()));
         this.params.setProperty(AppParameters.IMG_OUTPUT_EXIF, String.valueOf(exifON.isSelected()));
         this.params.setProperty(AppParameters.GPX_OVERWRITE_MAGVAR, String.valueOf(gpxOverwriteMagvar.isSelected()));
         this.params.setProperty(AppParameters.GPX_OUTPUT_SPEED, String.valueOf(gpxOutputSpeed.isSelected()));
-- 
2.11.0