Changeset 2264 in josm for trunk/src/org/openstreetmap/josm/actions

Timestamp:

2009-10-10T14:14:28+02:00 (17 years ago)

Author:

stoecker

Message:

applied #3676 - patch by Dave Hansen - cleanup selection handling interface

Location:

trunk/src/org/openstreetmap/josm/actions

Files:

• UnGlueAction.java (modified) (1 diff)
• mapmode/DrawAction.java (modified) (4 diffs)
• search/SearchAction.java (modified) (3 diffs)
• search/SearchCompiler.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/actions/UnGlueAction.java

@@ -152 +152 @@
         Node c = new Node(selectedNode);
         c.removeAll();
-        c.setSelected(false);
+        getCurrentDataSet().clearSelection(c);
         cmds.add(new ChangeCommand(selectedNode, c));
 

trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java

@@ -325 +325 @@
         mousePos = e.getPoint();
 
-        Collection<OsmPrimitive> selection = getCurrentDataSet().getSelected();
+        DataSet ds = getCurrentDataSet();
+        Collection<OsmPrimitive> selection = ds.getSelected();
         Collection<Command> cmds = new LinkedList<Command>();
 
@@ -405 +406 @@
                     // here so /only/ the new way will be selected after this method finishes.
                     if(alt) {
-                        wnew.setSelected(false);
+                        ds.addSelected(wnew);
                     }
 
@@ -519 +520 @@
                 extendedWay = true;
                 getCurrentDataSet().setSelected(way);
-                DataSet.fireSelectionChanged(getCurrentDataSet().getSelected());
+                DataSet.fireSelectionChanged(ds.getSelected());
             }
         }
@@ -532 +533 @@
                 title = tr("Add node into way");
                 for (Way w : reuseWays) {
-                    w.setSelected(false);
+                    ds.clearSelection(w);
                 }
             }

trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java

@@ -26 +26 @@
 import org.openstreetmap.josm.tools.Shortcut;
 import org.openstreetmap.josm.data.osm.Filter;
+import org.openstreetmap.josm.data.osm.DataSet;
 
 public class SearchAction extends JosmAction{
@@ -89 +90 @@
         left.add(input, GBC.eop().fill(GBC.HORIZONTAL));
         left.add(replace, GBC.eol());
+        DataSet ds = Main.main.getCurrentDataSet();
         left.add(add, GBC.eol());
         left.add(remove, GBC.eol());
@@ -237 +239 @@
         //        }
 
-        Collection<OsmPrimitive> sel = Main.main.getCurrentDataSet().getSelected();
+        final DataSet ds = Main.main.getCurrentDataSet();
+        Collection<OsmPrimitive> sel = ds.getSelected();
         int foundMatches = getSelection(s, sel, new Function(){
             public Boolean isSomething(OsmPrimitive o){
-                return o.isSelected();
+                return ds.isSelected(o);
             }
         });
-        Main.main.getCurrentDataSet().setSelected(sel);
+        ds.setSelected(sel);
         if (foundMatches == 0) {
             String msg = null;

trunk/src/org/openstreetmap/josm/actions/search/SearchCompiler.java

@@ -424 +424 @@
     private static class Selected extends Match {
         @Override public boolean match(OsmPrimitive osm) {
-            return osm.isSelected();
+            return Main.main.getCurrentDataSet().isSelected(osm);
         }
         @Override public String toString() {return "selected";}