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

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

Files:

• ImageryLayerInfo.java (modified) (2 diffs)
• WmsCache.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);