Changeset 16979 in josm for trunk

Timestamp:

2020-08-30T10:03:00+02:00 (4 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

Files:

• src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java (modified) (2 diffs)
• src/org/openstreetmap/josm/gui/preferences/display/DrawingPreference.java (modified) (5 diffs)
• src/org/openstreetmap/josm/gui/preferences/display/GPXPreference.java (added)
• test/unit/org/openstreetmap/josm/gui/preferences/PreferencesTestUtils.java (modified) (2 diffs)
• test/unit/org/openstreetmap/josm/gui/preferences/display/DrawingPreferenceTest.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/gui/preferences/display/GPXPreferenceTest.java (copied) (copied from trunk/test/unit/org/openstreetmap/josm/gui/preferences/display/DrawingPreferenceTest.java ) (2 diffs)

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;
     }
 

trunk/test/unit/org/openstreetmap/josm/gui/preferences/PreferencesTestUtils.java

@@ -20 +20 @@
     public static void doTestPreferenceSettingAddGui(
             PreferenceSettingFactory factory, Class<? extends DefaultTabPreferenceSetting> parentClass) {
-        doTestPreferenceSettingAddGui(factory, parentClass, 1);
-    }
-
-    /**
-     * Generic test for {@link PreferenceSetting#addGui(PreferenceTabbedPane)}.
-     * @param factory setting factory to test
-     * @param parentClass optional parent setting, can be {@code null}
-     * @param increment expected tab number increment
-     */
-    public static void doTestPreferenceSettingAddGui(
-            PreferenceSettingFactory factory, Class<? extends DefaultTabPreferenceSetting> parentClass, int increment) {
         PreferenceSetting setting = factory.createPreferenceSetting();
         PreferenceTabbedPane tabPane = new PreferenceTabbedPane();
@@ -37 +26 @@
         setting.addGui(tabPane);
         if (parentClass != null) {
-            assertEquals(tabs + increment, tabPane.getSetting(parentClass).getTabPane().getTabCount());
+            assertEquals(tabs + 1, tabPane.getSetting(parentClass).getTabPane().getTabCount());
             assertEquals(tabPane.getSetting(parentClass), ((SubPreferenceSetting) setting).getTabPreferenceSetting(tabPane));
         }

trunk/test/unit/org/openstreetmap/josm/gui/preferences/display/DrawingPreferenceTest.java

@@ -35 +35 @@
     @Test
     public void testAddGui() {
-        PreferencesTestUtils.doTestPreferenceSettingAddGui(new DrawingPreference.Factory(), DisplayPreference.class, 2);
+        PreferencesTestUtils.doTestPreferenceSettingAddGui(new DrawingPreference.Factory(), DisplayPreference.class);
     }
 }

trunk/test/unit/org/openstreetmap/josm/gui/preferences/display/GPXPreferenceTest.java

@@ -10 +10 @@
 
 /**
- * Unit tests of {@link DrawingPreference} class.
+ * Unit tests of {@link GPXPreference} class.
  */
-public class DrawingPreferenceTest {
+public class GPXPreferenceTest {
 
     /**
@@ -23 +23 @@
 
     /**
-     * Unit test of {@link DrawingPreference#DrawingPreference}.
+     * Unit test of {@link GPXPreference.Factory}.
      */
     @Test
-    public void testDrawingPreference() {
-        assertNotNull(new DrawingPreference.Factory().createPreferenceSetting());
+    public void testGPXPreference() {
+        assertNotNull(new GPXPreference.Factory().createPreferenceSetting());
     }
 
     /**
-     * Unit test of {@link DrawingPreference#addGui}.
+     * Unit test of {@link GPXPreference#addGui}.
      */
     @Test
     public void testAddGui() {
-        PreferencesTestUtils.doTestPreferenceSettingAddGui(new DrawingPreference.Factory(), DisplayPreference.class, 2);
+        PreferencesTestUtils.doTestPreferenceSettingAddGui(new GPXPreference.Factory(), DisplayPreference.class);
     }
 }