Changeset 23526 in osm for applications/editors/josm/plugins

Timestamp:

2010-10-09T15:35:42+02:00 (14 years ago)

Author:

guggis

Message:

Migrated to Java6 - making use of JTable::setFillsViewportHeight() and getting rid of former workarounds

Location:

applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor

Files:

• RelationMemberColumnModel.java (modified) (3 diffs)
• RelationMemberEditorModel.java (modified) (2 diffs)
• RelationMemberRoleCellRenderer.java (deleted)
• RelationMemberTable.java (modified) (1 diff)
• RelationMemberTargetCellRenderer.java (deleted)

applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/RelationMemberColumnModel.java

@@ -7 +7 @@
 import javax.swing.table.TableColumn;
 
+import org.openstreetmap.josm.gui.OsmPrimitivRenderer;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
 
@@ -22 +23 @@
          col.setPreferredWidth(100);    
          col.setCellEditor(new MemberRoleCellEditor());
-         col.setCellRenderer(new RelationMemberRoleCellRenderer());
          addColumn(col);
          
@@ -30 +30 @@
           col.setResizable(true);
           col.setPreferredWidth(300);
-          col.setCellRenderer(new RelationMemberTargetCellRenderer());
+          col.setCellRenderer(new OsmPrimitivRenderer());
           addColumn(col);         
     }

applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/RelationMemberEditorModel.java

@@ -446 +446 @@
 
     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 +459 @@
     @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;
     }

applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/RelationMemberTable.java

@@ -63 +63 @@
         setRowSelectionAllowed(true);
         setColumnSelectionAllowed(true);
+        setFillsViewportHeight(true); // make sure we can drag onto an empty table
 
         // register the popup menu launcher