Index: trunk/src/org/openstreetmap/josm/io/remotecontrol/RemoteControlHttpServer.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/remotecontrol/RemoteControlHttpServer.java	(revision 5893)
+++ trunk/src/org/openstreetmap/josm/io/remotecontrol/RemoteControlHttpServer.java	(revision 5894)
@@ -21,7 +21,4 @@
 public class RemoteControlHttpServer extends Thread {
 
-    /** Default port for the HTTP server */
-    public static final int DEFAULT_PORT = 8111;
-
     /** The server socket */
     private ServerSocket server;
@@ -33,12 +30,13 @@
      */
     public static void restartRemoteControlHttpServer() {
+        int port = Main.pref.getInteger("remote.control.port", 8111);
         try {
             stopRemoteControlHttpServer();
 
-            instance = new RemoteControlHttpServer(Main.pref.getInteger("remote.control.port", DEFAULT_PORT));
+            instance = new RemoteControlHttpServer(port);
             instance.start();
         } catch (BindException ex) {
             Main.warn(marktr("Warning: Cannot start remotecontrol server on port {0}: {1}"),
-                    Integer.toString(DEFAULT_PORT), ex.getLocalizedMessage());
+                    Integer.toString(port), ex.getLocalizedMessage());
         } catch (IOException ioe) {
             ioe.printStackTrace();