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

Timestamp:

2010-01-23T17:00:44+01:00 (14 years ago)

Author:

bastiK

Message:

Show in relation list if a relation has incomplete members.
Remove tooltips in relation list (fixes #3639, fixes #4227).

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• DefaultNameFormatter.java (modified) (2 diffs)
• OsmPrimitivRenderer.java (modified) (2 diffs)
• dialogs/RelationListDialog.java (modified) (1 diff)

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

@@ -19 +19 @@
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.Relation;
+import org.openstreetmap.josm.data.osm.RelationMember;
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.data.osm.history.HistoryNameFormatter;
@@ -197 +198 @@
 
             int mbno = relation.getMembersCount();
-            name += trn("{0} member", "{0} members", mbno, mbno) + ")";
+            name += trn("{0} member", "{0} members", mbno, mbno);
+
+            boolean incomplete = false;
+            for (RelationMember m : relation.getMembers()) {
+                if (m.getMember().isIncomplete()) {
+                    incomplete = true;
+                    break;
+                }
+            }
+            if (incomplete) {
+                name += ", "+tr("incomplete");
+            }
+
+            name += ")";
         }
         name = decorateNameWithId(name, relation);

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

@@ -67 +67 @@
     private Component renderer(Component def, OsmPrimitive value) {
         if (def != null && value != null && def instanceof JLabel) {
-            ((JLabel)def).setText(value.getDisplayName(DefaultNameFormatter.getInstance()));
+            ((JLabel)def).setText(getComponentText(value));
             ((JLabel)def).setIcon(ImageProvider.get(value.getType()));
-            ((JLabel)def).setToolTipText(formatter.buildDefaultToolTip(value));
+            ((JLabel)def).setToolTipText(getComponentToolTipText(value));
         }
         return def;
@@ -89 +89 @@
         return def;
     }
+
+    /**
+     * Can be overridden to customize the Text
+     */
+    protected String getComponentText(OsmPrimitive value) {
+        return value.getDisplayName(DefaultNameFormatter.getInstance());
+    }
+
+    /**
+     * Can be overridden to customize the ToolTipText
+     */
+    protected String getComponentToolTipText(OsmPrimitive value) {
+        return formatter.buildDefaultToolTip(value);
+    }
 }

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

@@ -95 +95 @@
         displaylist = new JList(model);
         displaylist.setSelectionModel(selectionModel);
-        displaylist.setCellRenderer(new OsmPrimitivRenderer());
+        displaylist.setCellRenderer(new OsmPrimitivRenderer() {
+            /**
+             * Don't show the default tooltip in the relation list.
+             */
+            @Override
+            protected String getComponentToolTipText(OsmPrimitive value) {
+                return null;
+            }
+        });
         displaylist.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION);
         displaylist.addMouseListener(new MouseEventHandler());