Changeset 16416 in josm for trunk/src/org
- Timestamp:
- 2020-05-15T22:39:18+02:00 (4 years ago)
- Location:
- trunk/src/org/openstreetmap/josm/gui
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java
r16415 r16416 49 49 import javax.swing.JTree; 50 50 import javax.swing.ListCellRenderer; 51 import javax.swing.ListSelectionModel; 51 52 import javax.swing.MenuElement; 52 53 import javax.swing.TransferHandler; … … 71 72 import org.openstreetmap.josm.gui.tagging.presets.TaggingPreset; 72 73 import org.openstreetmap.josm.gui.util.GuiHelper; 74 import org.openstreetmap.josm.gui.util.ReorderableTableModel; 73 75 import org.openstreetmap.josm.spi.preferences.Config; 74 76 import org.openstreetmap.josm.tools.GBC; … … 708 710 } 709 711 } else if ("up".equals(e.getActionCommand())) { 710 int i = selectedList.getSelectedIndex(); 711 ActionDefinition o = selected.get(i); 712 if (i != 0) { 713 selected.remove(i); 714 selected.add(i-1, o); 715 selectedList.setSelectedIndex(i-1); 716 } 712 selected.moveUp(); 717 713 } else if ("down".equals(e.getActionCommand())) { 718 int i = selectedList.getSelectedIndex(); 719 ActionDefinition o = selected.get(i); 720 if (i != selected.size()-1) { 721 selected.remove(i); 722 selected.add(i+1, o); 723 selectedList.setSelectedIndex(i+1); 724 } 714 selected.moveDown(); 725 715 } 726 716 } … … 753 743 } 754 744 745 private class ActionDefinitionModel extends DefaultListModel<ActionDefinition> implements ReorderableTableModel<ActionDefinition> { 746 @Override 747 public ListSelectionModel getSelectionModel() { 748 return selectedList.getSelectionModel(); 749 } 750 751 @Override 752 public int getRowCount() { 753 return getSize(); 754 } 755 756 @Override 757 public ActionDefinition getValue(int index) { 758 return getElementAt(index); 759 } 760 761 @Override 762 public ActionDefinition setValue(int index, ActionDefinition value) { 763 return set(index, value); 764 } 765 } 766 755 767 private final Move moveAction = new Move(); 756 768 757 private final DefaultListModel<ActionDefinition> selected = new DefaultListModel<>();769 private final ActionDefinitionModel selected = new ActionDefinitionModel(); 758 770 private final JList<ActionDefinition> selectedList = new JList<>(selected); 759 771 -
trunk/src/org/openstreetmap/josm/gui/util/ReorderableTableModel.java
r15226 r16416 2 2 package org.openstreetmap.josm.gui.util; 3 3 4 import javax.swing.JList; 5 import javax.swing.JTable; 6 import javax.swing.ListModel; 4 7 import javax.swing.ListSelectionModel; 5 8 import javax.swing.table.TableModel; … … 8 11 9 12 /** 10 * Defines a table model that can be reordered.13 * Defines a list/table model that can be reordered. 11 14 * @param <T> item type 12 15 * @since 15226 13 16 */ 14 public interface ReorderableTableModel<T> extends TableModel,ReorderableModel<T> {17 public interface ReorderableTableModel<T> extends ReorderableModel<T> { 15 18 16 19 /** 17 20 * Returns the selection model. 18 21 * @return the selection model (never null) 22 * @see JList#getSelectionModel() 23 * @see JTable#getSelectionModel() 19 24 */ 20 25 ListSelectionModel getSelectionModel(); 26 27 /** 28 * Returns the number of rows in the list/table. 29 * @return the number of rows in the list/table 30 * @see ListModel#getSize() 31 * @see TableModel#getRowCount() 32 */ 33 int getRowCount(); 21 34 22 35 /**
Note:
See TracChangeset
for help on using the changeset viewer.