Changeset 14121 in osm for applications/editors/josm/plugins/validator/src

Timestamp:

2009-03-18T15:57:27+01:00 (16 years ago)

Author:

stoecker

Message:

close #2302 - patch by jttt - optimizations and encapsulation

Location:

applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests

Files:

• TagChecker.java (modified) (1 diff)
• UntaggedNode.java (modified) (1 diff)
• UntaggedWay.java (modified) (2 diffs)

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

@@ -256 +256 @@
         if(presets != null)
         {
-            Way w = new Way();
-            w.checkTagged();
-            w.checkDirectionTagged();
             presetsValueData = new Bag<String, String>();
-            for(String a : OsmPrimitive.uninteresting)
+            for(String a : OsmPrimitive.getUninterestingKeys())
                 presetsValueData.add(a);
-            for(String a : OsmPrimitive.directionKeys)
+            for(String a : OsmPrimitive.getDirectionKeys())
                 presetsValueData.add(a);
             for(String a : Main.pref.getCollection(PreferenceEditor.PREFIX + ".knownkeys",

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

@@ -69 +69 @@
     public void visit(Node n)
     {
-        if(!n.incomplete && !n.deleted && !n.tagged)
+        if(!n.incomplete && !n.deleted && !n.isTagged())
             emptyNodes.add(n);
     }

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

@@ -85 +85 @@
         }
 
-        if(!w.tagged && !multipolygonways.contains(w))
+        if(!w.isTagged() && !multipolygonways.contains(w))
         {
             errors.add( new TestError(this, Severity.WARNING, tr("Untagged ways"), UNTAGGED_WAY, w) );
@@ -114 +114 @@
                     if(m.member != null && m.member instanceof Way &&
                     !m.member.deleted && !m.member.incomplete
-                    && !m.member.tagged)
+                    && !m.member.isTagged())
                         multipolygonways.add((Way)m.member);
                 }