Ticket #5810: 5810.patch

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

@@ -63 +63 @@
      * initialize the table
      */
     protected void init() {
-        MemberRoleCellEditor ce = (MemberRoleCellEditor)getColumnModel().getColumn(0).getCellEditor();  
+        MemberRoleCellEditor ce = (MemberRoleCellEditor)getColumnModel().getColumn(1).getCellEditor();
         setRowHeight(ce.getEditor().getPreferredSize().height);
         setAutoResizeMode(JTable.AUTO_RESIZE_ALL_COLUMNS);
         setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION);

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

@@ -15 +15 @@
 
         // column 0 - the member role
         col = new TableColumn(0);
+        col.setHeaderValue(tr("#"));
+        col.setResizable(true);
+        col.setPreferredWidth(20);
+        addColumn(col);
+
+        // column 1 - the member role
+        col = new TableColumn(1);
         col.setHeaderValue(tr("Role"));
         col.setResizable(true);
         col.setPreferredWidth(100);
@@ -22 +29 @@
         col.setCellEditor(new MemberRoleCellEditor(ds));
         addColumn(col);
 
-        // column 1 - the member
-        col = new TableColumn(1);
+        // column 2 - the member
+        col = new TableColumn(2);
         col.setHeaderValue(tr("Refers to"));
         col.setResizable(true);
         col.setPreferredWidth(300);
@@ -31 +38 @@
         col.setCellRenderer(new MemberTableMemberCellRenderer());
         addColumn(col);
 
-        // column 2 -
-        col = new TableColumn(2);
+        // column 3 - linked
+        col = new TableColumn(3);
         col.setHeaderValue("");
         col.setResizable(false);
         col.setPreferredWidth(20);

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

@@ -126 +126 @@
         Collection<RelationMember> sel = getSelectedMembers();
         for (int i=0; i < members.size();i++) {
             if (members.get(i).getMember() == event.getPrimitive()) {
-                fireTableCellUpdated(i, 1 /* the column with the primitive name */);
+                fireTableCellUpdated(i, 2 /* the column with the primitive name */);
             }
         }
         setSelectedMembers(sel);
@@ -164 +164 @@
     }
 
     public int getColumnCount() {
-        return 3;
+        return 4;
     }
 
     public int getRowCount() {
@@ -174 +174 @@
     public Object getValueAt(int rowIndex, int columnIndex) {
         switch (columnIndex) {
         case 0:
-            return members.get(rowIndex).getRole();
+            return rowIndex + 1;
         case 1:
-            return members.get(rowIndex).getMember();
+            return members.get(rowIndex).getRole();
         case 2:
+            return members.get(rowIndex).getMember();
+        case 3:
             return getWayConnection(rowIndex);
         }
         // should not happen
@@ -185 +187 @@
     }
 
     @Override
+    public Class<?> getColumnClass(int columnIndex) {
+        return columnIndex == 0 ? Integer.class : Object.class;
+    }
+
+    @Override
     public boolean isCellEditable(int rowIndex, int columnIndex) {
-        return columnIndex == 0;
+        return columnIndex == 1;
     }
 
     @Override