Changeset 11553 in josm for trunk/src/org/openstreetmap/josm/gui/mappaint

Timestamp:

2017-02-12T16:32:18+01:00 (7 years ago)

Author:

Don-vip

Message:

refactor handling of null values - use Java 8 Optional where possible

Location:

trunk/src/org/openstreetmap/josm/gui/mappaint

Files:

• StyleCache.java (modified) (2 diffs)
• styleelement/LabelCompositionStrategy.java (modified) (1 diff)
• styleelement/LineElement.java (modified) (3 diffs)
• styleelement/NodeElement.java (modified) (1 diff)

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

@@ -3 +3 @@
 
 import java.util.Arrays;
+import java.util.Optional;
 
 import org.openstreetmap.josm.data.osm.Storage;
@@ -44 +45 @@
 
         int idx = getIndex(selected);
-        DividedScale<StyleElementList> ds = s.states[idx];
-        if (ds == null) {
-            ds = new DividedScale<>();
-        }
-        s.states[idx] = ds.put(o, r);
+        s.states[idx] = Optional.ofNullable(s.states[idx]).orElseGet(DividedScale::new).put(o, r);
         return s.intern();
     }

trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/LabelCompositionStrategy.java

@@ -163 +163 @@
 
         private static List<String> buildNameTags(List<String> nameTags) {
-            if (nameTags == null) {
-                nameTags = Collections.emptyList();
-            }
             List<String> result = new ArrayList<>();
-            for (String tag: nameTags) {
-                if (tag == null) {
-                    continue;
-                }
-                tag = tag.trim();
-                if (tag.isEmpty()) {
-                    continue;
-                }
-                result.add(tag);
+            if (nameTags != null) {
+                for (String tag: nameTags) {
+                    if (tag == null) {
+                        continue;
+                    }
+                    tag = tag.trim();
+                    if (tag.isEmpty()) {
+                        continue;
+                    }
+                    result.add(tag);
+                }
             }
             return result;

trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/LineElement.java

@@ -6 +6 @@
 import java.util.Arrays;
 import java.util.Objects;
+import java.util.Optional;
 
 import org.openstreetmap.josm.Main;
@@ -357 +358 @@
                 if (casingWidth == null)
                     return null;
-                width = getWidth(c, WIDTH, getWidth(cDef, WIDTH, null));
-                if (width == null) {
-                    width = 0f;
-                }
-                width += 2 * casingWidth;
+                width = Optional.ofNullable(getWidth(c, WIDTH, getWidth(cDef, WIDTH, null))).orElse(0f) + 2 * casingWidth;
                 break;
             case LEFT_CASING:
@@ -378 +375 @@
 
             /* if we have a "width" tag, try use it */
-            String widthTag = env.osm.get("width");
-            if (widthTag == null) {
-                widthTag = env.osm.get("est_width");
-            }
+            String widthTag = Optional.ofNullable(env.osm.get("width")).orElseGet(() -> env.osm.get("est_width"));
             if (widthTag != null) {
                 try {

trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/NodeElement.java

@@ -167 +167 @@
             sizeOnDefault = null;
         }
-        Float size = getWidth(c, "symbol-size", sizeOnDefault);
-
-        if (size == null) {
-            size = 10f;
-        }
-
+        Float size = Optional.ofNullable(getWidth(c, "symbol-size", sizeOnDefault)).orElse(10f);
         if (size <= 0)
             return null;