Changeset 6093 in josm for trunk/src/org/openstreetmap/josm/data

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/data

Files:

• imagery/ImageryLayerInfo.java (modified) (2 diffs)
• imagery/WmsCache.java (modified) (1 diff)
• osm/MultipolygonCreate.java (modified) (1 diff)
• osm/QuadBuckets.java (modified) (2 diffs)
• projection/datum/NTV2GridShiftFile.java (modified) (1 diff)
• validation/tests/Coastlines.java (modified) (1 diff)
• validation/tests/RelationChecker.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/imagery/ImageryLayerInfo.java

@@ -42 +42 @@
 
     public void load() {
-        boolean addedDefault = layers.size() != 0;
+        boolean addedDefault = !layers.isEmpty();
         List<ImageryPreferenceEntry> entries = Main.pref.getListOfStructs("imagery.entries", null, ImageryPreferenceEntry.class);
         if (entries != null) {
@@ -121 +121 @@
 
         Collections.sort(defaultLayers);
-        Main.pref.putCollection("imagery.layers.default", defaultsSave.size() > 0
-                ? defaultsSave : defaults);
+        Main.pref.putCollection("imagery.layers.default", defaultsSave.isEmpty() ? defaults : defaultsSave);
     }
 

trunk/src/org/openstreetmap/josm/data/imagery/WmsCache.java

@@ -269 +269 @@
         index.setTotalFileSize(totalFileSize);
         for (ProjectionEntries projectionEntries: entries.values()) {
-            if (projectionEntries.entries.size() > 0) {
+            if (!projectionEntries.entries.isEmpty()) {
                 ProjectionType projectionType = new ProjectionType();
                 projectionType.setName(projectionEntries.projection);

trunk/src/org/openstreetmap/josm/data/osm/MultipolygonCreate.java

@@ -256 +256 @@
 
             //process inner ways
-            if (innerCandidates.size() > 0) {
+            if (!innerCandidates.isEmpty()) {
                 List<PolygonLevel> innerList = this.findOuterWaysRecursive(level + 1, innerCandidates);
                 if (innerList == null) {

trunk/src/org/openstreetmap/josm/data/osm/QuadBuckets.java

@@ -175 +175 @@
                 return false;
             boolean ret = this.content.remove(o);
-            if (this.content.size() == 0) {
+            if (this.content.isEmpty()) {
                 this.content = null;
             }
@@ -492 +492 @@
         boolean canRemove()
         {
-            if (content != null && content.size() > 0)
+            if (content != null && !content.isEmpty())
                 return false;
             if (this.hasChildren())

trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2GridShiftFile.java

@@ -184 +184 @@
         for (int i = 0; i < subGrid.length; i++) {
             ArrayList<NTV2SubGrid> subSubGrids = subGridMap.get(subGrid[i].getSubGridName());
-            if (subSubGrids.size() > 0) {
+            if (!subSubGrids.isEmpty()) {
                 NTV2SubGrid[] subGridArray = subSubGrids.toArray(nullArray);
                 subGrid[i].setSubGridArray(subGridArray);

trunk/src/org/openstreetmap/josm/data/validation/tests/Coastlines.java

@@ -157 +157 @@
                 }
 
-                if (highlight.size() > 0) {
+                if (!highlight.isEmpty()) {
                     errors.add(new TestError(this, Severity.ERROR, tr("Unconnected coastline"),
                             UNCONNECTED_COASTLINE, primitives, highlight));

trunk/src/org/openstreetmap/josm/data/validation/tests/RelationChecker.java

@@ -109 +109 @@
             }
         }
-        if (allroles.size() == 0) {
+        if (allroles.isEmpty()) {
             errors.add( new TestError(this, Severity.WARNING, tr("Relation type is unknown"),
                     RELATION_UNKNOWN, n) );