Changeset 18417 in osm for applications/editors/josm/plugins/remotecontrol

Timestamp:

2009-11-02T08:58:53+01:00 (15 years ago)

Author:

jttt

Message:

Replace Dataset.nodes with getNodes(), etc

Location:

applications/editors/josm/plugins/remotecontrol

Files:

• build.xml (modified) (1 diff)
• 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="2327"/>
+                <attribute name="Plugin-Mainversion" value="2381"/>
                 <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
             </manifest>

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

@@ -37 +37 @@
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor;
-import org.openstreetmap.josm.gui.progress.PleaseWaitProgressMonitor;
 
 /**
@@ -167 +166 @@
                         maxlon = downloadBounds.getMaxX();
                     }
-                    Future<?> future = osmTask.download(false /*no new layer*/, new Bounds(minlat,minlon,maxlat,maxlon), null /* let the task manage the progress monitor */);                    
-                    Main.worker.submit(new PostDownloadHandler(osmTask, future));                    
+                    Future<?> future = osmTask.download(false /*no new layer*/, new Bounds(minlat,minlon,maxlat,maxlon), null /* let the task manage the progress monitor */);
+                    Main.worker.submit(new PostDownloadHandler(osmTask, future));
                 } catch (AlreadyLoadedException ex) {
                     System.out.println("RemoteControl: no download necessary");
@@ -199 +198 @@
                                 }
                             }
-                            for (Way w : Main.main.getCurrentDataSet().ways) if (ways.contains(w.getId())) newSel.add(w);
-                            for (Node n : Main.main.getCurrentDataSet().nodes) if (nodes.contains(n.getId())) newSel.add(n);
-                            for (Relation r : Main.main.getCurrentDataSet().relations) if (relations.contains(r.getId())) newSel.add(r);
+                            for (Way w : Main.main.getCurrentDataSet().getWays()) if (ways.contains(w.getId())) newSel.add(w);
+                            for (Node n : Main.main.getCurrentDataSet().getNodes()) if (nodes.contains(n.getId())) newSel.add(n);
+                            for (Relation r : Main.main.getCurrentDataSet().getRelations()) if (relations.contains(r.getId())) newSel.add(r);
                             Main.main.getCurrentDataSet().setSelected(newSel);
                             if (Main.pref.getBoolean("remotecontrol.permission.change-viewport", true))
@@ -291 +290 @@
      * Adds a node, reacts to the GET /add_node?lon=...&amp;lat=... request.
      * @param args
-     * @param out 
-     * @throws IOException 
+     * @param out
+     * @throws IOException
      */
     private void addNode(HashMap<String, String> args, Writer out) throws IOException {
@@ -299 +298 @@
             return;
         }
-        
+
         // Parse the arguments
         double lat = Double.parseDouble(args.get("lat"));
         double lon = Double.parseDouble(args.get("lon"));
         System.out.println("Adding node at (" + lat + ", " + lon + ")");
-        
+
         // Create a new node
         LatLon ll = new LatLon(lat, lon);
         Node nnew = new Node(ll);
-        
+
         // Now execute the commands to add this node.
         Main.main.undoRedo.add(new AddCommand(nnew));
         Main.main.getCurrentDataSet().setSelected(nnew);
         Main.map.mapView.repaint();
-        
+
     }