Index: /applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/RelationMemberColumnModel.java
===================================================================
--- /applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/RelationMemberColumnModel.java	(revision 23525)
+++ /applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/RelationMemberColumnModel.java	(revision 23526)
@@ -7,4 +7,5 @@
 import javax.swing.table.TableColumn;
 
+import org.openstreetmap.josm.gui.OsmPrimitivRenderer;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
 
@@ -22,5 +23,4 @@
          col.setPreferredWidth(100);    
          col.setCellEditor(new MemberRoleCellEditor());
-         col.setCellRenderer(new RelationMemberRoleCellRenderer());
          addColumn(col);
          
@@ -30,5 +30,5 @@
           col.setResizable(true);
           col.setPreferredWidth(300);
-          col.setCellRenderer(new RelationMemberTargetCellRenderer());
+          col.setCellRenderer(new OsmPrimitivRenderer());
           addColumn(col);         
     }
Index: /applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/RelationMemberEditorModel.java
===================================================================
--- /applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/RelationMemberEditorModel.java	(revision 23525)
+++ /applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/RelationMemberEditorModel.java	(revision 23526)
@@ -446,21 +446,8 @@
 
     public int getRowCount() {
-        if (members.size() > 0) return members.size();
-        
-        // we display an empty row if the model is empty because otherwise
-        // we can't drag/drop into the empty table.
-        // FIXME: use JTable.setFillsViewportHeight(boolean) after the migration
-        // to Java 6.
-        return 1;
+    	return members.size();
     }
 
     public Object getValueAt(int rowIndex, int columnIndex) {
-        if (members.size() == 0 && rowIndex == 0){
-            // we display an empty row if the model is empty because otherwise
-            // we can't drag/drop into the empty table.
-            // FIXME: use JTable.setFillsViewportHeight(boolean) after the migration
-            // to Java 6.
-            return null;
-        }
         switch(columnIndex){
         case 0: return members.get(rowIndex).getRole();
@@ -472,11 +459,5 @@
     @Override
     public boolean isCellEditable(int rowIndex, int columnIndex) {
-        // we display an empty row if the model is empty because otherwise
-        // we can't drag/drop into the empty table. This row isn't editable
-        // FIXME: use JTable.setFillsViewportHeight(boolean) after the migration
-        // to Java 6.
-        if (members.size() == 0 && rowIndex == 0) return false;
-        
-        // otherwise only the column with the member roles is editable
+        // only the column with the member roles is editable
         return columnIndex == 0;
     }
Index: plications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/RelationMemberRoleCellRenderer.java
===================================================================
--- /applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/RelationMemberRoleCellRenderer.java	(revision 23525)
+++ 	(revision )
@@ -1,38 +1,0 @@
-package org.openstreetmap.josm.plugins.turnrestrictions.editor;
-
-import java.awt.Component;
-
-import javax.swing.JLabel;
-import javax.swing.JTable;
-import javax.swing.UIManager;
-import javax.swing.table.DefaultTableCellRenderer;
-
-public class RelationMemberRoleCellRenderer extends DefaultTableCellRenderer{
-private JLabel mockCell;
-    
-    public RelationMemberRoleCellRenderer() {
-        mockCell = new JLabel();
-        mockCell.setText("");
-        mockCell.setOpaque(true);
-    }
-    
-    public Component getTableCellRendererComponent(JTable table, Object value,
-            boolean isSelected, boolean hasFocus, int row, int column) {
-        if (value != null){
-            return super.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column);
-        }
-        
-        // FIXME: required to always draw a mock row, even if the table is empty.
-        // Otherwise, drag and drop onto the table fails.
-        // Replace with JTable.setFillsViewportHeight(boolean) after the migration
-        // to Java 6.
-        if (isSelected){
-            mockCell.setBackground(UIManager.getColor("Table.selectionBackground"));
-            mockCell.setForeground(UIManager.getColor("Table.selectionForeground"));
-        } else {
-            mockCell.setBackground(UIManager.getColor("Panel.background"));
-            mockCell.setForeground(UIManager.getColor("Panel.foreground"));
-        }       
-        return mockCell;
-    }
-}
Index: /applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/RelationMemberTable.java
===================================================================
--- /applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/RelationMemberTable.java	(revision 23525)
+++ /applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/RelationMemberTable.java	(revision 23526)
@@ -63,4 +63,5 @@
         setRowSelectionAllowed(true);
         setColumnSelectionAllowed(true);
+        setFillsViewportHeight(true); // make sure we can drag onto an empty table
 
         // register the popup menu launcher
Index: plications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/RelationMemberTargetCellRenderer.java
===================================================================
--- /applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/RelationMemberTargetCellRenderer.java	(revision 23525)
+++ 	(revision )
@@ -1,42 +1,0 @@
-package org.openstreetmap.josm.plugins.turnrestrictions.editor;
-
-import java.awt.Component;
-import java.util.logging.Logger;
-
-import javax.swing.JLabel;
-import javax.swing.JTable;
-import javax.swing.UIManager;
-
-import org.openstreetmap.josm.gui.OsmPrimitivRenderer;
-
-public class RelationMemberTargetCellRenderer extends OsmPrimitivRenderer{
-    static private final Logger logger = Logger.getLogger(RelationMemberTargetCellRenderer.class.getName());
-    private JLabel mockCell;
-    
-    public RelationMemberTargetCellRenderer() {
-        mockCell = new JLabel();
-        mockCell.setText("");
-        mockCell.setOpaque(true);
-    }
-    
-    @Override
-    public Component getTableCellRendererComponent(JTable table, Object value,
-            boolean isSelected, boolean hasFocus, int row, int column) {
-        if (value != null){
-            return super.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column);
-        }
-        
-        // FIXME: required to always draw a mock row, even if the table is empty.
-        // Otherwise, drag and drop onto the table fails.
-        // Replace with JTable.setFillsViewportHeight(boolean) after the migration
-        // to Java 6.
-        if (isSelected){
-            mockCell.setBackground(UIManager.getColor("Table.selectionBackground"));
-            mockCell.setForeground(UIManager.getColor("Table.selectionForeground"));
-        } else {
-            mockCell.setBackground(UIManager.getColor("Panel.background"));
-            mockCell.setForeground(UIManager.getColor("Panel.foreground"));
-        }       
-        return mockCell;        
-    }
-}