Changeset 18147 in osm for applications/editors

Timestamp:

2009-10-14T21:36:51+02:00 (15 years ago)

Author:

hampelratte

Message:

removed "active" flag and use dialog.isDialogShowing() instead

Location:

applications/editors/josm/plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb

Files:

• OsbDownloadLoop.java (modified) (1 diff)
• OsbPlugin.java (modified) (5 diffs)

applications/editors/josm/plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbDownloadLoop.java

@@ -78 +78 @@
 
                 // auto download if configured
-                if( Main.pref.getBoolean(ConfigKeys.OSB_AUTO_DOWNLOAD) && OsbPlugin.active ) {
+                if( Main.pref.getBoolean(ConfigKeys.OSB_AUTO_DOWNLOAD) && 
+                        plugin != null && plugin.getDialog() != null && plugin.getDialog().isDialogShowing() ) {
                     if(countdown < 0) {
                         if(!downloadDone) {

applications/editors/josm/plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbPlugin.java

@@ -31 +31 @@
 
 import java.net.URL;
-import java.util.LinkedList;
 
 import javax.swing.ImageIcon;
@@ -65 +64 @@
     private OsbLayer layer;
 
-    public static boolean active = false;
-
     private DownloadAction download = new DownloadAction();
 
@@ -164 +161 @@
 
             // display the parsed data
-            if(!dataSet.nodes.isEmpty()) {
+            if(!dataSet.nodes.isEmpty() && dialog.isDialogShowing()) {
                 // if the map layer has been closed, while we are requesting the osb db,
                 // we don't have to update the gui, because the user is not interested
@@ -218 +215 @@
     public void layerAdded(Layer newLayer) {
         if(newLayer instanceof OsmDataLayer) {
-            active = dialog.isDialogShowing();
-
             // start the auto download loop
             OsbDownloadLoop.getInstance().setPlugin(this);
@@ -246 +241 @@
         this.dataSet = dataSet;
     }
+    
+    public OsbDialog getDialog() {
+        return dialog;
+    }
 }