Changeset 11350 in josm for trunk/src/org/openstreetmap

Timestamp:

2016-11-30T13:00:13+01:00 (7 years ago)

Author:

Don-vip

Message:

fix unit test

File:

• trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java

@@ -43 +43 @@
 
     private static Component setColors(Component comp, JTable table, boolean isSelected, int row) {
-        RelationMemberConflictResolverModel model = (RelationMemberConflictResolverModel) table.getModel();
+        if (table.getModel() instanceof RelationMemberConflictResolverModel) {
+            RelationMemberConflictResolverModel model = (RelationMemberConflictResolverModel) table.getModel();
 
-        if (!isSelected && comp != null) {
-            switch (model.getDecision(row).getDecision()) {
-            case UNDECIDED:
-                comp.setForeground(ConflictColors.FGCOLOR_UNDECIDED.get());
-                comp.setBackground(ConflictColors.BGCOLOR_UNDECIDED.get());
-                break;
-            case KEEP:
-                comp.setForeground(ConflictColors.FGCOLOR_MEMBER_KEEP.get());
-                comp.setBackground(ConflictColors.BGCOLOR_MEMBER_KEEP.get());
-                break;
-            case REMOVE:
-                comp.setForeground(ConflictColors.FGCOLOR_MEMBER_REMOVE.get());
-                comp.setBackground(ConflictColors.BGCOLOR_MEMBER_REMOVE.get());
-                break;
+            if (!isSelected && comp != null) {
+                switch (model.getDecision(row).getDecision()) {
+                case UNDECIDED:
+                    comp.setForeground(ConflictColors.FGCOLOR_UNDECIDED.get());
+                    comp.setBackground(ConflictColors.BGCOLOR_UNDECIDED.get());
+                    break;
+                case KEEP:
+                    comp.setForeground(ConflictColors.FGCOLOR_MEMBER_KEEP.get());
+                    comp.setBackground(ConflictColors.BGCOLOR_MEMBER_KEEP.get());
+                    break;
+                case REMOVE:
+                    comp.setForeground(ConflictColors.FGCOLOR_MEMBER_REMOVE.get());
+                    comp.setBackground(ConflictColors.BGCOLOR_MEMBER_REMOVE.get());
+                    break;
+                }
             }
         }