diff --git a/pom.xml b/pom.xml index 7529f2d..016345a 100644 --- a/pom.xml +++ b/pom.xml @@ -1,16 +1,21 @@ - 4.0.0 osm.surveyor AdjustTerra 5.2-SNAPSHOT - jar + + + UTF-8 + 1.8 + ${java.version} + ${java.version} + - hayashi_repository + haya4 Hayashi Repository - http://surveyor.mydns.jp/archiva/repository/hayashi_repository/ + http://surveyor.mydns.jp/archiva/repository/haya4/ true @@ -50,12 +55,6 @@ - - UTF-8 - 11 - 11 - - diff --git a/src/main/java/osm/jp/gpx/GpxFile.java b/src/main/java/osm/jp/gpx/GpxFile.java index bc7c306..1833769 100644 --- a/src/main/java/osm/jp/gpx/GpxFile.java +++ b/src/main/java/osm/jp/gpx/GpxFile.java @@ -30,7 +30,6 @@ ElementMapTRKSEG mapTRKSEG = null; Document document; - @SuppressWarnings("LeakingThisInConstructor") public GpxFile(File file) throws ParserConfigurationException, DOMException, SAXException, IOException, ParseException { super(file.getParentFile(), file.getName()); diff --git a/src/main/java/osm/jp/gpx/ImportPicture.java b/src/main/java/osm/jp/gpx/ImportPicture.java index 0f66415..460464d 100644 --- a/src/main/java/osm/jp/gpx/ImportPicture.java +++ b/src/main/java/osm/jp/gpx/ImportPicture.java @@ -431,7 +431,6 @@ result.control = Discripter.CONTINUE; return result; } - @SuppressWarnings("LocalVariableHidesMemberVariable") TiffImageMetadata exif = jpegMetadata.getExif(); if (exif == null) { // "'%s'にEXIF情報がありません" @@ -539,7 +538,6 @@ ImageMetadata meta = Imaging.getMetadata(imageFile); JpegImageMetadata jpegMetadata = (JpegImageMetadata)meta; if (jpegMetadata != null) { - @SuppressWarnings("LocalVariableHidesMemberVariable") TiffImageMetadata exif = jpegMetadata.getExif(); if (exif != null) { outputSet = exif.getOutputSet(); @@ -624,7 +622,6 @@ ); return null; } - @SuppressWarnings("LocalVariableHidesMemberVariable") TiffImageMetadata exif = jpegMetadata.getExif(); if (exif == null) { // "'%s'にEXIF情報がありません" diff --git a/src/main/java/osm/jp/gpx/Restamp.java b/src/main/java/osm/jp/gpx/Restamp.java index 96da1ee..0670d3d 100644 --- a/src/main/java/osm/jp/gpx/Restamp.java +++ b/src/main/java/osm/jp/gpx/Restamp.java @@ -173,7 +173,6 @@ public ArrayList jpgFiles = new ArrayList<>(); public static ResourceBundle i18n = ResourceBundle.getBundle("i18n"); - @SuppressWarnings("Convert2Lambda") public void setUp(File imgDir, File baseFile1, Date baseTime1, File baseFile2, Date baseTime2) throws Exception { // 指定されたディレクトリ内のGPXファイルすべてを対象とする File[] files = imgDir.listFiles(); @@ -208,7 +207,6 @@ DateFormat df2 = new SimpleDateFormat(TIME_PATTERN); // imgDir内の画像ファイルを処理する - @SuppressWarnings("LocalVariableHidesMemberVariable") long span = baseTime2.getTime() - baseTime1.getTime(); span = span / (bCount2 - bCount1); int i = 0; diff --git a/src/main/java/osm/jp/gpx/matchtime/gui/AboutDialog.java b/src/main/java/osm/jp/gpx/matchtime/gui/AboutDialog.java index 07af69c..2069c61 100644 --- a/src/main/java/osm/jp/gpx/matchtime/gui/AboutDialog.java +++ b/src/main/java/osm/jp/gpx/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/jp/gpx/matchtime/gui/AdjustTerra.java b/src/main/java/osm/jp/gpx/matchtime/gui/AdjustTerra.java index a720a9e..2bf328e 100644 --- a/src/main/java/osm/jp/gpx/matchtime/gui/AdjustTerra.java +++ b/src/main/java/osm/jp/gpx/matchtime/gui/AdjustTerra.java @@ -94,7 +94,6 @@ * データベース内のテーブルを一覧で表示するFrame * @throws IOException */ - @SuppressWarnings("OverridableMethodCallInConstructor") public AdjustTerra() throws IOException { dfjp.setTimeZone(TimeZone.getTimeZone("JST")); @@ -337,7 +336,6 @@ * コマンドラインの引数はありません。 * @param args */ - @SuppressWarnings("UseSpecificCatch") static public void main(String args[]) { SwingUtilities.invokeLater(() -> { try { diff --git a/src/main/java/osm/jp/gpx/matchtime/gui/Card.java b/src/main/java/osm/jp/gpx/matchtime/gui/Card.java index ea503f4..bc14b82 100644 --- a/src/main/java/osm/jp/gpx/matchtime/gui/Card.java +++ b/src/main/java/osm/jp/gpx/matchtime/gui/Card.java @@ -13,7 +13,8 @@ import static osm.jp.gpx.matchtime.gui.AdjustTerra.i18n; public class Card extends JPanel { - JTabbedPane tabbe; + private static final long serialVersionUID = 9050047381377607421L; + JTabbedPane tabbe; public JPanel mainPanel; String title; int backNumber = -1; diff --git a/src/main/java/osm/jp/gpx/matchtime/gui/CardExifPerform.java b/src/main/java/osm/jp/gpx/matchtime/gui/CardExifPerform.java index 7beaa8a..73daf0f 100644 --- a/src/main/java/osm/jp/gpx/matchtime/gui/CardExifPerform.java +++ b/src/main/java/osm/jp/gpx/matchtime/gui/CardExifPerform.java @@ -17,7 +17,8 @@ * @author yuu */ public class CardExifPerform extends Card implements PanelAction { - ParameterPanelTime arg_basetime; // 画像の基準時刻: + private static final long serialVersionUID = 8902284630791931118L; + ParameterPanelTime arg_basetime; // 画像の基準時刻: ParameterPanelGpx arg_gpxFile; // GPX file or Folder ParameterPanelOutput arg_output; // EXIF & 書き出しフォルダ JButton doButton; // [処理実行]ボタン @@ -139,7 +140,6 @@ * [実行]ボタンをクリックしたときの動作 * @param event */ - @SuppressWarnings("UseSpecificCatch") void doButton_Action(java.awt.event.ActionEvent event) { doButton.setEnabled(false); @@ -149,7 +149,6 @@ try { AppParameters params = new AppParameters(); - String[] argv = new String[0]; params.setProperty(AppParameters.GPX_NO_FIRST_NODE, String.valueOf(arg_gpxFile.isNoFirstNodeSelected())); params.setProperty(AppParameters.GPX_REUSE, String.valueOf(arg_gpxFile.isGpxReuseSelected())); params.setProperty(AppParameters.GPX_SOURCE_FOLDER, arg_gpxFile.getText()); @@ -192,7 +191,6 @@ } @Override - @SuppressWarnings("empty-statement") public void openAction() { ; // 何もしない } diff --git a/src/main/java/osm/jp/gpx/matchtime/gui/CardGpxFile.java b/src/main/java/osm/jp/gpx/matchtime/gui/CardGpxFile.java index 67bcd71..0c99213 100644 --- a/src/main/java/osm/jp/gpx/matchtime/gui/CardGpxFile.java +++ b/src/main/java/osm/jp/gpx/matchtime/gui/CardGpxFile.java @@ -10,10 +10,11 @@ /** * [GPXファイル]選択パネル - * @author yuu + * @author haya4 */ public class CardGpxFile extends Card implements PanelAction { - ParameterPanelGpx arg_gpxFile; + private static final long serialVersionUID = -6130918418152241845L; + ParameterPanelGpx arg_gpxFile; /** * コンストラクタ @@ -67,7 +68,6 @@ } @Override - @SuppressWarnings("empty-statement") public void openAction() { ; // 何もしない } diff --git a/src/main/java/osm/jp/gpx/matchtime/gui/DoDialog.java b/src/main/java/osm/jp/gpx/matchtime/gui/DoDialog.java index 8c991e1..a558bd0 100644 --- a/src/main/java/osm/jp/gpx/matchtime/gui/DoDialog.java +++ b/src/main/java/osm/jp/gpx/matchtime/gui/DoDialog.java @@ -27,13 +27,11 @@ 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); @@ -183,7 +181,6 @@ // 非同期に行われる処理 @Override - @SuppressWarnings("SleepWhileInLoop") public Object doInBackground() { // ながーい処理 PrintStream defOut = System.out; diff --git a/src/main/java/osm/jp/gpx/matchtime/gui/ImagePreview.java b/src/main/java/osm/jp/gpx/matchtime/gui/ImagePreview.java index 203d3a2..d07d90f 100644 --- a/src/main/java/osm/jp/gpx/matchtime/gui/ImagePreview.java +++ b/src/main/java/osm/jp/gpx/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/jp/gpx/matchtime/gui/ParameterPanel.java b/src/main/java/osm/jp/gpx/matchtime/gui/ParameterPanel.java index 00f1418..d26be5e 100644 --- a/src/main/java/osm/jp/gpx/matchtime/gui/ParameterPanel.java +++ b/src/main/java/osm/jp/gpx/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/jp/gpx/matchtime/gui/ParameterPanelFolder.java b/src/main/java/osm/jp/gpx/matchtime/gui/ParameterPanelFolder.java index 0f46afc..b6dae01 100644 --- a/src/main/java/osm/jp/gpx/matchtime/gui/ParameterPanelFolder.java +++ b/src/main/java/osm/jp/gpx/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/jp/gpx/matchtime/gui/ParameterPanelGpx.java b/src/main/java/osm/jp/gpx/matchtime/gui/ParameterPanelGpx.java index 6a463f9..54b9dd6 100644 --- a/src/main/java/osm/jp/gpx/matchtime/gui/ParameterPanelGpx.java +++ b/src/main/java/osm/jp/gpx/matchtime/gui/ParameterPanelGpx.java @@ -22,7 +22,6 @@ * @param label * @param text */ - @SuppressWarnings({"OverridableMethodCallInConstructor", "LeakingThisInConstructor"}) public ParameterPanelGpx(String label, String text) { super(label, text); diff --git a/src/main/java/osm/jp/gpx/matchtime/gui/ParameterPanelImageFile.java b/src/main/java/osm/jp/gpx/matchtime/gui/ParameterPanelImageFile.java index 2c99c17..829a8a1 100644 --- a/src/main/java/osm/jp/gpx/matchtime/gui/ParameterPanelImageFile.java +++ b/src/main/java/osm/jp/gpx/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/jp/gpx/matchtime/gui/ParameterPanelSelecter.java b/src/main/java/osm/jp/gpx/matchtime/gui/ParameterPanelSelecter.java index 15b8d96..251710f 100644 --- a/src/main/java/osm/jp/gpx/matchtime/gui/ParameterPanelSelecter.java +++ b/src/main/java/osm/jp/gpx/matchtime/gui/ParameterPanelSelecter.java @@ -18,7 +18,6 @@ public JComboBox field; public String value; - @SuppressWarnings({"OverridableMethodCallInConstructor", "LeakingThisInConstructor"}) public ParameterPanelSelecter(String title, String[] items) { super(null); this.value = items[0]; diff --git a/src/main/java/osm/jp/gpx/matchtime/gui/ParameterPanelTime.java b/src/main/java/osm/jp/gpx/matchtime/gui/ParameterPanelTime.java index 2a9b0c3..1202e7e 100644 --- a/src/main/java/osm/jp/gpx/matchtime/gui/ParameterPanelTime.java +++ b/src/main/java/osm/jp/gpx/matchtime/gui/ParameterPanelTime.java @@ -27,7 +27,8 @@ * この１インスタンスで、１パラメータをあらわす。 */ public class ParameterPanelTime extends ParameterPanel { - SimpleDateFormat sdf = (SimpleDateFormat)DateFormat.getDateTimeInstance(); + private static final long serialVersionUID = 1683226418990348336L; + SimpleDateFormat sdf = (SimpleDateFormat)DateFormat.getDateTimeInstance(); ParameterPanelImageFile imageFile; // 基準時刻画像 @@ -40,7 +41,6 @@ public JButton resetButton; Window owner; - @SuppressWarnings("OverridableMethodCallInConstructor") public ParameterPanelTime( String label, String text, @@ -112,7 +112,6 @@ this.param = param; } - @SuppressWarnings("override") public void actionPerformed(ActionEvent e) { fileSelect_Action(param); (new DialogCorectTime(param, owner)).setVisible(true); @@ -130,7 +129,6 @@ this.paramPanelTime = param; } - @SuppressWarnings("override") public void actionPerformed(ActionEvent e) { fileSelect_Action(paramPanelTime); } diff --git a/src/main/java/osm/jp/gpx/matchtime/gui/QuitDialog.java b/src/main/java/osm/jp/gpx/matchtime/gui/QuitDialog.java index bf5b9e3..9f63cba 100644 --- a/src/main/java/osm/jp/gpx/matchtime/gui/QuitDialog.java +++ b/src/main/java/osm/jp/gpx/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/jp/gpx/matchtime/gui/restamp/CardImageFile.java b/src/main/java/osm/jp/gpx/matchtime/gui/restamp/CardImageFile.java index 1c9de29..9ebcd0a 100644 --- a/src/main/java/osm/jp/gpx/matchtime/gui/restamp/CardImageFile.java +++ b/src/main/java/osm/jp/gpx/matchtime/gui/restamp/CardImageFile.java @@ -15,10 +15,11 @@ /** * [基準画像（開始/終了）]選択パネル - * @author yuu + * @author haya4 */ public class CardImageFile extends Card implements PanelAction { - ParameterPanelImageFile arg_baseTimeImg; + private static final long serialVersionUID = 1L; + ParameterPanelImageFile arg_baseTimeImg; ParameterPanelTime arg_basetime; /** @@ -82,7 +83,6 @@ } @Override - @SuppressWarnings("empty-statement") public void openAction() { ; // 何もしない } diff --git a/src/main/java/osm/jp/gpx/matchtime/gui/restamp/CardPerformFile.java b/src/main/java/osm/jp/gpx/matchtime/gui/restamp/CardPerformFile.java index eb4aa82..c323d7c 100644 --- a/src/main/java/osm/jp/gpx/matchtime/gui/restamp/CardPerformFile.java +++ b/src/main/java/osm/jp/gpx/matchtime/gui/restamp/CardPerformFile.java @@ -19,7 +19,7 @@ * @author yuu */ public class CardPerformFile extends Card implements PanelAction { - //JPanel argsPanel; // パラメータ設定パネル (上部) + private static final long serialVersionUID = -4796133437768564759L; ParameterPanelTime arg1_basetime; ParameterPanelTime arg2_basetime; JButton doButton; // [処理実行]ボタン @@ -72,7 +72,6 @@ * [実行]ボタンをクリックしたときの動作 * @param event */ - @SuppressWarnings("UseSpecificCatch") void doButton_Action(java.awt.event.ActionEvent event) { ArrayList arry = new ArrayList<>(); File file = arg1_basetime.getImageFile().getImageFile(); @@ -97,7 +96,6 @@ } @Override - @SuppressWarnings("empty-statement") public void openAction() { ; // 何もしない } diff --git a/src/main/java/osm/jp/gpx/matchtime/gui/restamp/CardSourceFolder.java b/src/main/java/osm/jp/gpx/matchtime/gui/restamp/CardSourceFolder.java index 1ddba59..bc967bd 100644 --- a/src/main/java/osm/jp/gpx/matchtime/gui/restamp/CardSourceFolder.java +++ b/src/main/java/osm/jp/gpx/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 = -5496892696559069841L; + ParameterPanelFolder arg_srcFolder; // 対象フォルダ /** * コンストラクタ @@ -44,7 +45,6 @@ } @Override - @SuppressWarnings("empty-statement") public void openAction() { ; // 何もしない } diff --git a/src/main/java/osm/jp/gpx/matchtime/gui/restamp/DialogCorectTime.java b/src/main/java/osm/jp/gpx/matchtime/gui/restamp/DialogCorectTime.java index 743c33a..89e81c3 100644 --- a/src/main/java/osm/jp/gpx/matchtime/gui/restamp/DialogCorectTime.java +++ b/src/main/java/osm/jp/gpx/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 = -3573167730473345932L; + 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, AdjustTerra.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/jp/gpx/matchtime/gui/restamp/DoRestamp.java b/src/main/java/osm/jp/gpx/matchtime/gui/restamp/DoRestamp.java index 27d355a..e98f1ba 100644 --- a/src/main/java/osm/jp/gpx/matchtime/gui/restamp/DoRestamp.java +++ b/src/main/java/osm/jp/gpx/matchtime/gui/restamp/DoRestamp.java @@ -28,16 +28,13 @@ JTextArea textArea; // 実行結果を表示するJTextArea (中央) //}} - @SuppressWarnings("OverridableMethodCallInConstructor") public DoRestamp(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(DoRestamp.TITLE); @@ -184,7 +181,6 @@ // 非同期に行われる処理 @Override - @SuppressWarnings("SleepWhileInLoop") public Object doInBackground() { // ながーい処理 PrintStream defOut = System.out; diff --git a/src/main/java/osm/jp/gpx/matchtime/gui/restamp/RestampDialog.java b/src/main/java/osm/jp/gpx/matchtime/gui/restamp/RestampDialog.java index d03eaa9..110bfac 100644 --- a/src/main/java/osm/jp/gpx/matchtime/gui/restamp/RestampDialog.java +++ b/src/main/java/osm/jp/gpx/matchtime/gui/restamp/RestampDialog.java @@ -49,7 +49,6 @@ } } - @SuppressWarnings("OverridableMethodCallInConstructor") public RestampDialog(Frame parent, boolean modal) throws IOException { super(parent, modal); @@ -221,7 +220,6 @@ } } - @SuppressWarnings("OverridableMethodCallInConstructor") public RestampDialog(Frame parent, String title, boolean modal) throws IOException { this(parent, modal); setTitle(title);