Changeset 15280 in josm for trunk

Timestamp:

2019-08-04T22:30:23+02:00 (5 years ago)

Author:

Don-vip

Message:

fix #17979 - display number of incomplete objects in OSM data layer information

File:

• trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java (modified) (6 diffs)

trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java

@@ -294 +294 @@
          */
         public int deletedRelations;
+        /**
+         * Incomplete nodes that have been visited
+         */
+        public int incompleteNodes;
+        /**
+         * Incomplete ways that have been visited
+         */
+        public int incompleteWays;
+        /**
+         * Incomplete relations that have been visited
+         */
+        public int incompleteRelations;
 
         @Override
@@ -301 +313 @@
                 deletedNodes++;
             }
+            if (n.isIncomplete()) {
+                incompleteNodes++;
+            }
         }
 
@@ -309 +324 @@
                 deletedWays++;
             }
+            if (w.isIncomplete()) {
+                incompleteWays++;
+            }
         }
 
@@ -316 +334 @@
             if (r.isDeleted()) {
                 deletedRelations++;
+            }
+            if (r.isIncomplete()) {
+                incompleteRelations++;
             }
         }
@@ -650 +671 @@
     }
 
+    private static String counterText(String text, int deleted, int incomplete) {
+        StringBuilder sb = new StringBuilder(text);
+        if (deleted > 0 || incomplete > 0) {
+            sb.append(" (");
+            if (deleted > 0) {
+                sb.append(trn("{0} deleted", "{0} deleted", deleted, deleted));
+            }
+            if (deleted > 0 && incomplete > 0) {
+                sb.append(", ");
+            }
+            if (incomplete > 0) {
+                sb.append(trn("{0} incomplete", "{0} incomplete", incomplete, incomplete));
+            }
+            sb.append(')');
+        }
+        return sb.toString();
+    }
+
     @Override
     public Object getInfoComponent() {
@@ -658 +697 @@
         final JPanel p = new JPanel(new GridBagLayout());
 
-        String nodeText = trn("{0} node", "{0} nodes", counter.nodes, counter.nodes);
-        if (counter.deletedNodes > 0) {
-            nodeText += " ("+trn("{0} deleted", "{0} deleted", counter.deletedNodes, counter.deletedNodes)+')';
-        }
-
-        String wayText = trn("{0} way", "{0} ways", counter.ways, counter.ways);
-        if (counter.deletedWays > 0) {
-            wayText += " ("+trn("{0} deleted", "{0} deleted", counter.deletedWays, counter.deletedWays)+')';
-        }
-
-        String relationText = trn("{0} relation", "{0} relations", counter.relations, counter.relations);
-        if (counter.deletedRelations > 0) {
-            relationText += " ("+trn("{0} deleted", "{0} deleted", counter.deletedRelations, counter.deletedRelations)+')';
-        }
+        String nodeText = counterText(trn("{0} node", "{0} nodes", counter.nodes, counter.nodes),
+                counter.deletedNodes, counter.incompleteNodes);
+        String wayText = counterText(trn("{0} way", "{0} ways", counter.ways, counter.ways),
+                counter.deletedWays, counter.incompleteWays);
+        String relationText = counterText(trn("{0} relation", "{0} relations", counter.relations, counter.relations),
+                counter.deletedRelations, counter.incompleteRelations);
 
         p.add(new JLabel(tr("{0} consists of:", getName())), GBC.eol());