Changeset 15293 in josm for trunk

Timestamp:

2019-08-08T01:24:18+02:00 (5 years ago)

Author:

Don-vip

Message:

sonar

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/MapRectifierWMSmenuAction.java (modified) (2 diffs)
• data/validation/tests/ConditionalKeys.java (modified) (1 diff)
• gui/autofilter/AutoFilterRule.java (modified) (1 diff)
• gui/dialogs/MapPaintDialog.java (modified) (1 diff)
• gui/mappaint/BooleanStyleSettingGui.java (modified) (1 diff)
• gui/mappaint/StyleSetting.java (modified) (4 diffs)
• gui/tagging/presets/TaggingPresetItem.java (modified) (1 diff)
• gui/util/StayOpenCheckBoxMenuItemUI.java (modified) (1 diff)
• io/CachedFile.java (modified) (1 diff)
• tools/PlatformHookUnixoid.java (modified) (1 diff)
• tools/TextUtils.java (modified) (1 diff)
• tools/WikiReader.java (modified) (2 diffs)

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

@@ -204 +204 @@
                 if (m.find()) {
                     String id = m.group(1);
-                    String newURL = s.wmsUrl.replaceAll("__s__", id);
+                    String newURL = s.wmsUrl.replace("__s__", id);
                     String title = s.name + " (" + id + ')';
                     addWMSLayer(title, newURL);
@@ -211 +211 @@
                 // If not, look if it's a valid ID for the selected service
                 if (s.idValidator.matcher(text).matches()) {
-                    String newURL = s.wmsUrl.replaceAll("__s__", text);
+                    String newURL = s.wmsUrl.replace("__s__", text);
                     String title = s.name + " (" + text + ')';
                     addWMSLayer(title, newURL);

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

@@ -106 +106 @@
             return false;
         }
-        final String[] parts = key.replaceAll(":conditional", "").split(":");
+        final String[] parts = key.replace(":conditional", "").split(":");
         return isKeyValid3Parts(parts) || isKeyValid1Part(parts) || isKeyValid2Parts(parts);
     }

trunk/src/org/openstreetmap/josm/gui/autofilter/AutoFilterRule.java

@@ -97 +97 @@
             new AutoFilterRule("layer", 16),
             new AutoFilterRule("maxspeed", 16)
-                .setValueFormatter(s -> s.replaceAll(" mph", "")),
+                .setValueFormatter(s -> s.replace(" mph", "")),
             new AutoFilterRule("voltage", 5)
                 .setValueFormatter(s -> s.replaceAll("000$", "k") + 'V')

trunk/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java

@@ -706 +706 @@
                 // Add settings not in groups
                 final List<StyleSetting> allStylesInGroups = style.settingGroups.values().stream()
-                        .flatMap(l -> l.stream()).collect(Collectors.toList());
+                        .flatMap(List<StyleSetting>::stream).collect(Collectors.toList());
                 for (StyleSetting s : style.settings.stream()
                         .filter(s -> !allStylesInGroups.contains(s)).collect(Collectors.toList())) {

trunk/src/org/openstreetmap/josm/gui/mappaint/BooleanStyleSettingGui.java

@@ -48 +48 @@
         }
 
-        public void doClickWithoutRepaint(int pressTime) {
+        void doClickWithoutRepaint(int pressTime) {
             noRepaint = true;
             doClick(pressTime);

trunk/src/org/openstreetmap/josm/gui/mappaint/StyleSetting.java

@@ -54 +54 @@
 
         @Override
+        public int hashCode() {
+            return Objects.hash(label, parentStyle);
+        }
+
+        @Override
+        public boolean equals(Object obj) {
+            if (this == obj)
+                return true;
+            if (obj == null || getClass() != obj.getClass())
+                return false;
+            LabeledStyleSetting other = (LabeledStyleSetting) obj;
+            return Objects.equals(label, other.label) && Objects.equals(parentStyle, other.parentStyle);
+        }
+
+        @Override
         public int compareTo(LabeledStyleSetting o) {
             return label.compareTo(o.label);
@@ -64 +79 @@
      */
     class StyleSettingGroup extends LabeledStyleSetting {
+        /** group identifier */
         public final String key;
+        /** group icon (optional) */
         public final Icon icon;
 
@@ -73 +90 @@
         }
 
+        /**
+         * Creates a new {@code StyleSettingGroup}.
+         * @param c cascade
+         * @param parentStyle parent style source
+         * @param key group identifier
+         * @return newly created {@code StyleSettingGroup}
+         */
         public static StyleSettingGroup create(Cascade c, StyleSource parentStyle, String key) {
             String label = c.get("label", null, String.class);
@@ -98 +122 @@
         }
 
+        /**
+         * Creates a new {@code BooleanStyleSetting}.
+         * @param c cascade
+         * @param parentStyle parent style source
+         * @param key setting identifier
+         * @return newly created {@code BooleanStyleSetting}
+         */
         public static BooleanStyleSetting create(Cascade c, StyleSource parentStyle, String key) {
             String label = c.get("label", null, String.class);

trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetItem.java

@@ -102 +102 @@
 
     protected static String fixPresetString(String s) {
-        return s == null ? s : s.replaceAll("'", "''");
+        return s == null ? s : s.replace("'", "''");
     }
 

trunk/src/org/openstreetmap/josm/gui/util/StayOpenCheckBoxMenuItemUI.java

@@ -66 +66 @@
     }
 
+    /**
+     * Creates a new {@code StayOpenCheckBoxMenuItemUI}.
+     * @param c not used
+     * @return newly created {@code StayOpenCheckBoxMenuItemUI}
+     */
     public static ComponentUI createUI(JComponent c) {
         return new StayOpenCheckBoxMenuItemUI();

trunk/src/org/openstreetmap/josm/io/CachedFile.java

@@ -422 +422 @@
         }
         prefKey.append(url.toString().replaceAll("%<(.*)>", ""));
-        return prefKey.toString().replaceAll("=", "_");
+        return prefKey.toString().replace("=", "_");
     }
 

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

@@ -229 +229 @@
                 if (line != null && !line.isEmpty()) {
                     line = line.replaceAll("\"+", "");
-                    line = line.replaceAll("NAME=", ""); // strange code for some Gentoo's
+                    line = line.replace("NAME=", ""); // strange code for some Gentoo's
                     if (line.startsWith("Linux ")) // e.g. Linux Mint
                         return line;

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

@@ -19 +19 @@
      */
     public static String wrapLongUrl(String url) {
-        return url.replaceAll("/", "/\u200b").replaceAll("&", "&\u200b");
+        return url.replace("/", "/\u200b").replace("&", "&\u200b");
     }
 }

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

@@ -107 +107 @@
         for (String line = in.readLine(); line != null; line = in.readLine()) {
             if (!line.contains("[[TranslatedPages]]")) {
-                b.append(line.replaceAll(" />", ">")).append('\n');
+                b.append(line.replace(" />", ">")).append('\n');
             }
         }
@@ -140 +140 @@
                 // will render a thick  border around images inside an <a> element
                 // remove width information to avoid distorded images (fix #11262)
-                b.append(line.replaceAll("<img ", "<img border=\"0\" ")
+                b.append(line.replace("<img ", "<img border=\"0\" ")
                          .replaceAll("width=\"(\\d+)\"", "")
                          .replaceAll("<span class=\"icon\">.</span>", "")
-                         .replaceAll("href=\"/", "href=\"" + baseurl + '/')
-                         .replaceAll(" />", ">"))
+                         .replace("href=\"/", "href=\"" + baseurl + '/')
+                         .replace(" />", ">"))
                          .append('\n');
             } else if (transl && line.contains("</div>")) {