Changeset 15850 in josm

Timestamp:

2020-02-13T16:11:24+01:00 (5 years ago)

Author:

stoecker

Message:

allow three dots at the end of a ignore line to skip ever changing URLs, use like 'http...' at the end of entry

File:

• trunk/scripts/SyncEditorLayerIndex.java (modified) (4 diffs)

trunk/scripts/SyncEditorLayerIndex.java

@@ -110 +110 @@
     private static boolean optionNoEli;
     private Map<String, String> skip = new HashMap<>();
+    private Map<String, String> skipStart = new HashMap<>();
 
     /**
@@ -249 +250 @@
                 Matcher res = pattern.matcher(line);
                 if (res.matches()) {
-                    if ("Ignore".equals(res.group(1))) {
-                        skip.put(res.group(2), "green");
-                    } else {
-                        skip.put(res.group(2), "darkgoldenrod");
+                    String s = res.group(2);
+                    if(s.endsWith("..."))
+                    {
+                        s = s.substring(0, s.length() - 3);
+                        if ("Ignore".equals(res.group(1))) {
+                            skipStart.put(s, "green");
+                        } else {
+                            skipStart.put(s, "darkgoldenrod");
+                        }
+                    }
+                    else
+                    {
+                        if ("Ignore".equals(res.group(1))) {
+                            skip.put(s, "green");
+                        } else {
+                            skip.put(s, "darkgoldenrod");
+                        }
                     }
                 }
@@ -271 +285 @@
     }
 
+    String isSkipString(String s) {
+        if (skip.containsKey(s))
+            return skip.get(s);
+        for (Entry<String, String> str : skipStart.entrySet()) {
+            if (s.startsWith(str.getKey()))
+                return str.getValue();
+        }
+        return null;
+    }
+    
     void myprintln(String s) {
-        if (skip.containsKey(s)) {
-            String color = skip.get(s);
+        String color;
+        if ((color = isSkipString(s)) != null) {
             skip.remove(s);
             if (optionXhtmlBody || optionXhtml) {
@@ -283 +307 @@
             }
         } else if (optionXhtmlBody || optionXhtml) {
-            String color =
+            color =
                     s.startsWith("***") ? "black" :
                         ((s.startsWith("+ ") || s.startsWith("+++ ELI")) ? "blue" :