Changeset 680 in josm for trunk/src/org

Timestamp:

2008-07-05T15:10:14+02:00 (16 years ago)

Author:

stoecker

Message:

Preset buttons in toolbar work again (fixes #792)

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• preferences/TaggingPresetPreference.java (modified) (2 diffs)
• tagging/TaggingPreset.java (modified) (1 diff)

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

@@ -129 +129 @@
                         HashMap<String,JMenu> submenus = new HashMap<String,JMenu>();
                         for (final TaggingPreset p : taggingPresets) {
-                                if (p.getValue(Action.NAME).equals(" ")) {
+                                String name = (String) p.getValue(Action.NAME);
+                                if (name.equals(" ")) {
                                         Main.main.menu.presetsMenu.add(new JSeparator());
                                 } else {
-                                        String name = (String) p.getValue(Action.NAME);
                                         String[] sp = name.split("/");
                                         if (sp.length <= 1) {
                                                 Main.main.menu.presetsMenu.add(new JMenuItem(p));
                                         } else {
-                                                p.setName(sp[1]);
+                                                p.setDisplayName(sp[1]);
                                                 JMenu submenu = submenus.get(sp[0]);
                                                 if (submenu == null) {
@@ -144 +144 @@
                                                         Main.main.menu.presetsMenu.add(submenu);
                                                 }
-                                                submenu.add(new JMenuItem(p));
+                                                if (sp[1].equals(" "))
+                                                        submenu.add(new JSeparator());
+                                                else
+                                                        submenu.add(p);
                                         }
                                 }

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

@@ -332 +332 @@
          */
         public void setName(String name) {
+                setDisplayName(tr(name));
+                putValue("toolbar", "tagging_"+name);
+        }
+        
+        /**
+         * Change the display name without changing the toolbar value.
+         */
+        public void setDisplayName(String name) {
                 putValue(Action.NAME, tr(name));
-                putValue("toolbar", "tagging_"+name);
         }