Changeset 5622 in josm
- Timestamp:
- 2012-12-16T21:08:54+01:00 (12 years ago)
- Location:
- trunk/src/org/openstreetmap/josm/gui/history
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/history/VersionTable.java
r5495 r5622 39 39 public class VersionTable extends JTable implements Observer{ 40 40 private VersionTablePopupMenu popupMenu; 41 private final HistoryBrowserModel model; 41 42 42 43 protected void build() { … … 49 50 putClientProperty("terminateEditOnFocusLost", true); 50 51 popupMenu = new VersionTablePopupMenu(); 51 addMouseListener(new PopupMenuTrigger());52 addMouseListener(new MouseListener()); 52 53 getModel().addTableModelListener(new TableModelListener() { 53 54 @Override … … 66 67 model.addObserver(this); 67 68 build(); 69 this.model = model; 68 70 } 69 71 … … 93 95 } 94 96 95 class PopupMenuTrigger extends MouseAdapter {97 class MouseListener extends MouseAdapter { 96 98 @Override 97 99 public void mousePressed(MouseEvent e) { 98 showPopup(e); 100 if (!showPopup(e) && e.getButton() == MouseEvent.BUTTON1) { 101 int row = rowAtPoint(e.getPoint()); 102 int col = columnAtPoint(e.getPoint()); 103 if (row > 0 && (col == VersionTableColumnModel.COL_DATE || col == VersionTableColumnModel.COL_USER)) { 104 model.getVersionTableModel().setCurrentPointInTime(row); 105 model.getVersionTableModel().setReferencePointInTime(row - 1); 106 } 107 } 99 108 } 100 109 @Override … … 102 111 showPopup(e); 103 112 } 104 private voidshowPopup(MouseEvent e) {113 private boolean showPopup(MouseEvent e) { 105 114 if (e.isPopupTrigger()) { 106 115 showPopupMenu(e); 116 return true; 107 117 } 118 return false; 108 119 } 109 120 } … … 177 188 } 178 189 190 @Override 179 191 public Component getTableCellEditorComponent(JTable table, Object value, boolean isSelected, int row, int column) { 180 192 if (value == null) return null; … … 185 197 } 186 198 199 @Override 187 200 public Object getCellEditorValue() { 188 201 btn.removeItemListener(this); … … 192 205 public void itemStateChanged(ItemEvent e) { 193 206 fireEditingStopped(); 194 }195 }196 197 public static class LabelRenderer implements TableCellRenderer {198 public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus,int row,int column) {199 return (Component) value;200 207 } 201 208 } -
trunk/src/org/openstreetmap/josm/gui/history/VersionTableColumnModel.java
r5495 r5622 14 14 */ 15 15 public class VersionTableColumnModel extends DefaultTableColumnModel { 16 17 public static final int COL_VERSION = 0; 18 public static final int COL_REFERENCE = 1; 19 public static final int COL_CURRENT = 2; 20 public static final int COL_DATE = 3; 21 public static final int COL_USER = 4; 22 16 23 protected void createColumns() { 17 24 TableColumn col = null;
Note:
See TracChangeset
for help on using the changeset viewer.