Changeset 5756 in josm

Timestamp:

2013-03-03T21:20:18+01:00 (12 years ago)

Author:

akks

Message:

paste tags from text: fixed one more parser error, added JUnit tests, see #8384
NetBeans project: experimental testing support

Location:

trunk

Files:

• netbeans/nbproject/project.properties (modified) (4 diffs)
• netbeans/nbproject/project.xml (modified) (1 diff)
• src/org/openstreetmap/josm/tools/TextTagParser.java (modified) (6 diffs)
• test/unit/org/openstreetmap/josm/tools/TextTagParserTest.java (added)

trunk/netbeans/nbproject/project.properties

@@ -1 +1 @@
 annotation.processing.enabled=false
 annotation.processing.enabled.in.editor=false
+annotation.processing.processors.list=
 annotation.processing.run.all.processors=true
 annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output
@@ -31 +32 @@
 file.reference.core-src=../src
 file.reference.core=..
+file.reference.test-unit=../test/unit
 includes=org/**/*.java,gnu/**/*.java,oauth/**/*.java,com/**/*.java,images/**,org/openstreetmap/gui/**/*.png,data/**,styles/**,LICENSE,README,CONTRIBUTION,gpl-2.0.txt,gpl-3.0.txt
 jar.archive.disabled=${jnlp.enabled}
@@ -67 +69 @@
 jnlp.descriptor=application
 jnlp.enabled=false
-jnlp.mixed.code=defaut
+jnlp.mixed.code=default
 jnlp.offline-allowed=false
 jnlp.signed=false
+jnlp.signing=
+jnlp.signing.alias=
+jnlp.signing.keystore=
 main.class=org.openstreetmap.josm.gui.MainApplication
 manifest.file=manifest.mf
@@ -84 +89 @@
 src.core.dir=${file.reference.core}
 src.dir=${file.reference.core-src}
+test.unit.dir=${file.reference.test-unit}

trunk/netbeans/nbproject/project.xml

@@ -9 +9 @@
                 <root id="src.core.dir"/>
             </source-roots>
-            <test-roots/>
+            <test-roots>
+                <root id="test.unit.dir"/>
+            </test-roots>
         </data>
     </configuration>

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

@@ -1 +1 @@
 package org.openstreetmap.josm.tools;
 
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Map;
@@ -51 +52 @@
                 skipEmpty();
                 if (pos == n) { break; }
-                k = parseString(true);
+                k = parseString("\n\r\t= ");
                 if (pos == n) { tags.clear();  break; }
                 skipSign();
                 if (pos == n) { tags.clear();  break; }
-                v = parseString(false);
+                v = parseString("\n\r\t ");
                 tags.put(k, v);
             }
@@ -61 +62 @@
         }
         
-        private String parseString(boolean stopOnEquals) {
+        private String parseString(String stopChars) {
+            char stop[] = stopChars.toCharArray();
+            Arrays.sort(stop);
             char c;
             while (pos < n) {
@@ -81 +84 @@
                     pos++;
                     break;
-                } else if (!quotesStarted && (c=='\n'|| c=='\t'|| c==' ' || c=='\r'
-                      || (c=='=' && stopOnEquals))) {  // stop-symbols
+                } else if (!quotesStarted && (Arrays.binarySearch(stop, c)>=0)) { 
+                    // stop-symbol found
                     pos++;
                     break;
@@ -127 +130 @@
     }
 
-    private static String unescape(String k) {
+    protected static String unescape(String k) {
         if(! (k.startsWith("\"") && k.endsWith("\"")) ) {
             if (k.contains("=")) {
@@ -137 +140 @@
         }
         String text = k.substring(1,k.length()-1);
-        return (new TextAnalyzer(text)).parseString(false);
+        return (new TextAnalyzer(text)).parseString("\r\t\n");
     }