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

Timestamp:

2016-06-01T23:17:40+02:00 (8 years ago)

Author:

Don-vip

Message:

sonar - squid:S1854 - Dead stores should be removed

Location:

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

Files:

• HistoryBrowserModel.java (modified) (1 diff)
• NodeListTableCellRenderer.java (modified) (1 diff)
• NodeListTableColumnModel.java (modified) (1 diff)
• RelationMemberTableColumnModel.java (modified) (2 diffs)
• TagTableColumnModel.java (modified) (2 diffs)
• VersionTableColumnModel.java (modified) (3 diffs)

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

@@ -763 +763 @@
         l.data.addDataSetListener(this);
         OsmPrimitive primitive = history != null ? l.data.getPrimitiveById(history.getId(), history.getType()) : null;
-        HistoryOsmPrimitive latest;
+        HistoryOsmPrimitive newLatest;
         if (canShowAsLatest(primitive)) {
-            latest = new HistoryPrimitiveBuilder().build(primitive);
+            newLatest = new HistoryPrimitiveBuilder().build(primitive);
         } else {
-            latest = null;
-        }
-        setLatest(latest);
+            newLatest = null;
+        }
+        setLatest(newLatest);
         fireModelChange();
     }

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

@@ -33 +33 @@
     protected void renderNode(TwoColumnDiff.Item item, boolean isSelected) {
         String text = "";
-        Color bgColor = Color.WHITE;
         setIcon(nodeIcon);
         if (item.value != null) {
             text = tr("Node {0}", item.value.toString());
         }
-        bgColor = item.state.getColor();
+        Color bgColor = item.state.getColor();
         if (item.state == DiffItemType.EMPTY) {
             text = "";

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

@@ -7 +7 @@
 import javax.swing.table.TableColumn;
 
-
 /**
  * The {@link javax.swing.table.TableColumnModel} for the table with the list of nodes.
- *
- *
+ * @since 1709
  */
 public class NodeListTableColumnModel extends DefaultTableColumnModel {
+
+    /**
+     * Constructs a new {@code NodeListTableColumnModel}.
+     */
+    public NodeListTableColumnModel() {
+        createColumns();
+    }
+
     protected void createColumns() {
-        TableColumn col = null;
         NodeListTableCellRenderer renderer = new NodeListTableCellRenderer();
 
         // column 0 - Version
-        col = new TableColumn(0);
+        TableColumn col = new TableColumn(0);
         col.setHeaderValue(tr("Nodes"));
         col.setCellRenderer(renderer);
         addColumn(col);
     }
-
-    public NodeListTableColumnModel() {
-        createColumns();
-    }
 }

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

@@ -9 +9 @@
 /**
  * The {@link javax.swing.table.TableColumnModel} for the table with the list of relation members.
- *
+ * @since 1709
  */
 public class RelationMemberTableColumnModel extends DefaultTableColumnModel {
+
+    /**
+     * Constructs a new {@code RelationMemberTableColumnModel}.
+     */
+    public RelationMemberTableColumnModel() {
+        createColumns();
+    }
+
     protected void createColumns() {
-        TableColumn col = null;
         RelationMemberListTableCellRenderer renderer = new RelationMemberListTableCellRenderer();
 
         // column 0 - Version
-        col = new TableColumn(0);
+        TableColumn col = new TableColumn(0);
         col.setHeaderValue(tr("Role"));
         col.setCellRenderer(renderer);
@@ -28 +35 @@
         addColumn(col);
     }
-
-    public RelationMemberTableColumnModel() {
-        createColumns();
-    }
 }

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

@@ -12 +12 @@
  */
 public class TagTableColumnModel extends DefaultTableColumnModel {
+
+    /**
+     * Constructs a new {@code TagTableColumnModel}.
+     */
+    public TagTableColumnModel() {
+        createColumns();
+    }
+
     protected void createColumns() {
-        TableColumn col = null;
-
         TagTableCellRenderer renderer = new TagTableCellRenderer();
 
         // column 0 - Key
-        col = new TableColumn(0);
+        TableColumn col = new TableColumn(0);
         col.setHeaderValue(tr("Key"));
         col.setCellRenderer(renderer);
@@ -28 +34 @@
         col.setCellRenderer(renderer);
         addColumn(col);
-
-    }
-
-    /**
-     * Constructs a new {@code TagTableColumnModel}.
-     */
-    public TagTableColumnModel() {
-        createColumns();
     }
 }

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

@@ -11 +11 @@
 /**
  * The {@link TableColumnModel} for the table with the list of versions
- *
+ * @since 1709
  */
 public class VersionTableColumnModel extends DefaultTableColumnModel {
@@ -26 +26 @@
     public static final int COL_USER = 4;
 
+    /**
+     * Creates a new {@code VersionTableColumnModel}.
+     */
+    public VersionTableColumnModel() {
+        createColumns();
+    }
+
     protected void createColumns() {
-        TableColumn col = null;
         VersionTable.RadioButtonRenderer bRenderer = new VersionTable.RadioButtonRenderer();
 
         // column 0 - Version
-        col = new TableColumn(COL_VERSION);
+        TableColumn col = new TableColumn(COL_VERSION);
         /* translation note: 3 letter abbr. for "Version" */
         col.setHeaderValue(tr("Ver"));
@@ -62 +68 @@
         addColumn(col);
     }
-
-    /**
-     * Creates a new {@code VersionTableColumnModel}.
-     */
-    public VersionTableColumnModel() {
-        createColumns();
-    }
 }