Changeset 18871 in josm for trunk/src/org/openstreetmap/josm/gui/download/OverpassQueryWizardDialog.java

Timestamp:

2023-10-16T19:03:11+02:00 (3 years 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/download/OverpassQueryWizardDialog.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/download/OverpassQueryWizardDialog.java

@@ -16 +16 @@
 import org.openstreetmap.josm.gui.download.overpass.OverpassWizardRegistration.OverpassWizardCallbacks;
 import org.openstreetmap.josm.gui.tagging.ac.AutoCompComboBoxModel;
+import org.openstreetmap.josm.gui.widgets.JosmComboBoxModel;
 import org.openstreetmap.josm.tools.Logging;
 import org.openstreetmap.josm.tools.SearchCompilerQueryWizard;
@@ -29 +30 @@
 
     private static final ListProperty OVERPASS_WIZARD_HISTORY =
-            new ListProperty("download.overpass.wizard", new ArrayList<String>());
+            new ListProperty("download.overpass.wizard", new ArrayList<>());
     private final OverpassWizardCallbacks callbacks;
 
@@ -37 +38 @@
     private static final int CANCEL = 2;
 
-    private AutoCompComboBoxModel<SearchSetting> model;
+    private final AutoCompComboBoxModel<SearchSetting> model;
 
     /** preferences reader/writer with automatic transmogrification to and from String */
-    private AutoCompComboBoxModel<SearchSetting>.Preferences prefs;
+    private final JosmComboBoxModel<SearchSetting>.Preferences prefs;
 
     /**