Changeset 11386 in josm for trunk/src/org/openstreetmap/josm/io/CachedFile.java

Timestamp:

2016-12-13T02:16:07+01:00 (8 years ago)

Author:

Don-vip

Message:

sonar - squid:S1066 - Collapsible "if" statements should be merged

File:

• trunk/src/org/openstreetmap/josm/io/CachedFile.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/io/CachedFile.java

@@ -339 +339 @@
             while (entries.hasMoreElements()) {
                 ZipEntry entry = entries.nextElement();
-                if (entry.getName().endsWith('.' + extension)) {
-                    /* choose any file with correct extension. When more than
-                        one file, prefer the one which matches namepart */
-                    if (resentry == null || entry.getName().indexOf(namepart) >= 0) {
-                        resentry = entry;
-                    }
+                // choose any file with correct extension. When more than one file, prefer the one which matches namepart
+                if (entry.getName().endsWith('.' + extension) && (resentry == null || entry.getName().indexOf(namepart) >= 0)) {
+                    resentry = entry;
                 }
             }