Changeset 16628 in osm for applications/editors/josm/plugins/utilsplugin/src

Timestamp:

2009-07-21T21:53:14+02:00 (15 years ago)

Author:

jttt

Message:

Make it work without Main.ds

Location:

applications/editors/josm/plugins/utilsplugin/src/UtilsPlugin

Files:

• JoinAreasAction.java (modified) (8 diffs)
• SimplifyWayAction.java (modified) (2 diffs)

applications/editors/josm/plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java

@@ -114 +114 @@
         if(result != 1) return;
 
-        Collection<OsmPrimitive> selection = Main.ds.getSelectedWays();
+        Collection<OsmPrimitive> selection = Main.main.getCurrentDataSet().getSelectedWays();
 
         int ways = 0;
@@ -177 +177 @@
         if(joinAreas(selWays[0], selWays[ways == 2 ? 1 : 0])) {
             Main.map.mapView.repaint();
-            DataSet.fireSelectionChanged(Main.ds.getSelected());
+            DataSet.fireSelectionChanged(Main.main.getCurrentDataSet().getSelected());
         } else
             JOptionPane.showMessageDialog(Main.parent, tr("No intersection found. Nothing was changed."));
@@ -448 +448 @@
     private ArrayList<RelationRole> removeFromRelations(OsmPrimitive osm) {
         ArrayList<RelationRole> result = new ArrayList<RelationRole>();
-        for (Relation r : Main.ds.relations) {
+        for (Relation r : Main.main.getCurrentDataSet().relations) {
             if (r.deleted || r.incomplete) continue;
             for (RelationMember rm : r.members) {
@@ -479 +479 @@
         for (Way way : ways) {
             nodes.add(way);
-            Main.ds.setSelected(nodes);
+            Main.main.getCurrentDataSet().setSelected(nodes);
             nodes.remove(way);
             new SplitWayAction().actionPerformed(null);
             cmdsCount++;
-            affected.addAll(Main.ds.getSelectedWays());
+            affected.addAll(Main.main.getCurrentDataSet().getSelectedWays());
         }
         return osmprim2way(affected);
@@ -584 +584 @@
         if(w.isClosed())
             return w;
-        Main.ds.setSelected(w);
+        Main.main.getCurrentDataSet().setSelected(w);
         Way wnew = new Way(w);
         wnew.addNode(wnew.firstNode());
         cmds.add(new ChangeCommand(w, wnew));
         commitCommands(marktr("Closed Way"));
-        return (Way)(Main.ds.getSelectedWays().toArray())[0];
+        return (Way)(Main.main.getCurrentDataSet().getSelectedWays().toArray())[0];
     }
 
@@ -610 +610 @@
             if(a.nodes.get(0).equals(b.nodes.get(0)) ||
                a.nodes.get(a.nodes.size()-1).equals(b.nodes.get(b.nodes.size()-1))) {
-                Main.ds.setSelected(b);
+                Main.main.getCurrentDataSet().setSelected(b);
                 new ReverseWayAction().actionPerformed(null);
                 cmdsCount++;
@@ -616 +616 @@
             a = b;
         }
-        Main.ds.setSelected(ways);
+        Main.main.getCurrentDataSet().setSelected(ways);
         // TODO: It might be possible that a confirmation dialog is presented even after reversing (for
         // "strange" ways). If the user cancels this, makeCommitsOneAction will wrongly consume a previous
@@ -622 +622 @@
         new CombineWayAction().actionPerformed(null);
         cmdsCount++;
-        return (Way)(Main.ds.getSelectedWays().toArray())[0];
+        return (Way)(Main.main.getCurrentDataSet().getSelectedWays().toArray())[0];
     }
 

applications/editors/josm/plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java

@@ -36 +36 @@
 
     public void actionPerformed(ActionEvent e) {
-        Collection<OsmPrimitive> selection = Main.ds.getSelected();
+        Collection<OsmPrimitive> selection = Main.main.getCurrentDataSet().getSelected();
 
         int ways = 0;
@@ -107 +107 @@
         int toI = wnew.nodes.size() - 1;
         for (int i = wnew.nodes.size() - 1; i >= 0; i--) {
-            CollectBackReferencesVisitor backRefsV = new CollectBackReferencesVisitor(Main.ds, false);
+            CollectBackReferencesVisitor backRefsV = new CollectBackReferencesVisitor(Main.main.getCurrentDataSet(), false);
             backRefsV.visit(wnew.nodes.get(i));
             boolean used = false;