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

Timestamp:

2016-05-15T14:48:06+02:00 (8 years ago)

Author:

Don-vip

Message:

findbugs - SF_SWITCH_NO_DEFAULT + various sonar fixes

File:

• trunk/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java (modified) (4 diffs)

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

@@ -4 +4 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
-import java.awt.Color;
 import java.awt.Component;
 import java.util.EnumMap;
@@ -48 +47 @@
 
     protected void renderRole(Item diffItem) {
-        String text = "";
-        Color bgColor = diffItem.state.getColor();
         RelationMemberData member = (RelationMemberData) diffItem.value;
-        text = member == null ? "" : member.getRole();
+        String text = member == null ? "" : member.getRole();
         setText(text);
         setToolTipText(text);
-        GuiHelper.setBackgroundReadable(this, bgColor);
+        GuiHelper.setBackgroundReadable(this, diffItem.state.getColor());
     }
 
     protected void renderPrimitive(Item diffItem) {
         String text = "";
-        Color bgColor = diffItem.state.getColor();
         RelationMemberData member = (RelationMemberData) diffItem.value;
-        text = "";
         if (member != null) {
             switch(member.getMemberType()) {
@@ -67 +62 @@
             case WAY: text = tr("Way {0}", member.getMemberId()); break;
             case RELATION: text = tr("Relation {0}", member.getMemberId()); break;
+            default: throw new AssertionError();
             }
         }
         setText(text);
         setToolTipText(text);
-        GuiHelper.setBackgroundReadable(this, bgColor);
+        GuiHelper.setBackgroundReadable(this, diffItem.state.getColor());
     }
 
@@ -89 +85 @@
             renderPrimitive(member);
             break;
+        default: // Do nothing
         }