diff --git a/log.properties b/log.properties deleted file mode 100644 index 0a0e6db..0000000 --- a/log.properties +++ /dev/null @@ -1,8 +0,0 @@ -handlers=java.util.logging.ConsoleHandler, java.util.logging.FileHandler -.level=INFO -java.util.logging.ConsoleHandler.level=FINEST -java.util.logging.ConsoleHandler.formatter=osm.jp.hayashi.tools.log.YuuLogFormatter -java.util.logging.FileHandler.level=INFO -java.util.logging.FileHandler.pattern=Logging%u.%g.log -java.util.logging.FileHandler.formatter=osm.jp.hayashi.tools.log.YuuLogFormatter -java.util.logging.FileHandler.count=10 diff --git a/pom.xml b/pom.xml index 3020b66..9df82da 100644 --- a/pom.xml +++ b/pom.xml @@ -70,7 +70,7 @@ osm.surveyor adjustgpx-core - 5.3.20 + 5.3.22 diff --git a/src/main/java/osm/jp/gpx/matchtime/gui/AdjustTerra.java b/src/main/java/osm/jp/gpx/matchtime/gui/AdjustTerra.java index 9df9cbd..58d5e34 100644 --- a/src/main/java/osm/jp/gpx/matchtime/gui/AdjustTerra.java +++ b/src/main/java/osm/jp/gpx/matchtime/gui/AdjustTerra.java @@ -5,11 +5,9 @@ import java.text.SimpleDateFormat; import java.util.ResourceBundle; import java.util.TimeZone; -import java.util.logging.Logger; import javax.swing.*; -import osm.jp.hayashi.tools.log.LoggerFactory; import osm.jp.gpx.*; import osm.jp.gpx.matchtime.gui.parameters.ParameterPanelGpx; import osm.jp.gpx.matchtime.gui.parameters.ParameterPanelImageFile; @@ -24,7 +22,6 @@ public class AdjustTerra extends JFrame { public static final String PROGRAM_NAME = "AdjustGpx"; - public static Logger logger = LoggerFactory.getInstance(); AppParameters params; @@ -90,7 +87,6 @@ */ public AdjustTerra() throws Exception { - logger.info("start!"); dfjp.setTimeZone(TimeZone.getTimeZone("JST")); // INIT_CONTROLS diff --git a/src/main/java/osm/jp/gpx/matchtime/gui/parameters/ParameterPanelFolder.java b/src/main/java/osm/jp/gpx/matchtime/gui/parameters/ParameterPanelFolder.java index 714fbc2..4ce8562 100644 --- a/src/main/java/osm/jp/gpx/matchtime/gui/parameters/ParameterPanelFolder.java +++ b/src/main/java/osm/jp/gpx/matchtime/gui/parameters/ParameterPanelFolder.java @@ -2,7 +2,6 @@ import java.awt.event.ActionEvent; import java.awt.event.ActionListener; -import java.beans.PropertyChangeEvent; import java.io.File; import java.io.FileNotFoundException; import java.net.URISyntaxException; @@ -87,12 +86,6 @@ } @Override - public void propertyChange(PropertyChangeEvent evt) { - // TODO Auto-generated method stub - AdjustTerra.logger.warning("ParameterPanelFolder.propertyChange()"); - } - - @Override public void actionPerformed(ActionEvent e) { if (e.getSource() == selectButton){ File sdir; diff --git a/src/main/java/osm/jp/gpx/matchtime/gui/parameters/ParameterPanelSourceFolder.java b/src/main/java/osm/jp/gpx/matchtime/gui/parameters/ParameterPanelSourceFolder.java index f30e68b..67ee769 100644 --- a/src/main/java/osm/jp/gpx/matchtime/gui/parameters/ParameterPanelSourceFolder.java +++ b/src/main/java/osm/jp/gpx/matchtime/gui/parameters/ParameterPanelSourceFolder.java @@ -5,7 +5,6 @@ import javax.swing.JFileChooser; -import osm.jp.gpx.matchtime.gui.AdjustTerra; import osm.jp.gpx.matchtime.gui.ImageFileFilter; @SuppressWarnings("serial") @@ -32,7 +31,6 @@ public boolean isEnable() { try { File dir = super.getDirectory(); - AdjustTerra.logger.info("ParameterPanelSourceFolder.isEnable("+ dir.getAbsolutePath() +")"); File[] files = dir.listFiles(new ImageFileFilter()); if ((files == null) || (files.length < 1)) { @@ -41,7 +39,6 @@ return true; } catch (Exception e) { - AdjustTerra.logger.severe("ERROR: ParameterPanelSourceFolder.isEnable("+ e.toString() +")"); return false; } } diff --git a/src/main/resources/i18n.properties b/src/main/resources/i18n.properties deleted file mode 100644 index cf62f0d..0000000 --- a/src/main/resources/i18n.properties +++ /dev/null @@ -1,67 +0,0 @@ -dialog.quit=Quit -dialog.cancel=Cancel -dialog.msg1=Quit this program. -dialog.select=Selection - -menu.tools=Tools -menu.restamp=Restamp -button.close=Close - -menu.quit=Quit? -button.next=Next -button.previous=Previous -button.execute=Execute -button.select=Selection... -button.update=Update... -button.reset=Reset... - -tab.100=1. Source image Folder -label.100=

1. Select image source folder.

-label.110=Image Folder - -tab.200=2. Set correct shooting time -tab.restamp.200=2. Set correct shooting time (start) -tab.restamp.250=3. Set correct shooting time (end) -label.200=

2. Choose an image whose exact shooting time can be known.

-label.210=Reference time image -label.220=Based on EXIF date and time -label.230=Based on FILE UPDATE time -tab.300=2a. Set correct shooting time -tab.restamp.300=2a. Set correct shooting time (start) -label.300=

3. enter the correct shooting time.

-label.310=Reference time -label.restamp.310=Reference time (start) - -tab.400=3. Select GPX files -label.400=

4. Please select a GPX file to perform the matching.

-label.410=GPX folder -label.420=Ignore the first node of segment 'trkseg' -label.430=Also make the generated GPX file (the one whose filename ends with '_.gpx') as the target of conversion - -tab.restamp.400=4. Perform RESTAMP - -tab.500=4. perform EXIF conversion -label.500=Select whether to perform EXIF conversion -label.501=When performing EXIF conversion, you also need to specify the folder to output the converted file. -label.502=The output folder must have write permission and sufficient free space. -label.510=Convert IMG -label.520=Copy files outside the GPX file time -label.530=Output folder -label.540=Convert EXIF -label.550=Output point marker to GPX file -label.560=Ignoring of source GPX -label.570=Overwrite in output GPX -label.580=Simplify (m) - -msg.100=GPX file or directory does not exist.('%s') -msg.110=The target GPX file can not be found.('%s') -msg.120=When there are multiple GPX files, 'IMG.OUTPUT_ALL' option can not be specified. -msg.130=Format of '%s' is wrong.(%s) -msg.140=Not exists EXIF data in '%s'. - -msg.200=[error] Not exists . -msg.210=[error] is not Folder. -msg.220=[error] Not exists . -msg.230=[error] is not a file. -msg.240=[error] Not exists . -msg.250=[error] is not a file. diff --git a/src/main/resources/i18n_ja_JP.properties b/src/main/resources/i18n_ja_JP.properties deleted file mode 100644 index 1ad69ed..0000000 --- a/src/main/resources/i18n_ja_JP.properties +++ /dev/null @@ -1,69 +0,0 @@ -dialog.quit=\u7D42\u4E86 -dialog.cancel=\u30AD\u30E3\u30F3\u30BB\u30EB -dialog.msg1=\u30D7\u30ED\u30B0\u30E9\u30E0\u3092\u7D42\u4E86\u3057\u307E\u3059\u3002 -dialog.select=\u9078\u629E - -menu.tools=\u30C4\u30FC\u30EB -menu.restamp=Restamp -button.close=\u9589\u3058\u308B - -menu.quit=\u7D42\u4E86... -button.next=\u6B21\u3078 -button.previous=\u623B\u308B -button.execute=\u51E6\u7406\u5B9F\u884C -button.select=\u9078\u629E... -button.update=\u5909\u66F4... -button.reset=\u518D\u8A2D\u5B9A... - -tab.100=1. \u753B\u50CF\u30D5\u30A9\u30EB\u30C0\u306E\u9078\u629E -label.100=

1. \u4F4D\u7F6E\u60C5\u5831\u3092\u4ED8\u52A0\u3057\u305F\u3044\u753B\u50CF\u30D5\u30A1\u30A4\u30EB\u304C\u683C\u7D0D\u3055\u308C\u3066\u3044\u308B\u30D5\u30A9\u30EB\u30C0\u3092\u9078\u629E\u3057\u3066\u304F\u3060\u3055\u3044\u3002

  • \u30B3\u30D4\u30FC\u52D5\u4F5C\u3092\u884C\u3046\u3068\u3001\u30D5\u30A1\u30A4\u30EB\u66F4\u65B0\u6642\u523B\u304C\u30B3\u30D4\u30FC\u3092\u5B9F\u884C\u3057\u305F\u6642\u523B\u306B\u66F8\u304D\u63DB\u308F\u3063\u3066\u3057\u307E\u3046\u3053\u3068\u304C\u3042\u308A\u307E\u3059\u3002\u30AB\u30E1\u30E9SD\u30AB\u30FC\u30C9\u5185\u306E\u30D5\u30A9\u30EB\u30C0\u3092\u76F4\u63A5\u6307\u5B9A\u3059\u308B\u3053\u3068\u3092\u304A\u3059\u3059\u3081\u3057\u307E\u3059\u3002
-label.110=\u5BFE\u8C61\u30D5\u30A9\u30EB\u30C0 - -tab.200=2. \u57FA\u6E96\u3068\u3059\u308B\u753B\u50CF\u306E\u9078\u629E -tab.restamp.200=2. \u57FA\u6E96\u3068\u3059\u308B\u753B\u50CF(\u958B\u59CB\u753B\u50CF)\u306E\u9078\u629E -tab.restamp.250=3. \u57FA\u6E96\u3068\u3059\u308B\u753B\u50CF(\u7D42\u4E86\u753B\u50CF)\u306E\u9078\u629E -label.200=

2. \u6B63\u78BA\u306A\u64AE\u5F71\u6642\u523B\u304C\u5224\u660E\u3067\u304D\u308B\u753B\u50CF\u3092\u9078\u3093\u3067\u304F\u3060\u3055\u3044\u3002

  • \u30B9\u30DE\u30FC\u30C8\u30D5\u30A9\u30F3\u306E\u6642\u8A08\u753B\u9762\uFF08\u79D2\u304C\u5224\u5225\u3067\u304D\u308B\u3053\u3068\uFF09\u3092\u64AE\u5F71\u3057\u305F\u753B\u50CF
  • \u30AB\u30E1\u30E9\u306E\u6642\u8A08\u304C\u6B63\u78BA\u306A\u3089\u3070\u3001\u3069\u306E\u753B\u50CF\u3092\u9078\u3093\u3067\u3082\u69CB\u3044\u307E\u305B\u3093\u3002
-label.210=\u57FA\u6E96\u6642\u523B\u753B\u50CF -label.220=EXIF\u306E\u65E5\u6642\u3092\u57FA\u6E96\u306B\u3059\u308B -label.230=\u30D5\u30A1\u30A4\u30EB\u66F4\u65B0\u65E5\u6642\u3092\u57FA\u6E96\u306B\u3059\u308B - -tab.300=2a. \u57FA\u6E96\u6642\u523B\u3092\u8A2D\u5B9A -tab.restamp.300=2a. \u958B\u59CB\u753B\u50CF\u306E\u672C\u5F53\u306E\u6642\u523B\u3092\u8A2D\u5B9A -tab.restamp.350=3a. \u7D42\u4E86\u753B\u50CF\u306E\u672C\u5F53\u306E\u6642\u523B\u3092\u8A2D\u5B9A -label.300=

3. \u6B63\u78BA\u306A\u64AE\u5F71\u6642\u523B\u3092\u5165\u529B\u3057\u3066\u304F\u3060\u3055\u3044\u3002

  • \u30AB\u30E1\u30E9\u306E\u6642\u8A08\u304C\u6B63\u78BA\u306A\u3089\u3070\u3001\u8A2D\u5B9A\u3092\u5909\u66F4\u3059\u308B\u5FC5\u8981\u306F\u3042\u308A\u307E\u305B\u3093\u3002
-label.310=\u57FA\u6E96\u6642\u523B -label.restamp.310=\u57FA\u6E96\u6642\u523B(\u958B\u59CB\u753B\u50CF) - -tab.400=3. GPX\u30D5\u30A1\u30A4\u30EB\u3092\u9078\u629E -label.400=

4. \u30D2\u30E2\u4ED8\u3092\u884C\u3046GPX\u30D5\u30A1\u30A4\u30EB\u3092\u9078\u629E\u3057\u3066\u304F\u3060\u3055\u3044\u3002

  • \u30D5\u30A9\u30EB\u30C0\u3092\u6307\u5B9A\u3059\u308B\u3068\u3001\u30D5\u30A9\u30EB\u30C0\u5185\u306B\u3042\u308B\u3059\u3079\u3066\u306EGPX\u30D5\u30A1\u30A4\u30EB\u3092\u5BFE\u8C61\u3068\u3057\u307E\u3059\u3002
-label.410=GPX\u30D5\u30A9\u30EB\u30C0 -label.420=\u30BB\u30B0\u30E1\u30F3\u30C8'trkseg'\u306E\u6700\u521D\u306E\uFF11\u30CE\u30FC\u30C9\u306F\u7121\u8996\u3059\u308B -label.430=\u751F\u6210\u3055\u308C\u305FGPX\u30D5\u30A1\u30A4\u30EB\uFF08\u30D5\u30A1\u30A4\u30EB\u540D\u304C'_.gpx'\u3067\u7D42\u308F\u308B\u3082\u306E\uFF09\u3082\u5909\u63DB\u306E\u5BFE\u8C61\u306B\u3059\u308B - -tab.500=4. EXIF\u5909\u63DB\u306E\u5B9F\u884C -label.500=EXIF\u5909\u63DB\u3092\u884C\u3046\u304B\u3069\u3046\u304B\u3092\u9078\u629E\u3057\u3066\u304F\u3060\u3055\u3044 -label.501=EXIF\u5909\u63DB\u3092\u884C\u3046\u5834\u5408\u306B\u306F\u3001\u5909\u63DB\u30D5\u30A1\u30A4\u30EB\u3092\u51FA\u529B\u3059\u308B\u30D5\u30A9\u30EB\u30C0\u3082\u6307\u5B9A\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002 -label.502=\u51FA\u529B\u30D5\u30A9\u30EB\u30C0\u306B\u306F\u3001\u66F8\u304D\u8FBC\u307F\u6A29\u9650\u3068\u3001\u5341\u5206\u306A\u7A7A\u304D\u5BB9\u91CF\u304C\u5FC5\u8981\u3067\u3059\u3002 -label.510=IMG\u306E\u5909\u63DB\u3092\u3059\u308B -label.520=GPX\u30D5\u30A1\u30A4\u30EB\u6642\u9593\u5916\u306E\u30D5\u30A1\u30A4\u30EB\u3082\u30B3\u30D4\u30FC\u3059\u308B -label.530=\u51FA\u529B\u30D5\u30A9\u30EB\u30C0 -label.540=EXIF\u306E\u5909\u63DB\u3092\u3059\u308B -label.550=\u30DD\u30A4\u30F3\u30C8\u30DE\u30FC\u30AB\u30FC\u3092GPX\u30D5\u30A1\u30A4\u30EB\u306B\u51FA\u529B\u3059\u308B -label.560=\u30BD\u30FC\u30B9GPX\u306E\u3092\u7121\u8996\u3059\u308B -label.570=\u51FA\u529BGPX\u306B\u3092\u4E0A\u66F8\u304D\u3059\u308B -label.580=Simplify (m) - -tab.restamp.400=4. \u5909\u63DB\u306E\u5B9F\u884C - -msg.100=GPX\u30D5\u30A1\u30A4\u30EB\u307E\u305F\u306F\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u304C\u5B58\u5728\u3057\u307E\u305B\u3093\u3002('%s') -msg.110=\u5BFE\u8C61\u3068\u306A\u308BGPX\u30D5\u30A1\u30A4\u30EB\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093('%s') -msg.120=\u8907\u6570\u306EGPX\u30D5\u30A1\u30A4\u30EB\u304C\u3042\u308B\u3068\u304D\u306B\u306F\u3001'IMG.OUTPUT_ALL'\u30AA\u30D7\u30B7\u30E7\u30F3\u306F\u6307\u5B9A\u3067\u304D\u307E\u305B\u3093\u3002 -msg.130='%s'\u306E\u66F8\u5F0F\u304C\u9055\u3044\u307E\u3059(%s) -msg.140='%s'\u306BEXIF\u60C5\u5831\u304C\u3042\u308A\u307E\u305B\u3093 - -msg.200=[error] \u304C\u5B58\u5728\u3057\u307E\u305B\u3093 -msg.210=[error] \u304C\u30D5\u30A9\u30EB\u30C0\u3058\u3083\u306A\u3044 -msg.220=[error] \u304C\u5B58\u5728\u3057\u307E\u305B\u3093 -msg.230=[error] \u304C\u30D5\u30A1\u30A4\u30EB\u3058\u3083\u306A\u3044 -msg.240=[error] \u304C\u5B58\u5728\u3057\u307E\u305B\u3093 -msg.250=[error] \u304C\u30D5\u30A1\u30A4\u30EB\u3058\u3083\u306A\u3044