Index: applications/editors/josm/plugins/ImportImagePlugin/.settings/org.eclipse.jdt.core.prefs =================================================================== --- applications/editors/josm/plugins/ImportImagePlugin/.settings/org.eclipse.jdt.core.prefs (revision 34444) +++ applications/editors/josm/plugins/ImportImagePlugin/.settings/org.eclipse.jdt.core.prefs (revision 34445) @@ -3,6 +3,9 @@ org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull +org.eclipse.jdt.core.compiler.annotation.nonnull.secondary= org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault +org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary= org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable +org.eclipse.jdt.core.compiler.annotation.nullable.secondary= org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled @@ -13,4 +16,6 @@ org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.doc.comment.support=enabled +org.eclipse.jdt.core.compiler.problem.APILeak=warning org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning org.eclipse.jdt.core.compiler.problem.assertIdentifier=error @@ -36,4 +41,9 @@ org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore +org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning +org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled +org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=disabled +org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled +org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=public org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning @@ -42,4 +52,12 @@ org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore +org.eclipse.jdt.core.compiler.problem.missingJavadocComments=warning +org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled +org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public +org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=all_standard_tags +org.eclipse.jdt.core.compiler.problem.missingJavadocTags=warning +org.eclipse.jdt.core.compiler.problem.missingJavadocTagsMethodTypeParameters=disabled +org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled +org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled @@ -50,4 +68,5 @@ org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning +org.eclipse.jdt.core.compiler.problem.nonnullTypeVariableFromLegacyInvocation=warning org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error org.eclipse.jdt.core.compiler.problem.nullReference=warning @@ -56,4 +75,5 @@ org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore +org.eclipse.jdt.core.compiler.problem.pessimisticNullAnalysisForFreeTypeVariables=warning org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore @@ -72,4 +92,5 @@ org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore +org.eclipse.jdt.core.compiler.problem.terminalDeprecation=warning org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled @@ -78,4 +99,7 @@ org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning +org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentType=warning +org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentTypeStrict=disabled +org.eclipse.jdt.core.compiler.problem.unlikelyEqualsArgumentType=info org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore @@ -85,4 +109,5 @@ org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled +org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedImport=warning org.eclipse.jdt.core.compiler.problem.unusedLabel=warning Index: applications/editors/josm/plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java =================================================================== --- applications/editors/josm/plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java (revision 34444) +++ applications/editors/josm/plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java (revision 34445) @@ -223,5 +223,5 @@ } catch (ArrayIndexOutOfBoundsException e) { // TODO: prevents this to happen when displaying GeoTIFF images (see #7902) - e.printStackTrace(); + Logging.error(e); } Index: applications/editors/josm/plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LayerPropertiesDialog.java =================================================================== --- applications/editors/josm/plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LayerPropertiesDialog.java (revision 34444) +++ applications/editors/josm/plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LayerPropertiesDialog.java (revision 34445) @@ -8,4 +8,5 @@ import java.awt.GridBagLayout; import java.awt.Rectangle; +import java.awt.event.KeyAdapter; import java.awt.event.KeyEvent; import java.io.File; @@ -31,5 +32,4 @@ import org.geotools.referencing.CRS; import org.opengis.referencing.FactoryException; -import org.opengis.referencing.NoSuchAuthorityCodeException; import org.opengis.referencing.crs.CoordinateReferenceSystem; import org.openstreetmap.josm.tools.Logging; @@ -109,5 +109,4 @@ } - /** * This method initializes this @@ -118,5 +117,4 @@ this.setContentPane(getMainPanel()); this.setPreferredSize(new Dimension(404, 485)); - } @@ -353,11 +351,8 @@ okButton.setBounds(new Rectangle(134, 5, 136, 31)); okButton.setText("OK"); - okButton.addActionListener(new java.awt.event.ActionListener() { - @Override - public void actionPerformed(java.awt.event.ActionEvent e) { - setVisible(false); - dispose(); - } - }); + okButton.addActionListener(e -> { + setVisible(false); + dispose(); + }); } return okButton; @@ -374,7 +369,7 @@ searchField.setBounds(new Rectangle(13, 111, 282, 20)); searchField.setToolTipText("Enter keywords or EPSG codes"); - searchField.addKeyListener(new java.awt.event.KeyAdapter() { + searchField.addKeyListener(new KeyAdapter() { @Override - public void keyTyped(java.awt.event.KeyEvent e) { + public void keyTyped(KeyEvent e) { for (Iterator iterator = supportedCRS.iterator(); iterator.hasNext();) { @@ -430,31 +425,19 @@ useDefaultCRSButton.setBounds(new Rectangle(253, 54, 118, 28)); useDefaultCRSButton.setText("Apply Default"); - useDefaultCRSButton.addActionListener(new java.awt.event.ActionListener() { - @Override - public void actionPerformed(java.awt.event.ActionEvent e) { - try { - - setCursor(new Cursor(Cursor.WAIT_CURSOR)); - if (PluginOperations.defaultSourceCRS != null) { - imageLayer.resample(PluginOperations.defaultSourceCRS); - } else { - JOptionPane.showMessageDialog(getContentPane(), - "No default reference system available.
Please select one from the list"); + useDefaultCRSButton.addActionListener(e -> { + try { + setCursor(new Cursor(Cursor.WAIT_CURSOR)); + if (PluginOperations.defaultSourceCRS != null) { + imageLayer.resample(PluginOperations.defaultSourceCRS); + } else { + JOptionPane.showMessageDialog(getContentPane(), + "No default reference system available.
Please select one from the list"); + } + } catch (FactoryException | IOException e1) { + Logging.error(e1); + } finally { + setCursor(new Cursor(Cursor.DEFAULT_CURSOR)); } - - } catch (NoSuchAuthorityCodeException e1) { - // TODO Auto-generated catch block - e1.printStackTrace(); - } catch (FactoryException e1) { - // TODO Auto-generated catch block - e1.printStackTrace(); - } catch (IOException e2) { - // TODO Auto-generated catch block - e2.printStackTrace(); - } finally { - setCursor(new Cursor(Cursor.DEFAULT_CURSOR)); - } - } - }); + }); } return useDefaultCRSButton; @@ -473,33 +456,19 @@ applySelectedCRSButton.setHorizontalTextPosition(SwingConstants.TRAILING); applySelectedCRSButton.setText("Apply
Selection"); - applySelectedCRSButton.addActionListener(new java.awt.event.ActionListener() { - @Override - public void actionPerformed(java.awt.event.ActionEvent e) { - - String selection = crsJList.getSelectedValue(); - String code = selection.substring(selection.indexOf("[-") + 2, selection.indexOf("-]")); - - CoordinateReferenceSystem newRefSys = null; - try { - newRefSys = CRS.decode(code, eastingFirstCheckBox.isSelected()); - - setCursor(new Cursor(Cursor.WAIT_CURSOR)); - - imageLayer.resample(newRefSys); - - } catch (NoSuchAuthorityCodeException e1) { - // TODO Auto-generated catch block - e1.printStackTrace(); - } catch (FactoryException e1) { - // TODO Auto-generated catch block - e1.printStackTrace(); - } catch (IOException e2) { - // TODO Auto-generated catch block - e2.printStackTrace(); - } finally { - setCursor(new Cursor(Cursor.DEFAULT_CURSOR)); - } - } - }); + applySelectedCRSButton.addActionListener(e -> { + + String selection = crsJList.getSelectedValue(); + String code = selection.substring(selection.indexOf("[-") + 2, selection.indexOf("-]")); + + try { + CoordinateReferenceSystem newRefSys = CRS.decode(code, eastingFirstCheckBox.isSelected()); + setCursor(new Cursor(Cursor.WAIT_CURSOR)); + imageLayer.resample(newRefSys); + } catch (FactoryException | IOException e1) { + Logging.error(e1); + } finally { + setCursor(new Cursor(Cursor.DEFAULT_CURSOR)); + } + }); } return applySelectedCRSButton; @@ -516,32 +485,27 @@ setSelectedCRSAsDefaultButton.setBounds(new Rectangle(315, 300, 69, 61)); setSelectedCRSAsDefaultButton.setText("Set as
Default"); - setSelectedCRSAsDefaultButton - .addActionListener(new java.awt.event.ActionListener() { - @Override - public void actionPerformed(java.awt.event.ActionEvent e) { - - if (crsJList.getSelectedValue() != null) { - String selection = crsJList.getSelectedValue(); - String code = selection.substring(selection.indexOf("[-") + 2, selection.indexOf("-]")); - - try { - PluginOperations.defaultSourceCRS = CRS.decode(code, eastingFirstCheckBox.isSelected()); - PluginOperations.defaultSourceCRSDescription = selection; - - ImportImagePlugin.pluginProps.setProperty("default_crs_eastingfirst", - "" + eastingFirstCheckBox.isSelected()); - ImportImagePlugin.pluginProps.setProperty("default_crs_srid", code); - try (FileWriter fileWriter = new FileWriter(new File(ImportImagePlugin.PLUGINPROPERTIES_PATH))) { - ImportImagePlugin.pluginProps.store(fileWriter, null); - } - - defaultCRSLabel.setText(selection); - - } catch (IOException | FactoryException e2) { - Logging.error(e2); + setSelectedCRSAsDefaultButton.addActionListener(e -> { + if (crsJList.getSelectedValue() != null) { + String selection = crsJList.getSelectedValue(); + String code = selection.substring(selection.indexOf("[-") + 2, selection.indexOf("-]")); + + try { + PluginOperations.defaultSourceCRS = CRS.decode(code, eastingFirstCheckBox.isSelected()); + PluginOperations.defaultSourceCRSDescription = selection; + + ImportImagePlugin.pluginProps.setProperty("default_crs_eastingfirst", + "" + eastingFirstCheckBox.isSelected()); + ImportImagePlugin.pluginProps.setProperty("default_crs_srid", code); + try (FileWriter fileWriter = new FileWriter(new File(ImportImagePlugin.PLUGINPROPERTIES_PATH))) { + ImportImagePlugin.pluginProps.store(fileWriter, null); } - } else { - JOptionPane.showMessageDialog(getContentPane(), "Please make a selection from the list."); + + defaultCRSLabel.setText(selection); + + } catch (IOException | FactoryException e2) { + Logging.error(e2); } + } else { + JOptionPane.showMessageDialog(getContentPane(), "Please make a selection from the list."); } });