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

Timestamp:

2013-07-30T18:35:47+02:00 (11 years ago)

Author:

akks

Message:

see #8902 - collection size ==/!= 0 -> isEmpty()/!isEmpty() (patch by shinigami)

Location:

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

Files:

• CombinePrimitiveResolverDialog.java (modified) (1 diff)
• TagConflictResolutionUtil.java (modified) (1 diff)

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

@@ -259 +259 @@
 
         TagCollection allResolutions = getTagConflictResolverModel().getAllResolutions();
-        if (allResolutions.size() > 0) {
+        if (!allResolutions.isEmpty()) {
             cmds.addAll(buildTagChangeCommand(targetPrimitive, allResolutions));
         }

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

@@ -39 +39 @@
         int numNodesWithTags = 0;
         for (OsmPrimitive p: merged) {
-            if (p.getKeys().size() >0) {
+            if (!p.getKeys().isEmpty()) {
                 numNodesWithTags++;
             }