Changeset 9497 in josm for trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java

Timestamp:

2016-01-17T04:02:53+01:00 (10 years ago)

Author:

Don-vip

Message:

reduce duplicated code

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java (modified) (5 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java

@@ -7 +7 @@
 import java.awt.Dimension;
 import java.awt.GraphicsEnvironment;
-import java.awt.KeyboardFocusManager;
 import java.awt.event.ActionEvent;
-import java.awt.event.KeyEvent;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -17 +15 @@
 import javax.swing.AbstractAction;
 import javax.swing.DropMode;
-import javax.swing.JComponent;
 import javax.swing.JPopupMenu;
 import javax.swing.JTable;
 import javax.swing.JViewport;
-import javax.swing.KeyStroke;
 import javax.swing.ListSelectionModel;
 import javax.swing.SwingUtilities;
@@ -61 +57 @@
         setLayer(layer);
         model.addMemberModelListener(this);
-        init();
-    }
-
-    /**
-     * initialize the table
-     */
-    protected void init() {
+
         MemberRoleCellEditor ce = (MemberRoleCellEditor) getColumnModel().getColumn(0).getCellEditor();
         setRowHeight(ce.getEditor().getPreferredSize().height);
@@ -74 +64 @@
         putClientProperty("terminateEditOnFocusLost", Boolean.TRUE);
 
-        // make ENTER behave like TAB
-        //
-        getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT).put(
-                KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, 0, false), "selectNextColumnCell");
-
+        installCustomNavigation(0);
         initHighlighting();
-
-        // install custom navigation actions
-        //
-        getActionMap().put("selectNextColumnCell", new SelectNextColumnCellAction());
-        getActionMap().put("selectPreviousColumnCell", new SelectPreviousColumnCellAction());
 
         if (!GraphicsEnvironment.isHeadless()) {
@@ -164 +145 @@
     }
 
-    /**
-     * Action to be run when the user navigates to the next cell in the table, for instance by
-     * pressing TAB or ENTER. The action alters the standard navigation path from cell to cell: <ul>
-     * <li>it jumps over cells in the first column</li> <li>it automatically add a new empty row
-     * when the user leaves the last cell in the table</li></ul>
-     */
-    class SelectNextColumnCellAction extends AbstractAction {
-        @Override
-        public void actionPerformed(ActionEvent e) {
-            run();
-        }
-
-        public void run() {
-            int col = getSelectedColumn();
-            int row = getSelectedRow();
-            if (getCellEditor() != null) {
-                getCellEditor().stopCellEditing();
-            }
-
-            if (col == 0 && row < getRowCount() - 1) {
-                row++;
-            } else if (row < getRowCount() - 1) {
-                col = 0;
-                row++;
-            } else {
-                // go to next component, no more rows in this table
-                KeyboardFocusManager manager = KeyboardFocusManager.getCurrentKeyboardFocusManager();
-                manager.focusNextComponent();
-                return;
-            }
-            changeSelection(row, col, false, false);
-        }
-    }
-
-    /**
-     * Action to be run when the user navigates to the previous cell in the table, for instance by
-     * pressing Shift-TAB
-     */
-    private class SelectPreviousColumnCellAction extends AbstractAction {
-
-        @Override
-        public void actionPerformed(ActionEvent e) {
-            int col = getSelectedColumn();
-            int row = getSelectedRow();
-            if (getCellEditor() != null) {
-                getCellEditor().stopCellEditing();
-            }
-
-            if (col <= 0 && row <= 0) {
-                // change nothing
-            } else if (row > 0) {
-                col = 0;
-                row--;
-            }
-            changeSelection(row, col, false, false);
-        }
-    }
-
     @Override
     public void unlinkAsListener() {