Changeset 17479 in osm

Timestamp:

2009-09-06T13:27:25+02:00 (15 years ago)

Author:

stoecker

Message:

close josm bug 3367 and remove deprecations

Location:

applications/editors/josm/plugins/validator

Files:

• build.xml (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java (modified) (2 diffs)
• src/org/openstreetmap/josm/plugins/validator/Test.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/validator/TestError.java (modified) (3 diffs)
• src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/validator/tests/ChangePropertyKeyCommand.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java (modified) (3 diffs)
• src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java (added)
• src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java (modified) (3 diffs)
• src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java (modified) (2 diffs)
• src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java (modified) (1 diff)

applications/editors/josm/plugins/validator/build.xml

@@ -26 +26 @@
                 <attribute name="Plugin-Description" value="An OSM data validator. It checks for problems in data, and provides fixes for the common ones. Spellcheck integrated for tag names."/>
                 <attribute name="Plugin-Link" value="http://wiki.openstreetmap.org/index.php/JOSM/Plugins/Validator"/>
-                <attribute name="Plugin-Mainversion" value="2005"/>
+                <attribute name="Plugin-Mainversion" value="2067"/>
                 <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
             </manifest>

applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java

@@ -39 +39 @@
 import org.openstreetmap.josm.plugins.validator.tests.CrossingWays;
 import org.openstreetmap.josm.plugins.validator.tests.DuplicateNode;
+import org.openstreetmap.josm.plugins.validator.tests.DuplicateWay;
 import org.openstreetmap.josm.plugins.validator.tests.DuplicatedWayNodes;
 import org.openstreetmap.josm.plugins.validator.tests.NodesWithSameName;
@@ -97 +98 @@
             TagChecker.class, // ID 1201 .. 1299
             UnconnectedWays.class, // ID 1301 .. 1399
+            DuplicateWay.class, // ID 1401 .. 1499
     };
 

applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/Test.java

@@ -124 +124 @@
         for (OsmPrimitive p : selection)
         {
-            if( !p.deleted && !p.incomplete )
+            if( p.isUsable() )
                 p.visit(this);
         }

applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/TestError.java

@@ -153 +153 @@
         for (OsmPrimitive o : primitives) {
             // ignore data not yet uploaded
-            if (o.id == 0)
+            if (o.getId() == 0)
                 return null;
             String type = "u";
@@ -162 +162 @@
             else if (o instanceof Node)
                 type = "n";
-            strings.add(type + "_" + o.id);
+            strings.add(type + "_" + o.getId());
         }
         for (String o : strings) {
@@ -269 +269 @@
 
         public void visit(OsmPrimitive p) {
-            if (!p.deleted && !p.incomplete) {
+            if (p.isUsable()) {
                 p.visit(this);
             }

applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java

@@ -415 +415 @@
 
         public void visit(OsmPrimitive p) {
-            if (!p.deleted && !p.incomplete) {
+            if (p.isUsable()) {
                 p.visit(this);
             }

applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/ChangePropertyKeyCommand.java

@@ -53 +53 @@
             if(osm.hasKeys())
             {
-                osm.modified = true;
-                String oldValue= osm.get(key);
-                osm.put(newKey, oldValue );
+                osm.setModified(true);
+                String oldValue = osm.get(key);
+                osm.put(newKey, oldValue);
                 osm.remove(key);
             }

applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java

@@ -54 +54 @@
     public void visit(Way w)
     {
-        if( w.deleted || w.incomplete )
+        if( !w.isUsable() )
             return;
 

applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java

@@ -67 +67 @@
     public void visit(Way w)
     {
-        if( w.deleted || w.incomplete )
+        if( !w.isUsable() )
             return;
 

applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java

@@ -67 +67 @@
     public void visit(Node n)
     {
-        if(!n.deleted && !n.incomplete)
+        if(n.isUsable())
             nodes.add(n.getCoor(), n);
     }
@@ -91 +91 @@
         // select the target node in the same way as in the core action MergeNodesAction, rev.1084
         for (Node n: nodes) {
-            if (n.id > 0) {
+            if (n.getId() > 0) {
                 target = n;
                 break;
@@ -119 +119 @@
         if (a != null) {
             for (OsmPrimitive osm : del) {
-                if (osm instanceof Node && osm.id != 0) {
+                if (osm instanceof Node && osm.getId() != 0) {
                     Node n = (Node) osm;
                     if (!a.contains(n.getCoor())) {

applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java

@@ -25 +25 @@
 
     @Override public void visit(Way w) {
-        if (w.deleted || w.incomplete) return;
+        if (!w.isUsable()) return;
 
         Node lastN = null;

applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java

@@ -28 +28 @@
 
     @Override public void visit(Node n) {
-        if (n.deleted || n.incomplete) return;
+        if (!n.isUsable()) return;
 
         String name = n.get("name");

applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java

@@ -55 +55 @@
     public void visit(Way w)
     {
-        if( w.deleted || w.incomplete )
+        if( !w.isUsable() )
             return;
 

applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java

@@ -69 +69 @@
         mode = 0;
 
-        if (w.deleted || w.incomplete)
+        if (!w.isUsable())
             return;
 

applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java

@@ -190 +190 @@
     public void visit(Way w)
     {
-        if( w.deleted || w.incomplete )
+        if( !w.isUsable() )
             return;
         int size = w.getNodesCount();

applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java

@@ -52 +52 @@
         if (partialSelection) {
             for (OsmPrimitive p : selection) {
-                if (!p.deleted && !p.incomplete && p instanceof Node) {
+                if (p.isUsable() && p instanceof Node) {
                     p.visit(this);
                 }
@@ -61 +61 @@
         } else {
             for (OsmPrimitive p : selection) {
-                if (!p.deleted && !p.incomplete) {
+                if (p.isUsable()) {
                     p.visit(this);
                 }
@@ -71 +71 @@
     public void visit(Node n)
     {
-        if(!n.incomplete && !n.deleted && !n.isTagged())
+        if(n.isUsable() && !n.isTagged())
             emptyNodes.add(n);
     }

applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java

@@ -63 +63 @@
     public void visit(Way w)
     {
-        if (w.deleted || w.incomplete) return;
+        if (!w.isUsable()) return;
 
         Map<String, String> tags = w.getKeys();
-        if( tags != null )
+        if( tags.size() != 0 )
         {
             String highway = tags.get("highway");
@@ -117 +117 @@
         for (final Relation r : Main.main.getCurrentDataSet().relations)
         {
-            if(!r.deleted && !r.incomplete && r.getKeys() != null
-            && "multipolygon".equals(r.get("type")))
+            if(r.isUsable() && "multipolygon".equals(r.get("type")))
             {
                 for (RelationMember m : r.members)
                 {
                     if(m.member != null && m.member instanceof Way &&
-                    !m.member.deleted && !m.member.incomplete
-                    && !m.member.isTagged())
+                    m.member.isUsable() && !m.member.isTagged())
                         multipolygonways.add((Way)m.member);
                 }

applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java

@@ -53 +53 @@
         int type;
 
-        if( w.deleted || w.incomplete )
+        if( !w.isUsable() )
             return;
 

applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java

@@ -79 +79 @@
     private void addId(OsmPrimitive osm) {
         if (Main.pref.getBoolean("osm-primitives.showid"))
-            name += tr(" [id: {0}]", osm.id);
+            name += tr(" [id: {0}]", osm.getId());
     }
 }