Changeset 6064 in josm

Timestamp:

2013-07-12T20:10:07+02:00 (12 years ago)

Author:

akks

Message:

see #8125, #6221 (possibly): improve TAB switching in Relation Editor

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• dialogs/relation/GenericRelationEditor.java (modified) (3 diffs)
• dialogs/relation/MemberTable.java (modified) (2 diffs)
• tagging/TagEditorModel.java (modified) (3 diffs)
• tagging/TagEditorPanel.java (modified) (3 diffs)
• tagging/TagTable.java (modified) (13 diffs)

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

@@ -189 +189 @@
         tabbedPane.addChangeListener(
                 new ChangeListener() {
+                    @Override
                     public void stateChanged(ChangeEvent e) {
                         JTabbedPane sourceTabbedPane = (JTabbedPane) e.getSource();
@@ -214 +215 @@
                 }
         );
-
+        
+        tagEditorPanel.setNextFocusComponent(memberTable);
+        selectionTable.setFocusable(false);
         memberTableModel.setSelectedMembers(selectedMembers);
         HelpUtil.setHelpContext(getRootPane(),ht("/Dialog/RelationEditor"));
@@ -606 +609 @@
                 addToWindowMenu();
             }
+            tagEditorPanel.requestFocusInWindow();
         } else {
             // make sure all registered listeners are unregistered

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

@@ -6 +6 @@
 import java.awt.Container;
 import java.awt.Dimension;
+import java.awt.KeyboardFocusManager;
 import java.awt.event.ActionEvent;
 import java.awt.event.KeyEvent;
@@ -176 +177 @@
                 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);

trunk/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java

@@ -113 +113 @@
     }
 
+    @Override
     public int getColumnCount() {
         return 2;
     }
 
+    @Override
     public int getRowCount() {
         return tags.size();
     }
 
+    @Override
     public Object getValueAt(int rowIndex, int columnIndex) {
         if (rowIndex >= getRowCount())
@@ -335 +338 @@
      */
     public void ensureOneTag() {
-        if (tags.size() == 0) {
+        if (tags.isEmpty()) {
             appendNewTag();
         }
@@ -528 +531 @@
                 tags,
                 new Comparator<TagModel>() {
+                    @Override
                     public int compare(TagModel self, TagModel other) {
                         return self.getName().compareTo(other.getName());

trunk/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java

@@ -3 +3 @@
 
 import java.awt.BorderLayout;
+import java.awt.Component;
 import java.awt.GridBagConstraints;
 import java.awt.GridBagLayout;
 import java.awt.Insets;
+import java.awt.event.FocusAdapter;
+import java.awt.event.FocusEvent;
 import java.util.EnumSet;
 
@@ -58 +61 @@
     }
 
+    public void setNextFocusComponent(Component nextFocusComponent) {
+        tagTable.setNextFocusComponent(nextFocusComponent);
+    }
+    
     /**
      * builds the panel with the button row
@@ -116 +123 @@
             });
         }
+        
+        addFocusListener(new FocusAdapter() {
+            @Override public void focusGained(FocusEvent e) {
+                tagTable.requestFocusInCell(0, 0);
+            }
+        });
     }
 

trunk/src/org/openstreetmap/josm/gui/tagging/TagTable.java

@@ -45 +45 @@
     /** the table cell editor used by this table */
     private TagCellEditor editor = null;
-
+    private final TagEditorModel model;
+    private Component nextFocusComponent;
+        
     /** a list of components to which focus can be transferred without stopping
      * cell editing this table.
@@ -91 +93 @@
      */
     class SelectNextColumnCellAction extends AbstractAction  {
+        @Override
         public void actionPerformed(ActionEvent e) {
             run();
@@ -101 +104 @@
                 getCellEditor().stopCellEditing();
             }
-
+            
+            if (row==-1 && col==-1) {
+                requestFocusInCell(0, 0);
+                return;
+            }
+        
             if (col == 0) {
                 col++;
@@ -110 +118 @@
                 // we are at the end. Append an empty row and move the focus
                 // to its second column
-                TagEditorModel model = (TagEditorModel)getModel();
-                model.appendNewTag();
-                col=0;
-                row++;
-            }
-            changeSelection(row, col, false, false);
+                String key = ((TagModel)model.getValueAt(row, 0)).getName();
+                if (!key.trim().isEmpty()) {
+                    model.appendNewTag();
+                    col=0;
+                    row++;
+                } else {
+                    clearSelection();
+                    if (nextFocusComponent!=null)
+                        nextFocusComponent.requestFocusInWindow();
+                    return;
+                }
+            }
             requestFocusInCell(row,col);
         }
@@ -143 +157 @@
                 row--;
             }
-            changeSelection(row, col, false, false);
             requestFocusInCell(row,col);
         }
@@ -184 +197 @@
         protected void deleteTagNames() {
             int[] rows = getSelectedRows();
-            TagEditorModel model = (TagEditorModel)getModel();
             model.deleteTagNames(rows);
         }
@@ -193 +205 @@
         protected void deleteTagValues() {
             int[] rows = getSelectedRows();
-            TagEditorModel model = (TagEditorModel)getModel();
             model.deleteTagValues(rows);
         }
@@ -202 +213 @@
         protected void deleteTags() {
             int[] rows = getSelectedRows();
-            TagEditorModel model = (TagEditorModel)getModel();
             model.deleteTags(rows);
         }
@@ -230 +240 @@
             }
 
-            TagEditorModel model = (TagEditorModel)getModel();
             if (model.getRowCount() == 0) {
                 model.ensureOneTag();
@@ -277 +286 @@
                 getCellEditor().stopCellEditing();
             }
-            ((TagEditorModel)getModel()).appendNewTag();
-            final int rowIdx = getModel().getRowCount()-1;
-            requestFocusInCell(rowIdx, 0);
-        }
-
+            final int rowIdx = model.getRowCount()-1;
+            String key = ((TagModel)model.getValueAt(rowIdx, 0)).getName();
+            if (!key.trim().isEmpty()) {
+                model.appendNewTag();
+            } 
+            requestFocusInCell(model.getRowCount()-1, 0);
+        }
+            
         protected void updateEnabledState() {
             setEnabled(TagTable.this.isEnabled());
@@ -356 +368 @@
     public TagTable(TagEditorModel model) {
         super(model, new TagTableColumnModel(model.getColumnSelectionModel()), model.getRowSelectionModel());
+        this.model = model;
         init();
     }
@@ -419 +432 @@
     }
 
+    public void setNextFocusComponent(Component nextFocusComponent) {
+        this.nextFocusComponent = nextFocusComponent;
+    }
+    
     public TagCellEditor getTableCellEditor() {
         return editor;
@@ -445 +462 @@
 
     public void requestFocusInCell(final int row, final int col) {
+        changeSelection(row, col, false, false);
         editCellAt(row, col);
         Component c = getEditorComponent();