Changeset 5353 in josm

Timestamp:

Jul 19, 2012 11:04:38 PM (10 months ago)

Author:

Don-vip

Message:

fix #7229 - Render all names (up to 80 chars) in validator tree, instead of just the first one followed by "..."

File:

• trunk/src/org/openstreetmap/josm/data/validation/util/MultipleNameVisitor.java (modified) (6 diffs)

trunk/src/org/openstreetmap/josm/data/validation/util/MultipleNameVisitor.java

@@ -2 +2 @@
 package org.openstreetmap.josm.data.validation.util;
 
-import static org.openstreetmap.josm.tools.I18n.tr;
 import static org.openstreetmap.josm.tools.I18n.trn;
 
@@ -20 +19 @@
 public class MultipleNameVisitor extends NameVisitor
 {
+    public static final int MULTIPLE_NAME_MAX_LENGTH = 80;
+    
     /** The class name of the combined primitives */
-    String multipleClassname;
+    private String multipleClassname;
     /* name to be displayed */
-    String displayName;
+    private String displayName;
     /** Size of the collection */
-    int size;
+    private int size;
 
     /**
@@ -32 +33 @@
      */
     public void visit(Collection<? extends OsmPrimitive> data) {
-        String multipleName = null;
+        String multipleName = "";
         String multiplePluralClassname = null;
-        String firstName = null;
-        boolean initializedname = false;
         size = data.size();
 
@@ -44 +43 @@
                 name = osm.get("ref");
             }
-            if (!initializedname) {
-                multipleName = name; initializedname = true;
-            } else if (multipleName != null && (name == null  || !name.equals(multipleName))) {
-                multipleName = null;
+            if (name != null && !name.isEmpty() && multipleName.length() <= MULTIPLE_NAME_MAX_LENGTH) {
+                if (!multipleName.isEmpty()) {
+                    multipleName += ", ";
+                }
+                multipleName += name;
             }
 
-            if (firstName == null && name != null) {
-                firstName = name;
-            }
             osm.visit(this);
             if (multipleClassname == null) {
@@ -65 +62 @@
         if (size == 1) {
             displayName = name;
-        } else if (multipleName != null) {
-            displayName = size + " " + trn(multipleClassname, multiplePluralClassname, size) + ": " + multipleName;
-        } else if (firstName != null) {
-            displayName = size + " " + trn(multipleClassname, multiplePluralClassname, size) + ": " + tr("{0}, ...", firstName);
         } else {
             displayName = size + " " + trn(multipleClassname, multiplePluralClassname, size);
+            if (!multipleName.isEmpty()) {
+                if (multipleName.length() <= MULTIPLE_NAME_MAX_LENGTH) {
+                    displayName += ": " + multipleName;
+                } else {
+                    displayName += ": " + multipleName.substring(0, MULTIPLE_NAME_MAX_LENGTH) + "...";
+                }
+            }
         }
     }
@@ -97 +97 @@
             return ImageProvider.get("data", multipleClassname);
     }
+
+    @Override
+    public String toString() {
+        return getText();
+    }
 }