Changeset 10021 in josm for trunk/src/org/openstreetmap/josm/gui/history

Timestamp:

2016-03-19T20:36:31+01:00 (9 years ago)

Author:

bastiK

Message:

see #6301 - fix issues detected by the test

Location:

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

Files:

• NodeListTableCellRenderer.java (modified) (1 diff)
• RelationMemberListTableCellRenderer.java (modified) (1 diff)
• VersionTable.java (modified) (1 diff)

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

@@ -55 +55 @@
             int row, int column) {
 
-        renderNode((TwoColumnDiff.Item) value, isSelected);
+        if (value != null) {
+            renderNode((TwoColumnDiff.Item) value, isSelected);
+        }
         return this;
     }

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

@@ -79 +79 @@
             int row, int column) {
 
+        if (value == null) return this;
         Item member = (TwoColumnDiff.Item) value;
         renderIcon((RelationMemberData) member.value);

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

@@ -319 +319 @@
         }
 
+        // for unit tests
+        private AlignedRenderer() {
+            this(SwingConstants.LEFT);
+        }
+
         @Override
         public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus,