Changeset 9473 in josm for trunk/src/org/openstreetmap/josm/gui

Timestamp:

2016-01-15T22:25:06+01:00 (10 years ago)

Author:

simon04

Message:

fix #12343 - Display at most 20 primitives for some confirmation dialogs (e.g., deletion of relations)

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• DefaultNameFormatter.java (modified) (2 diffs)
• conflict/tags/CombinePrimitiveResolverDialog.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java

@@ -644 +644 @@
      * Formats the given collection of primitives as an HTML unordered list.
      * @param primitives collection of primitives to format
+     * @param maxElements the maximum number of elements to display
      * @return HTML unordered list
      */
-    public String formatAsHtmlUnorderedList(Collection<? extends OsmPrimitive> primitives) {
-        return Utils.joinAsHtmlUnorderedList(Utils.transform(primitives, new Function<OsmPrimitive, String>() {
+    public String formatAsHtmlUnorderedList(Collection<? extends OsmPrimitive> primitives, int maxElements) {
+        final Collection<String> displayNames = Utils.transform(primitives, new Function<OsmPrimitive, String>() {
 
             @Override
@@ -653 +654 @@
                 return x.getDisplayName(DefaultNameFormatter.this);
             }
-        }));
-    }
-
-    /**
-     * Formats the given primitive(s) as an HTML unordered list.
-     * @param primitives primitive(s) to format
+        });
+        return Utils.joinAsHtmlUnorderedList(Utils.limit(displayNames, maxElements, "..."));
+    }
+
+    /**
+     * Formats the given primitive as an HTML unordered list.
+     * @param primitive primitive to format
      * @return HTML unordered list
      */
-    public String formatAsHtmlUnorderedList(OsmPrimitive... primitives) {
-        return formatAsHtmlUnorderedList(Arrays.asList(primitives));
+    public String formatAsHtmlUnorderedList(OsmPrimitive primitive) {
+        return formatAsHtmlUnorderedList(Collections.singletonList(primitive), 1);
     }
 }

trunk/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java

@@ -551 +551 @@
                 + "Do you want to continue?",
                 parentRelations.size(), parentRelations.size(), primitives.size(),
-                DefaultNameFormatter.getInstance().formatAsHtmlUnorderedList(parentRelations));
+                DefaultNameFormatter.getInstance().formatAsHtmlUnorderedList(parentRelations, 20));
 
         if (!ConditionalOptionPaneUtil.showConfirmationDialog(