Changeset 1195 in josm for trunk/src/org/openstreetmap/josm/gui/dialogs

Timestamp:

2008-12-31T00:36:58+01:00 (15 years ago)

Author:

stoecker

Message:

fixed relation handling, applied language patches

Location:

trunk/src/org/openstreetmap/josm/gui/dialogs

Files:

• RelationEditor.java (modified) (3 diffs)
• SelectionListDialog.java (modified) (4 diffs)

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

@@ -14 +14 @@
 import java.beans.PropertyChangeListener;
 import java.io.IOException;
-import java.lang.reflect.Array;
 import java.text.Collator;
 import java.util.ArrayList;
@@ -304 +303 @@
             upDownPanel.setLayout(new BoxLayout(upDownPanel, BoxLayout.Y_AXIS));
 
-
-
-            upDownPanel.add(createButton(null, "moveup", tr("Move the currently selected member(s) up"),
+            upDownPanel.add(createButton(null, "moveup", tr("Move the currently selected members up"),
                     KeyEvent.VK_U, new ActionListener() {
                 public void actionPerformed(ActionEvent e) {
@@ -312 +309 @@
                 }
             }));
-            upDownPanel.add(createButton(null, "movedown", tr("Move the currently selected member(s) down"),
+            upDownPanel.add(createButton(null, "movedown", tr("Move the currently selected members down"),
                     KeyEvent.VK_N, new ActionListener() {
                 public void actionPerformed(ActionEvent e) {

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

@@ -4 +4 @@
 import static org.openstreetmap.josm.tools.I18n.marktr;
 import static org.openstreetmap.josm.tools.I18n.tr;
+import static org.openstreetmap.josm.tools.I18n.trn;
 
 import java.awt.BorderLayout;
@@ -37 +38 @@
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor;
@@ -286 +288 @@
             int ways = 0;
             int nodes = 0;
+            int relations = 0;
             for (OsmPrimitive o : sel) {
                 if (o instanceof Way)
@@ -291 +294 @@
                 else if (o instanceof Node)
                     nodes++;
-            }
-            setText(String.format(tr("Selection: %d way(s) and %d node(s)"), new Object[] { ways, nodes }));
+                else if (o instanceof Relation)
+                    relations++;
+            }
+            String text = "";
+            if(ways != 0)
+                text += (text.length() > 0 ? ", " : "")
+                + trn("{0} way", "{0} ways", ways, ways);
+            if(nodes != 0)
+                text += (text.length() > 0 ? ", " : "")
+                + trn("{0} node", "{0} nodes", nodes, nodes);
+            if(relations != 0)
+                text += (text.length() > 0 ? ", " : "")
+                + trn("{0} relation", "{0} relations", relations, relations);
+            setText(tr("Selection: {0}", text));
             addActionListener(this);
         }