Changeset 6652 in josm for trunk/src/org/openstreetmap/josm/tools

Timestamp:

2014-01-06T20:42:32+01:00 (9 years ago)

Author:

simon04

Message:

fix #9525 - multiselecting objects does not show differing relation membership correctly in the sidebar

For instance, positions are displayed as 48-49,91,✗.

Location:

trunk/src/org/openstreetmap/josm/tools

Files:

• Predicates.java (modified) (2 diffs)
• Utils.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/tools/Predicates.java

@@ -3 +3 @@
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 
+import java.util.Collection;
 import java.util.regex.Pattern;
 
@@ -84 +85 @@
         };
     }
+
+    /**
+     * Returns a {@link Predicate} executing {@link Collection#contains(Object)}.
+     */
+    public static <T> Predicate<T> inCollection(final Collection<? extends T> target) {
+        return new Predicate<T>() {
+            @Override
+            public boolean evaluate(T object) {
+                return target.contains(object);
+            }
+        };
+    }
 }

trunk/src/org/openstreetmap/josm/tools/Utils.java

@@ -37 +37 @@
 import java.util.Arrays;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
@@ -861 +862 @@
 
     /**
+     * Returns a human readable representation of a list of positions.
+     * <p/>
+     * For instance, {@code [1,5,2,6,7} yields "1-2,5-7
+     * @param positionList a list of positions
+     * @return a human readable representation
+     */
+    public static String getPositionListString(List<Integer> positionList)  {
+        Collections.sort(positionList);
+        final StringBuilder sb = new StringBuilder(32);
+        sb.append(positionList.get(0));
+        int cnt = 0;
+        int last = positionList.get(0);
+        for (int i = 1; i < positionList.size(); ++i) {
+            int cur = positionList.get(i);
+            if (cur == last + 1) {
+                ++cnt;
+            } else if (cnt == 0) {
+                sb.append(",").append(cur);
+            } else {
+                sb.append("-").append(last);
+                sb.append(",").append(cur);
+                cnt = 0;
+            }
+            last = cur;
+        }
+        if (cnt >= 1) {
+            sb.append("-").append(last);
+        }
+        return sb.toString();
+    }
+
+
+    /**
      * Returns a list of capture groups if {@link Matcher#matches()}, or {@code null}.
      * The first element (index 0) is the complete match.