Changeset 5177 in josm for trunk/src

Timestamp:

2012-04-12T01:04:13+02:00 (13 years ago)

Author:

simon04

Message:

see #6964 - validator initialization requires tagging presets to be initialized

File:

• trunk/src/org/openstreetmap/josm/Main.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/Main.java

@@ -292 +292 @@
                 }
                 TaggingPresetPreference.initialize();
+                // some validator tests require the presets to be initialized
+                // TODO remove this dependency for parallel initialization
+                if (initListener != null) {
+                    initListener.updateStatus(tr("Initializing validator"));
+                }
+                validator = new OsmValidator();
+                MapView.addLayerChangeListener(validator);
                 return null;
             }
@@ -316 +323 @@
                 }
                 ImageryPreference.initialize();
-                return null;
-            }
-        });
-
-        tasks.add(new Callable<Void>() {
-
-            @Override
-            public Void call() throws Exception {
-                if (initListener != null) {
-                    initListener.updateStatus(tr("Initializing validator"));
-                }
-                validator = new OsmValidator();
-                MapView.addLayerChangeListener(validator);
                 return null;
             }