Changeset 21440 in osm for applications/editors/josm/plugins

Timestamp:

2010-05-24T22:52:00+02:00 (15 years ago)

Author:

stoecker

Message:

check for keys > 255

Location:

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

Files:

• ErrorTreePanel.java (modified) (1 diff)
• tests/TagChecker.java (modified) (2 diffs)

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

@@ -221 +221 @@
                         msg = msgErrors.getKey() + " (" + errors.size() + ")";
                     else
-                        msg = msgErrors.getKey() + " - " + bag.getKey() + " (" + errors.size() + ")";
+                        msg = bag.getKey() + " - " + msgErrors.getKey() + " (" + errors.size() + ")";
                     DefaultMutableTreeNode messageNode = new DefaultMutableTreeNode(msg);
                     if (groupNode != null)

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

@@ -139 +139 @@
     protected static int INVALID_HTML      = 1206;
     protected static int PAINT             = 1207;
+    protected static int LONG_VALUE        = 1208;
+    protected static int LONG_KEY          = 1209;
     /** 1250 and up is used by tagcheck */
 
@@ -472 +474 @@
             String key = prop.getKey();
             String value = prop.getValue();
+            if( checkValues && (value!=null && value.length() > 255) && !withErrors.contains(p, "LV"))
+            {
+                errors.add( new TestError(this, Severity.ERROR, tr("Tag value longer than allowed"),
+                        tr(s, key), MessageFormat.format(s, key), LONG_VALUE, p) );
+                withErrors.add(p, "LV");
+            }
+            if( checkKeys && (value!=null && key.length() > 255) && !withErrors.contains(p, "LK"))
+            {
+                errors.add( new TestError(this, Severity.ERROR, tr("Tag key longer than allowed"),
+                        tr(s, key), MessageFormat.format(s, key), LONG_KEY, p) );
+                withErrors.add(p, "LK");
+            }
             if( checkValues && (value==null || value.trim().length() == 0) && !withErrors.contains(p, "EV"))
             {