Changeset 19200 in osm for applications/editors/josm/plugins/validator

Timestamp:

2009-12-24T09:50:22+01:00 (15 years ago)

Author:

jttt

Message:

Remove reference to OsmPrimitive.getDirectionKeys() (direction keys are now saved as search pattern)

File:

• applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java (modified) (6 diffs)

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

@@ -213 +213 @@
 
                 String okValue = null;
-                Boolean tagcheckerfile = false;
-                Boolean ignorefile = false;
+                boolean tagcheckerfile = false;
+                boolean ignorefile = false;
                 String line;
                 while((line = reader.readLine()) != null && (tagcheckerfile || line.length() != 0))
@@ -323 +323 @@
             for(String a : OsmPrimitive.getUninterestingKeys())
                 presetsValueData.add(a);
-            for(String a : OsmPrimitive.getDirectionKeys())
+            // TODO directionKeys are no longer in OsmPrimitive (search pattern is used instead)
+            /*  for(String a : OsmPrimitive.getDirectionKeys())
                 presetsValueData.add(a);
+            */
             for(String a : Main.pref.getCollection(PreferenceEditor.PREFIX + ".knownkeys",
             Arrays.asList(new String[]{"is_in", "int_ref", "fixme", "population"})))
@@ -497 +499 @@
                 if(values == null)
                 {
-                    Boolean ignore = false;
+                    boolean ignore = false;
                     for(String a : ignoreDataStartsWith)
                     {
@@ -886 +888 @@
             public Object tag;
             public Object value;
-            public Boolean noMatch;
-            public Boolean tagAll = false;
-            public Boolean valueAll = false;
-            public Boolean valueBool = false;
+            public boolean noMatch;
+            public boolean tagAll = false;
+            public boolean valueAll = false;
+            public boolean valueBool = false;
             private Pattern getPattern(String str) throws IllegalStateException, PatternSyntaxException
             {
@@ -925 +927 @@
                     value = n.startsWith("/") ? getPattern(n) : n;
             }
-            public Boolean match(OsmPrimitive osm)
+            public boolean match(OsmPrimitive osm)
             {
                 for(Entry<String, String> prop: osm.getKeys().entrySet())
@@ -998 +1000 @@
             return null;
         }
-        public Boolean match(OsmPrimitive osm)
+        public boolean match(OsmPrimitive osm)
         {
             if(osm.getKeys() == null || (type == NODE && !(osm instanceof Node))