Changeset 1647 in josm for trunk/src/org/openstreetmap/josm/actions

Timestamp:

2009-06-07T02:56:33+02:00 (15 years ago)

Author:

stoecker

Message:

fixed plugin handling a bit

Location:

trunk/src/org/openstreetmap/josm/actions

Files:

• PreferencesAction.java (modified) (2 diffs)
• downloadtasks/DownloadOsmTask.java (modified) (8 diffs)

trunk/src/org/openstreetmap/josm/actions/PreferencesAction.java

@@ -23 +23 @@
  * @author imi
  */
-public class PreferencesAction extends JosmAction {
+public class PreferencesAction extends JosmAction implements Runnable {
 
     /**
@@ -37 +37 @@
      */
     public void actionPerformed(ActionEvent e) {
+        new Thread(this).start();
+    }
+
+    public void run() {
         PreferenceDialog prefDlg = new PreferenceDialog();
         prefDlg.setMinimumSize(new Dimension(400,300));

trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java

@@ -39 +39 @@
         private int num = 1;
         private String msg = "";
-        
+
         public Task(boolean newLayer, OsmServerReader reader, boolean silent,
                 int numLayers, String msg) {
@@ -65 +65 @@
                 dataSet.dataSources.add(new DataSource(currentBounds, "OpenStreetMap server"));
             }
-            
+
             OsmDataLayer layer = new OsmDataLayer(dataSet, tr("Data Layer {0}", num), null);
             if (newLayer)
@@ -71 +71 @@
             else
                 Main.main.editLayer().mergeFrom(layer);
-            
+
             Main.pleaseWaitDlg.setCustomText("");
         }
@@ -94 +94 @@
             double t = minlon; minlon = maxlon; maxlon = t;
         }
-        
+
         boolean newLayer = action != null
                                 && (action.dialog == null || action.dialog.newLayer.isSelected());
@@ -104 +104 @@
                 message);
         currentBounds = new Bounds(new LatLon(minlat, minlon), new LatLon(maxlat, maxlon));
-        // We need submit instead of execute so we can wait for it to finish and get the error 
+        // We need submit instead of execute so we can wait for it to finish and get the error
         // message if necessary. If no one calls getErrorMessage() it just behaves like execute.
-        task = Main.worker.submit(t, t);       
+        task = Main.worker.submit(t, t);
     }
-    
+
     public void download(DownloadAction action, double minlat, double minlon,
             double maxlat, double maxlon) {
@@ -135 +135 @@
         return "osm";
     }
-    
+
     /**
      * Finds the number of data layers currently opened
@@ -149 +149 @@
         return num;
     }
-    
+
    /*
     * (non-Javadoc)
@@ -156 +156 @@
     public String getErrorMessage() {
         if(task == null)
-            return "";        
+            return "";
 
         try {