Changeset 4408 in josm for trunk/src/org/openstreetmap/josm/gui/dialogs

Timestamp:

2011-09-08T00:08:02+02:00 (13 years ago)

Author:

simon04

Message:

fix #6773 - shortcuts for History and Advanced info dialog

Location:

trunk/src/org/openstreetmap/josm/gui/dialogs

Files:

• HistoryDialog.java (modified) (5 diffs)
• SelectionListDialog.java (modified) (6 diffs)

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

@@ -22 +22 @@
 import javax.swing.JTable;
 import javax.swing.ListSelectionModel;
-import javax.swing.SwingUtilities;
 import javax.swing.event.ListSelectionEvent;
 import javax.swing.event.ListSelectionListener;
@@ -36 +35 @@
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.PrimitiveId;
-import org.openstreetmap.josm.data.osm.history.History;
 import org.openstreetmap.josm.data.osm.history.HistoryDataSet;
 import org.openstreetmap.josm.data.osm.history.HistoryDataSetListener;
@@ -44 +42 @@
 import org.openstreetmap.josm.gui.history.HistoryBrowserDialogManager;
 import org.openstreetmap.josm.gui.history.HistoryLoadTask;
-import org.openstreetmap.josm.tools.BugReportExceptionHandler;
 import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.Shortcut;
@@ -290 +287 @@
             if (e.getClickCount() == 2 && e.getButton() == MouseEvent.BUTTON1) {
                 int row = historyTable.rowAtPoint(e.getPoint());
-                new ShowHistoryAction().showHistory(Collections.singletonList(model.getPrimitive(row)));
+                HistoryBrowserDialogManager.getInstance().showHistory(Collections.singletonList(model.getPrimitive(row)));
             }
         }
@@ -306 +303 @@
         }
 
-        protected List<OsmPrimitive> filterPrimitivesWithUnloadedHistory(Collection<OsmPrimitive> primitives) {
-            ArrayList<OsmPrimitive> ret = new ArrayList<OsmPrimitive>(primitives.size());
-            HistoryDataSet hds = HistoryDataSet.getInstance();
-            for (OsmPrimitive p: primitives) {
-                if (hds.getHistory(p.getPrimitiveId()) == null) {
-                    // reload if the history is not in the cache yet
-                    ret.add(p);
-                } else if (!p.isNew() && hds.getHistory(p.getPrimitiveId()).getByVersion(p.getUniqueId()) == null) {
-                    // reload if the history object of the selected object is not in the cache
-                    // yet
-                    ret.add(p);
-                }
-            }
-            return ret;
-        }
-
-        public void showHistory(final List<OsmPrimitive> primitives) {
-            List<OsmPrimitive> toLoad = filterPrimitivesWithUnloadedHistory(primitives);
-            if (!toLoad.isEmpty()) {
-                HistoryLoadTask task = new HistoryLoadTask();
-                task.add(primitives);
-                Main.worker.submit(task);
-            }
-
-            Runnable r = new Runnable() {
-                public void run() {
-                    try {
-                        for (OsmPrimitive p : primitives) {
-                            History h = HistoryDataSet.getInstance().getHistory(p.getPrimitiveId());
-                            if (h == null) {
-                                continue;
-                            }
-                            HistoryBrowserDialogManager.getInstance().show(h);
-                        }
-                    } catch (final Exception e) {
-                        SwingUtilities.invokeLater(new Runnable() {
-                            public void run() {
-                                BugReportExceptionHandler.handleException(e);
-                            }
-                        });
-                    }
-
-                }
-            };
-            Main.worker.submit(r);
-        }
-
         public void actionPerformed(ActionEvent e) {
             int [] rows = historyTable.getSelectedRows();
             if (rows == null || rows.length == 0) return;
-            showHistory(model.getPrimitives(rows));
+            HistoryBrowserDialogManager.getInstance().showHistory(model.getPrimitives(rows));
         }
 

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

@@ -17 +17 @@
 import java.util.Collections;
 import java.util.Comparator;
-import java.util.HashMap;
 import java.util.HashSet;
 import java.util.LinkedList;
@@ -26 +25 @@
 import javax.swing.AbstractListModel;
 import javax.swing.DefaultListSelectionModel;
-import javax.swing.JButton;
 import javax.swing.JList;
 import javax.swing.JMenuItem;
@@ -88 +86 @@
     private EditRelationSelection actEditRelationSelection;
     private DownloadSelectedIncompleteMembersAction actDownloadSelectedIncompleteMembers;
-    private InspectAction actInspect;
 
     /**
@@ -147 +144 @@
         actDownloadSelectedIncompleteMembers = new DownloadSelectedIncompleteMembersAction();
         lstPrimitives.getSelectionModel().addListSelectionListener(actDownloadSelectedIncompleteMembers);
-
-        actInspect = new InspectAction();
-        lstPrimitives.getSelectionModel().addListSelectionListener(actInspect);
 
         lstPrimitives.addMouseListener(new SelectionPopupMenuLauncher());
@@ -221 +215 @@
             addSeparator();
             add(actDownloadSelectedIncompleteMembers);
-            addSeparator();
-            add(actInspect);
         }
     }
@@ -851 +843 @@
     }
 
-    class InspectAction extends AbstractAction implements ListSelectionListener {
-        public InspectAction() {
-            putValue(SHORT_DESCRIPTION, tr("Get detailed information on the internal state of the objects."));
-            putValue(NAME, tr("Inspect"));
-            updateEnabledState();
-        }
-
-        public void actionPerformed(ActionEvent e) {
-            Collection<OsmPrimitive> sel = model.getSelected();
-            if (sel.isEmpty()) return;
-            InspectPrimitiveDialog inspectDialog = new InspectPrimitiveDialog(sel, Main.map.mapView.getEditLayer());
-            inspectDialog.showDialog();
-        }
-
-        public void updateEnabledState() {
-            setEnabled(!model.getSelected().isEmpty());
-        }
-
-        public void valueChanged(ListSelectionEvent e) {
-            updateEnabledState();
-        }
-    }
-
     /** Quicker comparator, comparing just by type and ID's */
     static private class OsmPrimitiveQuickComparator implements Comparator<OsmPrimitive> {