Changeset 14851 in josm for trunk/src

Timestamp:

2019-03-07T09:54:49+01:00 (6 years ago)

Author:

GerdP

Message:

see #17268: fix some findbugs/sonar/javadoc issues

File:

• trunk/src/org/openstreetmap/josm/data/validation/OsmValidator.java (modified) (6 diffs)

trunk/src/org/openstreetmap/josm/data/validation/OsmValidator.java

@@ -27 +27 @@
 import java.util.TreeSet;
 import java.util.function.Predicate;
+import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
@@ -278 +279 @@
 
         Map<String, String> tmap = buildIgnore(buildJTreeList());
-        if (tmap != null && !tmap.isEmpty()) {
+        if (!tmap.isEmpty()) {
             ignoredErrors.clear();
             ignoredErrors.putAll(tmap);
@@ -303 +304 @@
     /**
      * Build a JTree with a list
-     * @return &lttype&gtlist as a {@code JTree}
+     * @return &lt;type&gt;list as a {@code JTree}
      */
     public static JTree buildJTreeList() {
         DefaultMutableTreeNode root = new DefaultMutableTreeNode(tr("Ignore list"));
+        final Pattern elemId1Pattern = Pattern.compile(":(r|w|n)_");
+        final Pattern elemId2Pattern = Pattern.compile("^[0-9]+$");
         for (Entry<String, String> e: ignoredErrors.entrySet()) {
             String key = e.getKey();
             String value = e.getValue();
             ArrayList<String> ignoredWayList = new ArrayList<>();
-            String[] osmobjects = key.split(":(r|w|n)_");
+            String[] osmobjects = elemId1Pattern.split(key);
             for (int i = 1; i < osmobjects.length; i++) {
                 String osmid = osmobjects[i];
-                if (osmid.matches("^[0-9]+$")) {
+                if (elemId2Pattern.matcher(osmid).matches()) {
                     osmid = '_' + osmid;
                     int index = key.indexOf(osmid);
@@ -388 +391 @@
 
 
+        StringBuilder sb = new StringBuilder();
         for (int i = 0; i < model.getChildCount(node); i++) {
             DefaultMutableTreeNode child = (DefaultMutableTreeNode) model.getChild(node, i);
@@ -393 +397 @@
                 String ignoreName = child.getUserObject().toString();
                 if (ignoreName.matches("^(r|w|n)_.*")) {
-                    osmids += ":" + child.getUserObject().toString();
+                    sb.append(":").append(child.getUserObject().toString());
                 } else if (ignoreName.matches("^[0-9]+(_.*|)$")) {
                     rHashMap.put(ignoreName, description);
@@ -401 +405 @@
             }
         }
+        osmids += sb.toString();
         if (!osmids.isEmpty() && osmids.indexOf(':') != 0) rHashMap.put(osmids, description);
         return rHashMap;