Changeset 22954 in osm for applications/editors/josm/plugins

Timestamp:

2010-09-02T23:03:23+02:00 (14 years ago)

Author:

bomm

Message:

fix for bug #5389: Don't call startGrabberThreads() from constructor if baseURL is null. Additionally call startGrabberThreads() if baseURL is not null after loading WMSLayer from file.

File:

• applications/editors/josm/plugins/wmsplugin/src/wmsplugin/WMSLayer.java (modified) (3 diffs)

applications/editors/josm/plugins/wmsplugin/src/wmsplugin/WMSLayer.java

@@ -33 +33 @@
 import org.openstreetmap.josm.actions.SaveActionBase;
 import org.openstreetmap.josm.data.Bounds;
-import org.openstreetmap.josm.data.ProjectionBounds;
 import org.openstreetmap.josm.data.Preferences.PreferenceChangeEvent;
 import org.openstreetmap.josm.data.Preferences.PreferenceChangedListener;
+import org.openstreetmap.josm.data.ProjectionBounds;
 import org.openstreetmap.josm.data.coor.EastNorth;
 import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor;
@@ -128 +128 @@
                 resolution = mv.getDist100PixelText();
 
-                startGrabberThreads();
+                if(baseURL != null)
+                {
+                        startGrabberThreads();
+                }
                 if (baseURL != null && !baseURL.startsWith("html:") && !WMSGrabber.isUrlWithPatterns(baseURL)) {
                         if (!(baseURL.endsWith("&") || baseURL.endsWith("?"))) {
@@ -669 +672 @@
                                 settingsChanged = true;
                                 mv.repaint();
+                                if(baseURL != null)
+                                {
+                                        startGrabberThreads();
+                                }
                         }
                         catch (Exception ex) {