Changeset 8394 in josm for trunk/src/org/openstreetmap/josm/io/remotecontrol/handler

Timestamp:

2015-05-18T23:34:11+02:00 (9 years ago)

Author:

Don-vip

Message:

• global use of String.isEmpty()
• Correctness - Method throws alternative exception from catch block without history

Location:

trunk/src/org/openstreetmap/josm/io/remotecontrol/handler

Files:

• AddNodeHandler.java (modified) (4 diffs)
• AddWayHandler.java (modified) (1 diff)
• LoadAndZoomHandler.java (modified) (1 diff)
• RequestHandler.java (modified) (1 diff)

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

@@ -30 +30 @@
     private double lat;
     private double lon;
-    
+
     private Node node;
 
@@ -47 +47 @@
         return new String[] { "lat", "lon" };
     }
-    
+
     @Override
     public String[] getOptionalParams()
@@ -63 +63 @@
         return new String[] {
             "/add_node?lat=11&lon=22",
-            "/add_node?lon=13.3&lat=53.2&addtags=natural=tree|name=%20%20%20==Great%20Oak==" 
+            "/add_node?lon=13.3&lat=53.2&addtags=natural=tree|name=%20%20%20==Great%20Oak=="
         };
     }
-    
+
     @Override
     public String getPermissionMessage() {
@@ -122 +122 @@
             lon = Double.parseDouble(args.get("lon"));
         } catch (NumberFormatException e) {
-            throw new RequestHandlerBadRequestException("NumberFormatException ("+e.getMessage()+")");
+            throw new RequestHandlerBadRequestException("NumberFormatException ("+e.getMessage()+")", e);
         }
         if (!Main.main.hasEditLayer()) {

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

@@ -104 +104 @@
                 allCoordinates.add(new LatLon(lat, lon));
             } catch (NumberFormatException e) {
-                throw new RequestHandlerBadRequestException("NumberFormatException ("+e.getMessage()+")");
+                throw new RequestHandlerBadRequestException("NumberFormatException ("+e.getMessage()+")", e);
             }
         }

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

@@ -272 +272 @@
             maxlon = LatLon.roundToOsmPrecision(Double.parseDouble(args.get("right")));
         } catch (NumberFormatException e) {
-            throw new RequestHandlerBadRequestException("NumberFormatException ("+e.getMessage()+")");
+            throw new RequestHandlerBadRequestException("NumberFormatException ("+e.getMessage()+")", e);
         }
 

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

@@ -223 +223 @@
         if(mandatory != null) for (String key : mandatory) {
             String value = args.get(key);
-            if ((value == null) || (value.length() == 0)) {
+            if (value == null || value.isEmpty()) {
                 error = true;
                 Main.warn("'" + myCommand + "' remote control request must have '" + key + "' parameter");