Ticket #6547: 6547.patch

src/org/openstreetmap/josm/gui/tagging/TagCellEditor.java

@@ -4 +4 @@
 import java.awt.Component;
 
 import javax.swing.AbstractCellEditor;
+import javax.swing.BorderFactory;
 import javax.swing.JTable;
 import javax.swing.table.TableCellEditor;
 
@@ -32 +33 @@
      */
     public TagCellEditor() {
         editor = new AutoCompletingTextField();
+        editor.setBorder(BorderFactory.createEmptyBorder(1, 1, 1, 1));
     }
 
     /**

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

@@ -32 +32 @@
 
 import javax.swing.AbstractAction;
 import javax.swing.BorderFactory;
+import javax.swing.DefaultCellEditor;
 import javax.swing.JComponent;
 import javax.swing.JLabel;
 import javax.swing.JOptionPane;
@@ -39 +40 @@
 import javax.swing.JScrollPane;
 import javax.swing.JSplitPane;
 import javax.swing.JTabbedPane;
+import javax.swing.JTextField;
 import javax.swing.JToolBar;
 import javax.swing.KeyStroke;
 import javax.swing.event.ChangeEvent;
@@ -275 +277 @@
         memberTable = new MemberTable(getLayer(),memberTableModel);
         memberTable.addMouseListener(new MemberTableDblClickAdapter());
         memberTableModel.addMemberModelListener(memberTable);
+        // setup a cell editor with a small border
+        final JTextField cellEditorTextField = new JTextField();
+        cellEditorTextField.setBorder(BorderFactory.createEmptyBorder(1,1,1,1));
+        cellEditorTextField.addFocusListener(
+            new FocusAdapter() {
+                @Override public void focusGained(FocusEvent e) {
+                    cellEditorTextField.selectAll();
+                }
+            }
+        );
+        DefaultCellEditor cellEditor = new DefaultCellEditor(cellEditorTextField);
+        cellEditor.setClickCountToStart(1);
+        memberTable.getColumnModel().getColumn(0).setCellEditor(cellEditor);
+        memberTable.setRowHeight(cellEditorTextField.getPreferredSize().height);
 
         final JScrollPane scrollPane = new JScrollPane(memberTable);
 
@@ -343 +359 @@
                 }
         );
         tfRole.setEnabled(memberTable.getSelectedRowCount() > 0);
-        memberTable.setRowHeight(tfRole.getPreferredSize().height);
         SideButton btnApply = new SideButton(setRoleAction);
         btnApply.setPreferredSize(new Dimension(20,20));
         btnApply.setText("");