Changeset 6087 in josm for trunk/src/org/openstreetmap/josm/gui/conflict

Timestamp:

2013-07-26T17:28:24+02:00 (11 years ago)

Author:

Don-vip

Message:

see #8902 - string.equals("") => string.isEmpty() (patch by shinigami)

Location:

trunk/src/org/openstreetmap/josm/gui/conflict/tags

Files:

• PasteTagsConflictResolverDialog.java (modified) (1 diff)
• RelationMemberConflictResolver.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java

@@ -462 +462 @@
                 case RELATION: msg = trn("{0} relation", "{0} relations", numPrimitives, numPrimitives); break;
                 }
-                text = text.equals("") ? msg : text + ", " + msg;
+                text = text.isEmpty() ? msg : text + ", " + msg;
             }
             setText(text);

trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java

@@ -174 +174 @@
         if (!cbTagRelations.isSelected())
             return null;
-        if (tfKey.getText().trim().equals(""))
+        if (tfKey.getText().trim().isEmpty())
             return null;
-        if (tfValue.getText().trim().equals(""))
+        if (tfValue.getText().trim().isEmpty())
             return null;
         if (primitives == null || primitives.isEmpty())