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

Timestamp:

2020-11-22T22:54:01+01:00 (3 years ago)

Author:

Don-vip

Message:

fix #20131 - remote control: report errors in case of OSM API error (load_and_zoom) or no valid identifier (load_object)

File:

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

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

@@ -25 +25 @@
 import org.openstreetmap.josm.data.osm.UploadPolicy;
 import org.openstreetmap.josm.data.preferences.BooleanProperty;
+import org.openstreetmap.josm.data.preferences.IntegerProperty;
 import org.openstreetmap.josm.gui.MainApplication;
+import org.openstreetmap.josm.io.OsmApiException;
 import org.openstreetmap.josm.io.remotecontrol.PermissionPrefWithDefault;
 import org.openstreetmap.josm.spi.preferences.Config;
@@ -43 +45 @@
     /** preference to determine if remote control loads data in a new layer */
     public static final BooleanProperty LOAD_IN_NEW_LAYER = new BooleanProperty("remotecontrol.new-layer", false);
+    /** preference to define OSM download timeout in seconds */
+    public static final IntegerProperty OSM_DOWNLOAD_TIMEOUT = new IntegerProperty("remotecontrol.osm.download.timeout", 5*60);
 
     protected static final Pattern SPLITTER_COMMA = Pattern.compile(",\\s*");
@@ -416 +420 @@
         /**
          * Constructs a new {@code RequestHandlerErrorException}.
+         * @param message the detail message. The detail message is saved for later retrieval by the {@link #getMessage()} method.
+         * @since 17330
+         */
+        public RequestHandlerErrorException(String message) {
+            super(message);
+        }
+
+        /**
+         * Constructs a new {@code RequestHandlerErrorException}.
          * @param cause the cause (which is saved for later retrieval by the {@link #getCause()} method).
          */
         public RequestHandlerErrorException(Throwable cause) {
+            super(cause);
+        }
+    }
+
+    /**
+     * Error raised for OSM API errors.
+     * @since 17330
+     */
+    public static class RequestHandlerOsmApiException extends RequestHandlerErrorException {
+
+        /**
+         * Constructs a new {@code RequestHandlerOsmApiException}.
+         * @param cause the cause (which is saved for later retrieval by the {@link #getCause()} method).
+         */
+        public RequestHandlerOsmApiException(OsmApiException cause) {
             super(cause);
         }