Changeset 8691 in osm for applications/editors/josm

Timestamp:

2008-07-03T18:02:52+02:00 (16 years ago)

Author:

stoecker

Message:

added more verbose names

File:

• applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/MultipleNameVisitor.java (modified) (6 diffs)

applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/MultipleNameVisitor.java

@@ -1 +1 @@
 package org.openstreetmap.josm.plugins.validator.util;
 
+import static org.openstreetmap.josm.tools.I18n.tr;
 import static org.openstreetmap.josm.tools.I18n.trn;
 
@@ -21 +22 @@
         /** The class name of the combined primitives */
         String multipleClassname;
+        /* name to be displayed */
+        String displayName;
         /** Size of the collection */
         int size;
@@ -30 +33 @@
         public void visit(Collection<? extends OsmPrimitive> data) 
         {
+                String multipleName = null;
+                String firstName = null;
+                boolean initializedname = false;
                 size = data.size();
+
                 multipleClassname = null;
                 for (OsmPrimitive osm : data) 
                 {
+                        String name = osm.get("name");
+                        if(name == null) name = osm.get("ref");
+                        if(!initializedname)
+                        {
+                                multipleName = name; initializedname = true;
+                        }
+                        else if(multipleName != null && (name == null  || !name.equals(multipleName)))
+                        {
+                                multipleName = null;
+                        }
+
+                        if(firstName == null && name != null)
+                                firstName = name;
                         osm.visit(this);
                         if (multipleClassname == null)
@@ -40 +60 @@
                                 multipleClassname = "object";
                 }
+                
+                if( size == 1 )
+                        displayName = name;
+                else if(multipleName != null)
+                        displayName = size + " " + trn(multipleClassname, multipleClassname + "s", size) + ": " + multipleName;
+                else if(firstName != null)
+                        displayName = size + " " + trn(multipleClassname, multipleClassname + "s", size) + ": " + tr("{0}, ...", firstName);
+                else
+                        displayName = size + " " + trn(multipleClassname, multipleClassname + "s", size);
         }
 
@@ -45 +74 @@
         public JLabel toLabel() 
         {
-                if( size == 1 )
-                        return super.toLabel();
-                else
-                        return new JLabel( size + " " + trn(multipleClassname, multipleClassname + "s", size), ImageProvider.get("data", multipleClassname), JLabel.HORIZONTAL);
+                return new JLabel(getText(), getIcon(), JLabel.HORIZONTAL);
         }
         
@@ -57 +83 @@
         public String getText()
         {
-                if( size == 1 )
-                        return name;
-                else
-                        return size + " " + trn(multipleClassname, multipleClassname + "s", size);
+                return displayName;
         }