Changeset 4566 in josm for trunk/src/org/openstreetmap/josm/gui

Timestamp:

2011-11-02T14:39:27+01:00 (12 years ago)

Author:

stoecker

Message:

fix #6652 - patch by olejorgenb - Members list in history panel for relations and ways is broken

Location:

trunk/src/org/openstreetmap/josm/gui/history

Files:

• HistoryBrowserModel.java (modified) (2 diffs)
• NodeListTableCellRenderer.java (modified) (1 diff)
• RelationMemberListTableCellRenderer.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java

@@ -596 +596 @@
         @Override
         public int getRowCount() {
+            // Match the size of the opposite table so comparison is less confusing.
+            // (scroll bars lines up properly, etc.)
             int n = 0;
             if (current != null && current.getType().equals(OsmPrimitiveType.RELATION)) {
@@ -644 +646 @@
             if (relation == null)
                 return null;
-            if (row >= relation.getNumMembers())
+            if (row >= relation.getNumMembers()) // see getRowCount
                 return null;
             return relation.getMembers().get(row);

trunk/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java

@@ -62 +62 @@
     }
 
+    // Warning: The model pads with null-rows to match the size of the opposite table. 'value' could be null
     public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus,
             int row, int column) {
-        if (value == null)
-            return this;
 
         renderNode((TwoColumnDiff.Item)value, isSelected);

trunk/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java

@@ -92 +92 @@
     }
 
+    // Warning: The model pads with null-rows to match the size of the opposite table. 'value' could be null
     public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus,
             int row, int column) {
-        if (value == null)
-            return this;
 
         HistoryBrowserModel.RelationMemberTableModel model = gteRelationMemberTableModel(table);