Changeset 3286 in josm for trunk/src/org/openstreetmap

Timestamp:

2010-05-29T22:21:47+02:00 (14 years ago)

Author:

stoecker

Message:

fix #4765 - improve selection history

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• DefaultNameFormatter.java (modified) (2 diffs)
• dialogs/SelectionListDialog.java (modified) (3 diffs)

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

@@ -147 +147 @@
                 nodesNo--;
             }
+            if(name.length() == 0 )
+                name = String.valueOf(way.getId());
+            /* note: length == 0 should no longer happen, but leave the bracket code
+               nevertheless, who knows what future brings */
             String nodes = trn("{0} node", "{0} nodes", nodesNo, nodesNo);
             name += (name.length() > 0) ? " ("+nodes+")" : nodes;
@@ -357 +361 @@
         int nodesNo = way.isClosed() ? way.getNumNodes() -1 : way.getNumNodes();
         String nodes = trn("{0} node", "{0} nodes", nodesNo, nodesNo);
+        if(sb.length() == 0 )
+            sb.append(way.getId());
+        /* note: length == 0 should no longer happen, but leave the bracket code
+           nevertheless, who knows what future brings */
         sb.append((sb.length() > 0) ? " ("+nodes+")" : nodes);
         decorateNameWithId(sb, way);

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

@@ -455 +455 @@
             if (history.getFirst().equals(selection)) return;
             history.addFirst(selection);
+            for(int i = 1; i < history.size(); ++i) {
+                if(history.get(i).equals(selection)) {
+                    history.remove(i);
+                    break;
+                }
+            }
             while (history.size() > SELECTION_HISTORY_SIZE) {
                 history.removeLast();
@@ -685 +691 @@
      */
     protected static class SelectionMenuItem extends JMenuItem implements ActionListener {
+        final private DefaultNameFormatter df = DefaultNameFormatter.getInstance();
         protected Collection<? extends OsmPrimitive> sel;
 
@@ -715 +722 @@
                 .append(trn("{0} relation", "{0} relations", relations, relations));
             }
-            setText(tr("Selection: {0}", text));
+            if(ways + nodes + relations == 1)
+            {
+                text.append(": ");
+                for(OsmPrimitive o : sel)
+                   text.append(o.getDisplayName(df));
+                setText(text.toString());
+            }
+            else
+                setText(tr("Selection: {0}", text));
             addActionListener(this);
         }