Ticket #6547: 6547-2.patch

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

@@ -58 +58 @@
      * initialize the table
      */
     protected void init() {
+        MemberRoleCellEditor ce = (MemberRoleCellEditor)getColumnModel().getColumn(0).getCellEditor();  
+        setRowHeight(ce.getEditor().getPreferredSize().height);
         setAutoResizeMode(JTable.AUTO_RESIZE_ALL_COLUMNS);
         setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION);
         putClientProperty("terminateEditOnFocusLost", Boolean.TRUE);

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;
@@ -40 +39 @@
 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.SwingUtilities;
@@ -346 +344 @@
                 }
         );
         tfRole.setEnabled(memberTable.getSelectedRowCount() > 0);
-        memberTable.setRowHeight(tfRole.getPreferredSize().height);
         SideButton btnApply = new SideButton(setRoleAction);
         btnApply.setPreferredSize(new Dimension(20,20));
         btnApply.setText("");

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

@@ -4 +4 @@
 import java.awt.Component;
 
 import javax.swing.AbstractCellEditor;
+import javax.swing.BorderFactory;
 import javax.swing.JTable;
 import javax.swing.table.TableCellEditor;
 
@@ -24 +25 @@
     public MemberRoleCellEditor(DataSet ds) {
         this.ds = ds;
         editor = new AutoCompletingTextField();
+        editor.setBorder(BorderFactory.createEmptyBorder(1,1,1,1)); 
         autoCompletionList = new AutoCompletionList();
         editor.setAutoCompletionList(autoCompletionList);
     }
@@ -54 +56 @@
     public boolean stopCellEditing() {
         return super.stopCellEditing();
     }
+    
+    /** Returns the edit field for this cell editor. */
+    public AutoCompletingTextField getEditor() {
+        return editor;
+    }
 }