Changeset 15288 in josm for trunk

Timestamp:

2019-08-07T02:39:36+02:00 (5 years ago)

Author:

Don-vip

Message:

see #10435 - keep the style settings menu open after one has been selected, like for mappaint menu

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• mappaint/BooleanStyleSettingGui.java (modified) (4 diffs)
• util/StayOpenCheckBoxMenuItem.java (modified) (1 diff)
• util/StayOpenCheckBoxMenuItemUI.java (added)

trunk/src/org/openstreetmap/josm/gui/mappaint/BooleanStyleSettingGui.java

@@ -4 +4 @@
 import java.awt.event.ActionEvent;
 import java.util.Arrays;
+import java.util.Objects;
 
 import javax.swing.AbstractAction;
@@ -11 +12 @@
 
 import org.openstreetmap.josm.gui.MainApplication;
+import org.openstreetmap.josm.gui.mappaint.StyleSetting.BooleanStyleSetting;
 import org.openstreetmap.josm.gui.mappaint.loader.MapPaintStyleLoader;
+import org.openstreetmap.josm.gui.util.StayOpenCheckBoxMenuItemUI;
 
 /**
- * GUI elements for a {@link StyleSetting.BooleanStyleSetting} class.
+ * GUI elements for a {@link BooleanStyleSetting} class.
  * @since 12831
  */
@@ -21 +24 @@
     final StyleSetting.BooleanStyleSetting setting;
 
-    public BooleanStyleSettingGui(StyleSetting.BooleanStyleSetting setting) {
-        this.setting = setting;
+    /**
+     * Constructs a new {@code BooleanStyleSettingGui}.
+     * @param setting boolean style setting
+     */
+    public BooleanStyleSettingGui(BooleanStyleSetting setting) {
+        this.setting = Objects.requireNonNull(setting);
     }
 
@@ -37 +44 @@
         item.setAction(a);
         item.setSelected((boolean) setting.getValue());
+        item.setUI(new StayOpenCheckBoxMenuItemUI());
         menu.add(item);
     }

trunk/src/org/openstreetmap/josm/gui/util/StayOpenCheckBoxMenuItem.java

@@ -10 +10 @@
  * An extension of JCheckBoxMenuItem that doesn't close the menu when selected.
  *
- * @author Darryl https://tips4java.wordpress.com/2010/09/12/keeping-menus-open/
+ * @author Darryl Burke https://tips4java.wordpress.com/2010/09/12/keeping-menus-open/
  */
 public class StayOpenCheckBoxMenuItem extends JCheckBoxMenuItem {