FIX: EXIF変換されたIMGが出力されないバグを直した

diff --git a/importPicture/src/AdjustTime2.jnlp b/importPicture/src/AdjustTime2.jnlp
new file mode 100644 (file)
index 0000000..d865797
--- /dev/null
+++ b/importPicture/src/AdjustTime2.jnlp
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- JNLP File for SwingSet2 Demo Application -->
+<jnlp spec="1.8+" codebase="http://my_company.com/jaws/apps" href="swingset2.jnlp">
+  <information>
+    <title>SwingSet2 Demo Application</title>
+    <vendor>Sun Microsystems, Inc.</vendor>
+    <homepage href="docs/help.html"/>
+    <description>SwingSet2 Demo Application</description>
+    <description kind="short">A demo of the capabilities 
+of the Swing Graphical User Interface.</description>
+    <icon href="images/swingset2.jpg"/>
+    <icon kind="splash" href="images/splash.gif"/>
+    <offline-allowed/> 
+    <association>
+      <mime-type="application-x/swingset2-file"/>
+      <extensions="swingset2"/> 
+    </association>
+    <shortcut online="false">
+      <desktop/>
+      <menu submenu="My Corporation Apps"/>
+    </shortcut>
+  </information>
+  <information os="linux">   
+    <title> SwingSet2 Demo on Linux </title>
+    <homepage href="docs/linuxhelp.html">
+  </information>
+  <security>
+      <all-permissions/>
+  </security>
+  <resources>
+    <j2se version="1.4.2+" java-vm-args="-esa -Xnoclassgc"/>
+    <jar href="lib/SwingSet2.jar"/>
+  </resources>
+  <application-desc main-class="SwingSet2"/>
+</jnlp>
\ No newline at end of file

diff --git a/importPicture/src/osm/jp/gpx/AppParameters.java b/importPicture/src/osm/jp/gpx/AppParameters.java
index 728b4be..c2fc36b 100644 (file)
--- a/importPicture/src/osm/jp/gpx/AppParameters.java
+++ b/importPicture/src/osm/jp/gpx/AppParameters.java
@@ -114,16 +114,18 @@ public class AppParameters extends Properties {
                valueStr = this.getProperty(IMG_OUTPUT);
                if (valueStr == null) {
                        update = true;
-                       this.setProperty(IMG_OUTPUT, String.valueOf(true));
+                       valueStr = String.valueOf(true);
                }
+               this.setProperty(IMG_OUTPUT, String.valueOf(valueStr));
 
                //------------------------------------------------
                // IMG出力: EXIFを変換する
                valueStr = this.getProperty(IMG_OUTPUT_EXIF);
                if (valueStr == null) {
                        update = true;
-                       this.setProperty(IMG_OUTPUT_EXIF, String.valueOf(true));
+                       valueStr = String.valueOf(true);
                }
+               this.setProperty(IMG_OUTPUT_EXIF, String.valueOf(valueStr));
 
                //------------------------------------------------
                // GPX出力: 時間的に間隔が開いたGPXログを別の<trkseg>セグメントに分割する。 {ON | OFF}

diff --git a/importPicture/src/osm/jp/gpx/ImportPicture.java b/importPicture/src/osm/jp/gpx/ImportPicture.java
index e4bb2c9..c28da45 100644 (file)
--- a/importPicture/src/osm/jp/gpx/ImportPicture.java
+++ b/importPicture/src/osm/jp/gpx/ImportPicture.java
@@ -192,18 +192,21 @@ public class ImportPicture extends Thread {
                obj.param_GpxOutputSpeed = true;\r
        }\r
 \r
-       // 第6引数が指定されなければ、指定されたディレクトリ内のGPXファイルすべてを対象とする\r
-        if (argv.length >= 5) {\r
-            obj.gpxDir = new File(argv[4]);\r
+       paramStr = obj.params.getProperty(AppParameters.GPX_SOURCE_FOLDER);\r
+       if (paramStr != null) {\r
+               obj.param_GpxSourceFolder = new String(paramStr);\r
+            obj.gpxDir = new File(obj.param_GpxSourceFolder);\r
             if (!obj.gpxDir.exists()) {\r
                // GPXファイルまたはディレクトリが存在しません。\r
-               System.out.println("GPXファイルまたはディレクトリが存在しません。('"+ argv[4] +"')");\r
+               System.out.println("GPXファイルまたはディレクトリが存在しません。('"+ paramStr +"')");\r
                return;\r
             }\r
-        }\r
+       }\r
         else {\r
             obj.gpxDir = obj.imgDir;\r
         }\r
+\r
+       // 指定されたディレクトリ内のGPXファイルすべてを対象とする\r
         if (obj.gpxDir.isDirectory()) {\r
             File[] files = obj.gpxDir.listFiles();\r
             if (files == null) {\r
@@ -214,7 +217,7 @@ public class ImportPicture extends Thread {
             for (File file : files) {\r
                 if (file.isFile()) {\r
                     String filename = file.getName().toUpperCase();\r
-                    if (filename.endsWith(".GPX")) {\r
+                    if (filename.toUpperCase().endsWith(".GPX")) {\r
                         if (!filename.toUpperCase().endsWith("_.GPX") || obj.param_GpxReuse) {\r
                             obj.gpxFiles.add(file);\r
                         }\r
@@ -225,7 +228,12 @@ public class ImportPicture extends Thread {
         else {\r
             obj.gpxFiles.add(obj.gpxDir);\r
         }\r
-        \r
+\r
+       paramStr = obj.params.getProperty(AppParameters.IMG_OUTPUT_EXIF);\r
+       if ((paramStr != null) && (paramStr.equals(Boolean.toString(true)))) {\r
+               obj.exif = true;\r
+       }\r
+\r
         System.out.println(" - param： imgDir = '"+ obj.imgDir.getAbsolutePath() +"'");\r
         System.out.println(" - param： outDir = '"+ (obj.outDir == null ? "" : obj.outDir.getAbsolutePath()) +"'");\r
         System.out.println(" - param： gpxDir = '"+ (obj.gpxDir == null ? "" : obj.gpxDir.getAbsolutePath()) +"'");\r
@@ -235,7 +243,8 @@ public class ImportPicture extends Thread {
         System.out.println(" - param： "+ AppParameters.GPX_REUSE +"="+ obj.param_GpxReuse);        \r
         System.out.println(" - param： "+ AppParameters.GPX_BASETIME +"="+ obj.params.getProperty(AppParameters.GPX_BASETIME) );\r
         System.out.println(" - param： "+ AppParameters.IMG_OUTPUT +"="+ obj.params.getProperty(AppParameters.IMG_OUTPUT));     \r
-        System.out.println(" - param： "+ AppParameters.IMG_OUTPUT_EXIF +"= '"+ String.valueOf(obj.exif) +"'");\r
+        System.out.println(" - param： "+ AppParameters.IMG_OUTPUT_EXIF +"= "+ String.valueOf(obj.exif));\r
+        System.out.println(" - param： "+ AppParameters.GPX_SOURCE_FOLDER +"="+ obj.param_GpxSourceFolder);\r
         System.out.println(" - param： "+ AppParameters.GPX_OUTPUT_WPT +"="+ obj.param_GpxOutputWpt);\r
         System.out.println(" - param： "+ AppParameters.GPX_OVERWRITE_MAGVAR +"="+ obj.param_GpxOverwriteMagvar);\r
         System.out.println(" - param： "+ AppParameters.GPX_OUTPUT_SPEED +"="+ obj.param_GpxOutputSpeed);\r
@@ -259,6 +268,7 @@ public class ImportPicture extends Thread {
        public boolean param_GpxOutputSpeed = false;\r
        public boolean param_GpxOverwriteMagvar = false;\r
        public boolean param_GpxOutputWpt = true;\r
+       public String param_GpxSourceFolder = ".";\r
        \r
     @Override\r
     public void run() {\r
@@ -313,9 +323,9 @@ public class ImportPicture extends Thread {
 \r
         File outputFile = new File(outDir, iStr +"_.gpx");\r
         System.out.println(gpxFile.getAbsolutePath() + " => "+ outputFile.getAbsolutePath());\r
-        System.out.println("           時差： "+ (delta / 1000) +"(sec)");\r
-        System.out.println("    Target GPX： ["+ gpxFile.getAbsolutePath() +"]");\r
-        System.out.println("          EXIF： "+ (exif ? ("convert to '" + outDir.getAbsolutePath() +"'") : "off"));\r
+        System.out.println("           時差: "+ (delta / 1000) +"(sec)");\r
+        System.out.println("    Target GPX: ["+ gpxFile.getAbsolutePath() +"]");\r
+        System.out.println("          EXIF: "+ (exif ? ("convert to '" + outDir.getAbsolutePath() +"'") : "off"));\r
         System.out.println();\r
 \r
         factory = DocumentBuilderFactory.newInstance();\r