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

Timestamp:

2009-08-23T22:37:39+02:00 (15 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/corrector

Files:

• RoleCorrectionTableModel.java (modified) (2 diffs)
• TagCorrector.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java

@@ -6 +6 @@
 import java.util.List;
 
-import org.openstreetmap.josm.gui.PrimitiveNameFormatter;
+import org.openstreetmap.josm.gui.DefaultNameFormatter;
 
 public class RoleCorrectionTableModel extends
 CorrectionTableModel<RoleCorrection> {
-    private static final PrimitiveNameFormatter NAME_FORMATTER = new PrimitiveNameFormatter();
 
     public RoleCorrectionTableModel(List<RoleCorrection> roleCorrections) {
@@ -40 +39 @@
         switch (colIndex) {
         case 0:
-            return NAME_FORMATTER.getName(roleCorrection.relation);
+            return roleCorrection.relation.getDisplayName(DefaultNameFormatter.getInstance());
         case 1:
             return roleCorrection.member.getRole();

trunk/src/org/openstreetmap/josm/corrector/TagCorrector.java

@@ -28 +28 @@
 import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.data.osm.Way;
+import org.openstreetmap.josm.gui.DefaultNameFormatter;
 import org.openstreetmap.josm.gui.JMultilineLabel;
 import org.openstreetmap.josm.gui.OptionPaneUtil;
-import org.openstreetmap.josm.gui.PrimitiveNameFormatter;
 import org.openstreetmap.josm.tools.GBC;
 import org.openstreetmap.josm.tools.ImageProvider;
 
 public abstract class TagCorrector<P extends OsmPrimitive> {
-    private static final PrimitiveNameFormatter NAME_FORMATTER = new PrimitiveNameFormatter();
 
     public abstract Collection<Command> execute(P primitive, P oldprimitive)
@@ -101 +100 @@
 
                 final JLabel primitiveLabel = new JLabel(
-                        NAME_FORMATTER.getName(primitive) + ":",
+                        primitive.getDisplayName(DefaultNameFormatter.getInstance()) + ":",
                         ImageProvider.get(OsmPrimitiveType.from(primitive)),
                         JLabel.LEFT
@@ -127 +126 @@
 
                 final JLabel primitiveLabel = new JLabel(
-                        NAME_FORMATTER.getName(primitive),
+                        primitive.getDisplayName(DefaultNameFormatter.getInstance()),
                         ImageProvider.get(OsmPrimitiveType.from(primitive)),
                         JLabel.LEFT