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

Timestamp:

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

Author:

Don-vip

Message:

SonarQube - fix minor issues

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/AddImageryLayerAction.java (modified) (2 diffs)
• io/imagery/WMSImagery.java (modified) (2 diffs)
• io/remotecontrol/handler/AddWayHandler.java (modified) (1 diff)
• io/remotecontrol/handler/LoadObjectHandler.java (modified) (1 diff)
• io/remotecontrol/handler/RequestHandler.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/actions/AddImageryLayerAction.java

@@ -191 +191 @@
             formats.setToolTipText(tr("Select image format for WMS layer"));
 
-            if (!GraphicsEnvironment.isHeadless()) {
-                if (1 != new ExtendedDialog(Main.parent, tr("Select WMS layers"), tr("Add layers"), tr("Cancel")) { {
+            if (!GraphicsEnvironment.isHeadless() &&
+                1 != new ExtendedDialog(Main.parent, tr("Select WMS layers"), tr("Add layers"), tr("Cancel")) { {
                     final JScrollPane scrollPane = new JScrollPane(tree.getLayerTree());
                     scrollPane.setPreferredSize(new Dimension(400, 400));
@@ -199 +199 @@
                     panel.add(formats, GBC.eol().fill(GBC.HORIZONTAL));
                     setContent(panel);
-                } }.showDialog().getValue()) {
-                    return null;
-                }
+            } }.showDialog().getValue()) {
+                return null;
             }
 

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));
                 }
             }

trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/AddWayHandler.java

@@ -94 +94 @@
     protected void validateRequest() throws RequestHandlerBadRequestException {
         allCoordinates.clear();
-        for (String coordinatesString : (args != null ? args.get("way") : "").split(";\\s*")) {
+        for (String coordinatesString : splitArg("way", SPLITTER_SEMIC)) {
             String[] coordinates = coordinatesString.split(",\\s*", 2);
             if (coordinates.length < 2) {

trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/LoadObjectHandler.java

@@ -98 +98 @@
     protected void validateRequest() throws RequestHandlerBadRequestException {
         ps.clear();
-        for (String i : (args != null ? args.get("objects") : "").split(",\\s*")) {
+        for (String i : splitArg("objects", SPLITTER_COMMA)) {
             if (!i.isEmpty()) {
                 try {

trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/RequestHandler.java

@@ -14 +14 @@
 import java.util.Map;
 import java.util.Set;
+import java.util.regex.Pattern;
 
 import javax.swing.JLabel;
@@ -36 +37 @@
     public static final String loadInNewLayerKey = "remotecontrol.new-layer";
     public static final boolean loadInNewLayerDefault = false;
+
+    protected static final Pattern SPLITTER_COMMA = Pattern.compile(",\\s*");
+    protected static final Pattern SPLITTER_SEMIC = Pattern.compile(";\\s*");
 
     /** past confirmations */
@@ -215 +219 @@
     protected void parseArgs() throws URISyntaxException {
         this.args = getRequestParameter(new URI(this.request));
+    }
+
+    protected final String[] splitArg(String arg, Pattern splitter) {
+        return splitter.split(args != null ? args.get(arg) : "");
     }