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

Timestamp:

2009-08-03T21:37:45+02:00 (15 years ago)

Author:

jttt

Message:

Add setter/getter for OsmPrimitive.selected

Location:

trunk/src/org/openstreetmap/josm/actions

Files:

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

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

@@ -153 +153 @@
         Node c = new Node(selectedNode);
         c.keys = null;
-        c.selected = false;
+        c.setSelected(false);
         cmds.add(new ChangeCommand(selectedNode, c));
 

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

@@ -403 +403 @@
                     // here so /only/ the new way will be selected after this method finishes.
                     if(alt) {
-                        wnew.selected = false;
+                        wnew.setSelected(false);
                     }
 
@@ -530 +530 @@
                 title = tr("Add node into way");
                 for (Way w : reuseWays) {
-                    w.selected = false;
+                    w.setSelected(false);
                 }
             }

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

@@ -177 +177 @@
                         sel.remove(osm);
                     }
-                } else if (mode == SearchMode.add && !osm.selected && matcher.match(osm)) {
+                } else if (mode == SearchMode.add && !osm.isSelected() && matcher.match(osm)) {
                     sel.add(osm);
                     ++foundMatches;
-                } else if (mode == SearchMode.remove && osm.selected && matcher.match(osm)) {
+                } else if (mode == SearchMode.remove && osm.isSelected() && matcher.match(osm)) {
                     sel.remove(osm);
                     ++foundMatches;

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

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