Changeset 9894 in osm

Timestamp:

2008-08-16T13:27:00+02:00 (16 years ago)

Author:

stoecker

Message:

fixed startup initialization error

File:

• applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java (modified) (6 diffs)

applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java

@@ -155 +155 @@
         {
                 spellCheckKeyData = new HashMap<String, String>();
-                String sources = Main.pref.get( PREF_SOURCES );
-                if(Main.pref.getBoolean(PREF_USE_DATA_FILE))
+                String sources = Main.pref.get( PREF_SOURCES, "");
+                if(Main.pref.getBoolean(PREF_USE_DATA_FILE, true))
                 {
                         if( sources == null || sources.length() == 0)
@@ -163 +163 @@
                                 sources = DATA_FILE + ";" + sources;
                 }
-                if(Main.pref.getBoolean(PREF_USE_SPELL_FILE))
+                if(Main.pref.getBoolean(PREF_USE_SPELL_FILE, true))
                 {
                         if( sources == null || sources.length() == 0)
@@ -172 +172 @@
 
                 String errorSources = "";
+                if(sources.length() == 0)
+                        return;
                 for(String source: sources.split(";"))
                 {
@@ -235 +237 @@
         public static void initializePresets() throws Exception
         {
-                if( !Main.pref.getBoolean(PREF_CHECK_VALUES) )
+                if( !Main.pref.getBoolean(PREF_CHECK_VALUES, true) )
                         return;
 
@@ -382 +384 @@
         {
                 String allAnnotations = Main.pref.get("taggingpreset.sources");
+                if(allAnnotations == null | allAnnotations.length() == 0)
+                        return;
                 for(String source : allAnnotations.split(";"))
                 {
@@ -410 +414 @@
         public void startTest()
         {
-                checkKeys = Main.pref.getBoolean(PREF_CHECK_KEYS);
+                checkKeys = Main.pref.getBoolean(PREF_CHECK_KEYS, true);
                 if( isBeforeUpload )
                         checkKeys = checkKeys && Main.pref.getBoolean(PREF_CHECK_KEYS_BEFORE_UPLOAD, true);
 
-                checkValues = Main.pref.getBoolean(PREF_CHECK_VALUES);
+                checkValues = Main.pref.getBoolean(PREF_CHECK_VALUES, true);
                 if( isBeforeUpload )
                         checkValues = checkValues && Main.pref.getBoolean(PREF_CHECK_VALUES_BEFORE_UPLOAD, true);
 
-                checkComplex = Main.pref.getBoolean(PREF_CHECK_COMPLEX);
+                checkComplex = Main.pref.getBoolean(PREF_CHECK_COMPLEX, true);
                 if( isBeforeUpload )
                         checkComplex = checkValues && Main.pref.getBoolean(PREF_CHECK_COMPLEX_BEFORE_UPLOAD, true);
 
-                checkFixmes = Main.pref.getBoolean(PREF_CHECK_FIXMES);
+                checkFixmes = Main.pref.getBoolean(PREF_CHECK_FIXMES, true);
                 if( isBeforeUpload )
                         checkFixmes = checkFixmes && Main.pref.getBoolean(PREF_CHECK_FIXMES_BEFORE_UPLOAD, true);