Changeset 13827 in josm for trunk/src/org/openstreetmap/josm/io/imagery

Timestamp:

2018-05-24T23:05:08+02:00 (6 years ago)

Author:

Don-vip

Message:

SonarQube - fix minor issues

File:

• trunk/src/org/openstreetmap/josm/io/imagery/WMSImagery.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/io/imagery/WMSImagery.java

@@ -466 +466 @@
                 }
                 if (tagEquals(QN_LAYER, reader.getName())) {
-
                     parseLayer(reader, ret);
                 }
-                if (tagEquals(QN_EX_GEOGRAPHIC_BBOX, reader.getName())) {
-                    if (ret.getBounds() == null) {
-                        Bounds bbox = parseExGeographic(reader);
-                        ret.setBounds(bbox);
-                    }
-
+                if (tagEquals(QN_EX_GEOGRAPHIC_BBOX, reader.getName()) && ret.getBounds() == null) {
+                    ret.setBounds(parseExGeographic(reader));
                 }
                 if (tagEquals(QN_BOUNDINGBOX, reader.getName())) {
@@ -484 +479 @@
                     }
                     if (ret.getBounds() == null && conv != null) {
-                        Bounds bbox = parseBoundingBox(reader, conv);
-                        ret.setBounds(bbox);
+                        ret.setBounds(parseBoundingBox(reader, conv));
                     }
                 }
-                if (tagEquals(QN_LATLONBOUNDINGBOX, reader.getName()) && belowWMS130()) {
-                    if (ret.getBounds() == null) {
-                        Bounds bbox = parseBoundingBox(reader, null);
-                        ret.setBounds(bbox);
-                    }
+                if (tagEquals(QN_LATLONBOUNDINGBOX, reader.getName()) && belowWMS130() && ret.getBounds() == null) {
+                    ret.setBounds(parseBoundingBox(reader, null));
                 }
             }