Changeset 2140 in josm for trunk/src

Timestamp:

2009-09-15T09:21:02+02:00 (15 years ago)

Author:

stoecker

Message:

fixed preset submenus

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• preferences/TaggingPresetPreference.java (modified) (1 diff)
• tagging/TaggingPresetMenu.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java

@@ -81 +81 @@
                 {
                     JMenu submenu = new JMenu(p);
+                    submenu.setText(p.getLocaleName());
                     ((TaggingPresetMenu)p).menu = submenu;
                     submenus.put((TaggingPresetMenu)p, submenu);

trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java

@@ -20 +20 @@
     public JMenu menu = null; // set by TaggingPresetPreferences
     public void setDisplayName() {
-        String n = getName();
-        putValue(Action.NAME, n);
-        putValue(SHORT_DESCRIPTION, tr("Preset group ''{0}''", n));
+        putValue(Action.NAME, getName());
+        putValue(SHORT_DESCRIPTION, (group != null ?
+                tr("Preset group ''{0}'' of group ''{1}''", getLocaleName(), group.getName()) :
+                    tr("Preset group ''{0}''", getLocaleName())));
         putValue("toolbar", "tagginggroup_" + getRawName());
     }