Changeset 5861 in josm

Timestamp:

2013-04-14T19:26:01+02:00 (12 years ago)

Author:

Don-vip

Message:

Remote control: start/stop HTTP server without restarting JOSM

Location:

trunk/src/org/openstreetmap/josm

Files:

• gui/preferences/RemoteControlPreference.java (modified) (2 diffs)
• io/remotecontrol/RemoteControl.java (modified) (1 diff)
• io/remotecontrol/RemoteControlHttpServer.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/preferences/RemoteControlPreference.java

@@ -34 +34 @@
 public class RemoteControlPreference extends DefaultTabPreferenceSetting {
 
+    /**
+     * Factory used to build a new instance of this preference setting
+     */
     public static class Factory implements PreferenceSettingFactory {
 
@@ -120 +123 @@
             Main.pref.put(RequestHandler.globalConfirmationKey, alwaysAskUserConfirm.isSelected());
         }
-        return changed;
+        if (changed) {
+            if (enabled) {
+                RemoteControl.start();
+            } else {
+                RemoteControl.stop();
+            }
+        }
+        return false;
     }
 }

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

@@ -35 +35 @@
 
     /**
+     * Stops the remote control server
+     * @since 5861
+     */
+    public static void stop() {
+        RemoteControlHttpServer.stopRemoteControlHttpServer();
+    }
+
+    /**
      * Adds external request handler.
      * Can be used by plugins that want to use remote control.

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

@@ -32 +32 @@
     public static void restartRemoteControlHttpServer() {
         try {
-            if (instance != null) {
-                instance.stopServer();
-            }
+            stopRemoteControlHttpServer();
 
             instance = new RemoteControlHttpServer(DEFAULT_PORT);
@@ -43 +41 @@
         } catch (IOException ioe) {
             ioe.printStackTrace();
+        }
+    }
+
+    /**
+     * Stops the HTTP server
+     * @since 5861
+     */
+    public static void stopRemoteControlHttpServer() {
+        if (instance != null) {
+            try {
+                instance.stopServer();
+                instance = null;
+            } catch (IOException ioe) {
+                ioe.printStackTrace();
+            }
         }
     }
@@ -96 +109 @@
     {
         server.close();
+        System.out.println("RemoteControl::Server stopped.");
     }
 }