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

Timestamp:

2009-09-13T22:23:19+02:00 (15 years ago)

Author:

stoecker

Message:

see #3475 - patch by Petr Dlouhý - code rework for display filtering

Location:

trunk/src/org/openstreetmap/josm/actions

Files:

• CombineWayAction.java (modified) (1 diff)
• SplitWayAction.java (modified) (2 diffs)
• UnGlueAction.java (modified) (1 diff)
• mapmode/DrawAction.java (modified) (1 diff)

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

@@ -286 +286 @@
         public void build(DataSet ds) {
             for (Relation r: ds.relations) {
-                if (r.isDeleted() || r.incomplete) {
+                if (!r.isUsable()) {
                     continue;
                 }

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

@@ -102 +102 @@
             for (Node n : selectedNodes) {
                 for (Way w : getCurrentDataSet().ways) {
-                    if (w.isDeleted() || w.incomplete) {
+                    if (!w.isUsable()) {
                         continue;
                     }
@@ -293 +293 @@
 
         for (Relation r : getCurrentDataSet().relations) {
-            if (r.isDeleted() || r.incomplete) {
+            if (!r.isUsable()) {
                 continue;
             }

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

@@ -66 +66 @@
             int count = 0;
             for (Way w : getCurrentDataSet().ways) {
-                if (w.isDeleted() || w.incomplete || w.getNodesCount() < 1) {
+                if (!w.isUsable() || w.getNodesCount() < 1) {
                     continue;
                 }

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

@@ -767 +767 @@
         Way way = null;
         for (Way w : getCurrentDataSet().ways) {
-            if (w.isDeleted() || w.incomplete || w.getNodesCount() < 1) {
+            if (!w.isUsable() || w.getNodesCount() < 1) {
                 continue;
             }