Changeset 4598 in josm for trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java

Timestamp:

2011-11-19T22:27:22+01:00 (13 years ago)

Author:

bastiK

Message:

history browser: changed selection of 2 compared version. WAS: double click and single click. NOW: 2 rows of radio buttons (inspired by Mediawiki)

File:

• trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java (modified) (3 diffs)

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

@@ -410 +410 @@
         @Override
         public Object getValueAt(int row, int column) {
-            if(history == null)
+            switch (column) {
+            case 0:
+                return isReferencePointInTime(row);
+            case 1:
+                return isCurrentPointInTime(row);
+            case 2:
+                if(history == null)
+                    return null;
+                if (row < history.getNumVersions())
+                    return history.get(row);
+                if (row == history.getNumVersions())
+                    return latest;
                 return null;
-            if (row < history.getNumVersions())
-                return history.get(row);
-            if (row == history.getNumVersions())
-                return latest;
+            }
             return null;
         }
 
         @Override
+        public void setValueAt(Object aValue, int row, int column) {
+            if (!((Boolean) aValue)) return;
+            switch (column) {
+            case 0:
+                setReferencePointInTime(row);
+                break;
+            case 1:
+                setCurrentPointInTime(row);
+                break;
+            }
+            fireTableDataChanged();
+        }
+
+        @Override
         public boolean isCellEditable(int row, int column) {
-            return false;
+            return column < 2;
         }
 
@@ -459 +481 @@
         }
 
+        public boolean isCurrentPointInTime(int row) {
+            if (history == null) return false;
+            if (row == history.getNumVersions())
+                return latest == current;
+            if (row < 0 || row > history.getNumVersions()) return false;
+            HistoryOsmPrimitive p = history.get(row);
+            return p == current;
+        }
+
         public HistoryOsmPrimitive getPrimitive(int row) {
             return isLatest(row) ? latest : history.get(row);
@@ -476 +507 @@
         @Override
         public int getColumnCount() {
-            return 1;
+            return 3;
         }
     }