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

Timestamp:

2009-07-11T12:33:24+02:00 (15 years ago)

Author:

Gubaer

Message:

fixed #1361: Relation dialog: "Download inclomplete..." blocks JOSM if OSM does not respond

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/UpdateDataAction.java (modified) (1 diff)
• gui/MapView.java (modified) (1 diff)
• gui/dialogs/relation/GenericRelationEditor.java (modified) (7 diffs)

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

@@ -60 +60 @@
 
         if(bboxCount == 0) {
-            JOptionPane.showMessageDialog(Main.parent,
-                    tr("No data to update found. Have you already opened or downloaded a data layer?"));
+            JOptionPane.showMessageDialog(
+                    Main.parent,
+                    tr("No data to update found. Have you already opened or downloaded a data layer?"),
+                    tr("No data"),
+                    JOptionPane.WARNING_MESSAGE
+            );
             return;
         }

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

@@ -217 +217 @@
         if (layer == activeLayer) {
             if (layer instanceof OsmDataLayer) {
-                Main.ds.setSelected();
+                Main.ds = null;
             }
         }

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java

@@ -5 +5 @@
 
 import java.awt.Dimension;
+import java.awt.EventQueue;
 import java.awt.GridBagLayout;
 import java.awt.GridLayout;
@@ -19 +20 @@
 import java.util.Collection;
 
+import javax.swing.JDialog;
 import javax.swing.JLabel;
 import javax.swing.JOptionPane;
@@ -46 +48 @@
 import org.openstreetmap.josm.data.osm.visitor.MergeVisitor;
 import org.openstreetmap.josm.gui.OsmPrimitivRenderer;
+import org.openstreetmap.josm.gui.PleaseWaitRunnable;
 import org.openstreetmap.josm.gui.SideButton;
 import org.openstreetmap.josm.gui.dialogs.ConflictDialog;
 import org.openstreetmap.josm.gui.dialogs.relation.ac.AutoCompletionCache;
 import org.openstreetmap.josm.gui.dialogs.relation.ac.AutoCompletionList;
+import org.openstreetmap.josm.io.OsmApi;
 import org.openstreetmap.josm.io.OsmServerObjectReader;
 import org.openstreetmap.josm.io.OsmTransferException;
@@ -162 +166 @@
                         });
                     }
-                    @Override public void windowGainedFocus(WindowEvent e) {
-                        requestFocusInTopLeftCell();
-                    }
-                    @Override
-                    public void windowActivated(WindowEvent e) {
-                        requestFocusInTopLeftCell();
-                    }
                     @Override
                     public void windowDeiconified(WindowEvent e) {
@@ -547 +544 @@
             Main.main.undoRedo.add(new AddCommand(getClone()));
             DataSet.fireSelectionChanged(Main.ds.getSelected());
-        } else if (getRelation().hasEqualSemanticAttributes(getClone())) {
+        } else if (! getRelation().hasEqualSemanticAttributes(getClone())) {
             tagEditorModel.applyToPrimitive(getClone());
             Main.main.undoRedo.add(new ChangeCommand(getRelation(), getClone()));
@@ -758 +755 @@
     }
 
+
+    /**
+     * Asynchronously download the members of the currently edited relation
+     *
+     */
     private void downloadRelationMembers() {
+
+        class DownloadTask extends PleaseWaitRunnable {
+            private boolean cancelled;
+            private Exception lastException;
+
+            protected void setIndeterminateEnabled(final boolean enabled) {
+                EventQueue.invokeLater(
+                        new Runnable() {
+                            public void run() {
+                                Main.pleaseWaitDlg.setIndeterminate(enabled);
+                            }
+                        }
+                );
+            }
+
+            public DownloadTask() {
+                super(tr("Download relation members"), false /* don't ignore exception */);
+            }
+            @Override
+            protected void cancel() {
+                cancelled = true;
+                OsmApi.getOsmApi().cancel();
+            }
+
+            protected void showLastException() {
+                String msg = lastException.getMessage();
+                if (msg == null) {
+                    msg = lastException.toString();
+                }
+                JOptionPane.showMessageDialog(
+                        null,
+                        msg,
+                        tr("Error"),
+                        JOptionPane.ERROR_MESSAGE
+                );
+            }
+
+            @Override
+            protected void finish() {
+                refreshTables();
+                if (cancelled) return;
+                if (lastException == null) return;
+                showLastException();
+            }
+
+            @Override
+            protected void realRun() throws SAXException, IOException, OsmTransferException {
+                try {
+                    Main.pleaseWaitDlg.setAlwaysOnTop(true);
+                    Main.pleaseWaitDlg.toFront();
+                    setIndeterminateEnabled(true);
+                    OsmServerObjectReader reader = new OsmServerObjectReader(getClone().id, OsmPrimitiveType.RELATION, true);
+                    DataSet dataSet = reader.parseOsm();
+                    if (dataSet != null) {
+                        final MergeVisitor visitor = new MergeVisitor(Main.main.map.mapView.getEditLayer()
+                                .data, dataSet);
+                        visitor.merge();
+
+                        // copy the merged layer's data source info
+                        for (DataSource src : dataSet.dataSources) {
+                            Main.map.mapView.getEditLayer().data.dataSources.add(src);
+                        }
+                        Main.map.mapView.getEditLayer().fireDataChange();
+
+                        if (visitor.getConflicts().isEmpty())
+                            return;
+                        final ConflictDialog dlg = Main.map.conflictDialog;
+                        dlg.getConflicts().add(visitor.getConflicts());
+                        JOptionPane op = new JOptionPane(
+                                tr("There were {0} conflicts during import.",
+                                        visitor.getConflicts().size()),
+                                        JOptionPane.WARNING_MESSAGE
+                        );
+                        JDialog dialog = op.createDialog(Main.pleaseWaitDlg, tr("Conflicts in data"));
+                        dialog.setAlwaysOnTop(true); //<-- this line
+                        dialog.setModal(true);
+                        dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
+                        dialog.setVisible(true);
+                    }
+                } catch(Exception e) {
+                    if (cancelled) {
+                        System.out.println(tr("Warning: ignoring exception because task is cancelled. Exception: {0}", e.toString()));
+                        return;
+                    }
+                    lastException = e;
+                } finally {
+                    Main.pleaseWaitDlg.setAlwaysOnTop(false);
+                    setIndeterminateEnabled(false);
+                }
+            }
+        }
+
         boolean download = false;
         for (RelationMember member : getClone().members) {
@@ -766 +860 @@
             }
         }
-        if (download) {
-            OsmServerObjectReader reader = new OsmServerObjectReader(getClone().id, OsmPrimitiveType.RELATION, true);
-            try {
-                DataSet dataSet = reader.parseOsm();
-                if (dataSet != null) {
-                    final MergeVisitor visitor = new MergeVisitor(Main.main.map.mapView.getEditLayer()
-                            .data, dataSet);
-                    visitor.merge();
-
-                    // copy the merged layer's data source info
-                    for (DataSource src : dataSet.dataSources) {
-                        Main.main.map.mapView.getEditLayer().data.dataSources.add(src);
-                    }
-                    Main.main.map.mapView.getEditLayer().fireDataChange();
-
-                    if (visitor.getConflicts().isEmpty())
-                        return;
-                    final ConflictDialog dlg = Main.map.conflictDialog;
-                    dlg.getConflicts().add(visitor.getConflicts());
-                    JOptionPane.showMessageDialog(Main.parent,
-                            tr("There were conflicts during import."));
-                    if (!dlg.isVisible()) {
-                        dlg.action
-                        .actionPerformed(new ActionEvent(this, 0, ""));
-                    }
-                }
-            } catch(OsmTransferException e) {
-                e.printStackTrace();
-                if (e.getCause() != null) {
-                    if (e.getCause() instanceof SAXException) {
-                        JOptionPane.showMessageDialog(this,tr("Error parsing server response.")+": "+e.getCause().getMessage(),
-                                tr("Error"), JOptionPane.ERROR_MESSAGE);
-                    } else if(e.getCause() instanceof IOException) {
-                        JOptionPane.showMessageDialog(this,tr("Cannot connect to server.")+": "+e.getCause().getMessage(),
-                                tr("Error"), JOptionPane.ERROR_MESSAGE);
-                    }
-                } else {
-                    JOptionPane.showMessageDialog(this,tr("Error when communicating with server.")+": "+e.getMessage(),
-                            tr("Error"), JOptionPane.ERROR_MESSAGE);
-                }
-            }
-        }
+        if (! download) return;
+        Main.worker.submit(new DownloadTask());
     }
 }