Changeset 5622 in josm for trunk/src/org

Timestamp:

2012-12-16T21:08:54+01:00 (12 years ago)

Author:

jttt

Message:

Compare selected version with previous after click on date on user in history dialog

Location:

trunk/src/org/openstreetmap/josm/gui/history

Files:

• VersionTable.java (modified) (8 diffs)
• VersionTableColumnModel.java (modified) (1 diff)

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

@@ -39 +39 @@
 public class VersionTable extends JTable implements Observer{
     private VersionTablePopupMenu popupMenu;
+    private final HistoryBrowserModel model;
 
     protected void build() {
@@ -49 +50 @@
         putClientProperty("terminateEditOnFocusLost", true);
         popupMenu = new VersionTablePopupMenu();
-        addMouseListener(new PopupMenuTrigger());
+        addMouseListener(new MouseListener());
         getModel().addTableModelListener(new TableModelListener() {
             @Override
@@ -66 +67 @@
         model.addObserver(this);
         build();
+        this.model = model;
     }
 
@@ -93 +95 @@
     }
 
-    class PopupMenuTrigger extends MouseAdapter {
+    class MouseListener extends MouseAdapter {
         @Override
         public void mousePressed(MouseEvent e) {
-            showPopup(e);
+            if (!showPopup(e) && e.getButton() == MouseEvent.BUTTON1) {
+                int row = rowAtPoint(e.getPoint());
+                int col = columnAtPoint(e.getPoint());
+                if (row > 0 && (col == VersionTableColumnModel.COL_DATE || col == VersionTableColumnModel.COL_USER)) {
+                    model.getVersionTableModel().setCurrentPointInTime(row);
+                    model.getVersionTableModel().setReferencePointInTime(row - 1);
+                }
+            }
         }
         @Override
@@ -102 +111 @@
             showPopup(e);
         }
-        private void showPopup(MouseEvent e) {
+        private boolean showPopup(MouseEvent e) {
             if (e.isPopupTrigger()) {
                 showPopupMenu(e);
+                return true;
             }
+            return false;
         }
     }
@@ -177 +188 @@
         }
 
+        @Override
         public Component getTableCellEditorComponent(JTable table, Object value, boolean isSelected, int row, int column) {
             if (value == null) return null;
@@ -185 +197 @@
         }
 
+        @Override
         public Object getCellEditorValue() {
             btn.removeItemListener(this);
@@ -192 +205 @@
         public void itemStateChanged(ItemEvent e) {
             fireEditingStopped();
-        }
-    }
-
-    public static class LabelRenderer implements TableCellRenderer {
-        public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus,int row,int column) {
-            return (Component) value;
         }
     }

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

@@ -14 +14 @@
  */
 public class VersionTableColumnModel extends DefaultTableColumnModel {
+
+    public static final int COL_VERSION = 0;
+    public static final int COL_REFERENCE = 1;
+    public static final int COL_CURRENT = 2;
+    public static final int COL_DATE = 3;
+    public static final int COL_USER = 4;
+
     protected void createColumns() {
         TableColumn col = null;