Changeset 11435 in josm for trunk

Timestamp:

2017-01-07T00:56:52+01:00 (8 years ago)

Author:

Don-vip

Message:

fix #14199 - JOSM drops empty tags on loading and thus prevents correcting them

Location:

trunk

Files:

• src/org/openstreetmap/josm/data/osm/AbstractPrimitive.java (modified) (1 diff)
• src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java (modified) (1 diff)
• src/org/openstreetmap/josm/gui/preferences/SourceEditor.java (modified) (1 diff)
• src/org/openstreetmap/josm/io/OsmReader.java (modified) (3 diffs)
• src/org/openstreetmap/josm/tools/Utils.java (modified) (4 diffs)
• test/data/regress/14199 (added)
• test/data/regress/14199/emptytag.osm (added)
• test/unit/org/openstreetmap/josm/io/OsmReaderTest.java (added)
• test/unit/org/openstreetmap/josm/tools/UtilsTest.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/data/osm/AbstractPrimitive.java

@@ -538 +538 @@
     public void put(String key, String value) {
         Map<String, String> originalKeys = getKeys();
-        if (key == null || Utils.strip(key).isEmpty())
+        if (key == null || Utils.isStripEmpty(key))
             return;
         else if (value == null) {

trunk/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java

@@ -274 +274 @@
         // Update text, hide prefixing label if empty
         if (label != null) {
-            label.setVisible(text != null && !Utils.strip(text).isEmpty());
+            label.setVisible(text != null && !Utils.isStripEmpty(text));
         }
         textArea.setText(text);

trunk/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java

@@ -965 +965 @@
 
         private void updateOkButtonState() {
-            buttons.get(0).setEnabled(!Utils.strip(tfURL.getText()).isEmpty());
+            buttons.get(0).setEnabled(!Utils.isStripEmpty(tfURL.getText()));
         }
 

trunk/src/org/openstreetmap/josm/io/OsmReader.java

@@ -25 +25 @@
 import org.openstreetmap.josm.data.DataSource;
 import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.data.osm.AbstractPrimitive;
 import org.openstreetmap.josm.data.osm.Changeset;
 import org.openstreetmap.josm.data.osm.DataSet;
@@ -41 +42 @@
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
+import org.openstreetmap.josm.tools.Utils;
 import org.openstreetmap.josm.tools.date.DateUtils;
 
@@ -377 +379 @@
         if (key == null || value == null) {
             throwException(tr("Missing key or value attribute in tag."));
+        } else if (Utils.isStripEmpty(key) && t instanceof AbstractPrimitive) {
+            // #14199: Empty keys as ignored by AbstractPrimitive#put, but it causes problems to fix existing data
+            // Drop the tag on import, but flag the primitive as modified
+            ((AbstractPrimitive) t).setModified(true);
         } else {
             t.put(key.intern(), value.intern());

trunk/src/org/openstreetmap/josm/tools/Utils.java

@@ -735 +735 @@
 
     /**
+     * Determines if the given String would be empty if stripped.
+     * This is an efficient alternative to {@code strip(s).isEmpty()} that avoids to create useless String object.
+     * @param str The string to test
+     * @return {@code true} if the stripped version of {@code s} would be empty.
+     * @since 11435
+     */
+    public static boolean isStripEmpty(String str) {
+        if (str != null) {
+            for (int i = 0; i < str.length(); i++) {
+                if (!isStrippedChar(str.charAt(i), DEFAULT_STRIP)) {
+                    return false;
+                }
+            }
+        }
+        return true;
+    }
+
+    /**
      * An alternative to {@link String#trim()} to effectively remove all leading
      * and trailing white characters, including Unicode ones.
@@ -774 +792 @@
         boolean leadingSkipChar = true;
         while (leadingSkipChar && start < end) {
-            char c = str.charAt(start);
-            leadingSkipChar = Character.isWhitespace(c) || Character.isSpaceChar(c) || stripChar(skipChars, c);
+            leadingSkipChar = isStrippedChar(str.charAt(start), skipChars);
             if (leadingSkipChar) {
                 start++;
@@ -782 +799 @@
         boolean trailingSkipChar = true;
         while (trailingSkipChar && end > start + 1) {
-            char c = str.charAt(end - 1);
-            trailingSkipChar = Character.isWhitespace(c) || Character.isSpaceChar(c) || stripChar(skipChars, c);
+            trailingSkipChar = isStrippedChar(str.charAt(end - 1), skipChars);
             if (trailingSkipChar) {
                 end--;
@@ -790 +806 @@
 
         return str.substring(start, end);
+    }
+
+    private static boolean isStrippedChar(char c, final char ... skipChars) {
+        return Character.isWhitespace(c) || Character.isSpaceChar(c) || stripChar(skipChars, c);
     }
 

trunk/test/unit/org/openstreetmap/josm/tools/UtilsTest.java

@@ -3 +3 @@
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
 
 import java.io.IOException;
@@ -10 +13 @@
 import java.util.Locale;
 
-import org.junit.Assert;
 import org.junit.Rule;
 import org.junit.Test;
@@ -53 +55 @@
             "\u3000"; // IDEOGRAPHIC SPACE
         // CHECKSTYLE.ON: SingleSpaceSeparator
-        Assert.assertNull(Utils.strip(null));
-        Assert.assertEquals("", Utils.strip(""));
-        Assert.assertEquals("", Utils.strip(" "));
-        Assert.assertEquals("", Utils.strip("  "));
-        Assert.assertEquals("", Utils.strip("   "));
-        Assert.assertEquals("", Utils.strip(someWhite));
-        Assert.assertEquals("a", Utils.strip("a"));
-        Assert.assertEquals("ab", Utils.strip("ab"));
-        Assert.assertEquals("abc", Utils.strip("abc"));
-        Assert.assertEquals("a", Utils.strip(" a"));
-        Assert.assertEquals("ab", Utils.strip(" ab"));
-        Assert.assertEquals("abc", Utils.strip(" abc"));
-        Assert.assertEquals("a", Utils.strip("a "));
-        Assert.assertEquals("ab", Utils.strip("ab "));
-        Assert.assertEquals("abc", Utils.strip("abc "));
-        Assert.assertEquals("a", Utils.strip(someWhite+"a"+someWhite));
-        Assert.assertEquals("ab", Utils.strip(someWhite+"ab"+someWhite));
-        Assert.assertEquals("abc", Utils.strip(someWhite+"abc"+someWhite));
+        assertNull(Utils.strip(null));
+        assertEquals("", Utils.strip(""));
+        assertEquals("", Utils.strip(" "));
+        assertEquals("", Utils.strip("  "));
+        assertEquals("", Utils.strip("   "));
+        assertEquals("", Utils.strip(someWhite));
+        assertEquals("a", Utils.strip("a"));
+        assertEquals("ab", Utils.strip("ab"));
+        assertEquals("abc", Utils.strip("abc"));
+        assertEquals("a", Utils.strip(" a"));
+        assertEquals("ab", Utils.strip(" ab"));
+        assertEquals("abc", Utils.strip(" abc"));
+        assertEquals("a", Utils.strip("a "));
+        assertEquals("ab", Utils.strip("ab "));
+        assertEquals("abc", Utils.strip("abc "));
+        assertEquals("a", Utils.strip(someWhite+"a"+someWhite));
+        assertEquals("ab", Utils.strip(someWhite+"ab"+someWhite));
+        assertEquals("abc", Utils.strip(someWhite+"abc"+someWhite));
 
         // extended skip
-        Assert.assertEquals("a", Utils.strip("a", "b"));
-        Assert.assertEquals("b", Utils.strip("acbcac", "ac"));
+        assertEquals("a", Utils.strip("a", "b"));
+        assertEquals("b", Utils.strip("acbcac", "ac"));
+    }
+
+    /**
+     * Test of {@link Utils#isStripEmpty} method.
+     */
+    @Test
+    public void testIsStripEmpty() {
+        assertTrue(Utils.isStripEmpty(null));
+        assertTrue(Utils.isStripEmpty(""));
+        assertTrue(Utils.isStripEmpty(" "));
+        assertTrue(Utils.isStripEmpty("  "));
+        assertFalse(Utils.isStripEmpty("a"));
+        assertFalse(Utils.isStripEmpty("foo"));
+        assertFalse(Utils.isStripEmpty(" foo"));
+        assertFalse(Utils.isStripEmpty("foo "));
+        assertFalse(Utils.isStripEmpty(" foo "));
     }
 
@@ -82 +100 @@
     @Test
     public void testToHexString() {
-        Assert.assertEquals("", Utils.toHexString(null));
-        Assert.assertEquals("", Utils.toHexString(new byte[0]));
-        Assert.assertEquals("01", Utils.toHexString(new byte[]{0x1}));
-        Assert.assertEquals("0102", Utils.toHexString(new byte[]{0x1, 0x2}));
-        Assert.assertEquals("12", Utils.toHexString(new byte[]{0x12}));
-        Assert.assertEquals("127f", Utils.toHexString(new byte[]{0x12, 0x7f}));
-        Assert.assertEquals("fedc", Utils.toHexString(new byte[]{(byte) 0xfe, (byte) 0xdc}));
+        assertEquals("", Utils.toHexString(null));
+        assertEquals("", Utils.toHexString(new byte[0]));
+        assertEquals("01", Utils.toHexString(new byte[]{0x1}));
+        assertEquals("0102", Utils.toHexString(new byte[]{0x1, 0x2}));
+        assertEquals("12", Utils.toHexString(new byte[]{0x12}));
+        assertEquals("127f", Utils.toHexString(new byte[]{0x12, 0x7f}));
+        assertEquals("fedc", Utils.toHexString(new byte[]{(byte) 0xfe, (byte) 0xdc}));
     }