Changeset 2689

Timestamp:

28.12.2009 00:16:04 (8 months ago)

Author:

Gubaer

Message:

new: Changeset Cache Manager for querying, downloading, browsing, and managing changesets within JOSM. See also Changeset Manager and Changeset Query Dialog

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• DefaultNameFormatter.java (modified) (3 diffs)
• JosmUserIdentityManager.java (added)
• MainMenu.java (modified) (2 diffs)
• OsmPrimitivRenderer.java (modified) (6 diffs)
• PleaseWaitRunnable.java (modified) (3 diffs)
• dialogs/ChangesetDialog.java (modified) (10 diffs)
• dialogs/changeset/ChangesetCacheManager.java (added)
• dialogs/changeset/ChangesetCacheManagerModel.java (added)
• dialogs/changeset/ChangesetCacheSortSpecification.java (added)
• dialogs/changeset/ChangesetCacheTableCellRenderer.java (added)
• dialogs/changeset/ChangesetCacheTableColumnModel.java (added)
• dialogs/changeset/ChangesetContentDownloadTask.java (added)
• dialogs/changeset/ChangesetContentPanel.java (added)
• dialogs/changeset/ChangesetContentTableCellRenderer.java (added)
• dialogs/changeset/ChangesetContentTableColumnModel.java (added)
• dialogs/changeset/ChangesetContentTableModel.java (added)
• dialogs/changeset/ChangesetDetailPanel.java (added)
• dialogs/changeset/ChangesetDownloadTask.java (added)
• dialogs/changeset/ChangesetHeaderDownloadTask.java (moved) (moved from trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/DownloadChangesetsTask.java) (6 diffs)
• dialogs/changeset/ChangesetInSelectionListModel.java (modified) (2 diffs)
• dialogs/changeset/ChangesetTagsPanel.java (added)
• dialogs/changeset/ChangesetsInActiveDataLayerListModel.java (modified) (4 diffs)
• dialogs/changeset/SingleChangesetDownloadPanel.java (added)
• dialogs/changeset/query (added)
• dialogs/changeset/query/AdvancedChangesetQueryPanel.java (added)
• dialogs/changeset/query/BasicChangesetQueryPanel.java (added)
• dialogs/changeset/query/ChangesetQueryDialog.java (added)
• dialogs/changeset/query/ChangesetQueryTask.java (added)
• dialogs/changeset/query/UrlBasedQueryPanel.java (added)
• download/SlippyMapChooser.java (modified) (2 diffs)
• history/HistoryLoadTask.java (modified) (3 diffs)
• io/DownloadOpenChangesetsTask.java (modified) (1 diff)

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

@@ -20 +20 @@
 import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.data.osm.Way;
+import org.openstreetmap.josm.data.osm.history.HistoryNameFormatter;
+import org.openstreetmap.josm.data.osm.history.HistoryNode;
+import org.openstreetmap.josm.data.osm.history.HistoryOsmPrimitive;
+import org.openstreetmap.josm.data.osm.history.HistoryRelation;
+import org.openstreetmap.josm.data.osm.history.HistoryWay;
 
 /**
@@ -25 +30 @@
  *
  */
-public class DefaultNameFormatter implements NameFormatter {
+public class DefaultNameFormatter implements NameFormatter, HistoryNameFormatter {
 
     static private DefaultNameFormatter instance;
@@ -238 +243 @@
         return sb.toString();
     }
+
+
+    /**
+     * Decorates the name of primitive with its id, if the preference
+     * <tt>osm-primitives.showid</tt> is set.
+     * 
+     * The id is append to the {@see StringBuilder} passed in in <code>name</code>.
+     *
+     * @param name  the name without the id
+     * @param primitive the primitive
+     */
+    protected void decorateNameWithId(StringBuilder name, HistoryOsmPrimitive primitive) {
+        if (Main.pref.getBoolean("osm-primitives.showid")) {
+            name.append(tr(" [id: {0}]", primitive.getId()));
+        }
+    }
+
+
+    /**
+     * Formats a name for a history node
+     *
+     * @param node the node
+     * @return the name
+     */
+    public String format(HistoryNode node) {
+        StringBuilder sb = new StringBuilder();
+        String name;
+        if (Main.pref.getBoolean("osm-primitives.localize-name", true)) {
+            name = node.getLocalName();
+        } else {
+            name = node.getName();
+        }
+        if (name == null) {
+            sb.append(node.getId());
+        } else {
+            sb.append(name);
+        }
+        sb.append(" (")
+        .append(node.getCoords().latToString(CoordinateFormat.getDefaultFormat()))
+        .append(", ")
+        .append(node.getCoords().lonToString(CoordinateFormat.getDefaultFormat()))
+        .append(")");
+        decorateNameWithId(sb, node);
+        return sb.toString();
+    }
+
+    /**
+     * Formats a name for a way
+     *
+     * @param way the way
+     * @return the name
+     */
+    public String format(HistoryWay way) {
+        StringBuilder sb = new StringBuilder();
+        String name;
+        if (Main.pref.getBoolean("osm-primitives.localize-name", true)) {
+            name = way.getLocalName();
+        } else {
+            name = way.getName();
+        }
+        if (name != null) {
+            sb.append(name);
+        }
+        if (sb.length() == 0 && way.get("ref") != null) {
+            sb.append(way.get("ref"));
+        }
+        if (sb.length() == 0) {
+            sb.append(
+                    (way.get("highway") != null) ? tr("highway") :
+                        (way.get("railway") != null) ? tr("railway") :
+                            (way.get("waterway") != null) ? tr("waterway") :
+                                (way.get("landuse") != null) ? tr("landuse") : ""
+            );
+        }
+
+        int nodesNo = way.isClosed() ? way.getNumNodes() -1 : way.getNumNodes();
+        String nodes = trn("{0} node", "{0} nodes", nodesNo, nodesNo);
+        sb.append((sb.length() > 0) ? " ("+nodes+")" : nodes);
+        decorateNameWithId(sb, way);
+        return sb.toString();
+    }
+
+
+    /**
+     * Formats a name for a {@see HistoryRelation})
+     *
+     * @param relation the relation
+     * @return the name
+     */
+    public String format(HistoryRelation relation) {
+        StringBuilder sb = new StringBuilder();
+        if (relation.get("type") != null) {
+            sb.append(relation.get("type"));
+        } else {
+            sb.append(tr("relation"));
+        }
+        sb.append(" (");
+        String nameTag = null;
+        Set<String> namingTags = new HashSet<String>(getNamingtagsForRelations());
+        for (String n : relation.getTags().keySet()) {
+            // #3328: "note " and " note" are name tags too
+            if (namingTags.contains(n.trim())) {
+                if (Main.pref.getBoolean("osm-primitives.localize-name", true)) {
+                    nameTag = relation.getLocalName();
+                } else {
+                    nameTag = relation.getName();
+                }
+                if (nameTag == null) {
+                    nameTag = relation.get(n);
+                }
+            }
+            if (nameTag != null) {
+                break;
+            }
+        }
+        if (nameTag == null) {
+            sb.append(Long.toString(relation.getId())).append(", ");
+        } else {
+            sb.append("\"").append(nameTag).append("\", ");
+        }
+
+        int mbno = relation.getNumMembers();
+        sb.append(trn("{0} member", "{0} members", mbno, mbno)).append(")");
+
+        decorateNameWithId(sb, relation);
+        return sb.toString();
+    }
+
+    /**
+     * Builds a default tooltip text for an HistoryOsmPrimitive <code>primitive</code>.
+     * 
+     * @param primitive the primitmive
+     * @return the tooltip text
+     */
+    public String buildDefaultToolTip(HistoryOsmPrimitive primitive) {
+        StringBuilder sb = new StringBuilder();
+        sb.append("<html>");
+        sb.append("<strong>id</strong>=")
+        .append(primitive.getId())
+        .append("<br>");
+        ArrayList<String> keyList = new ArrayList<String>(primitive.getTags().keySet());
+        Collections.sort(keyList);
+        for (int i = 0; i < keyList.size(); i++) {
+            if (i > 0) {
+                sb.append("<br>");
+            }
+            String key = keyList.get(i);
+            sb.append("<strong>")
+            .append(key)
+            .append("</strong>")
+            .append("=");
+            String value = primitive.get(key);
+            while(value.length() != 0) {
+                sb.append(value.substring(0,Math.min(50, value.length())));
+                if (value.length() > 50) {
+                    sb.append("<br>");
+                    value = value.substring(50);
+                } else {
+                    value = "";
+                }
+            }
+        }
+        sb.append("</html>");
+        return sb.toString();
+    }
 }

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

@@ -21 +21 @@
 import org.openstreetmap.josm.actions.AlignInLineAction;
 import org.openstreetmap.josm.actions.AutoScaleAction;
+import org.openstreetmap.josm.actions.ChangesetManagerToggleAction;
 import org.openstreetmap.josm.actions.CloseChangesetAction;
 import org.openstreetmap.josm.actions.CombineWayAction;
@@ -251 +252 @@
         add(viewMenu, new ZoomOutAction());
         viewMenu.addSeparator();
-        for (String mode : AutoScaleAction.modes) {
+        for (String mode : AutoScaleAction.MODES) {
             JosmAction autoScaleAction = new AutoScaleAction(mode);
             add(viewMenu, autoScaleAction);
         }
+
+        // -- changeset manager toggle action
+        ChangesetManagerToggleAction changesetManagerToggleAction = new ChangesetManagerToggleAction();
+        final JCheckBoxMenuItem mi = new JCheckBoxMenuItem(changesetManagerToggleAction);
+        viewMenu.addSeparator();
+        viewMenu.add(mi);
+        mi.setAccelerator(changesetManagerToggleAction.getShortcut().getKeyStroke());
+        changesetManagerToggleAction.addButtonModel(mi.getModel());
 
         // -- fullscreen toggle action

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

@@ -3 +3 @@
 
 import java.awt.Component;
-import java.util.ArrayList;
-import java.util.Collections;
 
 import javax.swing.DefaultListCellRenderer;
@@ -15 +13 @@
 
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
-import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
+import org.openstreetmap.josm.data.osm.history.HistoryOsmPrimitive;
 import org.openstreetmap.josm.tools.ImageProvider;
 
@@ -27 +25 @@
  */
 public class OsmPrimitivRenderer implements ListCellRenderer, TableCellRenderer {
+    private DefaultNameFormatter formatter = new DefaultNameFormatter();
+
     /**
      * Default list cell renderer - delegate for ListCellRenderer operation
@@ -50 +50 @@
     public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) {
         Component def = defaultTableCellRenderer.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column);
-        return renderer(def, (OsmPrimitive) value);
+        if (value instanceof OsmPrimitive)
+            return renderer(def, (OsmPrimitive) value);
+        else if (value instanceof HistoryOsmPrimitive)
+            return renderer(def, (HistoryOsmPrimitive) value);
+        else
+            return def;
     }
 
@@ -63 +68 @@
         if (def != null && value != null && def instanceof JLabel) {
             ((JLabel)def).setText(value.getDisplayName(DefaultNameFormatter.getInstance()));
-            ((JLabel)def).setIcon(ImageProvider.get(OsmPrimitiveType.from(value)));
-            ((JLabel)def).setToolTipText(buildToolTipText(value));
+            ((JLabel)def).setIcon(ImageProvider.get(value.getType()));
+            ((JLabel)def).setToolTipText(formatter.buildDefaultToolTip(value));
         }
         return def;
@@ -70 +75 @@
 
     /**
-     * build the tool tip text for an {@see OsmPrimitive}. It consist of the formatted
-     * key/value pairs for this primitive.
-     *
-     * @param primitive
-     * @return the tool tip text
+     * Internal method that stuffs information into the rendering component
+     * provided that it's a kind of JLabel.
+     * @param def the rendering component
+     * @param value the HistoryOsmPrimtive to render
+     * @return the modified rendering component
      */
-    public String buildToolTipText(OsmPrimitive primitive) {
-        StringBuilder sb = new StringBuilder();
-
-        sb.append("<html>");
-        // show the id
-        //
-        sb.append("<strong>id</strong>=")
-        .append(primitive.getId())
-        .append("<br>");
-
-        // show the key/value-pairs, sorted by key
-        //
-        ArrayList<String> keyList = new ArrayList<String>(primitive.keySet());
-        Collections.sort(keyList);
-        for (int i = 0; i < keyList.size(); i++) {
-            if (i > 0) {
-                sb.append("<br>");
-            }
-            String key = keyList.get(i);
-            sb.append("<strong>")
-            .append(key)
-            .append("</strong>")
-            .append("=");
-            // make sure long values are split into several rows. Otherwise
-            // the tool tip window can become to wide
-            //
-            String value = primitive.get(key);
-            while(value.length() != 0) {
-                sb.append(value.substring(0,Math.min(50, value.length())));
-                if (value.length() > 50) {
-                    sb.append("<br>");
-                    value = value.substring(50);
-                } else {
-                    value = "";
-                }
-            }
+    private Component renderer(Component def, HistoryOsmPrimitive value) {
+        if (def != null && value != null && def instanceof JLabel) {
+            ((JLabel)def).setText(value.getDisplayName(DefaultNameFormatter.getInstance()));
+            ((JLabel)def).setIcon(ImageProvider.get(value.getType()));
+            ((JLabel)def).setToolTipText(formatter.buildDefaultToolTip(value));
         }
-        sb.append("</html>");
-        return sb.toString();
+        return def;
     }
 }

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

@@ -2 +2 @@
 package org.openstreetmap.josm.gui;
 
+import java.awt.Component;
 import java.awt.EventQueue;
 import java.io.IOException;
@@ -12 +13 @@
 import org.openstreetmap.josm.gui.progress.ProgressMonitor.CancelListener;
 import org.openstreetmap.josm.io.OsmTransferException;
+import org.openstreetmap.josm.tools.CheckParameterUtil;
 import org.xml.sax.SAXException;
 
@@ -46 +48 @@
     public PleaseWaitRunnable(String title, boolean ignoreException) {
         this(title, new PleaseWaitProgressMonitor(title), ignoreException);
+    }
+
+    /**
+     * Create the runnable object with a given message for the user
+     *
+     * @param parent the parent component for the please wait dialog. Must not be null.
+     * @param title message for the user
+     * @param ignoreException If true, exception will be propagated to calling code. If false then
+     * exception will be thrown directly in EDT. When this runnable is executed using executor framework
+     * then use false unless you read result of task (because exception will get lost if you don't)
+     * @throws IllegalArgumentException thrown if parent is null
+     */
+    public PleaseWaitRunnable(Component parent, String title, boolean ignoreException) throws IllegalArgumentException{
+        CheckParameterUtil.ensureParameterNotNull(parent, "parent");
+        this.title = title;
+        this.progressMonitor = new PleaseWaitProgressMonitor(parent, title);
+        this.ignoreException = ignoreException;
     }
 

trunk/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java

@@ -6 +6 @@
 import java.awt.BorderLayout;
 import java.awt.FlowLayout;
+import java.awt.Frame;
 import java.awt.event.ActionEvent;
 import java.awt.event.ItemEvent;
@@ -11 +12 @@
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
+import java.util.Collection;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Future;
 
 import javax.swing.AbstractAction;
@@ -37 +41 @@
 import org.openstreetmap.josm.gui.MapFrame;
 import org.openstreetmap.josm.gui.MapView;
+import org.openstreetmap.josm.gui.dialogs.changeset.ChangesetCacheManager;
+import org.openstreetmap.josm.gui.dialogs.changeset.ChangesetHeaderDownloadTask;
 import org.openstreetmap.josm.gui.dialogs.changeset.ChangesetInSelectionListModel;
 import org.openstreetmap.josm.gui.dialogs.changeset.ChangesetListCellRenderer;
 import org.openstreetmap.josm.gui.dialogs.changeset.ChangesetListModel;
 import org.openstreetmap.josm.gui.dialogs.changeset.ChangesetsInActiveDataLayerListModel;
-import org.openstreetmap.josm.gui.dialogs.changeset.DownloadChangesetsTask;
 import org.openstreetmap.josm.gui.help.HelpUtil;
 import org.openstreetmap.josm.gui.io.CloseChangesetTask;
+import org.openstreetmap.josm.gui.widgets.PopupMenuLauncher;
+import org.openstreetmap.josm.tools.BugReportExceptionHandler;
 import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.OpenBrowser;
@@ -75 +82 @@
     private ShowChangesetInfoAction showChangsetInfoAction;
     private CloseOpenChangesetsAction closeChangesetAction;
+    private LaunchChangesetManagerAction launchChangesetManagerAction;
 
 
@@ -93 +101 @@
         lstInActiveDataLayer.setCellRenderer(new ChangesetListCellRenderer());
 
-        ChangesetCache.getInstance().addChangesetCacheListener(inSelectionModel);
-        MapView.addLayerChangeListener(inSelectionModel);
-        DataSet.selListeners.add(inSelectionModel);
-
-        ChangesetCache.getInstance().addChangesetCacheListener(inActiveDataLayerModel);
-
         DblClickHandler dblClickHandler = new DblClickHandler();
         lstInSelection.addMouseListener(dblClickHandler);
         lstInActiveDataLayer.addMouseListener(dblClickHandler);
 
-        PopupMenuLauncher popupMenuLauncher = new PopupMenuLauncher();
+        ChangesetPopupMenuLauncher popupMenuLauncher = new ChangesetPopupMenuLauncher();
         lstInSelection.addMouseListener(popupMenuLauncher);
         lstInActiveDataLayer.addMouseListener(popupMenuLauncher);
     }
 
+    protected void registerAsListener() {
+        // let the model for changesets in the current selection listen to various
+        // events
+        ChangesetCache.getInstance().addChangesetCacheListener(inSelectionModel);
+        MapView.addEditLayerChangeListener(inSelectionModel);
+        DataSet.selListeners.add(inSelectionModel);
+
+
+        // let the model for changesets in the current layer listen to various
+        // events and bootstrap it's content
+        ChangesetCache.getInstance().addChangesetCacheListener(inActiveDataLayerModel);
+        MapView.addEditLayerChangeListener(inActiveDataLayerModel);
+        if (Main.main.getEditLayer() != null) {
+            Main.main.getEditLayer().data.addDataSetListener(inActiveDataLayerModel);
+            inActiveDataLayerModel.initFromDataSet(Main.main.getEditLayer().data);
+            inSelectionModel.initFromPrimitives(Main.main.getEditLayer().data.getSelected());
+        }
+    }
+
+    protected void unregisterAsListener() {
+        // remove the list model for the current edit layer as listener
+        //
+        ChangesetCache.getInstance().removeChangesetCacheListener(inActiveDataLayerModel);
+        MapView.removeEditLayerChangeListener(inActiveDataLayerModel);
+        if (Main.main.getEditLayer() != null) {
+            Main.main.getEditLayer().data.removeDataSetListener(inActiveDataLayerModel);
+        }
+
+        // remove the list model for the changesets in the current selection as
+        // listener
+        //
+        MapView.removeEditLayerChangeListener(inSelectionModel);
+        DataSet.selListeners.remove(inSelectionModel);
+    }
+
     @Override
     public void tearDown() {
-        ChangesetCache.getInstance().removeChangesetCacheListener(inActiveDataLayerModel);
-        MapView.removeLayerChangeListener(inSelectionModel);
-        DataSet.selListeners.remove(inSelectionModel);
+        unregisterAsListener();
     }
 
     @Override
     public void showNotify() {
+        registerAsListener();
         DatasetEventManager.getInstance().addDatasetListener(inActiveDataLayerModel, true);
     }
@@ -122 +158 @@
     @Override
     public void hideNotify() {
+        unregisterAsListener();
         DatasetEventManager.getInstance().removeDatasetListener(inActiveDataLayerModel);
     }
@@ -179 +216 @@
         lstInActiveDataLayer.getSelectionModel().addListSelectionListener(showChangsetInfoAction);
         lstInSelection.getSelectionModel().addListSelectionListener(showChangsetInfoAction);
+
+        // -- launch changeset manager action
+        launchChangesetManagerAction = new LaunchChangesetManagerAction();
+        tp.add(launchChangesetManagerAction);
+        cbInSelectionOnly.addItemListener(launchChangesetManagerAction);
+        lstInActiveDataLayer.getSelectionModel().addListSelectionListener(launchChangesetManagerAction);
+        lstInSelection.getSelectionModel().addListSelectionListener(launchChangesetManagerAction);
 
         pnl.add(tp);
@@ -334 +378 @@
             if (sel.isEmpty())
                 return;
-            DownloadChangesetsTask task = new DownloadChangesetsTask(sel);
+            ChangesetHeaderDownloadTask task = new ChangesetHeaderDownloadTask(sel);
             Main.worker.submit(task);
         }
@@ -424 +468 @@
     }
 
-    class PopupMenuLauncher extends MouseAdapter {
-        protected void showPopup(MouseEvent evt) {
-            if (!evt.isPopupTrigger())
-                return;
+    /**
+     * Show information about the currently selected changesets
+     * 
+     */
+    class LaunchChangesetManagerAction extends AbstractAction implements ListSelectionListener, ItemListener {
+        public LaunchChangesetManagerAction() {
+            putValue(NAME, tr("Details"));
+            putValue(SHORT_DESCRIPTION, tr("Opens the Changeset Manager window for the selected changesets"));
+            putValue(SMALL_ICON, ImageProvider.get("dialogs/changeset", "changesetmanager"));
+            updateEnabledState();
+        }
+
+        protected void launchChangesetManager(Collection<Integer> toSelect) {
+            ChangesetCacheManager cm = ChangesetCacheManager.getInstance();
+            if (cm.isVisible()) {
+                cm.setExtendedState(Frame.NORMAL);
+                cm.toFront();
+                cm.requestFocus();
+            } else {
+                cm.setVisible(true);
+                cm.toFront();
+                cm.requestFocus();
+            }
+            cm.setSelectedChangesetsById(toSelect);
+        }
+
+        public void actionPerformed(ActionEvent arg0) {
+            ChangesetListModel model = getCurrentChangesetListModel();
+            Set<Integer> sel = model.getSelectedChangesetIds();
+            if (sel.isEmpty())
+                return;
+            final Set<Integer> toDownload = new HashSet<Integer>();
+            ChangesetCache cc = ChangesetCache.getInstance();
+            for (int id: sel) {
+                if (!cc.contains(id)) {
+                    toDownload.add(id);
+                }
+            }
+
+            final ChangesetHeaderDownloadTask task;
+            final Future<?> future;
+            if (toDownload.isEmpty()) {
+                task = null;
+                future = null;
+            } else {
+                task = new ChangesetHeaderDownloadTask(toDownload);
+                future = Main.worker.submit(task);
+            }
+
+            Runnable r = new Runnable() {
+                public void run() {
+                    // first, wait for the download task to finish, if a download
+                    // task was launched
+                    if (future != null) {
+                        try {
+                            future.get();
+                        } catch(InterruptedException e) {
+                            e.printStackTrace();
+                        } catch(ExecutionException e){
+                            e.printStackTrace();
+                            BugReportExceptionHandler.handleException(e.getCause());
+                            return;
+                        }
+                    }
+                    if (task != null) {
+                        if (task.isCanceled())
+                            // don't launch the changeset manager if the download task
+                            // was canceled
+                            return;
+                        if (task.isFailed()) {
+                            toDownload.clear();
+                        }
+                    }
+                    // launch the task
+                    launchChangesetManager(toDownload);
+                }
+            };
+            Main.worker.submit(r);
+        }
+
+        protected void updateEnabledState() {
+            setEnabled(getCurrentChangesetList().getSelectedIndices().length > 0);
+        }
+
+        public void itemStateChanged(ItemEvent arg0) {
+            updateEnabledState();
+        }
+
+        public void valueChanged(ListSelectionEvent e) {
+            updateEnabledState();
+        }
+    }
+
+
+    class ChangesetPopupMenuLauncher extends PopupMenuLauncher {
+        @Override
+        public void launch(MouseEvent evt) {
             JList lst = getCurrentChangesetList();
             if (lst.getSelectedIndices().length == 0) {
@@ -438 +575 @@
             popup.show(lst, evt.getX(), evt.getY());
 
-        }
-        @Override
-        public void mouseClicked(MouseEvent evt) {
-            showPopup(evt);
-        }
-        @Override
-        public void mousePressed(MouseEvent evt) {
-            showPopup(evt);
-        }
-        @Override
-        public void mouseReleased(MouseEvent evt) {
-            showPopup(evt);
         }
     }

trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetHeaderDownloadTask.java

@@ -4 +4 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
+import java.awt.Component;
 import java.io.IOException;
+import java.lang.reflect.InvocationTargetException;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.HashSet;
-import java.util.List;
 import java.util.Set;
 
 import javax.swing.SwingUtilities;
 
+import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.osm.Changeset;
 import org.openstreetmap.josm.data.osm.ChangesetCache;
@@ -18 +21 @@
 import org.openstreetmap.josm.io.OsmServerChangesetReader;
 import org.openstreetmap.josm.io.OsmTransferException;
+import org.openstreetmap.josm.tools.BugReportExceptionHandler;
+import org.openstreetmap.josm.tools.CheckParameterUtil;
+import org.openstreetmap.josm.tools.ExceptionUtil;
 import org.xml.sax.SAXException;
 
-public class DownloadChangesetsTask extends PleaseWaitRunnable{
+/**
+ * This is an asynchronous task for downloading a collection of changests from the OSM
+ * server.
+ * 
+ * The  task only downloads the changeset properties without the changeset content. It
+ * updates the global {@see ChangesetCache}.
+ * 
+ */
+public class ChangesetHeaderDownloadTask extends PleaseWaitRunnable implements ChangesetDownloadTask{
+
+    /**
+     * Builds a download task from for a collection of changesets.
+     * 
+     * Ignores null values and changesets with {@see Changeset#isNew()} == true.
+     * 
+     * @param changesets the collection of changesets. Assumes an empty collection if null.
+     * @return the download task
+     */
+    static public ChangesetHeaderDownloadTask buildTaskForChangesets(Collection<Changeset> changesets) {
+        return buildTaskForChangesets(Main.parent, changesets);
+    }
+
+    /**
+     * Builds a download task from for a collection of changesets.
+     * 
+     * Ignores null values and changesets with {@see Changeset#isNew()} == true.
+     * 
+     * @param parent the parent component relative to which the {@see PleaseWaitDialog} is displayed.
+     * Must not be null.
+     * @param changesets the collection of changesets. Assumes an empty collection if null.
+     * @return the download task
+     * @throws IllegalArgumentException thrown if parent is null
+     */
+    static public ChangesetHeaderDownloadTask buildTaskForChangesets(Component parent, Collection<Changeset> changesets) {
+        CheckParameterUtil.ensureParameterNotNull(parent, "parent");
+        if (changesets == null) {
+            changesets = Collections.emptyList();
+        }
+
+        HashSet<Integer> ids = new HashSet<Integer>();
+        for (Changeset cs: changesets) {
+            if (cs == null || cs.isNew()) {
+                continue;
+            }
+            ids.add(cs.getId());
+        }
+        if (parent == null)
+            return new ChangesetHeaderDownloadTask(ids);
+        else
+            return new ChangesetHeaderDownloadTask(parent, ids);
+
+    }
+
 
     private Set<Integer> idsToDownload;
     private OsmServerChangesetReader reader;
-    private boolean cancelled;
+    private boolean canceled;
     private Exception lastException;
-    private List<Changeset> downloadedChangesets;
-
-    public DownloadChangesetsTask(Collection<Integer> ids) {
-        super(tr("Download changesets"));
+    private Set<Changeset> downloadedChangesets;
+
+    protected void init(Collection<Integer> ids) {
+        if (ids == null) {
+            ids = Collections.emptyList();
+        }
         idsToDownload = new HashSet<Integer>();
         if (ids == null ||  ids.isEmpty())
@@ -41 +101 @@
     }
 
+    /**
+     * Creates the download task for a collection of changeset ids. Uses a {@see PleaseWaitDialog}
+     * whose parent is {@see Main#parent}.
+     * 
+     * Null ids or or ids <= 0 in the id collection are ignored.
+     * 
+     * @param ids the collection of ids. Empty collection assumed if null.
+     */
+    public ChangesetHeaderDownloadTask(Collection<Integer> ids) {
+        // parent for dialog is Main.parent
+        super(tr("Download changesets"), false /* don't ignore exceptions */);
+        init(ids);
+    }
+
+    /**
+     * Creates the download task for a collection of changeset ids. Uses a {@see PleaseWaitDialog}
+     * whose parent is the parent window of <code>dialogParent</code>.
+     * 
+     * Null ids or or ids <= 0 in the id collection are ignored.
+     * 
+     * @param dialogParent the parent reference component for the {@see PleaseWaitDialog}. Must not be null.
+     * @param ids the collection of ids. Empty collection assumed if null.
+     * @throws IllegalArgumentException thrown if dialogParent is null
+     */
+    public ChangesetHeaderDownloadTask(Component dialogParent, Collection<Integer> ids) throws IllegalArgumentException{
+        super(dialogParent,tr("Download changesets"), false /* don't ignore exceptions */);
+        init(ids);
+    }
+
     @Override
     protected void cancel() {
-        cancelled = true;
+        canceled = true;
         synchronized (this) {
             if (reader != null) {
@@ -53 +142 @@
     @Override
     protected void finish() {
-        if (cancelled)
+        if (canceled)
             return;
         if (lastException != null) {
@@ -67 +156 @@
             r.run();
         } else {
-            SwingUtilities.invokeLater(r);
+            try {
+                SwingUtilities.invokeAndWait(r);
+            } catch(InterruptedException e) {
+                e.printStackTrace();
+            } catch(InvocationTargetException e) {
+                Throwable t = e.getTargetException();
+                if (t instanceof RuntimeException) {
+                    BugReportExceptionHandler.handleException(t);
+                } else if (t instanceof Exception){
+                    ExceptionUtil.explainException(e);
+                } else {
+                    BugReportExceptionHandler.handleException(t);
+                }
+            }
         }
     }
@@ -77 +179 @@
                 reader = new OsmServerChangesetReader();
             }
-            downloadedChangesets = reader.readChangesets(idsToDownload, getProgressMonitor().createSubTaskMonitor(0, false));
-        } catch(Exception e) {
-            if (cancelled)
+            downloadedChangesets = new HashSet<Changeset>();
+            downloadedChangesets.addAll(reader.readChangesets(idsToDownload, getProgressMonitor().createSubTaskMonitor(0, false)));
+        } catch(OsmTransferException e) {
+            if (canceled)
                 // ignore exception if cancelled
                 return;
-            if (e instanceof RuntimeException)
-                throw (RuntimeException)e;
+            // remember other exceptions
             lastException = e;
         }
     }
+
+    /* ------------------------------------------------------------------------------- */
+    /* interface ChangesetDownloadTask                                                 */
+    /* ------------------------------------------------------------------------------- */
+    public Set<Changeset> getDownloadedChangesets() {
+        return downloadedChangesets;
+    }
+
+    public boolean isCanceled() {
+        return canceled;
+    }
+
+    public boolean isFailed() {
+        return lastException != null;
+    }
 }

trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetInSelectionListModel.java

@@ -8 +8 @@
 import org.openstreetmap.josm.data.SelectionChangedListener;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
-import org.openstreetmap.josm.gui.MapView;
-import org.openstreetmap.josm.gui.layer.Layer;
+import org.openstreetmap.josm.gui.MapView.EditLayerChangeListener;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 
-public class ChangesetInSelectionListModel extends ChangesetListModel implements SelectionChangedListener, MapView.LayerChangeListener{
+public class ChangesetInSelectionListModel extends ChangesetListModel implements SelectionChangedListener, EditLayerChangeListener{
 
     public ChangesetInSelectionListModel(DefaultListSelectionModel selectionModel) {
@@ -24 +23 @@
     }
 
+
     /* ---------------------------------------------------------------------------- */
     /* Interface LayerChangeListener                                                */
     /* ---------------------------------------------------------------------------- */
-    public void activeLayerChange(Layer oldLayer, Layer newLayer) {
-        if (newLayer == null || ! (newLayer instanceof OsmDataLayer)) {
+    public void editLayerChanged(OsmDataLayer oldLayer, OsmDataLayer newLayer) {
+        if (newLayer == null) {
             setChangesets(null);
         } else {
-            initFromPrimitives(((OsmDataLayer) newLayer).data.getSelected());
+            initFromPrimitives((newLayer).data.getSelected());
         }
     }
-    public void layerAdded(Layer newLayer) {}
-    public void layerRemoved(Layer oldLayer) {}
 }

trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetsInActiveDataLayerListModel.java

@@ -16 +16 @@
 import org.openstreetmap.josm.data.osm.event.TagsChangedEvent;
 import org.openstreetmap.josm.data.osm.event.WayNodesChangedEvent;
+import org.openstreetmap.josm.gui.MapView.EditLayerChangeListener;
+import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 
-public class ChangesetsInActiveDataLayerListModel extends ChangesetListModel implements DataSetListener  {
+/**
+ * This is the list model for the list of changeset in the current edit layer.
+ * 
+ */
+public class ChangesetsInActiveDataLayerListModel extends ChangesetListModel implements DataSetListener, EditLayerChangeListener {
 
     public ChangesetsInActiveDataLayerListModel(DefaultListSelectionModel selectionModel) {
@@ -23 +29 @@
     }
 
+    /* ------------------------------------------------------------------------------ */
+    /* interface DataSetListener                                                      */
+    /* ------------------------------------------------------------------------------ */
     public void dataChanged(DataChangedEvent event) {
-        initFromPrimitives(event.getPrimitives());
+        initFromDataSet(event.getDataset());
     }
-
-    public void nodeMoved(NodeMovedEvent event) {/* ignored */}
 
     public void primtivesAdded(PrimitivesAddedEvent event) {
@@ -41 +48 @@
     }
 
-    public void relationMembersChanged(RelationMembersChangedEvent event) {/* ignored */}
-
-    public void tagsChanged(TagsChangedEvent event) {/* ignored */}
-
     public void otherDatasetChange(AbstractDatasetChangedEvent event) {
         if (event instanceof ChangesetIdChangedEvent) {
@@ -53 +56 @@
     }
 
+    public void nodeMoved(NodeMovedEvent event) {/* ignored */}
+
+    public void relationMembersChanged(RelationMembersChangedEvent event) {/* ignored */}
+
+    public void tagsChanged(TagsChangedEvent event) {/* ignored */}
+
     public void wayNodesChanged(WayNodesChangedEvent event) {/* ignored */}
 
+    /* ------------------------------------------------------------------------------ */
+    /* interface EditLayerListener                                                    */
+    /* ------------------------------------------------------------------------------ */
+    public void editLayerChanged(OsmDataLayer oldLayer, OsmDataLayer newLayer) {
+        // just init the model content. Don't register as DataSetListener. The mode
+        // is already registered to receive DataChangedEvents from the current
+        // edit layer
+        if (newLayer != null) {
+            initFromDataSet(newLayer.data);
+        } else {
+            initFromDataSet(null);
+        }
+    }
 }

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

@@ -7 +7 @@
 import java.awt.BorderLayout;
 import java.awt.Color;
-import java.awt.Component;
 import java.awt.Dimension;
 import java.awt.Graphics;
@@ -225 +224 @@
                         Math.min(l2.getLat(), l1.getLat()),
                         Math.min(l1.getLon(), l2.getLon())
-                        ),
+                ),
                 new LatLon(
                         Math.max(l2.getLat(), l1.getLat()),
                         Math.max(l1.getLon(), l2.getLon()))
-                );
+        );
         iGui.boundingBoxChanged(b, this);
         repaint();

trunk/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java

@@ -5 +5 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
+import java.awt.Component;
 import java.io.IOException;
 import java.util.Collection;
@@ -21 +22 @@
 import org.openstreetmap.josm.io.OsmServerHistoryReader;
 import org.openstreetmap.josm.io.OsmTransferException;
+import org.openstreetmap.josm.tools.CheckParameterUtil;
 import org.xml.sax.SAXException;
 
@@ -51 +53 @@
     public HistoryLoadTask() {
         super(tr("Load history"), true);
+        toLoad = new HashSet<PrimitiveId>();
+    }
+
+    /**
+     * Creates a new task
+     * 
+     * @param parent the component to be used as reference to find the parent for {@see PleaseWaitDialog}.
+     * Must not be null.
+     * @throws IllegalArgumentException thrown if parent is null
+     */
+    public HistoryLoadTask(Component parent) {
+        super(parent, tr("Load history"), true);
+        CheckParameterUtil.ensureParameterNotNull(parent, "parent");
         toLoad = new HashSet<PrimitiveId>();
     }

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

@@ -99 +99 @@
                 return;
             reader = new OsmServerChangesetReader();
-            ChangesetQuery query = new ChangesetQuery().forUser(model.getUserId()).beingOpen();
+            ChangesetQuery query = new ChangesetQuery().forUser((int)model.getUserId()).beingOpen(true);
             changesets = reader.queryChangesets(
                     query,