Changeset 6342 in josm for trunk/src

Timestamp:

2013-10-30T01:57:46+01:00 (11 years ago)

Author:

Don-vip

Message:

various fixes

Location:

trunk/src/org/openstreetmap/josm

Files:

• Main.java (modified) (1 diff)
• gui/preferences/ServerAccessPreference.java (modified) (2 diffs)
• gui/widgets/UrlLabel.java (modified) (1 diff)
• io/remotecontrol/RemoteControl.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/Main.java

@@ -804 +804 @@
     /**
      * Closes JOSM and optionally terminates the Java Virtual Machine (JVM). If there are some unsaved data layers, asks first for user confirmation.
-     * @param exit If {@code true}, the JVM is terminated by running {@link System#exit} with a return code of 0.
+     * @param exit If {@code true}, the JVM is terminated by running {@link System#exit} with a given return code.
+     * @param exitCode The return code
      * @return {@code true} if JOSM has been closed, {@code false} if the user has cancelled the operation.
      * @since 3378

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

@@ -18 +18 @@
 import org.openstreetmap.josm.gui.preferences.server.ProxyPreferencesPanel;
 import org.openstreetmap.josm.gui.widgets.VerticallyScrollablePanel;
+
 public class ServerAccessPreference extends DefaultTabPreferenceSetting {
 
@@ -38 +39 @@
     /** panel for configuring proxy preferences */
     private ProxyPreferencesPanel pnlProxyPreferences;
-    /** panel for backup preferences */
 
     /**

trunk/src/org/openstreetmap/josm/gui/widgets/UrlLabel.java

@@ -41 +41 @@
 
     public UrlLabel(String url, String description) {
-        this (url, url, 0);
+        this (url, description, 0);
     }
 

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

@@ -14 +14 @@
 {
     /**
-     * If the remote cotrol feature is enabled or disabled. If disabled,
+     * If the remote control feature is enabled or disabled. If disabled,
      * it should not start the server.
      */
@@ -49 +49 @@
      * @param handlerClass The additional request handler.
      */
-    public void addRequestHandler(String command, Class<? extends RequestHandler> handlerClass)
-    {
+    public void addRequestHandler(String command, Class<? extends RequestHandler> handlerClass) {
         RequestProcessor.addRequestHandlerClass(command, handlerClass);
     }