Changeset 16979 in josm for trunk/src

Timestamp:

2020-08-30T10:03:00+02:00 (5 years ago)

Author:

simon04

Message:

fix #19734 - Autofilter: clicking active rule/key opens GPS settings instead of OSM settings

Extract GPXPreference from DrawingPreference

Location:

trunk/src/org/openstreetmap/josm/gui/preferences

Files:

• PreferenceTabbedPane.java (modified) (2 diffs)
• display/DrawingPreference.java (modified) (5 diffs)
• display/GPXPreference.java (added)

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

@@ -45 +45 @@
 import org.openstreetmap.josm.gui.preferences.display.DisplayPreference;
 import org.openstreetmap.josm.gui.preferences.display.DrawingPreference;
+import org.openstreetmap.josm.gui.preferences.display.GPXPreference;
 import org.openstreetmap.josm.gui.preferences.display.LafPreference;
 import org.openstreetmap.josm.gui.preferences.display.LanguagePreference;
@@ -572 +573 @@
         SETTINGS_FACTORIES.add(new DisplayPreference.Factory());
         SETTINGS_FACTORIES.add(new DrawingPreference.Factory());
+        SETTINGS_FACTORIES.add(new GPXPreference.Factory());
         SETTINGS_FACTORIES.add(new ColorPreference.Factory());
         SETTINGS_FACTORIES.add(new LafPreference.Factory());

trunk/src/org/openstreetmap/josm/gui/preferences/display/DrawingPreference.java

@@ -29 +29 @@
 
 /**
- * Map drawing preferences.
+ * "OSM Data" drawing preferences.
  */
 public class DrawingPreference implements SubPreferenceSetting {
@@ -49 +49 @@
     public static final BooleanProperty SOURCE_BOUNDS_PROP = new BooleanProperty("draw.data.downloaded_area", true);
 
-    private GPXSettingsPanel gpxPanel;
     private final JCheckBox directionHint = new JCheckBox(tr("Draw Direction Arrows"));
     private final JCheckBox headArrow = new JCheckBox(tr("Only on the head of a way."));
@@ -74 +73 @@
     @Override
     public void addGui(PreferenceTabbedPane gui) {
-        addOsmPane(gui);
-        addGpxPane(gui);
-    }
-
-    private void addGpxPane(PreferenceTabbedPane gui) {
-        gpxPanel = new GPXSettingsPanel();
-        gui.addValidationListener(gpxPanel);
-        JPanel panel = gpxPanel;
-
-        JScrollPane scrollpane = new JScrollPane(panel);
-        scrollpane.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
-        GuiHelper.setDefaultIncrement(scrollpane);
-        gui.getDisplayPreference().addSubTab(this, tr("GPS Points"), scrollpane);
-    }
-
-    private void addOsmPane(PreferenceTabbedPane gui) {
         JPanel panel = new JPanel(new GridBagLayout());
         panel.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
@@ -217 +200 @@
     @Override
     public boolean ok() {
-        boolean restart = gpxPanel.savePreferences();
         OsmDataLayer.PROPERTY_HIDE_LABELS_WHILE_DRAGGING.put(hideLabelsWhileDragging.isSelected());
         Config.getPref().putBoolean("draw.data.area_outline_only", outlineOnly.isSelected());
@@ -243 +225 @@
         }
         Config.getPref().putInt("mappaint.node.virtual-size", vn);
-        return restart;
+        return false;
     }