Changeset 6973 in josm for trunk

Timestamp:

2014-04-12T20:15:09+02:00 (11 years ago)

Author:

bastiK

Message:

applied #9634 - Downloading Referrers Grabs Focus (patch by Balaitous, minor modifications)

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/DownloadPrimitiveAction.java (modified) (2 diffs)
• actions/downloadtasks/DownloadReferrersTask.java (modified) (2 diffs)
• gui/io/DownloadPrimitivesTask.java (modified) (3 diffs)
• gui/io/DownloadPrimitivesWithReferrersTask.java (added)
• io/remotecontrol/handler/LoadObjectHandler.java (modified) (3 diffs)

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

@@ -4 +4 @@
 import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
 import static org.openstreetmap.josm.tools.I18n.tr;
-import static org.openstreetmap.josm.tools.I18n.trn;
 
-import java.awt.Font;
-import java.awt.GridBagLayout;
 import java.awt.event.ActionEvent;
 import java.awt.event.KeyEvent;
-import java.lang.reflect.InvocationTargetException;
 import java.util.List;
-import java.util.Set;
-import java.util.TreeSet;
-
-import javax.swing.JLabel;
-import javax.swing.JOptionPane;
-import javax.swing.JPanel;
-import javax.swing.JScrollPane;
-import javax.swing.SwingUtilities;
 
 import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.actions.downloadtasks.DownloadReferrersTask;
-import org.openstreetmap.josm.data.osm.DataSet;
-import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.PrimitiveId;
-import org.openstreetmap.josm.gui.ExtendedDialog;
 import org.openstreetmap.josm.gui.download.DownloadObjectDialog;
-import org.openstreetmap.josm.gui.io.DownloadPrimitivesTask;
-import org.openstreetmap.josm.gui.layer.OsmDataLayer;
-import org.openstreetmap.josm.gui.widgets.HtmlPanel;
-import org.openstreetmap.josm.gui.widgets.JosmTextArea;
-import org.openstreetmap.josm.tools.GBC;
+import org.openstreetmap.josm.gui.io.DownloadPrimitivesWithReferrersTask;
+import org.openstreetmap.josm.gui.util.GuiHelper;
 import org.openstreetmap.josm.tools.Shortcut;
-import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -63 +43 @@
     /**
      * @param newLayer if the data should be downloaded into a new layer
-     * @param ids
+     * @param ids List of primitive id to download
      * @param downloadReferrers if the referrers of the object should be downloaded as well, i.e., parent relations, and for nodes, additionally, parent ways
      * @param full if the members of a relation should be downloaded as well
      */
     public static void processItems(boolean newLayer, final List<PrimitiveId> ids, boolean downloadReferrers, boolean full) {
-        OsmDataLayer layer = getEditLayer();
-        if ((layer == null) || newLayer) {
-            layer = new OsmDataLayer(new DataSet(), OsmDataLayer.createNewName(), null);
-            Main.main.addLayer(layer);
-        }
-        final DownloadPrimitivesTask task = new DownloadPrimitivesTask(layer, ids, full);
+        final DownloadPrimitivesWithReferrersTask task =
+                new DownloadPrimitivesWithReferrersTask(newLayer, ids, downloadReferrers, full, null);
         Main.worker.submit(task);
-
-        if (downloadReferrers) {
-            for (PrimitiveId id : ids) {
-                Main.worker.submit(new DownloadReferrersTask(layer, id));
-            }
-        }
-
-        Runnable showErrorsAndWarnings = new Runnable() {
+        Main.worker.submit(new Runnable() {
             @Override
             public void run() {
-                final Set<PrimitiveId> errs = task.getMissingPrimitives();
-                if (errs != null && !errs.isEmpty()) {
-                    try {
-                        SwingUtilities.invokeAndWait(new Runnable() {
-                            @Override
-                            public void run() {
-                                reportProblemDialog(errs,
-                                        trn("Object could not be downloaded", "Some objects could not be downloaded", errs.size()),
-                                        trn("One object could not be downloaded.<br>",
-                                            "{0} objects could not be downloaded.<br>",
-                                            errs.size(),
-                                            errs.size())
-                                        + tr("The server replied with response code 404.<br>"
-                                            + "This usually means, the server does not know an object with the requested id."),
-                                        tr("missing objects:"),
-                                        JOptionPane.ERROR_MESSAGE
-                                ).showDialog();
-                            }
-                        });
-                    } catch (InterruptedException ex) {
-                        Main.warn("InterruptedException while displaying error dialog");
-                    } catch (InvocationTargetException ex) {
-                        Main.warn(ex);
-                    }
-                }
-
-                final Set<PrimitiveId> del = new TreeSet<PrimitiveId>();
-                DataSet ds = getCurrentDataSet();
-                for (PrimitiveId id : ids) {
-                    OsmPrimitive osm = ds.getPrimitiveById(id);
-                    if (osm != null && osm.isDeleted()) {
-                        del.add(id);
-                    }
-                }
-                if (!del.isEmpty()) {
-                    SwingUtilities.invokeLater(new Runnable() {
+                final List<PrimitiveId> downloaded = task.getDownloadedId();
+                if(downloaded != null) {
+                    GuiHelper.runInEDT(new Runnable() {
                         @Override
                         public void run() {
-                            reportProblemDialog(del,
-                                    trn("Object deleted", "Objects deleted", del.size()),
-                                    trn(
-                                        "One downloaded object is deleted.",
-                                        "{0} downloaded objects are deleted.",
-                                        del.size(),
-                                        del.size()),
-                                    null,
-                                    JOptionPane.WARNING_MESSAGE
-                            ).showDialog();
+                            Main.main.getCurrentDataSet().setSelected(downloaded);
                         }
                     });
                 }
             }
-        };
-        Main.worker.submit(showErrorsAndWarnings);
-    }
-
-    private static ExtendedDialog reportProblemDialog(Set<PrimitiveId> errs,
-            String TITLE, String TEXT, String LIST_LABEL, int msgType) {
-        JPanel p = new JPanel(new GridBagLayout());
-        p.add(new HtmlPanel(TEXT), GBC.eop());
-        if (LIST_LABEL != null) {
-            JLabel missing = new JLabel(LIST_LABEL);
-            missing.setFont(missing.getFont().deriveFont(Font.PLAIN));
-            p.add(missing, GBC.eol());
-        }
-        JosmTextArea txt = new JosmTextArea();
-        txt.setFont(new Font("Monospaced", txt.getFont().getStyle(), txt.getFont().getSize()));
-        txt.setEditable(false);
-        txt.setBackground(p.getBackground());
-        txt.setColumns(40);
-        txt.setRows(1);
-        txt.setText(Utils.join(", ", errs));
-        JScrollPane scroll = new JScrollPane(txt);
-        p.add(scroll, GBC.eop().weight(1.0, 0.0).fill(GBC.HORIZONTAL));
-
-        return new ExtendedDialog(
-                Main.parent,
-                TITLE,
-                new String[] { tr("Ok") })
-            .setButtonIcons(new String[] { "ok" })
-            .setIcon(msgType)
-            .setContent(p, false);
+        });
     }
 }

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

@@ -131 +131 @@
      */
     public DownloadReferrersTask(OsmDataLayer targetLayer, PrimitiveId primitiveId) throws IllegalArgumentException {
-        super("Download referrers", false /* don't ignore exception*/);
+        this(targetLayer,  primitiveId, null);
+    }
+
+    /**
+     * constructor
+     *
+     * @param targetLayer the target layer. Must not be null.
+     * @param primitiveId a PrimitiveId object.
+     * @param progressMonitor ProgressMonitor to use or null to create a new one.
+     * @exception IllegalArgumentException thrown if id <= 0
+     * @exception IllegalArgumentException thrown if targetLayer == null
+     *
+     */
+    public DownloadReferrersTask(OsmDataLayer targetLayer, PrimitiveId primitiveId,
+            ProgressMonitor progressMonitor) throws IllegalArgumentException {
+        super("Download referrers", progressMonitor, false /* don't ignore exception*/);
         CheckParameterUtil.ensureParameterNotNull(targetLayer, "targetLayer");
         if (primitiveId.isNew())
@@ -168 +183 @@
                     public void run() {
                         targetLayer.onPostDownloadFromServer();
-                        Main.map.mapView.repaint();
+                        if(Main.map != null)
+                            Main.map.mapView.repaint();
                     }
                 }

trunk/src/org/openstreetmap/josm/gui/io/DownloadPrimitivesTask.java

@@ -9 +9 @@
 import java.util.Set;
 
+import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.AutoScaleAction;
 import org.openstreetmap.josm.data.osm.DataSet;
@@ -52 +53 @@
      */
     public DownloadPrimitivesTask(OsmDataLayer layer, List<PrimitiveId> ids, boolean fullRelation) throws IllegalArgumentException {
-        super(tr("Download objects"), false /* don't ignore exception */);
+        this(layer, ids, fullRelation, null);
+    }
+
+    /**
+     * Creates the  task
+     *
+     * @param layer the layer in which primitives are updated. Must not be null.
+     * @param ids a collection of primitives to update from the server. Set to
+     *     the empty collection if null.
+     * @param fullRelation true if a full download is required, i.e.,
+     *     a download including the immediate children of a relation.
+     * @param progressMonitor ProgressMonitor to use or null to create a new one.
+     * @throws IllegalArgumentException thrown if layer is null.
+     */
+    public DownloadPrimitivesTask(OsmDataLayer layer, List<PrimitiveId> ids, boolean fullRelation,
+            ProgressMonitor progessMonitor) throws IllegalArgumentException {
+        super(tr("Download objects"), progessMonitor, false /* don't ignore exception */);
         ensureParameterNotNull(layer, "layer");
         this.ids = ids;
@@ -84 +101 @@
             public void run() {
                 layer.mergeFrom(ds);
-                AutoScaleAction.zoomTo(ds.allPrimitives());
+                if(Main.map != null)
+                    AutoScaleAction.zoomTo(ds.allPrimitives());
                 layer.onPostDownloadFromServer();
             }

trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/LoadObjectHandler.java

@@ -8 +8 @@
 
 import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.actions.DownloadPrimitiveAction;
 import org.openstreetmap.josm.data.osm.PrimitiveId;
 import org.openstreetmap.josm.data.osm.SimplePrimitiveId;
+import org.openstreetmap.josm.gui.io.DownloadPrimitivesWithReferrersTask;
 import org.openstreetmap.josm.gui.util.GuiHelper;
 import org.openstreetmap.josm.io.remotecontrol.AddTagsDialog;
@@ -33 +33 @@
         return new String[]{"objects"};
     }
-    
+
     @Override
     public String[] getOptionalParams() {
@@ -61 +61 @@
             final boolean relationMembers = Boolean.parseBoolean(args.get("relation_members"));
             final boolean referrers = args.containsKey("referrers") ? Boolean.parseBoolean(args.get("referrers")) : true;
-            GuiHelper.runInEDTAndWait(new Runnable() {
-                @Override public void run() {
-                    DownloadPrimitiveAction.processItems(newLayer, ps, referrers, relationMembers);
-                }
-            });
-            GuiHelper.executeByMainWorkerInEDT(new Runnable() {
+            final DownloadPrimitivesWithReferrersTask task = new DownloadPrimitivesWithReferrersTask(
+                    newLayer, ps, referrers, relationMembers, null);
+            Main.worker.submit(task);
+            Main.worker.submit(new Runnable() {
                 @Override
                 public void run() {
-                    Main.main.getCurrentDataSet().setSelected(ps);
+                    final List<PrimitiveId> downloaded = task.getDownloadedId();
+                    if(downloaded != null) {
+                        GuiHelper.runInEDT(new Runnable() {
+                            @Override
+                            public void run() {
+                                Main.main.getCurrentDataSet().setSelected(downloaded);
+                            }
+                        });
+                    }
                     AddTagsDialog.addTags(args, sender);
                     ps.clear();