Changeset 18208 in josm for trunk/src/org/openstreetmap/josm/command/ChangePropertyCommand.java

Timestamp:

2021-09-11T17:50:57+02:00 (5 years ago)

Author:

Don-vip

Message:

global use of Utils.isEmpty/isBlank

File:

• trunk/src/org/openstreetmap/josm/command/ChangePropertyCommand.java (modified) (6 diffs)

trunk/src/org/openstreetmap/josm/command/ChangePropertyCommand.java

@@ -26 +26 @@
 import org.openstreetmap.josm.tools.I18n;
 import org.openstreetmap.josm.tools.ImageProvider;
+import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -139 +140 @@
                 String newVal = tag.getValue();
 
-                if (newVal == null || newVal.isEmpty()) {
+                if (Utils.isEmpty(newVal)) {
                     if (oldVal != null) {
                         // new value is null and tag exists (will delete tag)
@@ -173 +174 @@
                     String newVal = tag.getValue();
 
-                    if (newVal == null || newVal.isEmpty()) {
+                    if (Utils.isEmpty(newVal)) {
                         if (oldVal != null)
                             osm.remove(tag.getKey());
@@ -204 +205 @@
             String msg;
             Map.Entry<String, String> entry = tags.entrySet().iterator().next();
-            if (entry.getValue() == null || entry.getValue().isEmpty()) {
+            if (Utils.isEmpty(entry.getValue())) {
                 switch(OsmPrimitiveType.from(primitive)) {
                 case NODE: msg = marktr("Remove \"{0}\" for node ''{1}''"); break;
@@ -223 +224 @@
         } else if (objects.size() > 1 && tags.size() == 1) {
             Map.Entry<String, String> entry = tags.entrySet().iterator().next();
-            if (entry.getValue() == null || entry.getValue().isEmpty()) {
+            if (Utils.isEmpty(entry.getValue())) {
                 /* I18n: plural form for objects, but value < 2 not possible! */
                 text = trn("Remove \"{0}\" for {1} object", "Remove \"{0}\" for {1} objects", objects.size(), entry.getKey(), objects.size());
@@ -233 +234 @@
         } else {
             boolean allNull = this.tags.entrySet().stream()
-                    .allMatch(tag -> tag.getValue() == null || tag.getValue().isEmpty());
+                    .allMatch(tag -> Utils.isEmpty(tag.getValue()));
 
             if (allNull) {