diff --git a/pom.xml b/pom.xml index 4372967..a5fe68f 100644 --- a/pom.xml +++ b/pom.xml @@ -5,12 +5,16 @@ ReStamp 3.1-SNAPSHOT jar - + + + ReStamp + http://surveyor.mydns.jp/gitbucket/yuu/Restamp/wiki + - hayashi_repository - Hayashi Repository - http://surveyor.mydns.jp/archiva/repository/hayashi_repository/ + internal + Archiva Managed Internal Repository + http://surveyor.mydns.jp/archiva/repositories/internal/ true @@ -38,20 +42,20 @@ org.apache.commons commons-imaging - 1.0-alpha1 + LATEST jar commons-codec commons-codec - 1.10 + LATEST test UTF-8 - 11 - 11 + 1.8 + 1.8 @@ -81,6 +85,58 @@ + + org.apache.maven.plugins + maven-site-plugin + 3.7.1 + + + org.apache.maven.plugins + maven-project-info-reports-plugin + 3.0.0 + - + + + + + + + org.apache.maven.plugins + maven-surefire-report-plugin + + + org.apache.maven.plugins + maven-javadoc-plugin + + 1.8 + protected + UTF-8 + UTF-8 + UTF-8 + + + + org.codehaus.mojo + cobertura-maven-plugin + + true + + + + + \ No newline at end of file diff --git a/src/main/java/osm/surveyor/matchtime/Restamp.java b/src/main/java/osm/surveyor/matchtime/Restamp.java index 2d372dc..d25f2e9 100644 --- a/src/main/java/osm/surveyor/matchtime/Restamp.java +++ b/src/main/java/osm/surveyor/matchtime/Restamp.java @@ -128,7 +128,6 @@ * @return パラメータチェックに合格すればtrue * @throws Exception */ - @SuppressWarnings("Convert2Lambda") public boolean setUp( Path imgDir, Path baseFile1, Date baseTime1, @@ -212,9 +211,8 @@ boolean base2 = false; ArrayList jpgFiles = new ArrayList<>(); - try { - // 指定されたディレクトリ内のJPEGファイルすべてを対象とする - Stream files = Files.list(Paths.get(imgDir.toString())); + // 指定されたディレクトリ内のJPEGファイルすべてを対象とする + try (Stream files = Files.list(Paths.get(imgDir.toString()))){ List sortedList = files.sorted(Comparator.naturalOrder()).collect(Collectors.toList()); for (Path p : sortedList) { @@ -237,7 +235,6 @@ DateFormat df2 = new SimpleDateFormat(TIME_PATTERN); // imgDir内の画像ファイルを処理する - @SuppressWarnings("LocalVariableHidesMemberVariable") long span = this.baseTime2.getTime() - this.baseTime1.getTime(); span = span / (bCount2 - bCount1); int i = 0; diff --git a/src/main/java/osm/surveyor/matchtime/gui/AboutDialog.java b/src/main/java/osm/surveyor/matchtime/gui/AboutDialog.java index 6c72aec..bbc2790 100644 --- a/src/main/java/osm/surveyor/matchtime/gui/AboutDialog.java +++ b/src/main/java/osm/surveyor/matchtime/gui/AboutDialog.java @@ -35,7 +35,6 @@ } } - @SuppressWarnings("OverridableMethodCallInConstructor") public AboutDialog(Frame parent, boolean modal) { super(parent, modal); @@ -71,7 +70,6 @@ //}} } - @SuppressWarnings("OverridableMethodCallInConstructor") public AboutDialog(Frame parent, String title, boolean modal) { this(parent, modal); setTitle(title); diff --git a/src/main/java/osm/surveyor/matchtime/gui/Card.java b/src/main/java/osm/surveyor/matchtime/gui/Card.java index 4181a47..c898b82 100644 --- a/src/main/java/osm/surveyor/matchtime/gui/Card.java +++ b/src/main/java/osm/surveyor/matchtime/gui/Card.java @@ -13,7 +13,8 @@ import static osm.surveyor.matchtime.gui.ReStamp.i18n; public class Card extends JPanel { - JTabbedPane tabbe; + private static final long serialVersionUID = 8530672831582833489L; + JTabbedPane tabbe; public JPanel mainPanel; String title; int backNumber = -1; diff --git a/src/main/java/osm/surveyor/matchtime/gui/CardGpxFile.java b/src/main/java/osm/surveyor/matchtime/gui/CardGpxFile.java index b69cbba..1b16f26 100644 --- a/src/main/java/osm/surveyor/matchtime/gui/CardGpxFile.java +++ b/src/main/java/osm/surveyor/matchtime/gui/CardGpxFile.java @@ -13,7 +13,8 @@ * @author yuu */ public class CardGpxFile extends Card implements PanelAction { - ParameterPanelGpx arg_gpxFile; + private static final long serialVersionUID = -8899524266392178269L; + ParameterPanelGpx arg_gpxFile; /** * コンストラクタ @@ -67,7 +68,6 @@ } @Override - @SuppressWarnings("empty-statement") public void openAction() { ; // 何もしない } diff --git a/src/main/java/osm/surveyor/matchtime/gui/DoDialog.java b/src/main/java/osm/surveyor/matchtime/gui/DoDialog.java index eac4820..0422913 100644 --- a/src/main/java/osm/surveyor/matchtime/gui/DoDialog.java +++ b/src/main/java/osm/surveyor/matchtime/gui/DoDialog.java @@ -27,16 +27,13 @@ JTextArea textArea; // 実行結果を表示するJTextArea (中央) //}} - @SuppressWarnings("OverridableMethodCallInConstructor") public DoDialog(String[] args) { super(); // モーダルダイアログを基盤にする this.args = args; // INIT_CONTROLS - @SuppressWarnings("OverridableMethodCallInConstructor") Container container = getContentPane(); container.setLayout(new BorderLayout()); - //parentFrame.setVisible(false); setSize(getInsets().left + getInsets().right + 980, getInsets().top + getInsets().bottom + 480); setTitle(DoDialog.TITLE); @@ -84,9 +81,6 @@ catch (Exception e) { System.out.println(e.toString()); } - - // JFrameの表示 - //parentFrame.setVisible(true); } /** @@ -183,7 +177,6 @@ // 非同期に行われる処理 @Override - @SuppressWarnings("SleepWhileInLoop") public Object doInBackground() { // ながーい処理 PrintStream defOut = System.out; diff --git a/src/main/java/osm/surveyor/matchtime/gui/ImagePreview.java b/src/main/java/osm/surveyor/matchtime/gui/ImagePreview.java index e4cb3d6..9fad226 100644 --- a/src/main/java/osm/surveyor/matchtime/gui/ImagePreview.java +++ b/src/main/java/osm/surveyor/matchtime/gui/ImagePreview.java @@ -45,7 +45,7 @@ static int IMAGE_SIZE_X = 320; static int IMAGE_SIZE_Y = 240; - @SuppressWarnings({"LeakingThisInConstructor", "OverridableMethodCallInConstructor"}) + @SuppressWarnings({}) public ImagePreview(JFileChooser fc) { setPreferredSize(new Dimension(IMAGE_SIZE_X + 10, IMAGE_SIZE_Y + 10)); fc.addPropertyChangeListener(this); diff --git a/src/main/java/osm/surveyor/matchtime/gui/ParameterPanel.java b/src/main/java/osm/surveyor/matchtime/gui/ParameterPanel.java index 7f6909e..e0a3a9d 100644 --- a/src/main/java/osm/surveyor/matchtime/gui/ParameterPanel.java +++ b/src/main/java/osm/surveyor/matchtime/gui/ParameterPanel.java @@ -18,7 +18,6 @@ public JLabel argLabel; public ResourceBundle i18n = ResourceBundle.getBundle("i18n"); - @SuppressWarnings("OverridableMethodCallInConstructor") public ParameterPanel(String label, String text) { this(); this.argLabel.setText(label); diff --git a/src/main/java/osm/surveyor/matchtime/gui/ParameterPanelFolder.java b/src/main/java/osm/surveyor/matchtime/gui/ParameterPanelFolder.java index e934c6a..32be1fc 100644 --- a/src/main/java/osm/surveyor/matchtime/gui/ParameterPanelFolder.java +++ b/src/main/java/osm/surveyor/matchtime/gui/ParameterPanelFolder.java @@ -24,7 +24,6 @@ this(label, text, JFileChooser.DIRECTORIES_ONLY); } - @SuppressWarnings({"OverridableMethodCallInConstructor", "LeakingThisInConstructor"}) public ParameterPanelFolder(String label, String text, int chooser) { super(label, text); diff --git a/src/main/java/osm/surveyor/matchtime/gui/ParameterPanelGpx.java b/src/main/java/osm/surveyor/matchtime/gui/ParameterPanelGpx.java index ce698ca..cd5f759 100644 --- a/src/main/java/osm/surveyor/matchtime/gui/ParameterPanelGpx.java +++ b/src/main/java/osm/surveyor/matchtime/gui/ParameterPanelGpx.java @@ -21,7 +21,6 @@ * @param label * @param text */ - @SuppressWarnings({"OverridableMethodCallInConstructor", "LeakingThisInConstructor"}) public ParameterPanelGpx(String label, String text) { super(label, text); diff --git a/src/main/java/osm/surveyor/matchtime/gui/ParameterPanelImageFile.java b/src/main/java/osm/surveyor/matchtime/gui/ParameterPanelImageFile.java index 4e84c9b..18475de 100644 --- a/src/main/java/osm/surveyor/matchtime/gui/ParameterPanelImageFile.java +++ b/src/main/java/osm/surveyor/matchtime/gui/ParameterPanelImageFile.java @@ -12,7 +12,6 @@ public JButton openButton; public ParameterPanelFolder paramDir; - @SuppressWarnings("OverridableMethodCallInConstructor") public ParameterPanelImageFile( String label, String text, ParameterPanelFolder paramDir @@ -31,7 +30,6 @@ class SelectButtonAction implements java.awt.event.ActionListener { - @SuppressWarnings("override") public void actionPerformed(ActionEvent e) { selectImage_Action(e); } diff --git a/src/main/java/osm/surveyor/matchtime/gui/ParameterPanelSelecter.java b/src/main/java/osm/surveyor/matchtime/gui/ParameterPanelSelecter.java index 0a7f768..a4619ed 100644 --- a/src/main/java/osm/surveyor/matchtime/gui/ParameterPanelSelecter.java +++ b/src/main/java/osm/surveyor/matchtime/gui/ParameterPanelSelecter.java @@ -18,7 +18,7 @@ public JComboBox field; public String value; - @SuppressWarnings({"OverridableMethodCallInConstructor", "LeakingThisInConstructor"}) + @SuppressWarnings({}) public ParameterPanelSelecter(String title, String[] items) { super(null); this.value = items[0]; diff --git a/src/main/java/osm/surveyor/matchtime/gui/ParameterPanelTime.java b/src/main/java/osm/surveyor/matchtime/gui/ParameterPanelTime.java index 23652ad..dec5b46 100644 --- a/src/main/java/osm/surveyor/matchtime/gui/ParameterPanelTime.java +++ b/src/main/java/osm/surveyor/matchtime/gui/ParameterPanelTime.java @@ -26,7 +26,8 @@ * この１インスタンスで、１パラメータをあらわす。 */ public class ParameterPanelTime extends ParameterPanel { - SimpleDateFormat sdf = (SimpleDateFormat)DateFormat.getDateTimeInstance(); + private static final long serialVersionUID = 9118495619374256843L; + SimpleDateFormat sdf = (SimpleDateFormat)DateFormat.getDateTimeInstance(); ParameterPanelImageFile imageFile; // 基準時刻画像 // 基準時刻の指定グループ (排他選択) @@ -38,7 +39,6 @@ public JButton resetButton; Window owner; - @SuppressWarnings("OverridableMethodCallInConstructor") public ParameterPanelTime( String label, String text, @@ -81,7 +81,6 @@ this.param = param; } - @SuppressWarnings("override") public void actionPerformed(ActionEvent e) { fileSelect_Action(param); (new DialogCorectTime(param, owner)).setVisible(true); @@ -99,7 +98,6 @@ this.paramPanelTime = param; } - @SuppressWarnings("override") public void actionPerformed(ActionEvent e) { fileSelect_Action(paramPanelTime); } diff --git a/src/main/java/osm/surveyor/matchtime/gui/QuitDialog.java b/src/main/java/osm/surveyor/matchtime/gui/QuitDialog.java index aafb9a6..903e720 100644 --- a/src/main/java/osm/surveyor/matchtime/gui/QuitDialog.java +++ b/src/main/java/osm/surveyor/matchtime/gui/QuitDialog.java @@ -20,7 +20,6 @@ JButton noButton; JLabel label1; - @SuppressWarnings("OverridableMethodCallInConstructor") public QuitDialog(JFrame parent, boolean modal) { super(parent, modal); diff --git a/src/main/java/osm/surveyor/matchtime/gui/ReStamp.java b/src/main/java/osm/surveyor/matchtime/gui/ReStamp.java index f1a4075..6658919 100644 --- a/src/main/java/osm/surveyor/matchtime/gui/ReStamp.java +++ b/src/main/java/osm/surveyor/matchtime/gui/ReStamp.java @@ -19,8 +19,8 @@ public class ReStamp extends JFrame { public static final String PROGRAM_NAME = "ReStamp for Movie2jpeg"; - public static final String PROGRAM_VARSION = "3.00a"; - public static final String PROGRAM_UPDATE = "2020-01-19"; + 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"); @@ -84,12 +84,11 @@ * データベース内のテーブルを一覧で表示するFrame * @throws IOException */ - @SuppressWarnings("OverridableMethodCallInConstructor") public ReStamp() throws IOException { dfjp.setTimeZone(TimeZone.getTimeZone("JST")); - // INIT_CONTROLS + // INIT_CONTROLS"sync-override" Container container = getContentPane(); container.setLayout(new BorderLayout()); setSize( @@ -311,8 +310,7 @@ * このクラスをインスタンスを生成して表示する。 * コマンドラインの引数はありません。 * @param args - */ - @SuppressWarnings("UseSpecificCatch") + */ static public void main(String args[]) { SwingUtilities.invokeLater(() -> { try { diff --git a/src/main/java/osm/surveyor/matchtime/gui/restamp/CardImageFile.java b/src/main/java/osm/surveyor/matchtime/gui/restamp/CardImageFile.java index 968137a..031e00f 100644 --- a/src/main/java/osm/surveyor/matchtime/gui/restamp/CardImageFile.java +++ b/src/main/java/osm/surveyor/matchtime/gui/restamp/CardImageFile.java @@ -18,7 +18,8 @@ * @author yuu */ public class CardImageFile extends Card implements PanelAction { - ParameterPanelImageFile arg_baseTimeImg; + private static final long serialVersionUID = 9181841489760243343L; + ParameterPanelImageFile arg_baseTimeImg; ParameterPanelTime arg_basetime; /** @@ -82,7 +83,6 @@ } @Override - @SuppressWarnings("empty-statement") public void openAction() { ; // 何もしない } diff --git a/src/main/java/osm/surveyor/matchtime/gui/restamp/CardPerformFile.java b/src/main/java/osm/surveyor/matchtime/gui/restamp/CardPerformFile.java index 857f941..b36e595 100644 --- a/src/main/java/osm/surveyor/matchtime/gui/restamp/CardPerformFile.java +++ b/src/main/java/osm/surveyor/matchtime/gui/restamp/CardPerformFile.java @@ -20,7 +20,7 @@ * @author yuu */ public class CardPerformFile extends Card implements PanelAction { - //JPanel argsPanel; // パラメータ設定パネル (上部) + private static final long serialVersionUID = 4781494884268871662L; ParameterPanelTime arg1_basetime; ParameterPanelTime arg2_basetime; ParameterPanelOutput arg_output; // EXIF & 書き出しフォルダ @@ -96,7 +96,6 @@ * [実行]ボタンをクリックしたときの動作 * @param event */ - @SuppressWarnings("UseSpecificCatch") void doButton_Action(java.awt.event.ActionEvent event) { doButton.setEnabled(false); @@ -127,7 +126,6 @@ } @Override - @SuppressWarnings("empty-statement") public void openAction() { ; // 何もしない } diff --git a/src/main/java/osm/surveyor/matchtime/gui/restamp/CardSourceFolder.java b/src/main/java/osm/surveyor/matchtime/gui/restamp/CardSourceFolder.java index dcfec52..7717a66 100644 --- a/src/main/java/osm/surveyor/matchtime/gui/restamp/CardSourceFolder.java +++ b/src/main/java/osm/surveyor/matchtime/gui/restamp/CardSourceFolder.java @@ -16,7 +16,8 @@ * @author yuu */ public class CardSourceFolder extends Card implements PanelAction { - ParameterPanelFolder arg_srcFolder; // 対象フォルダ + private static final long serialVersionUID = 5204302830596941052L; + ParameterPanelFolder arg_srcFolder; // 対象フォルダ /** * コンストラクタ @@ -44,7 +45,6 @@ } @Override - @SuppressWarnings("empty-statement") public void openAction() { ; // 何もしない } diff --git a/src/main/java/osm/surveyor/matchtime/gui/restamp/DialogCorectTime.java b/src/main/java/osm/surveyor/matchtime/gui/restamp/DialogCorectTime.java index 2170d25..12a43d5 100644 --- a/src/main/java/osm/surveyor/matchtime/gui/restamp/DialogCorectTime.java +++ b/src/main/java/osm/surveyor/matchtime/gui/restamp/DialogCorectTime.java @@ -24,7 +24,8 @@ * @author yuu */ public class DialogCorectTime extends JDialog implements PanelAction { - public JPanel mainPanel; + private static final long serialVersionUID = -8401502593882913338L; + public JPanel mainPanel; ParameterPanelTime arg_basetime; // 開始画像の基準時刻(parent) ParameterPanelTime basetime; // 開始画像の基準時刻(tempolarry) java.awt.Button closeButton; @@ -39,7 +40,6 @@ * @param arg3_basetime 開始画像の基準時刻: * @param owner */ - @SuppressWarnings("OverridableMethodCallInConstructor") public DialogCorectTime(ParameterPanelTime arg3_basetime, Window owner) { super(owner, ReStamp.i18n.getString("tab.restamp.300"), Dialog.ModalityType.DOCUMENT_MODAL); this.arg_basetime = arg3_basetime; @@ -152,7 +152,6 @@ * 選択された画像ファイルを表示する * 基準画像ボタンがクリックされた時に、基準時刻フィールドに基準画像の作成日時を設定する。 */ - @SuppressWarnings("UseSpecificCatch") public void imageView_Action() { try { String path = basetime.getImageFile().getImageFile().getAbsolutePath(); @@ -214,7 +213,6 @@ } @Override - @SuppressWarnings("empty-statement") public void openAction() { ; // 何もしない } diff --git a/src/main/java/osm/surveyor/matchtime/gui/restamp/DoRestamp.java b/src/main/java/osm/surveyor/matchtime/gui/restamp/DoRestamp.java index 6e260a8..0eb2bc4 100644 --- a/src/main/java/osm/surveyor/matchtime/gui/restamp/DoRestamp.java +++ b/src/main/java/osm/surveyor/matchtime/gui/restamp/DoRestamp.java @@ -28,13 +28,11 @@ JTextArea textArea; // 実行結果を表示するJTextArea (中央) //}} - @SuppressWarnings("OverridableMethodCallInConstructor") public DoRestamp(String[] args) { super(); // 親フォームなしのモーダルダイアログを基盤にする this.args = args; // INIT_CONTROLS - @SuppressWarnings("OverridableMethodCallInConstructor") Container container = getContentPane(); container.setLayout(new BorderLayout()); setSize(getInsets().left + getInsets().right + 980, getInsets().top + getInsets().bottom + 480); @@ -180,7 +178,6 @@ // 非同期に行われる処理 @Override - @SuppressWarnings("SleepWhileInLoop") public Object doInBackground() { // ながーい処理 PrintStream defOut = System.out; diff --git a/src/main/resources/AdjustTime.ini b/src/main/resources/AdjustTime.ini deleted file mode 100644 index 3d439b1..0000000 --- a/src/main/resources/AdjustTime.ini +++ /dev/null @@ -1,13 +0,0 @@ -#by AdjustTime -GPX.BASETIME=EXIF_TIME -IMG.OUTPUT_EXIF=true -GPX.OUTPUT_SPEED=false -GPX.noFirstNode=true -IMG.OUTPUT=false -GPX.gpxSplit=true -IMG.TIME=2016-08-14T11\:45\:47 -GPX.REUSE=true -IMG.BASE_FILE=IMG_0182.jpg -IMG.SOURCE_FOLDER=. -GPX.SOURCE_FOLDER=. -IMG.OUTPUT_FOLDER=. \ No newline at end of file diff --git a/src/main/resources/AdjustTime2.bat b/src/main/resources/AdjustTime2.bat deleted file mode 100644 index 96ed170..0000000 --- a/src/main/resources/AdjustTime2.bat +++ /dev/null @@ -1 +0,0 @@ -javaw -cp .;AdjustTime2.jar;commons-compress-1.14.jar;commons-imaging-1.0-20170205.201009-115.jar osm.jp.gpx.matchtime.gui.AdjustTime diff --git a/src/main/resources/AdjustTime2.jnlp b/src/main/resources/AdjustTime2.jnlp deleted file mode 100644 index d865797..0000000 --- a/src/main/resources/AdjustTime2.jnlp +++ /dev/null @@ -1,35 +0,0 @@ - - - - - SwingSet2 Demo Application - Sun Microsystems, Inc. - - SwingSet2 Demo Application - A demo of the capabilities -of the Swing Graphical User Interface. - - - - - - - - - - - - - - SwingSet2 Demo on Linux - - - - - - - - - - - \ No newline at end of file diff --git a/src/main/resources/AdjustTime2.sh b/src/main/resources/AdjustTime2.sh deleted file mode 100644 index bae5196..0000000 --- a/src/main/resources/AdjustTime2.sh +++ /dev/null @@ -1 +0,0 @@ -javaw -cp .:AdjustTime2.jar:commons-compress-1.14.jar:commons-imaging-1.0-20170205.201009-115.jar osm.jp.gpx.matchtime.gui.AdjustTime diff --git a/src/main/resources/README.jp.txt b/src/main/resources/README.jp.txt index 2749310..00e7c83 100644 --- a/src/main/resources/README.jp.txt +++ b/src/main/resources/README.jp.txt @@ -26,9 +26,9 @@ http://sourceforge.jp/projects/importpicture/wiki/FrontPage [起動] -下記のように'AdjustTime'を起動するとGUIでパラメータを逐次設定可能です。（推奨起動方法） +下記のように'ReStamp'を起動するとGUIでパラメータを逐次設定可能です。（推奨起動方法） -> java -cp .:AdjustTime2.jar:commons-imaging-1.0-SNAPSHOT.jar osm.jp.gpx.matchtime.gui.AdjustTime +> java -jar ReStamp.jar osm.surveyor.matchtime.gui.ReStamp 下記のコマンドラインによる起動方式は度重なる機能追加によりパラメーターが増大したため複雑になりすぎ作者でさえわけがわからなくなりました。 diff --git a/src/test/data/SAXperserException.gpx b/src/test/data/SAXperserException.gpx new file mode 100644 index 0000000..9da8375 --- /dev/null +++ b/src/test/data/SAXperserException.gpx @@ -0,0 +1 @@ +Garmin International2020-02-29 12:45:55 DayDarkMagenta84.7384.7384.2583.7782.8181.8580.8980.4179.9379.4578.9778.9778.4878.9778.9779.9380.4181.3782.3383.2983.7784.7385.6986.6687.6289.0690.0291.4691.4691.4690.9890.5090.0290.0289.5489.0689.5489.5489.5490.0290.5091.4692.4292.9093.8794.8395.3196.2797.2397.7198.1998.6798.6798.1997.2396.7596.2796.2795.7995.7995.3195.3194.8394.3594.3593.8793.8793.3992.9092.9092.4292.4291.9491.4690.9890.5090.5090.5090.0290.0290.0290.0290.0290.5090.5090.5090.9890.9890.9890.9890.9890.5090.5090.5090.5090.0290.0290.0289.5489.5489.0689.0688.5888.5888.1087.6287.1486.6686.6686.1885.6985.2185.2184.7384.2584.2583.7783.7783.2983.2982.8182.3381.8581.3781.3780.8980.4180.4180.4180.4180.4180.4180.4180.4180.4180.4180.4179.9379.4578.9778.4878.0077.5277.0476.5676.0876.0875.6075.1275.1274.6474.1673.6873.2072.7272.2471.7671.2770.7970.3170.3169.8369.8369.8369.3569.3569.3568.8768.8768.8768.3968.3967.9167.4366.9566.9566.4765.9965.9965.9965.5165.5165.5165.0365.0365.0365.0365.0365.5165.9965.9966.4766.9567.4367.9167.9168.3968.8769.3569.8370.3170.7971.2771.7671.7672.2473.2073.6874.1674.6475.1275.6075.6076.0876.0876.5677.0478.0078.9779.9380.4181.3782.3382.8183.2983.7783.7784.2583.7783.7784.2584.2584.2584.2584.2584.2584.2584.2584.7384.7384.7384.7384.7385.2185.2185.6986.1886.6686.6687.1487.6288.1088.1088.5888.5888.5889.0689.0689.5489.5489.5489.5489.5489.0689.0689.0688.5888.5888.5888.1087.6287.6287.1487.1486.6686.1886.1886.1886.1885.6985.6985.2184.7384.7384.7384.7384.7384.7384.7384.2584.2584.2584.2584.2584.2584.7384.7385.2185.2185.6985.6985.6985.6986.1886.1885.6985.6985.6985.6985.2185.2185.2184.7384.7384.7384.2584.2584.2583.7783.2983.2982.3382.3382.3382.3381.8581.8581.3781.3780.8980.4179.4578.9778.4878.4878.0078.0078.0078.0078.0078.4878.4878.4878.9778.9778.9779.4579.4579.4579.4578.9778.9778.9778.9778.4878.4878.0078.0078.0078.0078.0078.0078.0078.4878.4878.4878.4878.0078.4878.4878.0078.0078.0078.0078.0078.0078.0077.5277.0476.5676.0875.6075.1274.6474.1674.1674.1674.1674.1674.1673.6873.6873.6873.6873.6873.2073.2072.7272.7272.7272.7272.7272.7272.7273.2073.2073.6873.6874.1674.1674.1674.6474.6474.6475.1275.6075.6076.0876.0876.5676.5676.5676.5676.5676.5676.0876.0875.6075.6075.1274.6474.6474.1674.1673.6873.6873.6873.6873.6873.2073.2073.2073.2073.2073.2073.2072.7272.7272.7272.7272.7272.7273.2073.2073.6874.1674.6475.1276.0876.5677.0477.5278.0078.4878.9779.9380.4180.8981.3781.3781.3780.8980.4180.4180.4180.4179.9379.9379.9379.4579.4578.9778.4878.0077.5277.5277.0477.0477.0477.0477.0477.0477.0477.0477.0477.0477.0477.0477.0476.5676.5676.5676.5676.0875.6075.1274.6474.6475.1275.1275.1274.6474.6474.6474.6474.6474.6474.6474.6475.1275.1275.6076.0876.5676.5677.0477.5277.5278.0078.4878.4878.9779.4579.9379.9380.4180.4180.8981.3781.3781.3781.3781.3780.8980.8980.8980.8980.8980.8980.4180.4179.9379.9379.9379.4578.9778.9778.4878.4878.0078.0077.5277.0476.5676.5676.5676.0876.5676.5676.5676.5676.5677.0477.0477.0477.0477.0477.0477.0477.0477.0477.0477.0477.0477.0477.0477.5277.0476.5676.0876.0875.6075.6075.6075.6075.6075.6075.6075.6075.6075.6075.1275.1275.1275.1274.6474.6474.1674.1673.6873.2073.2073.2073.2073.2072.7272.7272.7272.2472.2472.2471.7671.7671.7671.7672.2472.2472.2472.2472.2471.7671.2771.2770.7970.3170.3169.8369.8369.3569.3569.3569.3569.3569.3569.3569.8369.8369.8369.8369.8369.8369.8369.8370.3170.3170.3170.3170.3169.8369.8369.8369.3569.3569.3568.8768.8768.8768.8768.8768.8768.3968.3968.3968.3968.8768.8768.8768.8769.3569.3569.3569.3569.3569.3569.3569.3569.3568.8768.8768.3968.3968.3968.3967.9167.9167.9167.9167.9167.9167.4366.9566.4766.4766.4765.9965.9965.9965.9965.5165.5165.0365.0365.5165.5165.9965.9965.9966.4766.4766.4766.4766.9566.9566.9567.4367.4367.4367.9167.9167.9168.3968.3968.3968.3968.3967.9167.9167.9167.9167.9167.9167.9167.9167.9167.9167.9167.9167.9167.9167.9167.9167.9167.4367.4366.9566.9566.4766.4766.4766.4766.9566.9566.9566.4766.4766.4766.4766.4766.4766.4766.4766.4766.4766.4766.4766.9566.9566.9566.9566.9566.9566.9566.9566.9566.9567.4367.4367.4367.4367.4367.4366.9566.9566.9566.9567.4367.4367.4367.4367.4367.4367.4367.4367.9167.9167.9167.9167.9167.9167.9167.4367.4367.4367.4367.4367.4367.4367.9167.9167.9167.9167.9167.9168.3967.9167.9167.9168.3967.9167.9167.9167.9167.9167.9167.9167.4367.4367.4367.4367.4367.4367.4367.4367.4367.4367.4367.4367.4367.4367.4367.4367.4367.4367.4367.4366.9566.9566.9566.9566.9566.9566.9566.9566.9566.9566.9566.9566.9566.9566.9567.4367.4367.4367.4367.4367.4367.4367.9167.9167.9167.9167.9167.9167.9167.9167.9167.9167.9167.9167.9167.9167.9167.9167.9167.9167.9167.9167.9167.9167.9167.9168.3968.3967.9167.9167.9167.9167.9167.9167.4367.4367.4367.4366.9566.9566.9566.9566.9566.9566.4766.4766.4765.9965.9965.9965.9965.9965.9965.9965.9965.9965.9965.9965.9965.9965.9965.9965.9965.9965.5165.5165.5165.5165.5165.0365.0365.0365.0365.0365.0365.0364.5564.5564.5564.0764.0764.0764.0764.0763.5863.5863.5863.1063.1062.6262.6262.6262.1462.1462.1461.6661.6661.6662.1462.1462.1462.1462.6262.6262.1462.6262.6262.6262.6262.6262.6263.1063.1063.1063.1063.1063.1063.1063.5863.5863.5863.5863.5863.5864.0764.0764.5564.5564.5564.5564.5565.0364.5564.5564.5564.5564.5564.5564.5564.5564.5565.0365.5165.9966.4766.4766.9567.9168.3968.8769.8370.7971.7672.7273.2074.1674.1674.6474.6474.6475.1275.1275.1275.1275.6075.6075.6075.6075.1275.1275.1275.1275.1274.6475.1275.1274.6474.6474.6474.6474.6474.6474.6474.6474.6474.6474.6475.1275.1275.6075.6076.0876.5676.5677.0477.0477.5278.0078.4878.4878.9778.4878.4878.4878.4878.4878.0078.4878.4878.9778.9779.4579.9379.9379.9379.9380.4180.8981.3781.8582.8183.7784.7385.6986.1886.6687.1487.6288.1088.5888.5889.0689.0689.5489.5489.0689.5489.5489.5490.0290.0290.5090.5090.5090.5090.0290.0289.0688.5888.5888.1088.1088.1087.6287.1486.6686.1885.2185.2184.7384.7384.7384.2584.7384.7384.7384.7384.7384.7385.2185.2185.2185.2185.6985.6986.1886.1886.1886.6687.6288.1088.5889.5489.5490.5090.9891.4692.4292.9093.8794.3594.8395.3195.3196.2796.7597.7198.1998.6798.6798.6798.1997.7197.2396.7596.2795.7995.7995.7995.3195.3194.8394.8394.8394.8394.3594.3594.3594.3594.3594.8394.8394.8395.3195.7995.7995.7995.7996.2795.3194.3593.3992.4291.9491.4690.9890.5090.5090.0289.5489.5489.0688.5888.1087.1486.1886.1885.6985.6985.6984.7384.7384.2583.2982.8182.3381.3780.8980.4180.4180.4180.4180.4180.4179.9379.9379.9379.4579.4579.4579.4578.9778.4878.0077.5277.5277.0477.0476.5676.5676.0876.0875.6075.6075.1275.1274.6474.6474.1673.6873.6873.2073.2073.2072.7272.7272.2472.2471.7671.7671.7671.7671.7672.2472.7272.7273.2073.6873.6873.6873.6873.6873.6873.2073.2073.2072.7272.7272.7272.7272.2472.2472.7272.7272.7272.7272.7272.2472.2472.2471.7671.7671.7671.2771.2771.2771.2771.2770.7970.7970.7970.7970.7970.7970.7970.7970.7970.7970.7970.7970.7970.7970.3170.3170.3169.8369.8369.3569.3568.8768.3967.9167.9167.4367.4366.9566.9566.4765.9965.5165.5165.0364.5564.5564.5564.0764.0763.5863.1063.1063.1063.1062.6262.6262.6262.6262.6262.1461.6661.6661.6661.1861.1860.7060.7060.7060.7060.7060.7060.7060.7060.7060.7060.7060.7060.7060.7061.1861.6662.1462.1462.6263.1063.1063.1063.1063.1063.1063.1063.1063.1063.1062.6262.6262.6262.6262.6262.6262.1462.1461.6661.6661.1861.1860.7060.2260.2260.2260.2259.7459.2659.2658.7858.7859.2659.2659.2659.2658.7858.7858.3058.3057.8257.8257.3456.8656.8656.3756.3755.8954.9354.4553.4953.0152.5352.0552.0551.5751.5751.5751.0950.6150.6150.1349.6549.1649.1649.1649.1649.1648.6848.6848.6848.6848.2048.2047.7247.7247.7247.2447.2447.2447.2447.7247.7247.7247.7247.7247.7247.7247.7247.7247.7247.7248.2048.6849.1650.1350.6151.5752.0553.0154.4554.9355.8956.3756.8657.8258.3059.2659.7460.2261.1861.6661.6662.1462.1462.1462.6262.6262.6263.1063.1062.6262.6262.6262.1462.1461.6661.1860.7060.7060.7060.2260.7060.2260.7060.7060.7060.7060.2260.2260.2259.7459.7459.2658.7858.3057.8257.3456.8656.3756.3755.8955.4154.4553.9753.4953.0152.0552.0551.5751.0950.6150.1349.6548.6848.2048.2047.7248.2047.7248.2047.7247.7247.7247.2447.2447.2447.2447.2447.2447.2447.2447.2447.2447.2446.7646.7646.2846.2846.2846.2846.2846.2846.2846.2846.2845.8045.3244.8444.8444.8444.8444.8444.8444.8444.8445.3245.8046.7647.7248.6849.6550.1350.1350.1350.6150.6151.0951.0951.0950.6151.0951.0951.0951.0951.0951.0950.6150.6150.6150.1350.1350.1350.6150.6151.0951.5752.5353.0153.0153.4953.4953.4953.0153.0153.0153.0153.0153.4953.4953.0153.0152.5352.0552.0551.5751.5751.5751.5751.5751.5751.5752.0552.5353.0153.0153.4953.4953.9754.4555.4156.3757.3458.3058.7858.7859.2658.7858.7858.7858.7858.7858.7859.2660.2260.7061.6662.6263.5864.0765.0366.4767.4368.3969.3570.3170.7971.2770.7970.3169.8369.8369.8370.7971.2771.7672.2472.2471.7671.2770.7970.3169.8368.3967.4366.4765.9965.9965.5165.5165.0364.5564.0763.5863.1062.6262.1461.6661.1860.2259.7458.7858.3057.8257.3456.8656.3756.3756.3756.3755.8955.8955.8956.3756.8657.3457.8257.8257.8257.3456.8656.3756.3756.3756.8656.8656.8656.8656.3755.4154.4553.4952.5352.0551.0950.6150.1349.6548.6848.6848.2048.2048.2047.7247.7247.2447.2447.2446.7646.2846.2845.3244.8444.3644.3643.8843.4043.4042.9242.9242.4442.4442.9242.9242.4442.4441.9541.9541.9541.9541.4741.4741.4740.9940.5139.5539.0738.5937.6337.1536.6736.1936.1935.7135.2334.2633.7833.7833.3032.8232.8232.8232.3431.8631.8631.8631.8631.8631.8631.8631.8631.8631.8631.8631.3831.3830.9030.9030.9030.9030.9030.9030.9030.9030.9030.9030.4230.4230.4230.4230.4230.4229.9429.9429.9429.9429.9429.9429.4629.4629.4629.4628.9828.9828.9828.9828.9828.5028.5028.0228.0228.0228.5028.5028.5028.9828.9829.4629.4629.4629.4629.4629.4629.4629.4629.4629.4629.4629.4629.4629.4628.9828.9828.5028.5028.0228.0227.5328.0228.0228.0228.0228.0227.5327.5327.0527.0527.0527.5327.5327.5327.0527.0527.0527.0527.0527.0527.0527.0527.0527.5328.0228.0228.5028.5028.9828.9828.9828.9828.9828.9829.4628.9828.9828.9828.9828.9828.9828.9828.9828.9828.9828.9828.9828.9828.5028.0228.0227.5327.5327.0527.0527.0527.0526.5726.5726.5726.0925.6125.1325.1325.1325.1324.6524.6524.6524.6524.6524.6524.6524.6524.6524.1724.1724.1723.6923.6923.6923.6923.2123.2123.2122.7322.7322.7322.7322.7322.7322.7323.2123.6924.1724.6525.1325.6125.6126.0926.0926.0926.5726.5727.0527.0527.5327.5327.0527.0526.5726.0926.0925.6125.6125.6125.1325.1325.1325.1324.6524.6525.1325.1325.1325.6126.0926.0926.5726.5726.5727.0527.0527.0527.0527.0527.5327.5328.0228.5028.5028.5028.5028.5028.0228.0228.0228.0228.0228.0227.5327.5327.5327.5327.5327.5327.5327.5328.0228.0228.0228.0227.5327.5327.5327.0527.0527.0527.5327.5327.5327.5327.5327.5327.5327.5327.5327.5327.0527.0527.0526.5726.5726.5726.5726.5726.5726.5726.5726.5726.5726.5726.5726.5727.0527.0527.0527.0527.5327.5328.0228.0228.0227.5327.5328.0228.0228.0228.0228.0228.0228.0228.0228.0228.0228.0228.5028.5028.9829.4629.4629.9430.4230.4230.9031.3831.8631.8631.8631.8631.8631.8631.8631.8631.3831.3831.3831.3831.3831.3830.9030.4230.4229.9429.9429.9429.9429.4629.4629.4628.9828.9828.5028.5028.0227.5327.0526.5726.0926.0926.0925.6125.6125.6125.1325.1324.6524.6524.6524.6524.6524.6524.6524.6524.1724.1724.1724.1723.6923.2123.2123.2123.2123.2123.2123.2123.2123.2123.2123.2123.2123.2123.2123.2123.2123.2123.2123.2123.2123.2123.2123.2122.7322.7322.7322.2522.2521.7721.2920.8120.8120.8120.8120.8120.8120.8120.3220.3219.8419.8419.8419.8419.3619.3619.3619.3618.8818.8818.8818.8818.8818.8818.8818.8818.8818.4018.4018.8818.8818.8818.8819.3619.3619.3619.8419.8419.8420.3220.3220.3220.3221.2922.2523.2123.6924.6525.1325.6126.0926.5727.0527.0528.0228.0227.5327.5327.5327.5327.5327.0527.0527.0527.0527.5327.5327.5327.5327.5328.0228.0228.0228.5028.5028.9829.4629.4629.9429.9430.4230.4230.4230.4230.4230.9030.9030.9030.9031.3831.3831.3831.8632.3432.8233.7834.2635.2336.1936.6737.1537.6338.1138.5939.0739.5540.5141.4742.4443.4044.3645.3245.8046.7647.7248.2049.1649.6550.1350.6151.0950.6150.6150.1350.1349.6549.6549.1648.6848.2048.2047.7247.2447.2446.7646.2845.3244.8444.3644.3644.3644.3644.3644.3644.3644.3644.3643.8843.8843.8843.8843.4043.4042.9242.9242.9243.4043.8844.3645.3245.8046.2847.2447.7248.2048.6848.6849.1649.6550.1350.1350.1349.6549.6548.6848.2048.2047.7246.7647.2447.7247.7248.2048.6849.1649.6549.6550.1350.1350.6150.6151.0951.0951.0951.5751.5751.5751.5751.5751.5751.5751.5751.5752.0552.0552.0552.0551.5751.5751.0950.6150.1349.6549.1648.6848.2047.2446.7646.7646.2846.2846.2846.2846.7646.7646.7646.7647.2447.7248.2048.6849.1649.6550.1351.0951.5752.0553.0153.4953.4953.9754.4554.4554.9354.9354.9354.9354.9355.4154.9354.4554.4554.4553.9753.0152.5352.5352.0552.5352.5352.5352.5353.0153.0153.0153.0153.0153.0153.0153.4953.4953.9753.4953.4953.0152.5352.0551.0950.1349.6549.1648.6848.2048.2048.2047.7247.2446.7646.7646.2846.2845.8045.3244.8444.3643.8843.4043.4042.9242.9242.9242.4442.4441.9541.4740.9940.5140.0339.5539.5539.5539.0738.5938.5938.1137.6337.1537.1536.6736.1936.1935.7135.2334.7434.2634.2633.7833.3032.8232.8232.3431.8631.3830.9030.9030.9030.4230.4229.9429.9429.9429.9429.9429.9429.9429.4629.4629.4629.4629.4629.4629.4629.4629.4629.4629.4629.4629.4629.9429.9429.9429.9429.9429.9429.9429.4629.4628.9828.9828.9828.5028.5028.5028.5028.5028.5028.0228.0228.0228.0228.0227.5327.5327.5327.0527.0526.5726.0926.5726.5727.0527.5328.0228.0228.0227.5327.5327.5327.0527.0527.0527.0527.0527.0527.0526.5726.5726.5726.5726.5726.5726.5726.5726.0926.0926.0926.0926.0925.6125.6125.6125.1325.1324.6524.6524.6524.6524.6525.1325.1325.6125.6125.6125.6125.1325.1325.1325.6125.6125.6125.6126.0926.0926.0926.0926.0926.5726.5726.5726.5727.0527.0527.0527.0527.5327.5327.5327.5327.5327.5327.5327.5328.0228.0228.0228.0227.5327.5327.0527.0527.0527.0526.5726.5726.5726.5726.5726.5726.5726.0926.0926.5726.0926.0926.0926.0926.0926.0925.6125.6125.6126.0926.0925.6126.0926.0926.0926.0925.6126.0926.0926.0926.0926.0926.0926.0926.5726.5726.5726.0926.0926.0926.0926.0926.0926.5726.5726.5726.5727.0527.0527.5327.5327.5327.5327.5327.5327.5327.5327.5327.5327.5327.0527.0527.0527.0527.0526.5726.5726.5726.5726.5726.5726.0926.0926.0926.5726.5726.5726.5726.5726.5726.5726.5727.0527.0527.0527.0527.5327.5327.5327.5328.0228.0228.5028.5028.5028.0227.5327.0526.5726.0925.6125.6125.1324.6524.6524.1724.1724.1724.1724.1724.1724.1724.1724.6524.6524.6525.1325.6125.6126.0926.0926.5726.5727.0527.0527.0527.5327.5327.5327.5327.5327.5327.5327.5327.5327.0527.0527.0527.0527.0526.5726.0926.0926.0925.6125.6125.6125.6125.6125.6125.6125.6125.6125.1325.1325.1325.1325.6125.6125.6125.6125.6125.6125.6126.0926.0926.5727.0527.0527.5327.5328.0228.0228.0228.5028.5028.5028.0228.0228.0228.0228.0228.0228.0227.5327.5327.5327.5327.5327.5327.5327.5327.5327.5328.0228.0228.0227.5327.5327.5327.0526.5726.5726.0926.0926.0926.0926.0925.6125.6125.6125.6125.6125.6126.0926.0926.0926.0926.0925.6125.6125.1325.1324.6524.6524.6524.6524.6524.6524.1724.1723.6923.6923.2123.2123.2123.2123.2123.6923.6924.1724.6524.6524.6524.1724.1724.1723.6923.6923.6923.2123.2123.2123.2122.7322.7322.2522.2522.2521.7721.7721.7721.7721.7721.7721.7721.7721.7721.7721.7721.7721.7721.2921.2920.8120.8120.8120.8120.8120.8121.2921.2921.7721.7722.2522.7322.7323.2123.6923.6924.1724.1724.6524.6524.6524.6524.6524.6524.6524.6525.1325.1325.1325.1324.6525.1325.1325.1325.1325.1324.6524.6524.6524.1724.1724.1724.1724.1724.6525.1325.1325.1325.1325.6125.6126.0926.0926.5726.5727.0527.5327.5328.0228.0228.5029.46 \ No newline at end of file diff --git a/src/test/java/osm/surveyor/matchtime/RestampTest.java b/src/test/java/osm/surveyor/matchtime/RestampTest.java index c64ff70..877b009 100644 --- a/src/test/java/osm/surveyor/matchtime/RestampTest.java +++ b/src/test/java/osm/surveyor/matchtime/RestampTest.java @@ -96,7 +96,7 @@ "2019-09-01 16:27:01 JST", outPath }; - HashMap before = getMd5(Paths.get(dirPath)); + HashMap before = getMd5(Paths.get(dirPath)); Restamp.main(argv); check(new File(outPath), ans); checkUnchanged(before, Paths.get(dirPath));