Changeset 12831 in josm for trunk

Timestamp:

2017-09-12T19:35:55+02:00 (7 years ago)

Author:

bastiK

Message:

see #15229 - extract GUI from StyleSetting class

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• dialogs/MapPaintDialog.java (modified) (2 diffs)
• mappaint/BooleanStyleSettingGui.java (added)
• mappaint/StyleSetting.java (modified) (3 diffs)
• mappaint/StyleSettingGui.java (added)
• mappaint/StyleSettingGuiFactory.java (added)

trunk/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java

@@ -68 +68 @@
 import org.openstreetmap.josm.gui.mappaint.mapcss.MapCSSStyleSource;
 import org.openstreetmap.josm.gui.preferences.map.MapPaintPreference;
+import org.openstreetmap.josm.gui.mappaint.StyleSettingGuiFactory;
 import org.openstreetmap.josm.gui.util.FileFilterAllFiles;
 import org.openstreetmap.josm.gui.util.GuiHelper;
@@ -700 +701 @@
             } else {
                 for (StyleSetting s : style.settings) {
-                    s.addMenuEntry(setMenu);
+                    StyleSettingGuiFactory.getStyleSettingGui(s).addMenuEntry(setMenu);
                 }
             }

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

@@ -2 +2 @@
 package org.openstreetmap.josm.gui.mappaint;
 
-import java.awt.event.ActionEvent;
-import java.util.Arrays;
-
-import javax.swing.AbstractAction;
-import javax.swing.Action;
-import javax.swing.JCheckBoxMenuItem;
-import javax.swing.JMenu;
-
 import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.gui.MainApplication;
-import org.openstreetmap.josm.gui.mappaint.loader.MapPaintStyleLoader;
 import org.openstreetmap.josm.tools.Logging;
 
@@ -38 +28 @@
 
     /**
-     * Adds the menu entry for this style setting to the menu
-     * @param menu The menu to add the setting to
-     */
-    void addMenuEntry(JMenu menu);
-
-    /**
      * gets the value for this setting
      * @return The value the user selected
@@ -63 +47 @@
             this.label = label;
             this.def = def;
-        }
-
-        @Override
-        public void addMenuEntry(JMenu menu) {
-            final JCheckBoxMenuItem item = new JCheckBoxMenuItem();
-            Action a = new AbstractAction(label) {
-                @Override
-                public void actionPerformed(ActionEvent e) {
-                    setValue(item.isSelected());
-                    MainApplication.worker.submit(new MapPaintStyleLoader(Arrays.asList(parentStyle)));
-                }
-            };
-            item.setAction(a);
-            item.setSelected((boolean) getValue());
-            menu.add(item);
         }