Changeset 20155 in osm for applications/editors/josm

Timestamp:

2010-02-25T22:40:01+01:00 (15 years ago)

Author:

jttt

Message:

Speed optimizations

Location:

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

Files:

• tests/TagChecker.java (modified) (23 diffs)
• util/AgregatePrimitivesVisitor.java (modified) (2 diffs)

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

@@ -5 +5 @@
 
 import java.awt.Dimension;
+import java.awt.GridBagConstraints;
 import java.awt.GridBagLayout;
 import java.awt.event.ActionEvent;
@@ -41 +42 @@
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
 import org.openstreetmap.josm.data.osm.OsmUtils;
 import org.openstreetmap.josm.data.osm.Relation;
@@ -149 +151 @@
     {
         super(tr("Properties checker :"),
-              tr("This plugin checks for errors in property keys and values."));
+                tr("This plugin checks for errors in property keys and values."));
     }
 
@@ -327 +329 @@
             /*  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"})))
+                    Arrays.asList(new String[]{"is_in", "int_ref", "fixme", "population"})))
                 presetsValueData.add(a);
             for(TaggingPreset p : presets)
@@ -431 +433 @@
                 {
                     errors.add( new TestError(this, Severity.ERROR, tr("Illegal tag/value combinations"),
-                    tr("Illegal tag/value combinations"), tr("Illegal tag/value combinations"), 1272, p) );
+                            tr("Illegal tag/value combinations"), tr("Illegal tag/value combinations"), 1272, p) );
                     withErrors.add(p, "TC");
                 }
             }
 
+            Map<String, String> keys = p.getKeys();
             for(CheckerData d : checkerData)
             {
-                if(d.match(p))
+                if(d.match(p, keys))
                 {
                     errors.add( new TestError(this, d.getSeverity(), tr("Illegal tag/value combinations"),
-                    d.getDescription(), d.getDescriptionOrig(), d.getCode(), p) );
+                            d.getDescription(), d.getDescriptionOrig(), d.getCode(), p) );
                     withErrors.add(p, "TC");
                 }
@@ -456 +459 @@
                     translated the stuff before. Makes the ignore file language dependend. */
                     errors.add( new TestError(this, Severity.WARNING, tr("Painting problem"),
-                    s, s, PAINT, p) );
+                            s, s, PAINT, p) );
                     withErrors.add(p, "P");
                 }
@@ -471 +474 @@
             {
                 errors.add( new TestError(this, Severity.WARNING, tr("Tags with empty values"),
-                tr(s, key), MessageFormat.format(s, key), EMPTY_VALUES, p) );
+                        tr(s, key), MessageFormat.format(s, key), EMPTY_VALUES, p) );
                 withErrors.add(p, "EV");
             }
@@ -477 +480 @@
             {
                 errors.add( new TestError(this, Severity.WARNING, tr("Invalid property key"),
-                tr(s, key), MessageFormat.format(s, key), INVALID_KEY, p) );
+                        tr(s, key), MessageFormat.format(s, key), INVALID_KEY, p) );
                 withErrors.add(p, "IPK");
             }
@@ -483 +486 @@
             {
                 errors.add( new TestError(this, Severity.WARNING, tr("Invalid white space in property key"),
-                tr(s, key), MessageFormat.format(s, key), INVALID_KEY_SPACE, p) );
+                        tr(s, key), MessageFormat.format(s, key), INVALID_KEY_SPACE, p) );
                 withErrors.add(p, "IPK");
             }
@@ -489 +492 @@
             {
                 errors.add( new TestError(this, Severity.OTHER, tr("Property values start or end with white space"),
-                tr(s, key), MessageFormat.format(s, key), INVALID_SPACE, p) );
+                        tr(s, key), MessageFormat.format(s, key), INVALID_SPACE, p) );
                 withErrors.add(p, "SPACE");
             }
@@ -495 +498 @@
             {
                 errors.add( new TestError(this, Severity.OTHER, tr("Property values contain HTML entity"),
-                tr(s, key), MessageFormat.format(s, key), INVALID_HTML, p) );
+                        tr(s, key), MessageFormat.format(s, key), INVALID_HTML, p) );
                 withErrors.add(p, "HTML");
             }
@@ -523 +526 @@
                         String i = marktr("Key ''{0}'' not in presets.");
                         errors.add( new TestError(this, Severity.OTHER, tr("Presets do not contain property key"),
-                        tr(i, key), MessageFormat.format(i, key), INVALID_VALUE, p) );
+                                tr(i, key), MessageFormat.format(i, key), INVALID_VALUE, p) );
                         withErrors.add(p, "UPK");
                     }
@@ -546 +549 @@
                         String i = marktr("Value ''{0}'' for key ''{1}'' not in presets.");
                         errors.add( new TestError(this, Severity.OTHER, tr("Presets do not contain property value"),
-                        tr(i, prop.getValue(), key), MessageFormat.format(i, prop.getValue(), key), INVALID_VALUE, p) );
+                                tr(i, prop.getValue(), key), MessageFormat.format(i, prop.getValue(), key), INVALID_VALUE, p) );
                         withErrors.add(p, "UPV");
                     }
                 }
             }
-                        if (checkFixmes && value != null && value.length() > 0) {
-                                if ((value.toLowerCase().contains("FIXME")
-                                                || value.contains("check and delete")
-                                                || key.contains("todo") || key.toLowerCase().contains("fixme"))
-                                                && !withErrors.contains(p, "FIXME")) {
-                                        errors.add(new TestError(this, Severity.OTHER,
-                                                        tr("FIXMES"), FIXME, p));
-                                        withErrors.add(p, "FIXME");
-                                }
-                        }
+            if (checkFixmes && value != null && value.length() > 0) {
+                if ((value.toLowerCase().contains("FIXME")
+                        || value.contains("check and delete")
+                        || key.contains("todo") || key.toLowerCase().contains("fixme"))
+                        && !withErrors.contains(p, "FIXME")) {
+                    errors.add(new TestError(this, Severity.OTHER,
+                            tr("FIXMES"), FIXME, p));
+                    withErrors.add(p, "FIXME");
+                }
+            }
         }
     }
@@ -600 +603 @@
     {
         GBC a = GBC.eol();
-        a.anchor = GBC.EAST;
+        a.anchor = GridBagConstraints.EAST;
 
         testPanel.add( new JLabel(name), GBC.eol().insets(3,0,0,0) );
@@ -637 +640 @@
                         tr("TagChecker source"),
                         JOptionPane.QUESTION_MESSAGE
-                        );
+                );
                 if (source != null)
                     ((DefaultListModel)Sources.getModel()).addElement(source);
@@ -668 +671 @@
                                 tr("Information"),
                                 JOptionPane.INFORMATION_MESSAGE
-                                );
+                        );
                     }
                 }
@@ -703 +706 @@
 
         testPanel.add(new JLabel(tr("Data sources")), GBC.eol().insets(23,0,0,0));
-        testPanel.add(new JScrollPane(Sources), GBC.eol().insets(23,0,0,0).fill(GBC.HORIZONTAL));
+        testPanel.add(new JScrollPane(Sources), GBC.eol().insets(23,0,0,0).fill(GridBagConstraints.HORIZONTAL));
         final JPanel buttonPanel = new JPanel(new GridBagLayout());
-        testPanel.add(buttonPanel, GBC.eol().fill(GBC.HORIZONTAL));
+        testPanel.add(buttonPanel, GBC.eol().fill(GridBagConstraints.HORIZONTAL));
         buttonPanel.add(addSrcButton, GBC.std().insets(0,5,0,0));
         buttonPanel.add(editSrcButton, GBC.std().insets(5,5,5,0));
@@ -837 +840 @@
                         {
                             commands.add( new ChangePropertyKeyCommand(Collections.singleton(primitives.get(i)),
-                            key, replacementKey) );
+                                    key, replacementKey) );
                         }
                     }
@@ -879 +882 @@
         private String description;
         private List<CheckerElement> data = new ArrayList<CheckerElement>();
-        private Integer type = 0;
-        private Integer code;
+        private OsmPrimitiveType type;
+        private int code;
         protected Severity severity;
-        protected static int NODE = 1;
-        protected static int WAY = 2;
-        protected static int RELATION = 3;
-        protected static int ALL = 4;
         protected static int TAG_CHECK_ERROR  = 1250;
         protected static int TAG_CHECK_WARN   = 1260;
@@ -915 +914 @@
                 else
                     tag = n.startsWith("/") ? getPattern(n) : n;
-                noMatch = m.group(2).equals("!=");
-                n = m.group(3).trim();
-                if(n.equals("*"))
-                    valueAll = true;
-                else if(n.equals("BOOLEAN_TRUE"))
-                {
-                    valueBool = true;
-                    value = OsmUtils.trueval;
-                }
-                else if(n.equals("BOOLEAN_FALSE"))
-                {
-                    valueBool = true;
-                    value = OsmUtils.falseval;
-                }
-                else
-                    value = n.startsWith("/") ? getPattern(n) : n;
-            }
-            public boolean match(OsmPrimitive osm)
-            {
-                for(Entry<String, String> prop: osm.getKeys().entrySet())
-                {
+                    noMatch = m.group(2).equals("!=");
+                    n = m.group(3).trim();
+                    if(n.equals("*"))
+                        valueAll = true;
+                    else if(n.equals("BOOLEAN_TRUE"))
+                    {
+                        valueBool = true;
+                        value = OsmUtils.trueval;
+                    }
+                    else if(n.equals("BOOLEAN_FALSE"))
+                    {
+                        valueBool = true;
+                        value = OsmUtils.falseval;
+                    }
+                    else
+                        value = n.startsWith("/") ? getPattern(n) : n;
+            }
+            public boolean match(OsmPrimitive osm, Map<String, String> keys) {
+                for(Entry<String, String> prop: keys.entrySet()) {
                     String key = prop.getKey();
                     String val = valueBool ? OsmUtils.getNamedOsmBoolean(prop.getValue()) : prop.getValue();
                     if((tagAll || (tag instanceof Pattern ? ((Pattern)tag).matcher(key).matches() : key.equals(tag)))
-                    && (valueAll || (value instanceof Pattern ? ((Pattern)value).matcher(val).matches() : val.equals(value))))
+                            && (valueAll || (value instanceof Pattern ? ((Pattern)value).matcher(val).matches() : val.equals(value))))
                         return !noMatch;
                 }
@@ -962 +959 @@
             String[] n = str.split(" *: *", 3);
             if(n[0].equals("way"))
-                type = WAY;
+                type = OsmPrimitiveType.WAY;
             else if(n[0].equals("node"))
-                type = NODE;
+                type = OsmPrimitiveType.NODE;
             else if(n[0].equals("relation"))
-                type = RELATION;
+                type = OsmPrimitiveType.RELATION;
             else if(n[0].equals("*"))
-                type = ALL;
-            if(type == 0 || n.length != 3)
+                type = null;
+            else
                 return tr("Could not find element type");
+            if (n.length != 3)
+                return tr("Incorrect number of parameters");
+
             if(n[1].equals("W"))
             {
@@ -1005 +1005 @@
             return null;
         }
-        public boolean match(OsmPrimitive osm)
-        {
-            if(osm.getKeys() == null || (type == NODE && !(osm instanceof Node))
-            || (type == RELATION && !(osm instanceof Relation)) || (type == WAY && !(osm instanceof Way)))
+        public boolean match(OsmPrimitive osm, Map<String, String> keys)
+        {
+            if (type != null && OsmPrimitiveType.from(osm) != type)
                 return false;
-            for(CheckerElement ce : data)
-            {
-                if(!ce.match(osm))
+
+            for(CheckerElement ce : data) {
+                if(!ce.match(osm, keys))
                     return false;
             }
@@ -1029 +1028 @@
             return severity;
         }
-        public int getCode()
-        {
-            return code + type;
+
+        public int getCode() {
+            if (type == null) {
+                return code;
+            } else {
+                return code + type.ordinal() + 1;
+            }
         }
     }

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

@@ -2 +2 @@
 
 import java.util.Collection;
-import java.util.LinkedList;
+import java.util.HashSet;
 
 import org.openstreetmap.josm.data.osm.Node;
@@ -21 +21 @@
 {
     /** Aggregated data */
-    Collection<OsmPrimitive> aggregatedData;
-
-    /**
-     * Constructor
-     */
-    public AgregatePrimitivesVisitor()
-    {
-        aggregatedData = new LinkedList<OsmPrimitive>();
-    }
+    final Collection<OsmPrimitive> aggregatedData = new HashSet<OsmPrimitive>();
 
     /**