Changeset 14231 in josm

Timestamp:

2018-09-08T20:20:58+02:00 (6 years ago)

Author:

Don-vip

Message:

fix #16723 - Display changes count in changeset manager

Location:

trunk

Files:

• src/org/openstreetmap/josm/data/osm/Changeset.java (modified) (4 diffs)
• src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableCellRenderer.java (modified) (2 diffs)
• src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableColumnModel.java (modified) (1 diff)
• src/org/openstreetmap/josm/io/OsmChangesetParser.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/io/OsmChangesetParserTest.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/data/osm/Changeset.java

@@ -43 +43 @@
     /** the number of comments for this changeset */
     private int commentsCount;
+    /** the number of changes for this changeset */
+    private int changesCount;
     /** the map of tags */
     private Map<String, String> tags;
@@ -283 +285 @@
     }
 
+    /**
+     * Replies the number of changes for this changeset.
+     * @return the number of changes for this changeset
+     * @since 14231
+     */
+    public int getChangesCount() {
+        return changesCount;
+    }
+
+    /**
+     * Sets the number of changes for this changeset.
+     * @param changesCount the number of changes for this changeset
+     * @since 14231
+     */
+    public void setChangesCount(int changesCount) {
+        this.changesCount = changesCount;
+    }
+
     @Override
     public Map<String, String> getKeys() {
@@ -346 +366 @@
      */
     public boolean hasEqualSemanticAttributes(Changeset other) {
-        if (other == null)
-            return false;
-        if (closedAt == null) {
-            if (other.closedAt != null)
-                return false;
-        } else if (!closedAt.equals(other.closedAt))
-            return false;
-        if (createdAt == null) {
-            if (other.createdAt != null)
-                return false;
-        } else if (!createdAt.equals(other.createdAt))
-            return false;
-        if (id != other.id)
-            return false;
-        if (max == null) {
-            if (other.max != null)
-                return false;
-        } else if (!max.equals(other.max))
-            return false;
-        if (min == null) {
-            if (other.min != null)
-                return false;
-        } else if (!min.equals(other.min))
-            return false;
-        if (open != other.open)
-            return false;
-        if (!tags.equals(other.tags))
-            return false;
-        if (user == null) {
-            if (other.user != null)
-                return false;
-        } else if (!user.equals(other.user))
-            return false;
-        return commentsCount == other.commentsCount;
+        return other != null
+            && id == other.id
+            && open == other.open
+            && commentsCount == other.commentsCount
+            && changesCount == other.changesCount
+            && Objects.equals(closedAt, other.closedAt)
+            && Objects.equals(createdAt, other.createdAt)
+            && Objects.equals(min, other.min)
+            && Objects.equals(max, other.max)
+            && Objects.equals(tags, other.tags)
+            && Objects.equals(user, other.user);
     }
 
@@ -434 +431 @@
         this.max = other.max;
         this.commentsCount = other.commentsCount;
+        this.changesCount = other.changesCount;
         this.tags = new HashMap<>(other.tags);
         this.incomplete = other.incomplete;

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

@@ -39 +39 @@
     }
 
+    protected void renderChanges(Changeset cs) {
+        setText(Integer.toString(cs.getChangesCount()));
+        setToolTipText(null);
+    }
+
     protected void renderDiscussions(Changeset cs) {
         setText(Integer.toString(cs.getCommentsCount()));
@@ -59 +64 @@
         case 4: /* created at */ renderDate(cs.getCreatedAt()); break;
         case 5: /* closed at */ renderDate(cs.getClosedAt()); break;
-        case 6: /* discussions */ renderDiscussions(cs); break;
+        case 6: /* changes */ renderChanges(cs); break;
+        case 7: /* discussions */ renderDiscussions(cs); break;
         default: // Do nothing
         }

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

@@ -47 +47 @@
         createColumn(5, tr("Closed at"), 100, -1);
 
-        // column 6 - Discussions
-        createColumn(6, tr("Discussions"), 25, -1);
+        // column 6 - Changes
+        createColumn(6, tr("Changes"), 25, -1);
+
+        // column 7 - Discussions
+        createColumn(7, tr("Discussions"), 25, -1);
     }
 

trunk/src/org/openstreetmap/josm/io/OsmChangesetParser.java

@@ -160 +160 @@
             if (commentsCount != null) {
                 current.setCommentsCount(parseNumericAttribute(commentsCount, 0));
+            }
+
+            // -- changes_count
+            String changesCount = atts.getValue("changes_count");
+            if (changesCount != null) {
+                current.setChangesCount(parseNumericAttribute(changesCount, 0));
             }
         }

trunk/test/unit/org/openstreetmap/josm/io/OsmChangesetParserTest.java

@@ -27 +27 @@
             "<changeset id=\"36749147\" user=\"kesler\" uid=\"13908\" created_at=\"2016-01-22T21:55:37Z\" "+
                 "closed_at=\"2016-01-22T21:56:39Z\"  open=\"false\" min_lat=\"36.6649211\" min_lon=\"55.377015\" max_lat=\"38.1490357\" " +
-                "max_lon=\"60.3766983\" comments_count=\"2\">" +
+                "max_lon=\"60.3766983\" comments_count=\"2\" changes_count=\"9\">" +
             "<tag k=\"created_by\" v=\"JOSM/1.5 (9329 en)\"/>" +
             "<tag k=\"comment\" v=\"Fixing errors in North Khorasan\"/>";
@@ -75 +75 @@
         Changeset cs = parse(BEGIN + END).iterator().next();
         assertEquals(2, cs.getCommentsCount());
+        assertEquals(9, cs.getChangesCount());
         assertTrue(cs.getDiscussion().isEmpty());
     }
@@ -87 +88 @@
         Changeset cs = parse(BEGIN + DISCUSSION + END).iterator().next();
         assertEquals(2, cs.getCommentsCount());
+        assertEquals(9, cs.getChangesCount());
         assertEquals(2, cs.getDiscussion().size());
     }