Changeset 6555 in josm for trunk/src/org

Timestamp:

2013-12-28T22:46:44+01:00 (11 years ago)

Author:

Don-vip

Message:

fix #4183 - split number of conflicts in conflict-list header depending on nodes, ways and relations

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/conflict/ConflictCollection.java (modified) (4 diffs)
• gui/dialogs/ConflictDialog.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java

@@ -12 +12 @@
 import java.util.concurrent.CopyOnWriteArrayList;
 
+import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.data.osm.Relation;
+import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
+import org.openstreetmap.josm.tools.Predicate;
+import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -37 +42 @@
     private CopyOnWriteArrayList<IConflictListener> listeners;
 
+    private static class FilterPredicate implements Predicate<Conflict<? extends OsmPrimitive>> {
+
+        private final Class<? extends OsmPrimitive> c;
+        
+        public FilterPredicate(Class<? extends OsmPrimitive> c) {
+            this.c = c;
+        }
+
+        @Override
+        public boolean evaluate(Conflict<? extends OsmPrimitive> conflict) {
+            return conflict != null && c.isInstance(conflict.getMy());
+        }
+    }
+    
+    private static final FilterPredicate NODE_FILTER_PREDICATE = new FilterPredicate(Node.class);
+    private static final FilterPredicate WAY_FILTER_PREDICATE = new FilterPredicate(Way.class);
+    private static final FilterPredicate RELATION_FILTER_PREDICATE = new FilterPredicate(Relation.class);
+
     /**
      * Constructs a new {@code ConflictCollection}.
@@ -281 +304 @@
     }
 
+    /**
+     * Adds all conflicts from another collection.
+     * @param other The other collection of conflicts to add
+     */
     public void add(ConflictCollection other) {
         for (Conflict<?> c : other) {
@@ -329 +356 @@
         return conflicts.toString();
     }
+
+    /**
+     * Returns the list of conflicts involving nodes.
+     * @return The list of conflicts involving nodes.
+     * @since 6555
+     */
+    public final Collection<Conflict<? extends OsmPrimitive>> getNodeConflicts() {
+        return Utils.filter(conflicts, NODE_FILTER_PREDICATE);
+    }
+
+    /**
+     * Returns the list of conflicts involving nodes.
+     * @return The list of conflicts involving nodes.
+     * @since 6555
+     */
+    public final Collection<Conflict<? extends OsmPrimitive>> getWayConflicts() {
+        return Utils.filter(conflicts, WAY_FILTER_PREDICATE);
+    }
+
+    /**
+     * Returns the list of conflicts involving nodes.
+     * @return The list of conflicts involving nodes.
+     * @since 6555
+     */
+    public final Collection<Conflict<? extends OsmPrimitive>> getRelationConflicts() {
+        return Utils.filter(conflicts, RELATION_FILTER_PREDICATE);
+    }
 }

trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java

@@ -203 +203 @@
             public void run() {
                 model.fireContentChanged();
-                updateTitle(conflicts.size());
+                updateTitle();
             }
         });
     }
 
-    private void updateTitle(int conflictsCount) {
+    private void updateTitle() {
+        int conflictsCount = conflicts.size();
         if (conflictsCount > 0) {
-            setTitle(tr("Conflicts: {0} unresolved", conflicts.size()));
+            setTitle(tr("Conflicts: {0} unresolved", conflicts.size()) +
+                    " ("+tr("Rel.:{0} / Ways:{1} / Nodes:{2}",
+                            conflicts.getRelationConflicts().size(),
+                            conflicts.getWayConflicts().size(),
+                            conflicts.getNodeConflicts().size())+")");
         } else {
             setTitle(tr("Conflict"));