diff --git a/log.properties b/log.properties new file mode 100644 index 0000000..0a0e6db --- /dev/null +++ b/log.properties @@ -0,0 +1,8 @@ +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 b29fd36..030a7ba 100644 --- a/pom.xml +++ b/pom.xml @@ -39,7 +39,7 @@ osm.surveyor AdjustTime - 5.3.10-SNAPSHOT + 5.3.12 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 71851be..a47f6d2 100644 --- a/src/main/java/osm/jp/gpx/matchtime/gui/AdjustTerra.java +++ b/src/main/java/osm/jp/gpx/matchtime/gui/AdjustTerra.java @@ -5,7 +5,11 @@ 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; @@ -22,6 +26,8 @@ public static final String PROGRAM_NAME = "AdjustTerra for JOSM"; public static final String PROGRAM_VARSION = "5.2"; public static final String PROGRAM_UPDATE = "2020/02/02"; + public static Logger logger = LoggerFactory.getInstance(); + AppParameters params; public static SimpleDateFormat dfjp = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss Z"); @@ -84,8 +90,9 @@ * データベース内のテーブルを一覧で表示するFrame * @throws IOException */ - public AdjustTerra() throws IOException + public AdjustTerra() throws Exception { + logger.info("start!"); dfjp.setTimeZone(TimeZone.getTimeZone("JST")); // INIT_CONTROLS @@ -285,7 +292,7 @@ } }); } - private static void createAndShowGUI() throws IOException { + private static void createAndShowGUI() throws Exception { (new AdjustTerra()).setVisible(true); } 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 c9218db..6af259f 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 @@ -5,10 +5,14 @@ import java.beans.PropertyChangeEvent; import java.io.File; import java.io.FileNotFoundException; +import java.net.URISyntaxException; +import java.nio.file.Path; + import javax.swing.JButton; import javax.swing.JFileChooser; import osm.jp.gpx.matchtime.gui.AdjustTerra; +import osm.jp.hayashi.tools.files.Directory; @SuppressWarnings("serial") public abstract class ParameterPanelFolder extends ParameterPanel implements ActionListener @@ -85,7 +89,7 @@ @Override public void propertyChange(PropertyChangeEvent evt) { // TODO Auto-generated method stub - + AdjustTerra.logger.warning("ParameterPanelFolder.propertyChange()"); } @Override @@ -95,8 +99,14 @@ try { sdir = getDirectory(); } catch (FileNotFoundException ex) { - sdir = new File("."); - this.argField.setText(sdir.getAbsolutePath()); + Path p; + try { + p = Directory.getCurrentDirectory(); + this.argField.setText(p.toAbsolutePath().toString()); + } catch (URISyntaxException e1) { + this.argField.setText("."); + } + sdir = new File(this.argField.getText()); } if (sdir.exists()) { this.fc = new JFileChooser(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 63288d3..888d390 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 @@ -3,6 +3,7 @@ import java.io.File; import java.io.FileNotFoundException; +import osm.jp.gpx.matchtime.gui.AdjustTerra; import osm.jp.gpx.matchtime.gui.ImageFileFilter; @SuppressWarnings("serial") @@ -29,6 +30,8 @@ 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)) { return false; @@ -36,6 +39,7 @@ return true; } catch (Exception e) { + AdjustTerra.logger.severe("ERROR: ParameterPanelSourceFolder.isEnable("+ e.toString() +")"); return false; } }