Changeset 11553 in josm for trunk/src/org/openstreetmap/josm/gui/layer/Layer.java

Timestamp:

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

Author:

Don-vip

Message:

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

File:

• trunk/src/org/openstreetmap/josm/gui/layer/Layer.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/layer/Layer.java

@@ -11 +11 @@
 import java.io.File;
 import java.util.List;
+import java.util.Optional;
 
 import javax.swing.AbstractAction;
@@ -301 +302 @@
             removeColorPropertyListener();
         }
-        if (name == null) {
-            name = "";
-        }
-
         String oldValue = this.name;
-        this.name = name;
+        this.name = Optional.ofNullable(name).orElse("");
         if (!this.name.equals(oldValue)) {
             propertyChangeSupport.firePropertyChange(NAME_PROP, oldValue, this.name);