Changeset 1990 in josm for trunk/src/org/openstreetmap/josm/command

Timestamp:

2009-08-23T22:37:39+02:00 (14 years ago)

Author:

Gubaer

Message:

fixed #3261: Use the "name:$CURRENT_LOCALE" name in the JOSM UI instead of "name" when it exists
new: new checkbox in LAF preferences for enabling/disabling localized names for primitives

Location:

trunk/src/org/openstreetmap/josm/command

Files:

• AddCommand.java (modified) (2 diffs)
• ChangeCommand.java (modified) (2 diffs)
• ChangePropertyCommand.java (modified) (6 diffs)
• ChangeRelationMemberRoleCommand.java (modified) (2 diffs)
• ConflictAddCommand.java (modified) (5 diffs)
• DeleteCommand.java (modified) (5 diffs)
• RemoveRelationMemberCommand.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/command/AddCommand.java

@@ -13 +13 @@
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
-import org.openstreetmap.josm.gui.PrimitiveNameFormatter;
+import org.openstreetmap.josm.gui.DefaultNameFormatter;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.tools.ImageProvider;
@@ -73 +73 @@
                 new JLabel(
                         tr(msg,
-                                new PrimitiveNameFormatter().getName(osm)
+                                osm.getDisplayName(DefaultNameFormatter.getInstance())
                         ),
                         ImageProvider.get(OsmPrimitiveType.from(osm)),

trunk/src/org/openstreetmap/josm/command/ChangeCommand.java

@@ -13 +13 @@
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
-import org.openstreetmap.josm.gui.PrimitiveNameFormatter;
+import org.openstreetmap.josm.gui.DefaultNameFormatter;
 import org.openstreetmap.josm.tools.ImageProvider;
 
@@ -53 +53 @@
         return new DefaultMutableTreeNode(
                 new JLabel(tr(msg,
-                        new PrimitiveNameFormatter().getName(osm)),
+                        osm.getDisplayName(DefaultNameFormatter.getInstance()),
                         ImageProvider.get(OsmPrimitiveType.from(osm)),
-                        JLabel.HORIZONTAL));
+                        JLabel.HORIZONTAL)));
     }
 }

trunk/src/org/openstreetmap/josm/command/ChangePropertyCommand.java

@@ -2 +2 @@
 package org.openstreetmap.josm.command;
 
+import static org.openstreetmap.josm.tools.I18n.marktr;
 import static org.openstreetmap.josm.tools.I18n.tr;
-import static org.openstreetmap.josm.tools.I18n.marktr;
 import static org.openstreetmap.josm.tools.I18n.trn;
 
@@ -16 +16 @@
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
-import org.openstreetmap.josm.gui.PrimitiveNameFormatter;
+import org.openstreetmap.josm.gui.DefaultNameFormatter;
 import org.openstreetmap.josm.tools.ImageProvider;
 
@@ -95 +95 @@
     @Override public MutableTreeNode description() {
         String text;
-        PrimitiveNameFormatter formatter = new PrimitiveNameFormatter();
         if (objects.size() == 1) {
             OsmPrimitive primitive = objects.iterator().next();
-            String name = formatter.getName(primitive);
             String msg = "";
             if (value == null) {
@@ -106 +104 @@
                 case RELATION: msg = marktr("Remove \"{0}\" for relation ''{1}''"); break;
                 }
-                text = tr(msg, key, name);
+                text = tr(msg, key, primitive.getDisplayName(DefaultNameFormatter.getInstance()));
             } else {
                 switch(OsmPrimitiveType.from(primitive)) {
@@ -113 +111 @@
                 case RELATION: msg = marktr("Set {0}={1} for relation ''{2}''"); break;
                 }
-                text = tr(msg, key, value, name);
+                text = tr(msg, key, value, primitive.getDisplayName(DefaultNameFormatter.getInstance()));
             }
         }
@@ -128 +126 @@
             root.add(new DefaultMutableTreeNode(
                     new JLabel(
-                            formatter.getName(osm),
+                            osm.getDisplayName(DefaultNameFormatter.getInstance()),
                             ImageProvider.get(OsmPrimitiveType.from(osm)),
                             JLabel.HORIZONTAL)

trunk/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java

@@ -14 +14 @@
 import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
 import org.openstreetmap.josm.data.osm.Relation;
-import org.openstreetmap.josm.gui.PrimitiveNameFormatter;
+import org.openstreetmap.josm.gui.DefaultNameFormatter;
 import org.openstreetmap.josm.tools.ImageProvider;
 
@@ -70 +70 @@
                         tr("Change relation member role for {0} {1}",
                                 OsmPrimitiveType.from(relation),
-                                new PrimitiveNameFormatter().getName(relation)
+                                relation.getDisplayName(DefaultNameFormatter.getInstance())
                         ),
                         ImageProvider.get(OsmPrimitiveType.from(relation)),

trunk/src/org/openstreetmap/josm/command/ConflictAddCommand.java

@@ -8 +8 @@
 import javax.swing.JLabel;
 import javax.swing.JOptionPane;
-import javax.swing.text.html.Option;
 import javax.swing.tree.DefaultMutableTreeNode;
 import javax.swing.tree.MutableTreeNode;
@@ -16 +15 @@
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
+import org.openstreetmap.josm.gui.DefaultNameFormatter;
 import org.openstreetmap.josm.gui.OptionPaneUtil;
-import org.openstreetmap.josm.gui.PrimitiveNameFormatter;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.tools.ImageProvider;
@@ -36 +35 @@
                         + "This conflict can't be added.</html>",
                         getLayer().getName(),
-                        new PrimitiveNameFormatter().getName(conflict.getMy())
+                        conflict.getMy().getDisplayName(DefaultNameFormatter.getInstance())
                 ),
                 tr("Double conflict"),
@@ -56 +55 @@
             System.out.println(tr("Warning: layer ''{0}'' doesn't exist anymore. Can't remove conflict for primitmive ''{1}''",
                     getLayer().getName(),
-                    new PrimitiveNameFormatter().getName(conflict.getMy())
+                    conflict.getMy().getDisplayName(DefaultNameFormatter.getInstance())
             ));
             return;
@@ -71 +70 @@
                 new JLabel(
                         tr("Add conflict for ''{0}''",
-                                new PrimitiveNameFormatter().getName(conflict.getMy())
+                                conflict.getMy().getDisplayName(DefaultNameFormatter.getInstance())
                         ),
                         ImageProvider.get(OsmPrimitiveType.from(conflict.getMy())),

trunk/src/org/openstreetmap/josm/command/DeleteCommand.java

@@ -33 +33 @@
 import org.openstreetmap.josm.data.osm.visitor.CollectBackReferencesVisitor;
 import org.openstreetmap.josm.gui.ConditionalOptionPaneUtil;
+import org.openstreetmap.josm.gui.DefaultNameFormatter;
 import org.openstreetmap.josm.gui.ExtendedDialog;
-import org.openstreetmap.josm.gui.PrimitiveNameFormatter;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.tools.ImageProvider;
@@ -115 +115 @@
             }
 
-            return new DefaultMutableTreeNode(new JLabel(tr(msg, new PrimitiveNameFormatter().getName(primitive)),
+            return new DefaultMutableTreeNode(new JLabel(tr(msg, primitive.getDisplayName(DefaultNameFormatter.getInstance())),
                     ImageProvider.get(OsmPrimitiveType.from(primitive)), JLabel.HORIZONTAL));
         }
@@ -140 +140 @@
         );
         for (OsmPrimitive osm : toDelete) {
-            root.add(new DefaultMutableTreeNode(new JLabel(new PrimitiveNameFormatter().getName(osm), ImageProvider
-                    .get(OsmPrimitiveType.from(osm)), JLabel.HORIZONTAL)));
+            root.add(new DefaultMutableTreeNode(new JLabel(
+                    osm.getDisplayName(DefaultNameFormatter.getInstance()),
+                    ImageProvider.get(OsmPrimitiveType.from(osm)), JLabel.HORIZONTAL)));
         }
         return root;
@@ -173 +174 @@
 
     private static int testRelation(Relation ref, OsmPrimitive osm) {
-        PrimitiveNameFormatter formatter = new PrimitiveNameFormatter();
         String role = new String();
         for (RelationMember m : ref.getMembers()) {
@@ -183 +183 @@
         if (role.length() > 0)
             return new ExtendedDialog(Main.parent, tr("Conflicting relation"), tr(
-                    "Selection \"{0}\" is used by relation \"{1}\" with role {2}.\nDelete from relation?", formatter
-                    .getName(osm), formatter.getName(ref), role), new String[] { tr("Delete from relation"),
+                    "Selection \"{0}\" is used by relation \"{1}\" with role {2}.\nDelete from relation?",
+                    osm.getDisplayName(DefaultNameFormatter.getInstance()), ref.getDisplayName(DefaultNameFormatter.getInstance()), role), new String[] { tr("Delete from relation"),
                 tr("Cancel") }, new String[] { "dialogs/delete.png", "cancel.png" }).getValue();
         else
             return new ExtendedDialog(Main.parent, tr("Conflicting relation"), tr(
-                    "Selection \"{0}\" is used by relation \"{1}\".\nDelete from relation?", formatter.getName(osm),
-                    formatter.getName(ref)), new String[] { tr("Delete from relation"), tr("Cancel") }, new String[] {
+                    "Selection \"{0}\" is used by relation \"{1}\".\nDelete from relation?",
+                    osm.getDisplayName(DefaultNameFormatter.getInstance()),
+                    ref.getDisplayName(DefaultNameFormatter.getInstance())), new String[] { tr("Delete from relation"), tr("Cancel") }, new String[] {
                 "dialogs/delete.png", "cancel.png" }).getValue();
     }

trunk/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java

@@ -2 +2 @@
 package org.openstreetmap.josm.command;
 
+import static org.openstreetmap.josm.tools.I18n.marktr;
 import static org.openstreetmap.josm.tools.I18n.tr;
-import static org.openstreetmap.josm.tools.I18n.marktr;
 
 import java.util.Collection;
@@ -16 +16 @@
 import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.data.osm.RelationMember;
-import org.openstreetmap.josm.gui.PrimitiveNameFormatter;
+import org.openstreetmap.josm.gui.DefaultNameFormatter;
 import org.openstreetmap.josm.tools.ImageProvider;
 
@@ -74 +74 @@
                 new JLabel(
                         tr(msg,
-                                new PrimitiveNameFormatter().getName(member.member),
+                                member.member.getDisplayName(DefaultNameFormatter.getInstance()),
                                 relation.getMembers().indexOf(member),
-                                new PrimitiveNameFormatter().getName(relation)
+                                relation.getDisplayName(DefaultNameFormatter.getInstance())
                         ),
                         ImageProvider.get(OsmPrimitiveType.from(relation)),