Changeset 16436 in josm for trunk/src/org/openstreetmap/josm/data/imagery/ImageryInfo.java

Timestamp:

2020-05-17T12:08:17+02:00 (4 years ago)

Author:

simon04

Message:

see #19251 - Java 8: use Stream

File:

• trunk/src/org/openstreetmap/josm/data/imagery/ImageryInfo.java (modified) (6 diffs)

trunk/src/org/openstreetmap/josm/data/imagery/ImageryInfo.java

@@ -48 +48 @@
 import org.openstreetmap.josm.tools.Logging;
 import org.openstreetmap.josm.tools.MultiMap;
+import org.openstreetmap.josm.tools.StreamUtils;
 import org.openstreetmap.josm.tools.Utils;
 
@@ -95 +96 @@
          */
         public static ImageryType fromString(String s) {
-            for (ImageryType type : ImageryType.values()) {
-                if (type.getTypeString().equals(s)) {
-                    return type;
-                }
-            }
-            return null;
+            return Arrays.stream(ImageryType.values())
+                    .filter(type -> type.getTypeString().equals(s))
+                    .findFirst().orElse(null);
         }
     }
@@ -170 +168 @@
          */
         public static ImageryCategory fromString(String s) {
-            for (ImageryCategory category : ImageryCategory.values()) {
-                if (category.getCategoryString().equals(s)) {
-                    return category;
-                }
-            }
-            return null;
+            return Arrays.stream(ImageryCategory.values())
+                    .filter(category -> category.getCategoryString().equals(s))
+                    .findFirst().orElse(null);
         }
     }
@@ -403 +398 @@
             if (i.bounds != null) {
                 bounds = i.bounds.encodeAsString(",");
-                StringBuilder shapesString = new StringBuilder();
-                for (Shape s : i.bounds.getShapes()) {
-                    if (shapesString.length() > 0) {
-                        shapesString.append(';');
-                    }
-                    shapesString.append(s.encodeAsString(","));
-                }
-                if (shapesString.length() > 0) {
-                    shapes = shapesString.toString();
+                String shapesString = Shape.encodeAsString(i.bounds.getShapes());
+                if (!shapesString.isEmpty()) {
+                    shapes = shapesString;
                 }
             }
@@ -1093 +1082 @@
      */
     public static Collection<String> getActiveIds() {
-        ArrayList<String> ids = new ArrayList<>();
         IPreferences pref = Config.getPref();
-        if (pref != null) {
-            List<ImageryPreferenceEntry> entries = StructUtils.getListOfStructs(
-                pref, "imagery.entries", null, ImageryPreferenceEntry.class);
-            if (entries != null) {
-                for (ImageryPreferenceEntry prefEntry : entries) {
-                    if (prefEntry.id != null && !prefEntry.id.isEmpty())
-                        ids.add(prefEntry.id);
-                }
-                Collections.sort(ids);
-            }
-        }
-        return ids;
+        if (pref == null) {
+            return Collections.emptyList();
+        }
+        List<ImageryPreferenceEntry> entries = StructUtils.getListOfStructs(pref, "imagery.entries", null, ImageryPreferenceEntry.class);
+        if (entries == null) {
+            return Collections.emptyList();
+        }
+        return entries.stream()
+                .filter(prefEntry -> prefEntry.id != null && !prefEntry.id.isEmpty())
+                .map(prefEntry -> prefEntry.id)
+                .sorted()
+                .collect(Collectors.toList());
     }
 
@@ -1230 +1218 @@
         this.serverProjections = serverProjections.stream()
                 .map(String::intern)
-                .collect(Collectors.collectingAndThen(Collectors.toList(), Utils::toUnmodifiableList));
+                .collect(StreamUtils.toUnmodifiableList());
     }