Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableModel.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableModel.java	(revision 16217)
+++ /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableModel.java	(revision 16218)
@@ -96,26 +96,9 @@
     protected void sort() {
         data.sort((c1, c2) -> {
-                if (c1.getModificationType() == c2.getModificationType()) {
-                    long id1 = c1.getPrimitive().getId();
-                    long id2 = c2.getPrimitive().getId();
-
-                    if (id1 == id2)
-                        return 0;
-                    else if (id1 < id2)
-                        return -1;
-                    return 1;
-                }
-                switch(c1.getModificationType()) {
-                case CREATED: return -1;
-                case UPDATED:
-                    switch(c2.getModificationType()) {
-                    case CREATED: return 1;
-                    default: return -1;
-                    }
-                case DELETED:
-                    return 1;
-                }
-                // should not happen
-                return 0;
+            int d = c1.getModificationType().compareTo(c2.getModificationType());
+            if (d == 0) {
+                d = Long.compare(c1.getPrimitive().getId(), c2.getPrimitive().getId());
+            }
+            return d;
             }
         );