Changeset 18871 in josm for trunk/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java

Timestamp:

2023-10-16T19:03:11+02:00 (16 months ago)

Author:

taylor.smock

Message:

See #23218: Use newer error_prone versions when compiling on Java 11+

error_prone 2.11 dropped support for compiling with Java 8, although it still
supports compiling for Java 8. The "major" new check for us is NotJavadoc since
we used /** in quite a few places which were not javadoc.

Other "new" checks that are of interest:

• AlreadyChecked: if (foo) { doFoo(); } else if (!foo) { doBar(); }
• UnnecessaryStringBuilder: Avoid StringBuilder (Java converts + to StringBuilder behind-the-scenes, but may also do something else if it performs better)
• NonApiType: Avoid specific interface types in function definitions
• NamedLikeContextualKeyword: Avoid using restricted names for classes and methods
• UnusedMethod: Unused private methods should be removed

This fixes most of the new error_prone issues and some SonarLint issues.

File:

• trunk/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java (modified) (5 diffs)

trunk/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java

@@ -765 +765 @@
     private static void prepareFileChooser(String url, AbstractFileChooser fc) {
         if (Utils.isBlank(url)) return;
-        URL sourceUrl = null;
+        URL sourceUrl;
         try {
             sourceUrl = new URL(url);
@@ -816 +816 @@
             p.add(new JLabel(tr("URL / File:")), GBC.std().insets(15, 0, 5, 0));
             p.add(tfURL, GBC.std().insets(0, 0, 5, 5));
-            JButton fileChooser = new JButton(new LaunchFileChooserAction());
+            JButton fileChooser = new JButton(new LaunchFileChooserSourceTypeAction());
             fileChooser.setMargin(new Insets(0, 0, 0, 0));
             p.add(fileChooser, GBC.eol().insets(0, 0, 5, 5));
@@ -848 +848 @@
         }
 
-        class LaunchFileChooserAction extends AbstractAction {
-            LaunchFileChooserAction() {
+        class LaunchFileChooserSourceTypeAction extends AbstractAction {
+            LaunchFileChooserSourceTypeAction() {
                 new ImageProvider("open").getResource().attachImageIcon(this);
                 putValue(SHORT_DESCRIPTION, tr("Launch a file chooser to select a file"));
@@ -1535 +1535 @@
             gc.weightx = 0.0;
             gc.weighty = 1.0;
-            add(new JButton(new LaunchFileChooserAction()));
+            add(new JButton(new LaunchFileChooserEditCellAction()));
 
             tfFileName.addFocusListener(
@@ -1622 +1622 @@
         }
 
-        class LaunchFileChooserAction extends AbstractAction {
-            LaunchFileChooserAction() {
+        class LaunchFileChooserEditCellAction extends AbstractAction {
+            LaunchFileChooserEditCellAction() {
                 putValue(NAME, "...");
                 putValue(SHORT_DESCRIPTION, tr("Launch a file chooser to select a file"));