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

Timestamp:

2013-10-27T03:04:38+01:00 (10 years ago)

Author:

Don-vip

Message:

fix #9201 - fix remote control usage examples for handlers with several commands + typo

Location:

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

Files:

• RequestProcessor.java (modified) (6 diffs)
• handler/FeaturesHandler.java (modified) (1 diff)
• handler/LoadAndZoomHandler.java (modified) (1 diff)
• handler/RequestHandler.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/io/remotecontrol/RequestProcessor.java

@@ -373 +373 @@
                 r.append(", ");
             }
-            r.append(getHanldlerInfoAsJSON(p.getKey()));
+            r.append(getHandlerInfoAsJSON(p.getKey()));
         }
         r.append("]");
@@ -380 +380 @@
     }
 
-    public static String getHanldlerInfoAsJSON(String cmd) {
+    public static String getHandlerInfoAsJSON(String cmd) {
         StringWriter w = new StringWriter();
         PrintWriter r = new PrintWriter(w);
@@ -421 +421 @@
         
         r.append("], \"examples\" : [");
-        String examples[] = handler.getUsageExamples();
+        String examples[] = handler.getUsageExamples(cmd.substring(1));
         if (examples != null) {
             for (int i = 0; i < examples.length; i++) {
@@ -443 +443 @@
     }
 
-
     /**
      * Reports HTML message with the description of all available commands
@@ -451 +450 @@
      */
     public static String getUsageAsHtml() throws IllegalAccessException, InstantiationException {
-        // no handler found
         StringBuilder usage = new StringBuilder(1024);
         for (Entry<String, Class<? extends RequestHandler>> handler : handlers.entrySet()) {
@@ -457 +455 @@
             String[] mandatory = sample.getMandatoryParams();
             String[] optional = sample.getOptionalParams();
-            String[] examples = sample.getUsageExamples();
+            String[] examples = sample.getUsageExamples(handler.getKey().substring(1));
             usage.append("<li>");
             usage.append(handler.getKey());

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

@@ -33 +33 @@
                    buf.append(", ");
                }
-               String info = RequestProcessor.getHanldlerInfoAsJSON("/"+s);
+               String info = RequestProcessor.getHandlerInfoAsJSON("/"+s);
                if (info!=null) {
                    buf.append(info);

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

@@ -80 +80 @@
     @Override
     public String[] getUsageExamples() {
-        if (command.equals(myCommand)) {
+        return getUsageExamples(myCommand);
+    }
+    
+    @Override
+    public String[] getUsageExamples(String cmd) {
+        if (command.equals(cmd)) {
             return new String[] { 
-                "/load_and_zoom?addtags=wikipedia:de=Wei%C3%9Fe_Gasse|maxspeed=5&select=way23071688,way23076176,way23076177,&left=13.740&right=13.741&top=51.05&bottom=51.049",
-                "/load_and_zoom?left=8.19&right=8.20&top=48.605&bottom=48.590&select=node413602999&new_layer=true"};
+                    "/load_and_zoom?addtags=wikipedia:de=Wei%C3%9Fe_Gasse|maxspeed=5&select=way23071688,way23076176,way23076177,&left=13.740&right=13.741&top=51.05&bottom=51.049",
+                    "/load_and_zoom?left=8.19&right=8.20&top=48.605&bottom=48.590&select=node413602999&new_layer=true"};
         } else {
             return new String[] { 
-                "/zoom?left=8.19&right=8.20&top=48.605&bottom=48.590&select=node413602999"};
-        }
-    }
-    
+            "/zoom?left=8.19&right=8.20&top=48.605&bottom=48.590&select=node413602999"};
+        }
+    }
+
     @Override
     protected void handleRequest() throws RequestHandlerErrorException

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

@@ -116 +116 @@
     public String[] getUsageExamples() {
         return null;
+    }
+
+    /**
+     * Returns usage examples for the given command. To be overriden only my handlers that define several commands.
+     * @param cmd The command asked
+     * @return Usage examples for the given command
+     * @since 6332
+     */
+    public String[] getUsageExamples(String cmd) {
+        return getUsageExamples();
     }