Changeset 6070 in josm for trunk/src/org/openstreetmap/josm/gui/dialogs/relation
- Timestamp:
- 2013-07-17T00:01:49+02:00 (11 years ago)
- Location:
- trunk/src/org/openstreetmap/josm/gui/dialogs/relation
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java
r5925 r6070 415 415 refreshView(r); 416 416 } 417 SwingUtilities.invokeLater(new Runnable() { 418 public void run() { 419 Main.map.repaint(); 420 } 421 }); 417 SwingUtilities.invokeLater(new Runnable() { 418 public void run() { 419 Main.map.repaint(); 420 } 421 }); 422 422 } catch (Exception e) { 423 423 if (canceled) { -
trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java
r6068 r6070 216 216 } 217 217 ); 218 218 219 219 tagEditorPanel.setNextFocusComponent(memberTable); 220 220 selectionTable.setFocusable(false); … … 492 492 tb.add(moveDownAction); 493 493 memberTable.getActionMap().put("moveDown", moveDownAction); 494 494 495 495 tb.addSeparator(); 496 496 … … 499 499 memberTableModel.getSelectionModel().addListSelectionListener(editAction); 500 500 tb.add(editAction); 501 501 502 502 // -- delete action 503 503 RemoveAction removeSelectedAction = new RemoveAction(); … … 505 505 tb.add(removeSelectedAction); 506 506 memberTable.getActionMap().put("removeSelected", removeSelectedAction); 507 507 508 508 tb.addSeparator(); 509 509 // -- sort action … … 536 536 inputMap.put((KeyStroke) moveDownAction.getValue(AbstractAction.ACCELERATOR_KEY),"moveDown"); 537 537 inputMap.put((KeyStroke) downloadIncompleteMembersAction.getValue(AbstractAction.ACCELERATOR_KEY),"downloadIncomplete"); 538 538 539 539 return tb; 540 540 } … … 677 677 } 678 678 679 679 680 680 private void registerCopyPasteAction(AbstractAction action, Object actionName, KeyStroke shortcut) { 681 681 int mods = shortcut.getModifiers(); -
trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberRoleCellEditor.java
r4238 r6070 26 26 this.ds = ds; 27 27 editor = new AutoCompletingTextField(); 28 editor.setBorder(BorderFactory.createEmptyBorder(1,1,1,1)); 28 editor.setBorder(BorderFactory.createEmptyBorder(1,1,1,1)); 29 29 autoCompletionList = new AutoCompletionList(); 30 30 editor.setAutoCompletionList(autoCompletionList); … … 57 57 return super.stopCellEditing(); 58 58 } 59 59 60 60 /** Returns the edit field for this cell editor. */ 61 61 public AutoCompletingTextField getEditor() { -
trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java
r6064 r6070 63 63 */ 64 64 protected void init() { 65 MemberRoleCellEditor ce = (MemberRoleCellEditor)getColumnModel().getColumn(0).getCellEditor(); 65 MemberRoleCellEditor ce = (MemberRoleCellEditor)getColumnModel().getColumn(0).getCellEditor(); 66 66 setRowHeight(ce.getEditor().getPreferredSize().height); 67 67 setAutoResizeMode(JTable.AUTO_RESIZE_ALL_COLUMNS); … … 75 75 76 76 initHighlighting(); 77 77 78 78 // install custom navigation actions 79 79 // … … 81 81 getActionMap().put("selectPreviousColumnCell", new SelectPreviousColumnCellAction()); 82 82 } 83 83 84 84 @Override 85 85 protected ZoomToAction buildZoomToAction() { 86 86 return new ZoomToAction(this); 87 87 } 88 88 89 89 @Override 90 90 protected JPopupMenu buildPopupMenu() { … … 99 99 return menu; 100 100 } 101 101 102 102 @Override 103 103 public Dimension getPreferredSize(){ … … 140 140 } 141 141 }}; 142 142 143 143 private void initHighlighting() { 144 144 highlightEnabled = Main.pref.getBoolean("draw.target-highlight", true); … … 217 217 MapView.removeLayerChangeListener(zoomToGap); 218 218 } 219 219 220 220 public void stopHighlighting() { 221 221 if (highlighterListener == null) return;
Note:
See TracChangeset
for help on using the changeset viewer.