Changeset 6638 in josm for trunk/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java

Timestamp:

2014-01-05T20:09:34+01:00 (10 years ago)

Author:

simon04

Message:

fix #9539 - *.cfg tag checker: display when custom files are loaded together with their type (tag checker, ignore tags, spellchecker)

File:

• trunk/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java (modified) (6 diffs)

trunk/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java

@@ -135 +135 @@
     protected static final Entities entities = new Entities();
 
+    static final List<String> DEFAULT_SOURCES = Arrays.asList(DATA_FILE, IGNORE_FILE, SPELL_FILE);
+
     /**
      * Constructor
@@ -167 +169 @@
         
         String errorSources = "";
-        for (String source : Main.pref.getCollection(PREF_SOURCES, Arrays.asList(DATA_FILE, IGNORE_FILE, SPELL_FILE))) {
+        for (String source : Main.pref.getCollection(PREF_SOURCES, DEFAULT_SOURCES)) {
             BufferedReader reader = null;
             try {
@@ -176 +178 @@
                 boolean tagcheckerfile = false;
                 boolean ignorefile = false;
+                boolean isFirstLine = true;
                 String line;
                 while ((line = reader.readLine()) != null && (tagcheckerfile || line.length() != 0)) {
@@ -181 +184 @@
                         if (line.startsWith("# JOSM TagChecker")) {
                             tagcheckerfile = true;
-                        }
+                            if (!DEFAULT_SOURCES.contains(source)) {
+                                Main.info(tr("Adding {0} to tag checker", source));
+                            }
+                        } else
                         if (line.startsWith("# JOSM IgnoreTags")) {
                             ignorefile = true;
+                            if (!DEFAULT_SOURCES.contains(source)) {
+                                Main.info(tr("Adding {0} to ignore tags", source));
+                            }
                         }
-                        continue;
                     } else if (ignorefile) {
                         line = line.trim();
@@ -208 +216 @@
                             ignoreDataKeyPair.add(tmp);
                         }
-                        continue;
                     } else if (tagcheckerfile) {
                         if (line.length() > 0) {
@@ -226 +233 @@
                     } else {
                         Main.error(tr("Invalid spellcheck line: {0}", line));
+                    }
+                    if (isFirstLine) {
+                        isFirstLine = false;
+                        if (!(tagcheckerfile || ignorefile) && !DEFAULT_SOURCES.contains(source)) {
+                            Main.info(tr("Adding {0} to spellchecker", source));
+                        }
                     }
                 }