Changeset 14706 in josm for trunk

Timestamp:

2019-01-19T20:46:28+01:00 (5 years ago)

Author:

GerdP

Message:

fix more recent sonar issues

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/AboutAction.java (modified) (1 diff)
• actions/ShowStatusReportAction.java (modified) (1 diff)
• actions/UnGlueAction.java (modified) (4 diffs)
• data/validation/tests/TagChecker.java (modified) (1 diff)
• gui/tagging/presets/items/KeyedItem.java (modified) (1 diff)
• tools/LanguageInfo.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/actions/AboutAction.java

@@ -187 +187 @@
      * @param source source for symbol
      */
-    private void addInstallationLine(JPanel inst, String dir, String source) {
+    private static void addInstallationLine(JPanel inst, String dir, String source) {
         if (source == null)
             return;

trunk/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java

@@ -279 +279 @@
         Preferences.main().getAllSettings().forEach((key, setting) -> {
             if (key.startsWith("marker.show")
-                    || key.equals("file-open.history")
-                    || key.equals("download.overpass.query")
-                    || key.equals("download.overpass.queries")
+                    || "file-open.history".equals(key)
+                    || "download.overpass.query".equals(key)
+                    || "download.overpass.queries".equals(key)
                     || key.contains("username")
                     || key.contains("password")

trunk/src/org/openstreetmap/josm/actions/UnGlueAction.java

@@ -183 +183 @@
 
     private static void updateProperties(ExistingBothNew tags, Node existingNode, Iterable<Node> newNodes, Collection<Command> cmds) {
-        if (ExistingBothNew.NEW.equals(tags)) {
+        if (ExistingBothNew.NEW == tags) {
             final Node newSelectedNode = new Node(existingNode);
             newSelectedNode.removeAll();
             cmds.add(new ChangeCommand(existingNode, newSelectedNode));
-        } else if (ExistingBothNew.OLD.equals(tags)) {
+        } else if (ExistingBothNew.OLD == tags) {
             for (Node newNode : newNodes) {
                 newNode.removeAll();
@@ -213 +213 @@
         List<Command> cmds = new LinkedList<>();
         cmds.add(new AddCommand(selectedNode.getDataSet(), unglued));
-        if (dialog != null && ExistingBothNew.NEW.equals(dialog.getTags().orElse(null))) {
+        if (dialog != null && ExistingBothNew.NEW == dialog.getTags().orElse(null)) {
             // unglued node gets the ID and history, thus replace way node with a fresh one
             final Way way = selectedNode.getParentWays().get(0);
@@ -388 +388 @@
      */
     private static void updateMemberships(ExistingBothNew memberships, Node originalNode, List<Node> newNodes, Collection<Command> cmds) {
-        if (memberships == null || ExistingBothNew.OLD.equals(memberships)) {
+        if (memberships == null || ExistingBothNew.OLD == memberships) {
             return;
         }
@@ -417 +417 @@
                             newRel.addMember(role.getValue() + 1, new RelationMember(role.getKey(), n));
                         }
-                        if (ExistingBothNew.NEW.equals(memberships)) {
+                        if (ExistingBothNew.NEW == memberships) {
                             // remove old member
                             newRel.removeMember(role.getValue());

trunk/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java

@@ -190 +190 @@
      * Add presets that contain only numerical values to the ignore list
      */
-    private void analysePresets() {
+    private static void analysePresets() {
         for (String key : TaggingPresets.getPresetKeys()) {
             if (isKeyIgnored(key))

trunk/src/org/openstreetmap/josm/gui/tagging/presets/items/KeyedItem.java

@@ -171 +171 @@
     public boolean isKeyRequired() {
         final MatchType type = MatchType.ofString(match);
-        return MatchType.KEY_REQUIRED.equals(type) || MatchType.KEY_VALUE_REQUIRED.equals(type);
+        return MatchType.KEY_REQUIRED == type || MatchType.KEY_VALUE_REQUIRED == type;
     }
 

trunk/src/org/openstreetmap/josm/tools/LanguageInfo.java

@@ -66 +66 @@
                 }
             }
-            if (code.equals("nb")) { /* OSM-Wiki has "no", but no "nb" */
+            if ("nb".equals(code)) { /* OSM-Wiki has "no", but no "nb" */
                 return "No:";
-            } else if (code.equals("de") || code.equals("es") || code.equals("fr")
-                    || code.equals("it") || code.equals("nl") || code.equals("ru")
-                    || code.equals("ja")) {
+            } else if ("de".equals(code) || "es".equals(code) || "fr".equals(code)
+                    || "it".equals(code) || "nl".equals(code) || "ru".equals(code)
+                    || "ja".equals(code)) {
                 return code.toUpperCase(Locale.ENGLISH) + ":";
             } else {