Changeset 4238 in josm

Timestamp:

Jul 14, 2011 10:17:30 AM (23 months ago)

Author:

stoecker

Message:

fix #6547 - patch by Hojoe - line height in relation editor too high

Location:

trunk/src/org/openstreetmap/josm/gui/dialogs/relation

Files:

• GenericRelationEditor.java (modified) (3 diffs)
• MemberRoleCellEditor.java (modified) (3 diffs)
• MemberTable.java (modified) (1 diff)

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

@@ -33 +33 @@
 import javax.swing.AbstractAction;
 import javax.swing.BorderFactory;
-import javax.swing.DefaultCellEditor;
 import javax.swing.JComponent;
 import javax.swing.JLabel;
@@ -41 +40 @@
 import javax.swing.JSplitPane;
 import javax.swing.JTabbedPane;
-import javax.swing.JTextField;
 import javax.swing.JToolBar;
 import javax.swing.KeyStroke;
@@ -347 +345 @@
         );
         tfRole.setEnabled(memberTable.getSelectedRowCount() > 0);
-        memberTable.setRowHeight(tfRole.getPreferredSize().height);
         SideButton btnApply = new SideButton(setRoleAction);
         btnApply.setPreferredSize(new Dimension(20,20));

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

@@ -5 +5 @@
 
 import javax.swing.AbstractCellEditor;
+import javax.swing.BorderFactory;
 import javax.swing.JTable;
 import javax.swing.table.TableCellEditor;
@@ -25 +26 @@
         this.ds = ds;
         editor = new AutoCompletingTextField();
+        editor.setBorder(BorderFactory.createEmptyBorder(1,1,1,1)); 
         autoCompletionList = new AutoCompletionList();
         editor.setAutoCompletionList(autoCompletionList);
@@ -55 +57 @@
         return super.stopCellEditing();
     }
+    
+    /** Returns the edit field for this cell editor. */
+    public AutoCompletingTextField getEditor() {
+        return editor;
+    }
 }

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

@@ -59 +59 @@
      */
     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);