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

Timestamp:

2023-10-16T19:03:11+02:00 (14 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/ToolbarPreferences.java (modified) (9 diffs)

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

@@ -24 +24 @@
 import java.util.Collection;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
@@ -299 +300 @@
                 return null;
 
-            ActionDefinition result = new ActionDefinition(action);
+            ActionDefinition actionDefinition = new ActionDefinition(action);
 
             if (action instanceof ParameterizedAction) {
@@ -305 +306 @@
 
                 ParameterizedAction parametrizedAction = (ParameterizedAction) action;
-                Map<String, ActionParameter<?>> actionParams = new ConcurrentHashMap<>();
+                Map<String, ActionParameter<?>> actionParams = new HashMap<>();
                 for (ActionParameter<?> param: parametrizedAction.getActionParameters()) {
                     actionParams.put(param.getName(), param);
@@ -317 +318 @@
                         ActionParameter<?> actionParam = actionParams.get(paramName);
                         if (actionParam != null) {
-                            result.getParameters().put(paramName, actionParam.readFromString(paramValue));
+                            actionDefinition.getParameters().put(paramName, actionParam.readFromString(paramValue));
                         }
                     }
@@ -332 +333 @@
                     String paramValue = readTillChar(',', '}');
                     if ("icon".equals(paramName) && !paramValue.isEmpty()) {
-                        result.setIcon(paramValue);
+                        actionDefinition.setIcon(paramValue);
                     } else if ("name".equals(paramName) && !paramValue.isEmpty()) {
-                        result.setName(paramValue);
+                        actionDefinition.setName(paramValue);
                     }
                     skip(',');
@@ -341 +342 @@
             }
 
-            return result;
+            return actionDefinition;
         }
 
@@ -798 +799 @@
         private JButton createButton(String name) {
             JButton b = new JButton();
-            if ("up".equals(name)) {
-                b.setIcon(ImageProvider.get("dialogs", "up", ImageSizes.LARGEICON));
-                b.setToolTipText(tr("Move the currently selected members up"));
-            } else if ("down".equals(name)) {
-                b.setIcon(ImageProvider.get("dialogs", "down", ImageSizes.LARGEICON));
-                b.setToolTipText(tr("Move the currently selected members down"));
-            } else if ("<".equals(name)) {
-                b.setIcon(ImageProvider.get("dialogs/conflict", "copybeforecurrentright", ImageSizes.LARGEICON));
-                b.setToolTipText(tr("Add all objects selected in the current dataset before the first selected member"));
-            } else if (">".equals(name)) {
-                b.setIcon(ImageProvider.get("dialogs", "delete", ImageSizes.LARGEICON));
-                b.setToolTipText(tr("Remove"));
+            switch (name) {
+                case "up":
+                    b.setIcon(ImageProvider.get("dialogs", "up", ImageSizes.LARGEICON));
+                    b.setToolTipText(tr("Move the currently selected members up"));
+                    break;
+                case "down":
+                    b.setIcon(ImageProvider.get("dialogs", "down", ImageSizes.LARGEICON));
+                    b.setToolTipText(tr("Move the currently selected members down"));
+                    break;
+                case "<":
+                    b.setIcon(ImageProvider.get("dialogs/conflict", "copybeforecurrentright", ImageSizes.LARGEICON));
+                    b.setToolTipText(tr("Add all objects selected in the current dataset before the first selected member"));
+                    break;
+                case ">":
+                    b.setIcon(ImageProvider.get("dialogs", "delete", ImageSizes.LARGEICON));
+                    b.setToolTipText(tr("Remove"));
+                    break;
+                default:
+                    // do nothing
             }
             b.addActionListener(moveAction);
@@ -1044 +1052 @@
                         continue;
                     } else if (!(tb instanceof String)) {
-                        if (!(tb instanceof Boolean) || (Boolean) tb) {
+                        if (!(tb instanceof Boolean) || Boolean.TRUE.equals(tb)) {
                             Logging.info(tr("Strange toolbar value: {0}",
                             action.getClass().getName()));
@@ -1162 +1170 @@
     /**
      * Parse the toolbar preference setting and construct the toolbar GUI control.
-     *
+     * <p>
      * Call this, if anything has changed in the toolbar settings and you want to refresh
      * the toolbar content (e.g. after registering actions in a plugin)