Changeset 2322 in josm for trunk/src/org/openstreetmap/josm/gui

Timestamp:

2009-10-25T23:09:53+01:00 (16 years ago)

Author:

Gubaer

Message:

Added canceling of DownloadOsmTaskLists
Removed error remembering in the progress dialog

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• PleaseWaitRunnable.java (modified) (2 diffs)
• download/DownloadDialog.java (modified) (2 diffs)
• layer/GeoImageLayer.java (modified) (4 diffs)
• layer/GpxLayer.java (modified) (6 diffs)
• progress/PleaseWaitProgressMonitor.java (modified) (1 diff)
• progress/ProgressMonitor.java (modified) (1 diff)

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

@@ -73 +73 @@
                     }
                 }
-            } catch (SAXException x) {
-                x.printStackTrace();
-                progressMonitor.setErrorMessage(tr("Error while parsing")+": "+x.getMessage());
-            } catch (FileNotFoundException x) {
-                x.printStackTrace();
-                progressMonitor.setErrorMessage(tr("File not found")+": "+x.getMessage());
-            } catch (IOException x) {
-                x.printStackTrace();
-                progressMonitor.setErrorMessage(x.getMessage());
-            } catch(OsmTransferException x) {
-                x.printStackTrace();
-                if (x.getCause() != null) {
-                    progressMonitor.setErrorMessage(x.getCause().getMessage());
-                } else {
-                    progressMonitor.setErrorMessage(x.getMessage());
-                }
             } finally {
                 progressMonitor.finishTask();
@@ -96 +80 @@
                 }
             }
-        } catch (final Throwable e) {
+        } catch (final Exception e) {
             if (!ignoreException) {
                 // Exception has to thrown in EDT to be shown to user
                 SwingUtilities.invokeLater(new Runnable() {
                     public void run() {
-                        throw new RuntimeException(e);
+                        ExceptionDialogUtil.explainException(e);
                     }
                 });

trunk/src/org/openstreetmap/josm/gui/download/DownloadDialog.java

@@ -27 +27 @@
 import org.openstreetmap.josm.actions.downloadtasks.DownloadGpsTask;
 import org.openstreetmap.josm.actions.downloadtasks.DownloadOsmTask;
+import org.openstreetmap.josm.actions.downloadtasks.DownloadTask;
 import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.gui.MapView;
@@ -46 +47 @@
 public class DownloadDialog extends JPanel {
 
-    public interface DownloadTask {
-        /**
-         * Execute the download using the given bounding box. Set silent on progressMonitor
-         * if no error messages should be popped up.
-         */
-        void download(DownloadAction action, double minlat, double minlon,
-                double maxlat, double maxlon, ProgressMonitor progressMonitor);
-
-        /**
-         * Execute the download using the given URL
-         * @param newLayer
-         * @param url
-         */
-        void loadUrl(boolean newLayer, String url, ProgressMonitor progressMonitor);
-
-        /**
-         * @return The checkbox presented to the user
-         */
-        JCheckBox getCheckBox();
-
-        /**
-         * @return The name of the preferences suffix to use for storing the
-         * selection state.
-         */
-        String getPreferencesSuffix();
-
-        /**
-         * Gets the error message of the task once it executed. If there is no error message, an empty
-         * string is returned.
-         *
-         * WARNING: Never call this in the same thread you requested the download() or it will cause a
-         * dead lock. See actions/downloadTasks/DownloadOsmTaskList.java for a proper implementation.
-         *
-         * @return Error message or empty String
-         */
-        String getErrorMessage();
-    }
-
     /**
      * The list of download tasks. First entry should be the osm data entry

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

@@ -278 +278 @@
         private final Collection<File> files;
         private final GpxLayer gpxLayer;
+        private LinkedList<TimedPoint> gps;
+
         public Loader(Collection<File> files, GpxLayer gpxLayer) {
             super(tr("Images for {0}", gpxLayer.getName()));
@@ -286 +288 @@
             progressMonitor.subTask(tr("Read GPX..."));
             progressMonitor.setTicksCount(10 + files.size());
-            LinkedList<TimedPoint> gps = new LinkedList<TimedPoint>();
+            gps = new LinkedList<TimedPoint>();
 
             // Extract dates and locations from GPX input
@@ -322 +324 @@
 
 
-            if (gps.isEmpty()) {
-                progressMonitor.setErrorMessage(tr("No images with readable timestamps found."));
+            if (gps.isEmpty())
                 return;
-            }
 
             // read the image files
@@ -352 +352 @@
         }
         @Override protected void finish() {
+            if (gps.isEmpty()) {
+                JOptionPane.showMessageDialog(
+                        Main.parent,
+                        tr("No images with readable timestamps found."),
+                        tr("Warning"),
+                        JOptionPane.WARNING_MESSAGE
+                );
+                return;
+            }
             if (layer != null) {
                 Main.main.addLayer(layer);
             }
         }
+
         @Override
         protected void cancel() {

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

@@ -29 +29 @@
 import java.util.LinkedList;
 import java.util.List;
+import java.util.concurrent.Future;
 
 import javax.swing.AbstractAction;
@@ -346 +347 @@
 
         if (data.tracks.size() > 0) {
-            info.append("<table><thead align=\"center\"><tr><td colspan=\"5\">"
-                + trn("{0} track", "{0} tracks", data.tracks.size(), data.tracks.size())
-                + "</td></tr><tr><td>" + tr("Name") + "</td><td>"
-                + tr("Description") + "</td><td>" + tr("Timespan")
-                + "</td><td>" + tr("Length") + "</td><td>" + tr("URL")
-                + "</td></tr></thead>");
+            info.append("<table><thead align=\"center\"><tr><td colspan=\"5\">"
+                    + trn("{0} track", "{0} tracks", data.tracks.size(), data.tracks.size())
+                    + "</td></tr><tr><td>" + tr("Name") + "</td><td>"
+                    + tr("Description") + "</td><td>" + tr("Timespan")
+                    + "</td><td>" + tr("Length") + "</td><td>" + tr("URL")
+                    + "</td></tr></thead>");
 
             for (GpxTrack trk : data.tracks) {
-                WayPoint earliest = null, latest = null;
-
-                info.append("<tr><td>");
-                if (trk.attr.containsKey("name"))
-                    info.append(trk.attr.get("name"));
-                info.append("</td><td>");
-                if (trk.attr.containsKey("desc"))
-                    info.append(" ").append(trk.attr.get("desc"));
-                info.append("</td><td>");
+                WayPoint earliest = null, latest = null;
+
+                info.append("<tr><td>");
+                if (trk.attr.containsKey("name")) {
+                    info.append(trk.attr.get("name"));
+                }
+                info.append("</td><td>");
+                if (trk.attr.containsKey("desc")) {
+                    info.append(" ").append(trk.attr.get("desc"));
+                }
+                info.append("</td><td>");
 
                 for (Collection<WayPoint> seg : trk.trackSegs) {
@@ -378 +381 @@
                 }
 
-                if (earliest != null && latest != null) {
-                    DateFormat df = DateFormat.getDateTimeInstance(DateFormat.MEDIUM, DateFormat.SHORT);
-                    info.append(df.format(new Date((long) (earliest.time * 1000))) + " - "
-                        + df.format(new Date((long) (latest.time * 1000))));
-                    int diff = (int) (latest.time - earliest.time);
-                    info.append(" (" + (diff / 3600) + ":" + ((diff % 3600) / 60) + ")");
-                }
-
-                info.append("</td><td>");
-                info.append(new DecimalFormat("#0.00").format(trk.length() / 1000) + "km");
-                info.append("</td><td>");
-                if (trk.attr.containsKey("url"))
-                    info.append(trk.attr.get("url"));
-                info.append("</td></tr>");
-            }
-
-            info.append("</table><br><br>");
+                if (earliest != null && latest != null) {
+                    DateFormat df = DateFormat.getDateTimeInstance(DateFormat.MEDIUM, DateFormat.SHORT);
+                    info.append(df.format(new Date((long) (earliest.time * 1000))) + " - "
+                            + df.format(new Date((long) (latest.time * 1000))));
+                    int diff = (int) (latest.time - earliest.time);
+                    info.append(" (" + (diff / 3600) + ":" + ((diff % 3600) / 60) + ")");
+                }
+
+                info.append("</td><td>");
+                info.append(new DecimalFormat("#0.00").format(trk.length() / 1000) + "km");
+                info.append("</td><td>");
+                if (trk.attr.containsKey("url")) {
+                    info.append(trk.attr.get("url"));
+                }
+                info.append("</td></tr>");
+            }
+
+            info.append("</table><br><br>");
 
         }
@@ -401 +405 @@
         info.append("<br>");
 
-        info.append(trn("{0} route, ", "{0} routes, ", data.routes.size(), data.routes.size())).append(
-                        trn("{0} waypoint", "{0} waypoints", data.waypoints.size(), data.waypoints.size())).append("<br>");
+        info.append(trn("{0} route, ", "{0} routes, ", data.routes.size(), data.routes.size())).append(
+                trn("{0} waypoint", "{0} waypoints", data.waypoints.size(), data.waypoints.size())).append("<br>");
 
         return info.append("</html>").toString();
@@ -694 +698 @@
                 } // end for segment
             } // end for trk
-        } // end if large || hdopcircle 
+        } // end if large || hdopcircle
 
         /****************************************************************
@@ -939 +943 @@
                 }
             }
-            new DownloadOsmTaskList().download(false, toDownload, new PleaseWaitProgressMonitor(tr("Download data")));
+            final PleaseWaitProgressMonitor monitor = new PleaseWaitProgressMonitor(tr("Download data"));
+            final Future<?> future = new DownloadOsmTaskList().download(false, toDownload, monitor);
+            Main.worker.submit(
+                    new Runnable() {
+                        public void run() {
+                            try {
+                                future.get();
+                            } catch(Exception e) {
+                                e.printStackTrace();
+                                return;
+                            }
+                            monitor.close();
+                        }
+                    }
+            );
         }
     }

trunk/src/org/openstreetmap/josm/gui/progress/PleaseWaitProgressMonitor.java

@@ -16 +16 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.gui.PleaseWaitDialog;
+import static org.openstreetmap.josm.tools.I18n.tr;
 
 

trunk/src/org/openstreetmap/josm/gui/progress/ProgressMonitor.java

@@ -121 +121 @@
 
     void setSilent(boolean value);
-    void setErrorMessage(String message);
-    String getErrorMessage();
 
     /**