Changeset 1733 in josm for trunk/src/org/openstreetmap/josm

Timestamp:

2009-07-05T10:48:09+02:00 (15 years ago)

Author:

stoecker

Message:

fixed #2821, #2775 - agpifojpicture position wrong, preferences callable twice

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/PreferencesAction.java (modified) (2 diffs)
• data/coor/LatLon.java (modified) (1 diff)
• gui/PleaseWaitRunnable.java (modified) (5 diffs)
• plugins/PluginDownloader.java (modified) (5 diffs)
• plugins/PluginSelection.java (modified) (3 diffs)

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

@@ -37 +37 @@
      */
     public void actionPerformed(ActionEvent e) {
-        new Thread(this).start();
+        run();
     }
 
@@ -75 +75 @@
         dlg.setBounds(targetX, targetY, targetWidth, targetHeight);
 
+        dlg.setModal(true);
         dlg.setVisible(true);
         if (pane.getValue() instanceof Integer && (Integer)pane.getValue() == JOptionPane.OK_OPTION)

trunk/src/org/openstreetmap/josm/data/coor/LatLon.java

@@ -148 +148 @@
 
     public LatLon interpolate(LatLon ll2, double proportion) {
-        return new LatLon(this.x + proportion * (ll2.x - this.x),
-            this.y + proportion * (ll2.y - this.y));
+        return new LatLon(this.lat() + proportion * (ll2.lat() - this.lat()),
+            this.lon() + proportion * (ll2.lon() - this.lon()));
     }
 
     public LatLon getCenter(LatLon ll2) {
-        return new LatLon((this.x + ll2.x)/2.0, (this.y + ll2.y)/2.0);
+        return new LatLon((this.lat() + ll2.lat())/2.0, (this.lon() + ll2.lon())/2.0);
     }
 

trunk/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java

@@ -9 +9 @@
 import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
+import java.awt.event.WindowListener;
 import java.io.FileNotFoundException;
 import java.io.IOException;
@@ -36 +37 @@
     private final String title;
 
+    private ActionListener cancelListener = new ActionListener(){
+        public void actionPerformed(ActionEvent e) {
+            if (!cancelled) {
+                cancelled = true;
+                cancel();
+            }
+        }
+    };
+
+    private WindowListener windowListener = new WindowAdapter(){
+        @Override public void windowClosing(WindowEvent e) {
+            if (!closeDialogCalled) {
+                if (!cancelled) {
+                    cancelled = true;
+                    cancel();
+                }
+                closeDialog();
+            }
+        }
+    };
+
     /**
      * Create the runnable object with a given message for the user.
@@ -53 +75 @@
         this.title = title;
         this.ignoreException = ignoreException;
-        Main.pleaseWaitDlg.cancel.addActionListener(new ActionListener(){
-            public void actionPerformed(ActionEvent e) {
-                if (!cancelled) {
-                    cancelled = true;
-                    cancel();
-                }
-            }
-        });
-        Main.pleaseWaitDlg.addWindowListener(new WindowAdapter(){
-            @Override public void windowClosing(WindowEvent e) {
-                if (!closeDialogCalled) {
-                    if (!cancelled) {
-                        cancelled = true;
-                        cancel();
-                    }
-                    closeDialog();
-                }
-            }
-        });
-    }
-
-    public final void run() {
+    }
+
+    private void prepareDialog() {
+        // reset dialog state
+        errorMessage = null;
+        closeDialogCalled = false;
+
+        Main.pleaseWaitDlg.setTitle(title);
+        Main.pleaseWaitDlg.cancel.setEnabled(true);
+        Main.pleaseWaitDlg.setCustomText("");
+        Main.pleaseWaitDlg.cancel.addActionListener(cancelListener);
+        Main.pleaseWaitDlg.addWindowListener(windowListener);
+        Main.pleaseWaitDlg.setVisible(true);
+    }
+
+    private void doRealRun() {
         try {
             try {
-                if (cancelled)
-                    return; // since realRun isn't executed, do not call to finish
-
-                // reset dialog state
-                Main.pleaseWaitDlg.setTitle(title);
-                Main.pleaseWaitDlg.cancel.setEnabled(true);
-                Main.pleaseWaitDlg.setCustomText("");
-                errorMessage = null;
-                closeDialogCalled = false;
-
-                // show the dialog
-                synchronized (this) {
-                    EventQueue.invokeLater(new Runnable() {
-                        public void run() {
-                            synchronized (PleaseWaitRunnable.this) {
-                                PleaseWaitRunnable.this.notifyAll();
-                            }
-                            Main.pleaseWaitDlg.setVisible(true);
-                        }
-                    });
-                    try {wait();} catch (InterruptedException e) {}
-                }
-
                 realRun();
             } catch (SAXException x) {
@@ -129 +122 @@
                 });
             }
+        }
+    }
+
+    public final void run() {
+        if (cancelled)
+            return; // since realRun isn't executed, do not call to finish
+
+        if (EventQueue.isDispatchThread()) {
+            new Thread(new Runnable() {
+                public void run() {
+                    doRealRun();
+                }
+            }).start();
+            prepareDialog();
+        } else {
+            EventQueue.invokeLater(new Runnable() {
+                public void run() {
+                    prepareDialog();
+                }
+            });
+            doRealRun();
         }
     }
@@ -165 +179 @@
                         Main.pleaseWaitDlg.setVisible(false);
                         Main.pleaseWaitDlg.dispose();
+                        Main.pleaseWaitDlg.removeWindowListener(windowListener);
+                        Main.pleaseWaitDlg.cancel.removeActionListener(cancelListener);
                     }
                     if (errorMessage != null && !silent) {

trunk/src/org/openstreetmap/josm/plugins/PluginDownloader.java

@@ -11 +11 @@
 import java.io.BufferedWriter;
 import java.io.File;
-import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
-import java.io.FileWriter;
 import java.io.FilenameFilter;
 import java.io.IOException;
@@ -20 +18 @@
 import java.io.OutputStream;
 import java.io.OutputStreamWriter;
-import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.Arrays;
-import java.util.concurrent.Future;
 import java.util.Collection;
 import java.util.LinkedList;
@@ -29 +25 @@
 import javax.swing.JOptionPane;
 
+import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.AboutAction;
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.gui.ExtendedDialog;
 import org.openstreetmap.josm.gui.PleaseWaitRunnable;
@@ -66 +62 @@
             if (!pluginDir.exists())
                 pluginDir.mkdirs();
+            Main.pleaseWaitDlg.progress.setMaximum(toUpdate.size());
+            int progressValue = 0;
             for (PluginInformation d : toUpdate) {
+                Main.pleaseWaitDlg.progress.setValue(progressValue++);
                 Main.pleaseWaitDlg.currentAction.setText(tr("Downloading Plugin {0}...", d.name));
                 File pluginFile = new File(pluginDir, d.name + ".jar.new");
@@ -145 +144 @@
 
     public Collection<PluginInformation> download(Collection<PluginInformation> download) {
+        // Execute task in current thread instead of executing it in other thread and waiting for result
+        // Waiting for result is not a good idea because the waiting thread will probably be either EDT
+        // or worker thread. Blocking one of these threads will cause deadlock
         UpdateTask t = new UpdateTask(download, false);
-        try {
-            Future<UpdateTask> ta = Main.worker.submit(t, t);
-            t = ta.get();
-            return t.failed;
-        }
-        catch(java.lang.InterruptedException e) {e.printStackTrace();}
-        catch(java.util.concurrent.ExecutionException e) {e.printStackTrace();}
-        return download;
+        t.run();
+        return t.failed;
     }
 

trunk/src/org/openstreetmap/josm/plugins/PluginSelection.java

@@ -9 +9 @@
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
-
 import java.io.BufferedReader;
 import java.io.ByteArrayInputStream;
@@ -15 +14 @@
 import java.io.FileInputStream;
 import java.io.InputStreamReader;
-import java.io.IOException;
 import java.util.Arrays;
 import java.util.Collection;
@@ -97 +95 @@
     }
 
-    public Boolean finish() {
+    public boolean finish() {
         Collection<PluginInformation> toDownload = new LinkedList<PluginInformation>();
         String msg = "";