Ignore:
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/gui/dialogs
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java

    r1987 r1990  
    2525import org.openstreetmap.josm.command.Command;
    2626import org.openstreetmap.josm.data.osm.OsmPrimitive;
     27import org.openstreetmap.josm.gui.DefaultNameFormatter;
    2728import org.openstreetmap.josm.gui.OptionPaneUtil;
    28 import org.openstreetmap.josm.gui.PrimitiveNameFormatter;
    2929import org.openstreetmap.josm.gui.conflict.pair.ConflictResolver;
    3030import org.openstreetmap.josm.gui.conflict.pair.properties.OperationCancelledException;
    … …  
    241241            setTitle(tr("Resolve conflicts"));
    242242        } else {
    243             PrimitiveNameFormatter formatter = new PrimitiveNameFormatter();
    244             setTitle(tr("Resolve conflicts for ''{0}''", formatter.getName(my)));
     243            setTitle(tr("Resolve conflicts for ''{0}''", my.getDisplayName(DefaultNameFormatter.getInstance())));
    245244        }
    246245    }

  • trunk/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java

    r1987 r1990  
    6666import org.openstreetmap.josm.data.osm.RelationMember;
    6767import org.openstreetmap.josm.data.osm.Way;
     68import org.openstreetmap.josm.gui.DefaultNameFormatter;
    6869import org.openstreetmap.josm.gui.ExtendedDialog;
    6970import org.openstreetmap.josm.gui.MapFrame;
    70 import org.openstreetmap.josm.gui.PrimitiveNameFormatter;
    7171import org.openstreetmap.josm.gui.SideButton;
    7272import org.openstreetmap.josm.gui.dialogs.relation.RelationEditor;
    … …  
    9999 */
    100100public class PropertiesDialog extends ToggleDialog implements SelectionChangedListener, LayerChangeListener {
    101     static private final PrimitiveNameFormatter NAME_FORMATTER = new PrimitiveNameFormatter();
    102 
    103101    /**
    104102     * Watches for double clicks and from editing or new property, depending on the
    … …  
    498496                Component c = super.getTableCellRendererComponent(table, value, isSelected, false, row, column);
    499497                if (c instanceof JLabel) {
    500                     ((JLabel)c).setText(NAME_FORMATTER.getName((Relation)value));
     498                    ((JLabel)c).setText(((Relation)value).getDisplayName(DefaultNameFormatter.getInstance()));
    501499                }
    502500                return c;
    … …  
    837835            int result = new ExtendedDialog(Main.parent,
    838836                    tr("Change relation"),
    839                     tr("Really delete selection from relation {0}?", NAME_FORMATTER.getName(cur)),
     837                    tr("Really delete selection from relation {0}?", cur.getDisplayName(DefaultNameFormatter.getInstance())),
    840838                    new String[] {tr("Delete from relation"), tr("Cancel")},
    841839                    new String[] {"dialogs/delete.png", "cancel.png"}).getValue();

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

    r1944 r1990  
    2929import org.openstreetmap.josm.data.osm.RelationMember;
    3030import org.openstreetmap.josm.gui.OsmPrimitivRenderer;
    31 import org.openstreetmap.josm.gui.PrimitiveNameFormatter;
    3231import org.openstreetmap.josm.gui.SideButton;
    3332import org.openstreetmap.josm.gui.dialogs.relation.RelationEditor;
    … …  
    4948public class RelationListDialog extends ToggleDialog implements LayerChangeListener, DataChangeListener {
    5049    private static final Logger logger = Logger.getLogger(RelationListDialog.class.getName());
    51     static private final PrimitiveNameFormatter NAME_FORMATTER = new PrimitiveNameFormatter();
    5250
    5351    /**

  • trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java

    r1937 r1990  
    3434import org.openstreetmap.josm.data.osm.RelationMember;
    3535import org.openstreetmap.josm.data.osm.visitor.MergeVisitor;
     36import org.openstreetmap.josm.gui.DefaultNameFormatter;
    3637import org.openstreetmap.josm.gui.ExceptionDialogUtil;
    3738import org.openstreetmap.josm.gui.OptionPaneUtil;
    3839import org.openstreetmap.josm.gui.PleaseWaitRunnable;
    39 import org.openstreetmap.josm.gui.PrimitiveNameFormatter;
    4040import org.openstreetmap.josm.gui.layer.OsmDataLayer;
    4141import org.openstreetmap.josm.gui.progress.PleaseWaitProgressMonitor;
    … …  
    342342         */
    343343        protected void warnBecauseOfDeletedRelation(Relation r) {
    344             PrimitiveNameFormatter nameFormatter = new PrimitiveNameFormatter();
    345 
    346344            String message = tr("<html>The child relation<br>"
    347345                    + "{0}<br>"
    348346                    + "is deleted on the server. It can't be loaded",
    349                     nameFormatter.getName(r)
     347                    r.getDisplayName(DefaultNameFormatter.getInstance())
    350348            );
    351349
    … …  
    404402        protected void realRun() throws SAXException, IOException, OsmTransferException {
    405403            try {
    406                 PrimitiveNameFormatter nameFormatter = new PrimitiveNameFormatter();
    407404                while(! relationsToDownload.isEmpty() && !cancelled) {
    408405                    Relation r = relationsToDownload.pop();
    … …  
    411408                    }
    412409                    rememberChildRelationsToDownload(r);
    413                     progressMonitor.setCustomText(tr("Downloading relation {0}", nameFormatter.getName(r)));
     410                    progressMonitor.setCustomText(tr("Downloading relation {0}", r.getDisplayName(DefaultNameFormatter.getInstance())));
    414411                    OsmServerObjectReader reader = new OsmServerObjectReader(r.id, OsmPrimitiveType.RELATION,
    415412                            true);
    … …  
    515512        protected void realRun() throws SAXException, IOException, OsmTransferException {
    516513            try {
    517                 PrimitiveNameFormatter nameFormatter = new PrimitiveNameFormatter();
    518514                Iterator<Relation> it = relations.iterator();
    519515                while(it.hasNext() && !cancelled) {
    … …  
    522518                        continue;
    523519                    }
    524                     progressMonitor.setCustomText(tr("Downloading relation {0}", nameFormatter.getName(r)));
     520                    progressMonitor.setCustomText(tr("Downloading relation {0}", r.getDisplayName(DefaultNameFormatter.getInstance())));
    525521                    OsmServerObjectReader reader = new OsmServerObjectReader(r.id, OsmPrimitiveType.RELATION,
    526522                            true);

  • trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java

    r1987 r1990  
    6464import org.openstreetmap.josm.data.osm.visitor.MergeVisitor;
    6565import org.openstreetmap.josm.gui.ConditionalOptionPaneUtil;
     66import org.openstreetmap.josm.gui.DefaultNameFormatter;
    6667import org.openstreetmap.josm.gui.ExceptionDialogUtil;
    6768import org.openstreetmap.josm.gui.OptionPaneUtil;
    6869import org.openstreetmap.josm.gui.PleaseWaitRunnable;
    69 import org.openstreetmap.josm.gui.PrimitiveNameFormatter;
    7070import org.openstreetmap.josm.gui.SideButton;
    7171import org.openstreetmap.josm.gui.dialogs.relation.ac.AutoCompletionCache;
    … …  
    697697
    698698    abstract class  AddFromSelectionAction extends AbstractAction {
    699         private PrimitiveNameFormatter nameFormatter = new PrimitiveNameFormatter();
    700 
    701699        protected boolean isPotentialDuplicate(OsmPrimitive primitive) {
    702700            return memberTableModel.hasMembersReferringTo(Collections.singleton(primitive));
    … …  
    708706                    + "<br>"
    709707                    + "Do you really want to add another relation member?</html>",
    710                     nameFormatter.getName(primitive)
     708                    primitive.getDisplayName(DefaultNameFormatter.getInstance())
    711709            );
    712710            int ret = ConditionalOptionPaneUtil.showOptionDialog(
    … …  
    736734                    + "This creates circular references and is therefore discouraged.<br>"
    737735                    + "Skipping relation ''{0}''.</html>",
    738                     this.nameFormatter.getName(primitive)
     736                    primitive.getDisplayName(DefaultNameFormatter.getInstance())
    739737            );
    740738            OptionPaneUtil.showMessageDialog(
    … …  
    11701168                            + "Please resolve this conflict first, then try again.</html>",
    11711169                            getLayer().getName(),
    1172                             new PrimitiveNameFormatter().getName(getRelation())
     1170                            getRelation().getDisplayName(DefaultNameFormatter.getInstance())
    11731171                    ),
    11741172                    tr("Double conflict"),

  • trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableMemberCellRenderer.java

    r1822 r1990  
    1010import org.openstreetmap.josm.data.osm.OsmPrimitive;
    1111import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
    12 import org.openstreetmap.josm.gui.PrimitiveNameFormatter;
     12import org.openstreetmap.josm.gui.DefaultNameFormatter;
    1313import org.openstreetmap.josm.tools.ImageProvider;
    1414
    1515public class MemberTableMemberCellRenderer extends MemberTableCellRenderer {
    1616    private HashMap<OsmPrimitiveType, ImageIcon> icons;
    17     static private final PrimitiveNameFormatter NAME_FORMATTER = new PrimitiveNameFormatter();
    1817
    1918    public MemberTableMemberCellRenderer() {
    … …  
    3635    protected void renderPrimitive(OsmPrimitive primitive) {
    3736        setIcon(icons.get(OsmPrimitiveType.from(primitive)));
    38         setText(NAME_FORMATTER.getName(primitive));
     37        setText(primitive.getDisplayName(DefaultNameFormatter.getInstance()));
    3938        setToolTipText(buildToolTipText(primitive));
    4039    }

  • trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTreeCellRenderer.java

    r1828 r1990  
    1111
    1212import org.openstreetmap.josm.data.osm.Relation;
    13 import org.openstreetmap.josm.gui.PrimitiveNameFormatter;
     13import org.openstreetmap.josm.gui.DefaultNameFormatter;
    1414import org.openstreetmap.josm.tools.ImageProvider;
    1515
    … …  
    2020 */
    2121public class RelationTreeCellRenderer extends JLabel implements TreeCellRenderer {
    22     private static final PrimitiveNameFormatter NAME_FORMATTER = new PrimitiveNameFormatter();
    2322    public final static Color BGCOLOR_SELECTED = new Color(143,170,255);
    2423
    … …  
    4746     */
    4847    protected void renderValue(Relation relation) {
    49         setText(NAME_FORMATTER.getName(relation));
     48        setText(relation.getDisplayName(DefaultNameFormatter.getInstance()));
    5049    }
    5150

  • trunk/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableCellRenderer.java

    r1814 r1990  
    1515import org.openstreetmap.josm.data.osm.OsmPrimitive;
    1616import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
    17 import org.openstreetmap.josm.gui.PrimitiveNameFormatter;
     17import org.openstreetmap.josm.gui.DefaultNameFormatter;
    1818import org.openstreetmap.josm.tools.ImageProvider;
    1919
    … …  
    2323 */
    2424public  class SelectionTableCellRenderer extends JLabel implements TableCellRenderer {
    25     static private final PrimitiveNameFormatter NAME_FORMATTER = new PrimitiveNameFormatter();
    26 
    2725    public final static Color BGCOLOR_SELECTED = new Color(143,170,255);
    2826    public final static Color BGCOLOR_DOUBLE_ENTRY = new Color(255,234,213);
    … …  
    118116    protected void renderPrimitive(OsmPrimitive primitive) {
    119117        setIcon(icons.get(OsmPrimitiveType.from(primitive)));
    120         setText(NAME_FORMATTER.getName(primitive));
     118        setText(primitive.getDisplayName(DefaultNameFormatter.getInstance()));
    121119        setToolTipText(buildToolTipText(primitive));
    122120    }
Note: See TracChangeset for help on using the changeset viewer.