diff --git a/pom.xml b/pom.xml index a22ca5e..4fe7bc9 100644 --- a/pom.xml +++ b/pom.xml @@ -8,8 +8,22 @@ <connection>scm:git:http://surveyor.mydns.jp/gitbucket/git/yuu/ReStamp-gui.git</connection> <url>http://surveyor.mydns.jp/gitbucket/yuu/ReStamp-gui/wiki</url> <developerConnection>scm:git:http://surveyor.mydns.jp/gitbucket/git/yuu/ReStamp-gui.git</developerConnection> - <tag>HEAD</tag> </scm> + + <licenses> + <license> + <name>MIT License</name> + <url>http://www.opensource.org/licenses/mit-license.php</url> + </license> + </licenses> + <developers> + <developer> + <name>Yuu Hayashi</name> + <email>hayashi.yuu@gmail.com</email> + <organization>surveyor</organization> + <organizationUrl>http://surveyor.mydns.jp/</organizationUrl> + </developer> + </developers> <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> @@ -22,31 +36,34 @@ <name>ReStamp-gui</name> <url>http://surveyor.mydns.jp/gitbucket/yuu/Restamp-gui/wiki</url> - <repositories> + <!-- DEPLOY先の指定 mvn deploy --> + <distributionManagement> <repository> - <id>internal</id> - <name>Hayashi Repository</name> + <id>surveyor.haya4</id> + <name>Internal Release Repository</name> <url>http://surveyor.mydns.jp/archiva/repository/haya4/</url> - <releases> - <enabled>true</enabled> - </releases> - <snapshots> - <enabled>false</enabled> - </snapshots> </repository> - </repositories> + <snapshotRepository> + <id>surveyor.snapshots</id> + <name>Archiva Managed Snapshot Repository</name> + <url>http://surveyor.mydns.jp/archiva/repository/snapshots/</url> + </snapshotRepository> + </distributionManagement> <dependencies> + + <!-- restamp-core --> <dependency> <groupId>osm.surveyor</groupId> <artifactId>ReStamp</artifactId> - <version>3.3</version> + <version>3.8.4</version> </dependency> + + <!-- https://mvnrepository.com/artifact/org.apache.commons/commons-imaging --> <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-imaging</artifactId> - <version>1.0-alpha1</version> - <type>jar</type> + <groupId>org.apache.commons</groupId> + <artifactId>commons-imaging</artifactId> + <version>1.0-alpha1</version> </dependency> <!-- for JUnit test --> diff --git a/src/main/java/osm/surveyor/matchtime/gui/ReStamp.java b/src/main/java/osm/surveyor/matchtime/gui/ReStamp.java index 6658919..75fd3bf 100644 --- a/src/main/java/osm/surveyor/matchtime/gui/ReStamp.java +++ b/src/main/java/osm/surveyor/matchtime/gui/ReStamp.java @@ -1,8 +1,8 @@ package osm.surveyor.matchtime.gui; -import osm.surveyor.matchtime.AppParameters; import java.awt.*; import java.io.IOException; +import java.nio.file.Paths; import java.text.SimpleDateFormat; import java.util.ResourceBundle; import java.util.TimeZone; @@ -22,7 +22,6 @@ public static final String PROGRAM_VARSION = "3.01a"; public static final String PROGRAM_UPDATE = "2020-02-11"; - AppParameters params; public static SimpleDateFormat dfjp = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss Z"); // Used for addNotify check. @@ -113,8 +112,6 @@ container.add(Box.createHorizontalStrut(10), BorderLayout.WEST); container.add(Box.createHorizontalStrut(10), BorderLayout.EAST); - params = new AppParameters(); - //--------------------------------------------------------------------- cardPanel = new JTabbedPane(JTabbedPane.LEFT); mainPanel.add(cardPanel, BorderLayout.CENTER); @@ -127,7 +124,7 @@ { arg1_srcFolder = new ParameterPanelFolder( i18n.getString("label.110") +": ", - params.getProperty(AppParameters.IMG_SOURCE_FOLDER) + Paths.get(".").toString() ); arg1_srcFolder.argField.getDocument().addDocumentListener( new SimpleDocumentListener() {