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

Timestamp:

2017-04-10T00:14:42+02:00 (7 years ago)

Author:

Don-vip

Message:

findbugs - EI_EXPOSE_REP2 + javadoc

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• dialogs/changeset/ChangesetContentTableCellRenderer.java (modified) (2 diffs)
• dialogs/changeset/ChangesetContentTableModel.java (modified) (6 diffs)
• dialogs/changeset/ChangesetDetailPanel.java (modified) (2 diffs)
• history/CoordinateInfoViewer.java (modified) (1 diff)
• io/ChangesetCellRenderer.java (modified) (2 diffs)
• widgets/DateEditorWithSlider.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableCellRenderer.java

@@ -17 +17 @@
 public class ChangesetContentTableCellRenderer extends AbstractCellRenderer {
 
+    /**
+     * Renders primitive modification type.
+     * @param type modification type
+     */
     protected void renderModificationType(ChangesetModificationType type) {
         switch(type) {
@@ -35 +39 @@
         switch(column) {
         case 0:
-            ChangesetModificationType type = (ChangesetModificationType) value;
-            renderModificationType(type);
+            renderModificationType((ChangesetModificationType) value);
             break;
         case 1:
-            HistoryOsmPrimitive primitive = (HistoryOsmPrimitive) value;
-            renderId(primitive.getId());
+            renderId(((HistoryOsmPrimitive) value).getId());
             break;
         default:

trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableModel.java

@@ -18 +18 @@
 /**
  * This is the table model for the content of a changeset.
- *
+ * @since 2689
  */
 public class ChangesetContentTableModel extends AbstractTableModel {
@@ -25 +25 @@
     private final DefaultListSelectionModel selectionModel;
 
+    /**
+     * Constructs a new {@code ChangesetContentTableModel}.
+     * @param selectionModel selection model
+     */
     public ChangesetContentTableModel(DefaultListSelectionModel selectionModel) {
         this.selectionModel = selectionModel;
@@ -38 +42 @@
     }
 
+    /**
+     * Selects a single item by its index.
+     * @param row index
+     */
     public void setSelectedByIdx(int row) {
         selectionModel.setSelectionInterval(row, row);
@@ -50 +58 @@
     }
 
+    /**
+     * Returns the selected history primitives.
+     * @return the selected history primitives
+     */
     public Set<HistoryOsmPrimitive> getSelectedPrimitives() {
         Set<HistoryOsmPrimitive> ret = new HashSet<>();
@@ -78 +90 @@
     }
 
+    /**
+     * Sort data.
+     */
     protected void sort() {
         data.sort((c1, c2) -> {
@@ -130 +145 @@
      * The type used internally to keep information about {@link HistoryOsmPrimitive}
      * with their {@link ChangesetModificationType}.
-     *
      */
     private static class ChangesetContentEntry implements ChangesetDataSetEntry {

trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java

@@ -17 +17 @@
 import java.text.DateFormat;
 import java.util.Collections;
+import java.util.Date;
 import java.util.HashSet;
 import java.util.Set;
@@ -238 +239 @@
         DateFormat sdf = DateUtils.getDateTimeFormat(DateFormat.SHORT, DateFormat.SHORT);
 
-        tfCreatedOn.setText(cs.getCreatedAt() == null ? "" : sdf.format(cs.getCreatedAt()));
-        tfClosedOn.setText(cs.getClosedAt() == null ? "" : sdf.format(cs.getClosedAt()));
+        Date createdDate = cs.getCreatedAt();
+        Date closedDate = cs.getClosedAt();
+        tfCreatedOn.setText(createdDate == null ? "" : sdf.format(createdDate));
+        tfClosedOn.setText(closedDate == null ? "" : sdf.format(closedDate));
     }
 

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

@@ -231 +231 @@
         protected final Pair<LatLon, LatLon> getCoordinates() {
             HistoryOsmPrimitive p = getPrimitive();
+            if (!(p instanceof HistoryNode)) return null;
             HistoryOsmPrimitive opposite = getOppositePrimitive();
-            if (!(p instanceof HistoryNode)) return null;
             if (!(opposite instanceof HistoryNode)) return null;
             HistoryNode node = (HistoryNode) p;

trunk/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java

@@ -6 +6 @@
 import java.awt.Component;
 import java.text.DateFormat;
+import java.util.Date;
 
 import javax.swing.ImageIcon;
@@ -37 +38 @@
         StringBuilder sb = new StringBuilder(64);
         sb.append("<html><strong>").append(tr("Changeset id:")).append("</strong>").append(cs.getId()).append("<br>");
-        if (cs.getCreatedAt() != null) {
+        Date createdDate = cs.getCreatedAt();
+        if (createdDate != null) {
             sb.append("<strong>").append(tr("Created at:")).append("</strong>").append(
-                    DateUtils.formatDateTime(cs.getCreatedAt(), DateFormat.SHORT, DateFormat.SHORT)).append("<br>");
+                    DateUtils.formatDateTime(createdDate, DateFormat.SHORT, DateFormat.SHORT)).append("<br>");
         }
         String comment = cs.get("comment");

trunk/src/org/openstreetmap/josm/gui/widgets/DateEditorWithSlider.java

@@ -91 +91 @@
 
     public void setRange(Date dateMin, Date dateMax) {
-        this.dateMin = dateMin;
-        this.dateMax = dateMax;
+        this.dateMin = DateUtils.cloneDate(dateMin);
+        this.dateMax = DateUtils.cloneDate(dateMax);
     }
 
     public void setDate(Date date) {
-        spinner.setValue(date);
+        spinner.setValue(DateUtils.cloneDate(date));
     }
 
     public Date getDate() {
-        return (Date) spinner.getValue();
+        return DateUtils.cloneDate((Date) spinner.getValue());
     }