Index: trunk/data/validator/tagchecker.cfg
===================================================================
--- trunk/data/validator/tagchecker.cfg	(revision 8308)
+++ 	(revision )
@@ -1,47 +1,0 @@
-# JOSM TagChecker validator file
-
-# Format:
-# Each line specifies a certain error to be reported
-# <data type> : messagetype : <key><expression><value>
-# Lines starting with a # are considered as comments.
-#
-# Data type can be:
-#  node        - a node point
-#  way         - a way
-#  relation    - a relation
-#  *           - all data types
-#
-# Message type can be:
-# E            - an error
-# W            - a warning
-# I            - an low priority informational warning
-#
-# Key and value are expressions describing certain keys and values of these keys.
-# Regular expressions are supported. In this case the expressions starts and
-# ends with a / sign. If an 'i' is appended, the regular expression is
-# case insensitive. For instance, /foo|bar/i
-#
-# The * sign indicates any string.
-# The texts BOOLEAN_TRUE and BOOLEAN_FALSE in the value part indicate a special
-# handling for boolean values (yes, true, 0, false, no, ...).
-#
-# Expression can be:
-#  !=          - the key/value combination does not match
-#  ==          - the key/value combination does match
-#
-# To have more complicated expressions, multiple elements can be grouped together
-# with an logical and (&&).
-#
-# The comment at the end of a rule is displayed in validator description
-#
-# Empty lines and space signs are ignored
-
-# The following could replace unnamed way check. Still at the moment we keep it as it is
-#way  : W : junction == roundabout && highway == /motorway|trunk|primary|secondary|tertiary|residential|pedestrian/ && /name|ref|(name:.*)|(.*_name)|(.*_ref)/ != * # Unnamed junction
-#way  : W : highway == /motorway|trunk|primary|secondary|tertiary|residential|pedestrian/ && /name|ref|(name:.*)|(.*_name)|(.*_ref)/ != * # Unnamed 
-
-# see #5844, #6760
-#way  : W : oneway != BOOLEAN_FALSE && /.*:(backward|forward)/ == *    # oneway combined with *:backward/forward
-
-
-# all former checks are now located in data/validator/*mapcss :-)
Index: trunk/data_nodist/tagchecker.cfg
===================================================================
--- trunk/data_nodist/tagchecker.cfg	(revision 8309)
+++ trunk/data_nodist/tagchecker.cfg	(revision 8309)
@@ -0,0 +1,47 @@
+# JOSM TagChecker validator file
+
+# Format:
+# Each line specifies a certain error to be reported
+# <data type> : messagetype : <key><expression><value>
+# Lines starting with a # are considered as comments.
+#
+# Data type can be:
+#  node        - a node point
+#  way         - a way
+#  relation    - a relation
+#  *           - all data types
+#
+# Message type can be:
+# E            - an error
+# W            - a warning
+# I            - an low priority informational warning
+#
+# Key and value are expressions describing certain keys and values of these keys.
+# Regular expressions are supported. In this case the expressions starts and
+# ends with a / sign. If an 'i' is appended, the regular expression is
+# case insensitive. For instance, /foo|bar/i
+#
+# The * sign indicates any string.
+# The texts BOOLEAN_TRUE and BOOLEAN_FALSE in the value part indicate a special
+# handling for boolean values (yes, true, 0, false, no, ...).
+#
+# Expression can be:
+#  !=          - the key/value combination does not match
+#  ==          - the key/value combination does match
+#
+# To have more complicated expressions, multiple elements can be grouped together
+# with an logical and (&&).
+#
+# The comment at the end of a rule is displayed in validator description
+#
+# Empty lines and space signs are ignored
+
+# The following could replace unnamed way check. Still at the moment we keep it as it is
+#way  : W : junction == roundabout && highway == /motorway|trunk|primary|secondary|tertiary|residential|pedestrian/ && /name|ref|(name:.*)|(.*_name)|(.*_ref)/ != * # Unnamed junction
+#way  : W : highway == /motorway|trunk|primary|secondary|tertiary|residential|pedestrian/ && /name|ref|(name:.*)|(.*_name)|(.*_ref)/ != * # Unnamed 
+
+# see #5844, #6760
+#way  : W : oneway != BOOLEAN_FALSE && /.*:(backward|forward)/ == *    # oneway combined with *:backward/forward
+
+
+# all former checks are now located in data/validator/*mapcss :-)
Index: trunk/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java	(revision 8308)
+++ trunk/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java	(revision 8309)
@@ -64,5 +64,5 @@
 
     /** The default data file of tagchecker rules */
-    public static final String DATA_FILE = "resource://data/validator/tagchecker.cfg";
+    //public static final String DATA_FILE = "resource://data/validator/tagchecker.cfg";
     /** The config file of ignored tags */
     public static final String IGNORE_FILE = "resource://data/validator/ignoretags.cfg";
@@ -130,5 +130,5 @@
     protected static final Entities entities = new Entities();
 
-    private static final List<String> DEFAULT_SOURCES = Arrays.asList(DATA_FILE, IGNORE_FILE, SPELL_FILE);
+    private static final List<String> DEFAULT_SOURCES = Arrays.asList(/*DATA_FILE, */IGNORE_FILE, SPELL_FILE);
 
     /**
@@ -490,5 +490,5 @@
         testPanel.add(prefCheckComplexBeforeUpload, a);
 
-        final Collection<String> sources = Main.pref.getCollection(PREF_SOURCES, Arrays.asList(DATA_FILE, IGNORE_FILE, SPELL_FILE));
+        final Collection<String> sources = Main.pref.getCollection(PREF_SOURCES, DEFAULT_SOURCES);
         sourcesList = new EditableList(tr("TagChecker source"));
         sourcesList.setItems(sources);