Changeset 17787 in josm for trunk/src

Timestamp:

2021-04-14T21:29:47+02:00 (4 years ago)

Author:

simon04

Message:

fix #20741 - Various code simplifications (patch by gaben)

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/downloadtasks/DownloadGpsTask.java (modified) (1 diff)
• actions/downloadtasks/DownloadSessionTask.java (modified) (1 diff)
• data/Preferences.java (modified) (1 diff)
• data/coor/conversion/LatLonParser.java (modified) (1 diff)
• data/osm/Storage.java (modified) (1 diff)
• data/osm/search/SearchCompiler.java (modified) (2 diffs)
• data/validation/OsmValidator.java (modified) (2 diffs)
• data/validation/tests/Addresses.java (modified) (1 diff)
• gui/preferences/imagery/HeadersTable.java (modified) (2 diffs)
• gui/preferences/shortcut/PrefJPanel.java (modified) (1 diff)
• gui/tagging/presets/TaggingPresetItem.java (modified) (1 diff)
• io/CachedFile.java (modified) (1 diff)
• io/GpxWriter.java (modified) (2 diffs)
• io/InvalidXmlCharacterFilter.java (modified) (2 diffs)
• io/OsmWriter.java (modified) (1 diff)
• io/OverpassDownloadReader.java (modified) (1 diff)
• io/rtklib/RtkLibPosReader.java (modified) (1 diff)
• tools/LanguageInfo.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java

@@ -87 +87 @@
 
         } else if (GpxUrlPattern.TRACKPOINTS_BBOX.matches(url)) {
-            String[] table = url.split("\\?|=|&", -1);
+            String[] table = url.split("[?=&]", -1);
             for (int i = 0; i < table.length; i++) {
                 if ("bbox".equals(table[i]) && i < table.length-1)

trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadSessionTask.java

@@ -23 +23 @@
 public class DownloadSessionTask extends AbstractDownloadTask<Object> {
 
-    private static final String PATTERN_SESSION = "https?://.*/.*\\.jo(s|z)";
+    private static final String PATTERN_SESSION = "https?://.*/.*\\.jo([sz])";
 
     private Loader loader;

trunk/src/org/openstreetmap/josm/data/Preferences.java

@@ -442 +442 @@
 
         try (PreferencesWriter writer = new PreferencesWriter(
-                new PrintWriter(new File(prefFile + "_tmp"), StandardCharsets.UTF_8.name()), false, defaults)) {
+                new PrintWriter(prefFile + "_tmp", StandardCharsets.UTF_8.name()), false, defaults)) {
             writer.write(settings);
         } catch (SecurityException e) {

trunk/src/org/openstreetmap/josm/data/coor/conversion/LatLonParser.java

@@ -43 +43 @@
             + "('|"+MIN+"|min)|"                // (4)
             + "(\"|"+SEC+"|sec)|"               // (5)
-            + "(,|;)|"                          // (6)
+            + "([,;])|"                         // (6)
             + "([NSEW"+N_TR+S_TR+E_TR+W_TR+"])|"// (7)
             + "\\s+|"

trunk/src/org/openstreetmap/josm/data/osm/Storage.java

@@ -232 +232 @@
         modCount++;
         size = 0;
-        for (int i = 0; i < data.length; i++) {
-            data[i] = null;
-        }
+        Arrays.fill(data, null);
     }
 

trunk/src/org/openstreetmap/josm/data/osm/search/SearchCompiler.java

@@ -732 +732 @@
                     String v1 = Normalizer.normalize(caseSensitive ? mv : mv.toLowerCase(Locale.ENGLISH), Normalizer.Form.NFC);
                     String v2 = Normalizer.normalize(caseSensitive ? value : value.toLowerCase(Locale.ENGLISH), Normalizer.Form.NFC);
-                    return v1.indexOf(v2) != -1;
+                    return v1.contains(v2);
                 }
             }
@@ -1072 +1072 @@
                     value = Normalizer.normalize(value, Normalizer.Form.NFC);
 
-                    if (key.indexOf(search) != -1 || value.indexOf(search) != -1)
+                    if (key.contains(search) || value.contains(search))
                         return true;
                 }

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

@@ -364 +364 @@
     public static JTree buildJTreeList() {
         DefaultMutableTreeNode root = new DefaultMutableTreeNode(tr("Ignore list"));
-        final Pattern elemId1Pattern = Pattern.compile(":(r|w|n)_");
+        final Pattern elemId1Pattern = Pattern.compile(":([rwn])_");
         final Pattern elemId2Pattern = Pattern.compile("^[0-9]+$");
         for (Entry<String, String> e: ignoredErrors.entrySet()) {
@@ -464 +464 @@
                 String item = child.getUserObject().toString();
                 String entry = null;
-                if (item.matches("^\\[(r|w|n)_.*")) {
+                if (item.matches("^\\[([rwn])_.*")) {
                     // list of elements (produced with list.toString() method)
                     entry = key + ":" + item.substring(1, item.lastIndexOf(']')).replace(", ", ":");
-                } else if (item.matches("^(r|w|n)_.*")) {
+                } else if (item.matches("^([rwn])_.*")) {
                     // single element
                     entry = key + ":" + item;

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

@@ -269 +269 @@
      */
     static List<String> expandHouseNumber(String houseNumber) {
-        return Arrays.asList(houseNumber.split(",|;", -1));
+        return Arrays.asList(houseNumber.split("[,;]", -1));
     }
 

trunk/src/org/openstreetmap/josm/gui/preferences/imagery/HeadersTable.java

@@ -5 +5 @@
 
 import java.awt.GridBagLayout;
-import java.util.Comparator;
 import java.util.List;
 import java.util.Map;
@@ -107 +106 @@
 
     private static List<String[]> getHeadersAsVector(Map<String, String> headers) {
-        return headers.entrySet().stream().sorted(Comparator.comparing(Map.Entry::getKey))
+        return headers.entrySet().stream().sorted(Map.Entry.comparingByKey())
                 .map(e -> new String[] {e.getKey(), e.getValue()}).collect(Collectors.toList());
     }

trunk/src/org/openstreetmap/josm/gui/preferences/shortcut/PrefJPanel.java

@@ -107 +107 @@
             }
         }
-        KeyboardUtils.getExtendedKeyCodes(InputContext.getInstance().getLocale()).entrySet()
-            .forEach(e -> list.put(e.getKey(), e.getValue().toString()));
+        KeyboardUtils.getExtendedKeyCodes(InputContext.getInstance().getLocale())
+                .forEach((key, value) -> list.put(key, value.toString()));
         list.put(Integer.valueOf(-1), "");
         return list;

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

@@ -89 +89 @@
             return TYPE_CACHE.get(types);
         Set<TaggingPresetType> result = EnumSet.noneOf(TaggingPresetType.class);
-        for (String type : Arrays.asList(types.split(",", -1))) {
+        for (String type : types.split(",", -1)) {
             try {
                 TaggingPresetType presetType = TaggingPresetType.fromString(type);

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

@@ -353 +353 @@
                 ZipEntry entry = entries.nextElement();
                 // choose any file with correct extension. When more than one file, prefer the one which matches namepart
-                if (entry.getName().endsWith('.' + extension) && (resentry == null || entry.getName().indexOf(namepart) >= 0)) {
+                if (entry.getName().endsWith('.' + extension) && (resentry == null || entry.getName().contains(namepart))) {
                     resentry = entry;
                 }

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

@@ -12 +12 @@
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Comparator;
 import java.util.Date;
 import java.util.List;
@@ -98 +97 @@
             data.getLayerPrefs().entrySet()
             .stream()
-            .sorted(Comparator.comparing(Map.Entry::getKey))
+            .sorted(Map.Entry.comparingByKey())
             .forEach(entry -> {
                 GpxExtension e = layerExts.add("josm", "entry");

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

@@ -4 +4 @@
 import java.io.IOException;
 import java.io.Reader;
+import java.util.Arrays;
 
 import org.openstreetmap.josm.tools.Logging;
@@ -28 +29 @@
     static {
         INVALID_CHARS = new boolean[0x20];
-        for (int i = 0; i < INVALID_CHARS.length; ++i) {
-            INVALID_CHARS[i] = true;
-        }
+        Arrays.fill(INVALID_CHARS, true);
         INVALID_CHARS[0x9] = false; // tab
         INVALID_CHARS[0xA] = false; // LF

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

@@ -319 +319 @@
     }
 
-    protected static final Comparator<Entry<String, String>> byKeyComparator = Comparator.comparing(Entry::getKey);
+    protected static final Comparator<Entry<String, String>> byKeyComparator = Entry.comparingByKey();
 
     protected void addTags(Tagged osm, String tagname, boolean tagOpen) {

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

@@ -271 +271 @@
         }
         if (javaDur) {
-            d = Duration.parse(javaPer ? 'P' + duration.substring(idx, duration.length()) : duration);
+            d = Duration.parse(javaPer ? 'P' + duration.substring(idx) : duration);
         } else if (!javaPer) {
             d = Duration.parse(duration);

trunk/src/org/openstreetmap/josm/io/rtklib/RtkLibPosReader.java

@@ -78 +78 @@
         Collection<WayPoint> waypoints = new ArrayList<>();
         try (BufferedReader rd = new BufferedReader(new InputStreamReader(source, StandardCharsets.UTF_8))) {
-            String line = null;
+            String line;
             do {
                 line = rd.readLine();

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

@@ -66 +66 @@
                 }
             }
-            if ("nb".equals(code)) { /* OSM-Wiki has "no", but no "nb" */
-                return "No:";
-            } else if ("sr@latin".equals(code)) { /* OSM-Wiki has "Sr-latn" and not Sr-latin */
-                return "Sr-latn:";
-            } 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 {
-                return code.substring(0, 1).toUpperCase(Locale.ENGLISH) + code.substring(1) + ":";
+            switch (code) {
+                case "nb":          /* OSM-Wiki has "no", but no "nb" */
+                    return "No:";
+                case "sr@latin":    /* OSM-Wiki has "Sr-latn" and not Sr-latin */
+                    return "Sr-latn:";
+                case "de":
+                case "es":
+                case "fr":
+                case "it":
+                case "nl":
+                case "ru":
+                case "ja":
+                    return code.toUpperCase(Locale.ENGLISH) + ":";
+                default:
+                    return code.substring(0, 1).toUpperCase(Locale.ENGLISH) + code.substring(1) + ":";
             }
         }
@@ -160 +165 @@
     public static String getJavaLocaleCode(String localeName) {
         if (localeName == null) return "en";
-        if ("ca@valencia".equals(localeName)) {
-            localeName = "ca__valencia";
-        } else if ("sr@latin".equals(localeName)) {
-            localeName = "sr__latin";
-        } else if ("he".equals(localeName)) {
-            localeName = "iw_IL";
-        } else if ("id".equals(localeName)) {
-            localeName = "in";
+        switch (localeName) {
+            case "ca@valencia":
+                return "ca__valencia";
+            case "sr@latin":
+                return "sr__latin";
+            case "he":
+                return "iw_IL";
+            case "id":
+                return "in";
         }
         return localeName;