Changeset 16624 in osm for applications/editors

Timestamp:

2009-07-21T20:40:31+02:00 (15 years ago)

Author:

jttt

Message:

Make it work without Main.ds

Location:

applications/editors/josm/plugins/remotecontrol

Files:

• build.xml (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java (modified) (2 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="1813"/>
+                <attribute name="Plugin-Mainversion" value="1815"/>
                 <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
             </manifest>

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

@@ -148 +148 @@
 
                     // find out whether some data has already been downloaded
-                    Area present = Main.ds.getDataSourceArea();
+                    Area present = Main.main.getCurrentDataSet().getDataSourceArea();
                     if (present != null && !present.isEmpty()) {
                         Area toDownload = new Area(new Rectangle2D.Double(minlon,minlat,maxlon-minlon,maxlat-minlat));
@@ -191 +191 @@
                                 }
                             }
-                            for (Way w : Main.ds.ways) if (ways.contains(w.id)) newSel.add(w);
-                            for (Node n : Main.ds.nodes) if (nodes.contains(n.id)) newSel.add(n);
-                            for (Relation r : Main.ds.relations) if (relations.contains(r.id)) newSel.add(r);
-                            Main.ds.setSelected(newSel);
+                            for (Way w : Main.main.getCurrentDataSet().ways) if (ways.contains(w.id)) newSel.add(w);
+                            for (Node n : Main.main.getCurrentDataSet().nodes) if (nodes.contains(n.id)) newSel.add(n);
+                            for (Relation r : Main.main.getCurrentDataSet().relations) if (relations.contains(r.id)) newSel.add(r);
+                            Main.main.getCurrentDataSet().setSelected(newSel);
                             if (Main.pref.getBoolean("remotecontrol.permission.change-viewport", true))
                                 new AutoScaleAction("selection").actionPerformed(null);