Changeset 5085 in josm for trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/RequestHandler.java

Timestamp:

2012-03-14T23:33:27+01:00 (12 years ago)

Author:

simon04

Message:

fix #5824 - remotecontrol: add command for opening local files + refactoring of permission preference

File:

• trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/RequestHandler.java (modified) (7 diffs)

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

@@ -4 +4 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
+import java.text.MessageFormat;
 import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
-import java.util.StringTokenizer;
 
 import javax.swing.JOptionPane;
@@ -50 +50 @@
     public final void handle() throws RequestHandlerForbiddenException, RequestHandlerBadRequestException, RequestHandlerErrorException
     {
+        checkMandatoryParams();
         checkPermission();
-        checkMandatoryParams();
         handleRequest();
     }
@@ -86 +86 @@
      * @return the preference name and error message or null
      */
-    public PermissionPrefWithDefault getPermissionPref()
-    {
-        /* Example:
-        return new PermissionPrefWithDefault("fooobar.remotecontrol",
-        true
-        "RemoteControl: foobar forbidden by preferences");
-        */
-        return null;
-    }
-
-    public String[] getMandatoryParams() {
-        return null;
-    }
+    abstract public PermissionPrefWithDefault getPermissionPref();
+
+    abstract public String[] getMandatoryParams();
 
     /**
@@ -119 +109 @@
         {
             if (!Main.pref.getBoolean(permissionPref.pref, permissionPref.defaultVal)) {
-                System.out.println(permissionPref.message);
-                throw new RequestHandlerForbiddenException();
+                String err = MessageFormat.format("RemoteControl: ''{0}'' forbidden by preferences", myCommand);
+                System.out.println(err);
+                throw new RequestHandlerForbiddenException(err);
             }
         }
@@ -133 +124 @@
                 tr("Confirm Remote Control action"),
                 JOptionPane.YES_NO_OPTION) != JOptionPane.YES_OPTION) {
-                    throw new RequestHandlerForbiddenException();
+                    String err = MessageFormat.format("RemoteControl: ''{0}'' forbidden by user''s choice", myCommand);
+                    throw new RequestHandlerForbiddenException(err);
             }
         }
@@ -178 +170 @@
         List<String> missingKeys = new LinkedList<String>();
         boolean error = false;
-        for (int i = 0; i < mandatory.length; ++i) {
-            String key = mandatory[i];
+        for (String key : mandatory) {
             String value = args.get(key);
             if ((value == null) || (value.length() == 0)) {
@@ -243 +234 @@
     public static class RequestHandlerForbiddenException extends RequestHandlerException {
         private static final long serialVersionUID = 2263904699747115423L;
+
+        public RequestHandlerForbiddenException(String message) {
+            super(message);
+        }
     }
 }