Changeset 16589 in osm for applications/editors/josm

Timestamp:

2009-07-19T19:30:14+02:00 (15 years ago)

Author:

jttt

Message:

Made plug-in work with JOSM new ProgressMonitor API

Location:

applications/editors/josm/plugins/remotecontrol

Files:

• build.xml (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPlugin.java (modified) (4 diffs)
• src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java (modified) (2 diffs)
• src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java (modified) (5 diffs)

applications/editors/josm/plugins/remotecontrol/build.xml

@@ -26 +26 @@
                 <attribute name="Plugin-Description" value="Let other applications send commands to JOSM."/>
                 <attribute name="Plugin-Link" value="http://wiki.openstreetmap.org/index.php/JOSM/Plugins/RemoteControl"/>
-                <attribute name="Plugin-Mainversion" value="1722"/>
+                <attribute name="Plugin-Mainversion" value="1813"/>
                 <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
             </manifest>

applications/editors/josm/plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPlugin.java

@@ -3 +3 @@
 import java.io.IOException;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.gui.preferences.PreferenceSetting;
 import org.openstreetmap.josm.plugins.Plugin;
@@ -10 +9 @@
 
  */
-public class RemoteControlPlugin extends Plugin 
+public class RemoteControlPlugin extends Plugin
 {
     /** The HTTP server this plugin launches */
     static HttpServer server;
-    
+
     /**
      * Creates the plugin, and starts the HTTP server
@@ -22 +21 @@
         restartServer();
     }
-    
+
     @Override
-    public PreferenceSetting getPreferenceSetting() 
+    public PreferenceSetting getPreferenceSetting()
     {
         return new RemoteControlPreferences();
     }
-    
+
     /**
      * Starts or restarts the HTTP server
@@ -39 +38 @@
             if (server != null)
                 server.stopServer();
-            
+
             int port = HttpServer.DEFAULT_PORT;
             server = new HttpServer(port);

applications/editors/josm/plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java

@@ -5 +5 @@
 import java.awt.Color;
 import java.awt.GridBagLayout;
-import java.awt.event.*;
 
-import javax.swing.*;
+import javax.swing.BorderFactory;
+import javax.swing.Box;
+import javax.swing.JCheckBox;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
 
 import org.openstreetmap.josm.Main;
@@ -13 +16 @@
 import org.openstreetmap.josm.gui.preferences.PreferenceSetting;
 import org.openstreetmap.josm.tools.GBC;
-import org.openstreetmap.josm.tools.I18n;
 
 /**

applications/editors/josm/plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java

@@ -5 +5 @@
 import java.awt.geom.Area;
 import java.awt.geom.Rectangle2D;
-import java.io.*;
+import java.io.BufferedInputStream;
+import java.io.BufferedOutputStream;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.io.Reader;
+import java.io.Writer;
 import java.net.Socket;
 import java.net.URLDecoder;
@@ -19 +26 @@
 import org.openstreetmap.josm.actions.downloadtasks.DownloadOsmTask;
 import org.openstreetmap.josm.data.Bounds;
-import org.openstreetmap.josm.data.coor.EastNorth;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.osm.Node;
@@ -27 +33 @@
 import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor;
 import org.openstreetmap.josm.gui.download.DownloadDialog.DownloadTask;
+import org.openstreetmap.josm.gui.progress.PleaseWaitProgressMonitor;
 
 /**
@@ -37 +44 @@
 
     private class AlreadyLoadedException extends Exception {};
-    private class DeniedException extends Exception {};
     private class LoadDeniedException extends Exception {};
 
@@ -154 +160 @@
                         maxlon = downloadBounds.getMaxX();
                     }
-                    osmTask.download(null, minlat,minlon,maxlat,maxlon);
+                    osmTask.download(null, minlat,minlon,maxlat,maxlon, new PleaseWaitProgressMonitor());
                 } catch (AlreadyLoadedException ex) {
                     System.out.println("RemoteControl: no download necessary");