Changeset 10493 in osm for applications/editors/josm

Timestamp:

2008-09-05T12:30:12+02:00 (16 years ago)

Author:

stoecker

Message:

added entity checking

Location:

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

Files:

• tests/TagChecker.java (modified) (6 diffs)
• util/Entities.java (added)

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

@@ -56 +56 @@
 import org.openstreetmap.josm.plugins.validator.util.Bag;
 import org.openstreetmap.josm.plugins.validator.util.Util;
+import org.openstreetmap.josm.plugins.validator.util.Entities;
 import org.openstreetmap.josm.tools.GBC;
 import org.openstreetmap.josm.tools.XmlObjectParser;
@@ -123 +124 @@
         protected static int INVALID_SPACE     = 1204;
         protected static int INVALID_KEY_SPACE = 1205;
+        protected static int INVALID_HTML      = 1206;
         /** 1250 and up is used by tagcheck */
 
@@ -128 +130 @@
         protected JList Sources;
 
+        
+        protected static Entities entities = new Entities();
         /**
          * Constructor
@@ -336 +340 @@
                                 tr(s, key), MessageFormat.format(s, key), INVALID_SPACE, p) );
                                 withErrors.add(p, "SPACE");
+                        }
+                        if( checkValues && value != null && !value.equals(entities.unescape(value)) && !withErrors.contains(p, "HTML"))
+                        {
+                                errors.add( new TestError(this, Severity.OTHER, tr("Property values contain HTML entity"),
+                                tr(s, key), MessageFormat.format(s, key), INVALID_HTML, p) );
+                                withErrors.add(p, "HTML");
                         }
                         if( checkValues && value != null && value.length() > 0 && presetsValueData != null)
@@ -584 +594 @@
                                         commands.add( new ChangePropertyCommand(Collections.singleton(primitives.get(i)), key, value.trim()) );
                                 else if(key.startsWith(" ") || key.endsWith(" "))
-                                {
                                         commands.add( new ChangePropertyKeyCommand(Collections.singleton(primitives.get(i)), key, key.trim()) );
-                                }
                                 else
                                 {
-                                        String replacementKey = spellCheckKeyData.get(key);
-                                        if( replacementKey != null )
-                                                commands.add( new ChangePropertyKeyCommand(Collections.singleton(primitives.get(i)), key, replacementKey) );
+                                        String evalue = entities.unescape(value);
+                                        if(!evalue.equals(value))
+                                                commands.add( new ChangePropertyCommand(Collections.singleton(primitives.get(i)), key, evalue) );
+                                        else
+                                        {
+                                                String replacementKey = spellCheckKeyData.get(key);
+                                                if( replacementKey != null )
+                                                {
+                                                        commands.add( new ChangePropertyKeyCommand(Collections.singleton(primitives.get(i)),
+                                                        key, replacementKey) );
+                                                }
+                                        }
                                 }
                         }
@@ -610 +627 @@
                 {
                         int code = testError.getCode();
-                        return code == INVALID_KEY || code == EMPTY_VALUES || code == INVALID_SPACE || code == INVALID_KEY_SPACE;
+                        return code == INVALID_KEY || code == EMPTY_VALUES || code == INVALID_SPACE || code == INVALID_KEY_SPACE || code == INVALID_HTML;
                 }