Changes in trunk [1732:1738] in josm

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)
• gui/layer/GeoImageLayer.java (modified) (1 diff)
• gui/layer/GpxLayer.java (modified) (3 diffs)
• io/OsmWriter.java (modified) (1 diff)
• plugins/PluginDownloader.java (modified) (5 diffs)
• plugins/PluginSelection.java (modified) (8 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/gui/layer/GeoImageLayer.java

@@ -686 +686 @@
                 Date time = new Date(tp.time.getTime() - (delta+gpstimezone));
                 if (time.after(e.time) && lastTP != null) {
-                    e.pos.setCoor(lastTP.pos.getCenter(tp.pos));
+                    e.pos = new CachedLatLon(lastTP.pos.getCenter(tp.pos));
                     break;
                 }

trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java

@@ -485 +485 @@
                                             hdop = 0;
                                         }
-                                        int hdoplvl = Math.round(hdop * 25);
+                                        int hdoplvl = Math.round(hdop * Main.pref.getInteger("hdop.factor", 25));
                                         // High hdop is bad, but high values in colors are green.
                                         // Therefore inverse the logic
@@ -1093 +1093 @@
                 WayPoint R = null;
                 for (WayPoint S : seg) {
+                    EastNorth c = R.getEastNorth();
                     if (R == null) {
-                        EastNorth c = R.getEastNorth();
                         R = S;
                         rx = c.east();
@@ -1107 +1107 @@
                         }
                     } else {
-                        EastNorth c = S.getEastNorth();
                         sx = c.east();
                         sy = c.north();

trunk/src/org/openstreetmap/josm/io/OsmWriter.java

@@ -169 +169 @@
             }
             for (Entry<String, String> e : osm.keys.entrySet()) {
-                if (!("created_by".equals(e.getKey())))
+                if ((osm instanceof Changeset) || !("created_by".equals(e.getKey())))
                     out.println("    <tag k='"+ XmlWriter.encode(e.getKey()) +
                             "' v='"+XmlWriter.encode(e.getValue())+ "' />");

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;
@@ -25 +23 @@
 import java.util.Map;
 import java.util.Set;
-import java.util.SortedMap;
 import java.util.TreeMap;
 import java.util.Map.Entry;
@@ -72 +69 @@
             PluginInformation description = availablePlugins.get(local.name);
 
-            if (description != null && (description.version == null || description.version.equals("")) ?
-            (local.version != null && local.version.equals("")) : !description.version.equals(local.version)) {
+            if (description.version != null && !description.version.equals(local.version)) {
                 toUpdate.add(description);
                 toUpdateStr.append(description.name+"\n");
@@ -97 +93 @@
     }
 
-    public Boolean finish() {
+    public boolean finish() {
         Collection<PluginInformation> toDownload = new LinkedList<PluginInformation>();
+        Collection<String> installedPlugins = Main.pref.getCollection("plugins", null);
+
         String msg = "";
         for (Entry<String, Boolean> entry : pluginMap.entrySet()) {
-            if(entry.getValue())
+            if(entry.getValue() && !installedPlugins.contains(entry.getKey()))
             {
                 String name = entry.getKey();
@@ -138 +136 @@
     /* return true when plugin list changed */
     public void drawPanel(JPanel pluginPanel) {
-        availablePlugins = getAvailablePlugins();
+        loadPlugins();
         Collection<String> enabledPlugins = Main.pref.getCollection("plugins", null);
 
@@ -224 +222 @@
     }
 
-    /**
-     * Return information about a loaded plugin.
-     *
-     * Note that if you call this in your plugins bootstrap, you may get <code>null</code> if
-     * the plugin requested is not loaded yet.
-     *
-     * @return The PluginInformation to a specific plugin, but only if the plugin is loaded.
-     * If it is not loaded, <code>null</code> is returned.
-     */
-    private static PluginInformation getLoaded(String pluginName) {
-        for (PluginProxy p : PluginHandler.pluginList)
-            if (p.info.name.equals(pluginName))
-                return p.info;
-        return null;
-    }
-
-    private Map<String, PluginInformation> getAvailablePlugins() {
-        SortedMap<String, PluginInformation> availablePlugins = new TreeMap<String, PluginInformation>(new Comparator<String>(){
+    private void loadPlugins() {
+        availablePlugins = new TreeMap<String, PluginInformation>(new Comparator<String>(){
             public int compare(String o1, String o2) {
                 return o1.compareToIgnoreCase(o2);
@@ -348 +330 @@
                 localPlugins.put(proxy.info.name, proxy.info);
         }
-        return availablePlugins;
     }
 }