Ticket #7548: 7548_2014_v2.patch

src/org/openstreetmap/josm/gui/MainApplication.java

@@ -44 +44 @@
 import org.openstreetmap.josm.data.Version;
 import org.openstreetmap.josm.gui.download.DownloadDialog;
 import org.openstreetmap.josm.gui.preferences.server.OAuthAccessTokenHolder;
-import org.openstreetmap.josm.gui.preferences.server.ProxyPreference;
+import org.openstreetmap.josm.gui.preferences.server.ServerAccessPreference;
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
 import org.openstreetmap.josm.gui.util.GuiHelper;
 import org.openstreetmap.josm.io.DefaultProxySelector;
@@ -515 +515 @@
                 ed.setContent(message);
 
                 if (ed.showDialog().getValue() == 1) {
-                    PreferencesAction.forPreferenceSubTab(null, null, ProxyPreference.class).run();
+                    PreferencesAction.forPreferenceTab(null, null, ServerAccessPreference.class).run();
                 }
             }
             return hasErrors;

src/org/openstreetmap/josm/gui/MainMenu.java

@@ -708 +708 @@
 
         add(presetsMenu, presetSearchAction);
         add(presetsMenu, presetSearchPrimitiveAction);
-        add(presetsMenu, PreferencesAction.forPreferenceSubTab(tr("Preset preferences"),
+        add(presetsMenu, PreferencesAction.forPreferenceTab(tr("Preset preferences"),
                 tr("Click to open the tagging presets tab in the preferences"), TaggingPresetPreference.class));
         presetsMenu.addSeparator();
 

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

@@ -69 +69 @@
 import org.openstreetmap.josm.gui.mappaint.MapPaintStyles.MapPaintSylesUpdateListener;
 import org.openstreetmap.josm.gui.mappaint.StyleSource;
 import org.openstreetmap.josm.gui.mappaint.mapcss.MapCSSStyleSource;
+import org.openstreetmap.josm.gui.preferences.PreferenceDialog;
 import org.openstreetmap.josm.gui.preferences.SourceEntry;
 import org.openstreetmap.josm.gui.preferences.map.MapPaintPreference;
 import org.openstreetmap.josm.gui.util.FileFilterAllFiles;
@@ -94 +95 @@
     protected MoveUpDownAction downAction;
     protected JCheckBox cbWireframe;
 
-    public static final JosmAction PREFERENCE_ACTION = PreferencesAction.forPreferenceSubTab(
+    public static final JosmAction PREFERENCE_ACTION = PreferencesAction.forPreferenceTab(
             tr("Map paint preferences"), null, MapPaintPreference.class, "dialogs/mappaintpreference");
 
     /**

src/org/openstreetmap/josm/gui/preferences/DefaultTabPreferenceSetting.java

@@ -1 @@
-// License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.gui.preferences;
-
-import java.awt.Component;
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.swing.JPanel;
-import javax.swing.JScrollPane;
-import javax.swing.JTabbedPane;
-
-import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.tools.GBC;
-
-public abstract class DefaultTabPreferenceSetting extends DefaultPreferenceSetting implements TabPreferenceSetting {
-
-    private final String iconName;
-    private final String description;
-    private final String title;
-    private final JTabbedPane tabpane;
-    private final Map<SubPreferenceSetting, Component> subSettingMap;
-    
-    /**
-     * Constructs a new {@code DefaultTabPreferenceSetting}.
-     */
-    public DefaultTabPreferenceSetting() {
-        this(null, null, null);
-    }
-
-    public DefaultTabPreferenceSetting(String iconName, String title, String description) {
-        this(iconName, title, description, false);
-    }
-
-    public DefaultTabPreferenceSetting(String iconName, String title, String description, boolean isExpert) {
-        this(iconName, title, description, isExpert, null);
-    }
-
-    public DefaultTabPreferenceSetting(String iconName, String title, String description, boolean isExpert, JTabbedPane tabpane) {
-        super(isExpert);
-        this.iconName = iconName;
-        this.description = description;
-        this.title = title;
-        this.tabpane = tabpane;
-        this.subSettingMap = tabpane != null ? new HashMap<SubPreferenceSetting, Component>() : null;
-    }
-
-    @Override
-    public String getIconName() {
-        return iconName;
-    }
-
-    @Override
-    public String getTooltip() {
-        if (getDescription() != null) {
-            return "<html>"+getDescription()+"</html>";
-        } else {
-            return null;
-        }
-    }
-
-    @Override
-    public String getDescription() {
-        return description;
-    }
-
-    @Override
-    public String getTitle() {
-        return title;
-    }
-
-    /**
-     * Get the inner tab pane, if any.
-     * @return The JTabbedPane contained in this tab preference settings, or null if none is set.
-     * @since 5631
-     */
-    public final JTabbedPane getTabPane() {
-        return tabpane;
-    }
-    
-    protected final void createPreferenceTabWithScrollPane(PreferenceTabbedPane gui, JPanel panel) {
-        GBC a = GBC.eol().insets(-5,0,0,0);
-        a.anchor = GBC.EAST;
-        
-        JScrollPane scrollPane = new JScrollPane(panel);
-        scrollPane.setBorder(null);
-
-        JPanel tab = gui.createPreferenceTab(this);
-        tab.add(scrollPane, GBC.eol().fill(GBC.BOTH));
-        tab.add(GBC.glue(0,10), a);
-    }
-
-    @Override
-    public boolean selectSubTab(SubPreferenceSetting subPref) {
-        if (tabpane != null && subPref != null) {
-            Component tab = getSubTab(subPref);
-            if (tab != null) {
-                try {
-                    tabpane.setSelectedComponent(tab);
-                    return true;
-                } catch (IllegalArgumentException e) {
-                    // Ignore exception and return false below
-                    Main.debug(Main.getErrorMessage(e));
-                }
-            }
-        }
-        return false;
-    }
-    
-    @Override
-    public final void addSubTab(SubPreferenceSetting sub, String title, Component component) {
-        addSubTab(sub, title, component, null);
-    }
-    
-    @Override
-    public final void addSubTab(SubPreferenceSetting sub, String title, Component component, String tip) {
-        if (tabpane != null && component != null) {
-            tabpane.addTab(title, null, component, tip);
-            registerSubTab(sub, component);
-        }
-    }
-    
-    @Override
-    public final void registerSubTab(SubPreferenceSetting sub, Component component) {
-        if (subSettingMap != null && sub != null && component != null) {
-            subSettingMap.put(sub, component);
-        }
-    }
-    
-    @Override
-    public final Component getSubTab(SubPreferenceSetting sub) {
-        return subSettingMap != null ? subSettingMap.get(sub) : null;
-    }
-}
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.gui.preferences;
+
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.tools.GBC;
+
+import javax.swing.*;
+import java.awt.*;
+import java.util.HashMap;
+import java.util.Map;
+
+
+public abstract class DefaultTabPreferenceSetting extends DefaultPreferenceSetting implements TabPreferenceSetting {
+
+    private final String iconName;
+    private final String description;
+    private final String title;
+    private final JTabbedPane tabpane;
+    private final Map<SubPreferenceSetting, Component> subSettingMap;
+
+    /**
+     * Constructs a new {@code DefaultTabPreferenceSetting}.
+     */
+    public DefaultTabPreferenceSetting() {
+        this(null, null, null);
+    }
+
+    public DefaultTabPreferenceSetting(String iconName, String title, String description) {
+        this(iconName, title, description, false);
+    }
+
+    public DefaultTabPreferenceSetting(String iconName, String title, String description, boolean isExpert) {
+        this(iconName, title, description, isExpert, null);
+    }
+
+    public DefaultTabPreferenceSetting(String iconName, String title, String description, boolean isExpert, JTabbedPane tabpane) {
+        super(isExpert);
+        this.iconName = iconName;
+        this.description = description;
+        this.title = title;
+        this.tabpane = tabpane;
+        this.subSettingMap = tabpane != null ? new HashMap<SubPreferenceSetting, Component>() : null;
+    }
+
+    @Override
+    public String getIconName() {
+        return iconName;
+    }
+
+    @Override
+    public String getTooltip() {
+        if (getDescription() != null) {
+            return "<html>"+getDescription()+"</html>";
+        } else {
+            return null;
+        }
+    }
+
+    @Override
+    public String getDescription() {
+        return description;
+    }
+
+    @Override
+    public String getTitle() {
+        return title;
+    }
+
+    /**
+     * Get the inner tab pane, if any.
+     * @return The JTabbedPane contained in this tab preference settings, or null if none is set.
+     * @since 5631
+     */
+    public final JTabbedPane getTabPane() {
+        return tabpane;
+    }
+
+    protected final void createPreferenceTabWithScrollPane(PreferenceTabbedPane gui, JPanel panel) {
+        GBC a = GBC.eol().insets(-5,0,0,0);
+        a.anchor = GBC.EAST;
+
+        JScrollPane scrollPane = new JScrollPane(panel, JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED, JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED);
+        scrollPane.setBorder(null);
+
+        JPanel tab = gui.createPreferenceTab(this);
+        tab.add(scrollPane, GBC.eol().fill(GBC.BOTH));
+        tab.add(GBC.glue(0,10), a);
+    }
+
+    @Override
+    public boolean selectSubTab(SubPreferenceSetting subPref) {
+        if (tabpane != null && subPref != null) {
+            Component tab = getSubTab(subPref);
+            if (tab != null) {
+                try {
+                    tabpane.setSelectedComponent(tab);
+                    return true;
+                } catch (IllegalArgumentException e) {
+                    // Ignore exception and return false below
+                    Main.debug(Main.getErrorMessage(e));
+                }
+            }
+        }
+        return false;
+    }
+
+    @Override
+    public final void addSubTab(SubPreferenceSetting sub, String title, Component component) {
+        addSubTab(sub, title, component, null);
+    }
+
+    @Override
+    public final void addSubTab(SubPreferenceSetting sub, String title, Component component, String tip) {
+        if (tabpane != null && component != null) {
+            tabpane.addTab(title, null, component, tip);
+            registerSubTab(sub, component);
+        }
+    }
+
+    @Override
+    public final void registerSubTab(SubPreferenceSetting sub, Component component) {
+        if (subSettingMap != null && sub != null && component != null) {
+            subSettingMap.put(sub, component);
+        }
+    }
+
+    @Override
+    public final Component getSubTab(SubPreferenceSetting sub) {
+        return subSettingMap != null ? subSettingMap.get(sub) : null;
+    }
+}

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

@@ -35 +35 @@
 import org.openstreetmap.josm.gui.preferences.advanced.AdvancedPreference;
 import org.openstreetmap.josm.gui.preferences.audio.AudioPreference;
 import org.openstreetmap.josm.gui.preferences.display.ColorPreference;
-import org.openstreetmap.josm.gui.preferences.display.DisplayPreference;
 import org.openstreetmap.josm.gui.preferences.display.DrawingPreference;
+import org.openstreetmap.josm.gui.preferences.display.GPXSettingsPanel;
 import org.openstreetmap.josm.gui.preferences.display.LafPreference;
 import org.openstreetmap.josm.gui.preferences.display.LanguagePreference;
 import org.openstreetmap.josm.gui.preferences.imagery.ImageryPreference;
 import org.openstreetmap.josm.gui.preferences.map.BackupPreference;
 import org.openstreetmap.josm.gui.preferences.map.MapPaintPreference;
-import org.openstreetmap.josm.gui.preferences.map.MapPreference;
 import org.openstreetmap.josm.gui.preferences.map.TaggingPresetPreference;
 import org.openstreetmap.josm.gui.preferences.plugin.PluginPreference;
+import org.openstreetmap.josm.gui.preferences.plugin.PluginUpdatePolicyPanel;
 import org.openstreetmap.josm.gui.preferences.projection.ProjectionPreference;
+import org.openstreetmap.josm.gui.preferences.server.ProxyPreferencesPanel;
 import org.openstreetmap.josm.gui.preferences.remotecontrol.RemoteControlPreference;
-import org.openstreetmap.josm.gui.preferences.server.AuthenticationPreference;
-import org.openstreetmap.josm.gui.preferences.server.ProxyPreference;
 import org.openstreetmap.josm.gui.preferences.server.ServerAccessPreference;
 import org.openstreetmap.josm.gui.preferences.shortcut.ShortcutPreference;
 import org.openstreetmap.josm.gui.preferences.validator.ValidatorPreference;
 import org.openstreetmap.josm.gui.preferences.validator.ValidatorTagCheckerRulesPreference;
-import org.openstreetmap.josm.gui.preferences.validator.ValidatorTestsPreference;
 import org.openstreetmap.josm.plugins.PluginDownloadTask;
 import org.openstreetmap.josm.plugins.PluginHandler;
 import org.openstreetmap.josm.plugins.PluginInformation;
@@ -238 +236 @@
     }
 
     /**
-     * Returns the {@code DisplayPreference} object.
-     * @return the {@code DisplayPreference} object.
+     * Returns the {@code DrawingPreference} object.
+     * @return the {@code DrawingPreference} object.
      */
-    public final DisplayPreference getDisplayPreference() {
-        return getSetting(DisplayPreference.class);
-    }
-
-    /**
-     * Returns the {@code MapPreference} object.
-     * @return the {@code MapPreference} object.
-     */
-    public final MapPreference getMapPreference() {
-        return getSetting(MapPreference.class);
+    public final DrawingPreference getDrawingPreference() {
+        return getSetting(DrawingPreference.class);
     }
 
     /**
@@ -427 +417 @@
         int position = index;
         for (PreferenceTab tab : tabs) {
             if (tab.getTabPreferenceSetting().equals(tps)) {
-                insertTab(null, icon, tab.getComponent(), tps.getTooltip(), position++);
+                if (tps instanceof IconPreferenceSetting) {
+                    insertTab(null, icon, tab.getComponent(), tps.getTooltip(), position++);
+                } else {
+                    insertTab(tps.getTitle(), null, tab.getComponent(), tps.getTooltip(), position++);
+                }
             }
         }
     }
@@ -455 +449 @@
                         addGUITabsForSetting(icon, tps);
                     } else {
                         // If it has not been initialized, create an empty tab with only icon and tooltip
-                        addTab(null, icon, new PreferencePanel(tps), tps.getTooltip());
+                        if (tps instanceof IconPreferenceSetting) {
+                            addTab(null, icon, new PreferencePanel(tps), tps.getTooltip());
+                        } else {
+                            addTab(tps.getTitle(), null, new PreferencePanel(tps), tps.getTooltip());
+                        }
                     }
                 }
             } else if (!(setting instanceof SubPreferenceSetting)) {
@@ -489 +487 @@
         return null;
     }
 
+    static class IconPreferenceSetting extends DefaultTabPreferenceSetting {
+
+        public static class Factory implements PreferenceSettingFactory {
+
+            private final String iconName, title, description;
+
+            public Factory(String iconName, String title, String description) {
+                this.iconName = iconName;
+                this.title = title;
+                this.description = description;
+            }
+
+            @Override
+            public PreferenceSetting createPreferenceSetting() {
+                return new IconPreferenceSetting(iconName, title, description);
+            }
+        }
+
+        public IconPreferenceSetting(String iconName, String title, String description) {
+            super(iconName, title, description);
+        }
+
+        @Override
+        public void addGui(PreferenceTabbedPane gui) {
+            createPreferenceTabWithScrollPane(gui, new JPanel());
+        }
+
+        @Override
+        public boolean ok() {
+            return false;
+        }
+    }
+
     static {
+
         // order is important!
-        settingsFactory.add(new DisplayPreference.Factory());
+        settingsFactory.add(new IconPreferenceSetting.Factory("map", tr("Mapping"), tr("Various settings that influence the visual representation of geodata.")));
         settingsFactory.add(new DrawingPreference.Factory());
-        settingsFactory.add(new ColorPreference.Factory());
-        settingsFactory.add(new LafPreference.Factory());
-        settingsFactory.add(new LanguagePreference.Factory());
-        settingsFactory.add(new ServerAccessPreference.Factory());
-        settingsFactory.add(new AuthenticationPreference.Factory());
-        settingsFactory.add(new ProxyPreference.Factory());
-        settingsFactory.add(new MapPreference.Factory());
+        settingsFactory.add(new GPXSettingsPanel.Factory());
         settingsFactory.add(new ProjectionPreference.Factory());
         settingsFactory.add(new MapPaintPreference.Factory());
         settingsFactory.add(new TaggingPresetPreference.Factory());
+        settingsFactory.add(new ImageryPreference.Factory());
+
+        settingsFactory.add(new IconPreferenceSetting.Factory("connection", tr("Server"), tr("Connection Settings for the OSM server.")));
+        settingsFactory.add(new ServerAccessPreference.Factory());
+        settingsFactory.add(new ProxyPreferencesPanel.Factory());
+
+        settingsFactory.add(new IconPreferenceSetting.Factory("display", tr("User Interface"), tr("Various settings that influence the visual representation of the whole program.")));
+        settingsFactory.add(new ColorPreference.Factory());
+        settingsFactory.add(new LafPreference.Factory());
+        settingsFactory.add(new LanguagePreference.Factory());
         settingsFactory.add(new BackupPreference.Factory());
-        settingsFactory.add(new PluginPreference.Factory());
         settingsFactory.add(Main.toolbar);
-        settingsFactory.add(new AudioPreference.Factory());
         settingsFactory.add(new ShortcutPreference.Factory());
+
+        settingsFactory.add(new IconPreferenceSetting.Factory("advanced", tr("Advanced Preferences"), tr("Modify advanced JOSM configuration.")));
+        settingsFactory.add(new AudioPreference.Factory());
         settingsFactory.add(new ValidatorPreference.Factory());
-        settingsFactory.add(new ValidatorTestsPreference.Factory());
         settingsFactory.add(new ValidatorTagCheckerRulesPreference.Factory());
         settingsFactory.add(new RemoteControlPreference.Factory());
-        settingsFactory.add(new ImageryPreference.Factory());
-
-        PluginHandler.getPreferenceSetting(settingsFactory);
-
-        // always the last: advanced tab
         settingsFactory.add(new AdvancedPreference.Factory());
+
+        settingsFactory.add(new IconPreferenceSetting.Factory("plugin", tr("Plugins"), tr("Install new plugins or configure installed plugins.")));
+        settingsFactory.add(new PluginPreference.Factory());
+        settingsFactory.add(new PluginUpdatePolicyPanel.Factory());
+        PluginHandler.getPreferenceSetting(settingsFactory);
+
     }
 
     /**

src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java

@@ -569 +569 @@
         private String movingComponent;
 
         public Settings(DefaultMutableTreeNode rootActionsNode) {
-            super("toolbar", tr("Toolbar customization"), tr("Customize the elements on the toolbar."));
+            super("toolbar", tr("Toolbar"), tr("Customize the elements on the toolbar."));
             actionsTreeModel = new DefaultTreeModel(rootActionsNode);
             actionsTree = new JTree(actionsTreeModel);
         }

src/org/openstreetmap/josm/gui/preferences/display/ColorPreference.java

@@ -41 +41 @@
 import org.openstreetmap.josm.gui.layer.ImageryLayer;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.gui.layer.markerlayer.MarkerLayer;
+import org.openstreetmap.josm.gui.preferences.DefaultTabPreferenceSetting;
 import org.openstreetmap.josm.gui.preferences.PreferenceSetting;
 import org.openstreetmap.josm.gui.preferences.PreferenceSettingFactory;
 import org.openstreetmap.josm.gui.preferences.PreferenceTabbedPane;
-import org.openstreetmap.josm.gui.preferences.SubPreferenceSetting;
-import org.openstreetmap.josm.gui.preferences.TabPreferenceSetting;
 import org.openstreetmap.josm.tools.ColorHelper;
 import org.openstreetmap.josm.tools.GBC;
 
 /**
  * Color preferences.
  */
-public class ColorPreference implements SubPreferenceSetting {
+public class ColorPreference extends DefaultTabPreferenceSetting {
 
     /**
      * Factory used to create a new {@code ColorPreference}.
@@ -72 +71 @@
     private JButton defaultSet;
     private JButton remove;
 
+    public ColorPreference() {
+        super(null, tr("Colors"), tr("Change colors used in program dialogs and in map paint styles."));
+    }
+
     /**
      * Set the colors to be shown in the preference table. This method creates a table model if
      * none exists and overwrites all existing values.
@@ -250 +253 @@
         buttonPanel.add(defaultSet, GBC.std().insets(5,5,5,0));
         buttonPanel.add(defaultAll, GBC.std().insets(0,5,0,0));
         buttonPanel.add(remove, GBC.std().insets(0,5,0,0));
-        gui.getDisplayPreference().addSubTab(this, tr("Colors"), panel);
+
+        createPreferenceTabWithScrollPane(gui, panel);
     }
 
     Boolean isRemoveColor(int row) {
@@ -296 +300 @@
     public boolean isExpert() {
         return false;
     }
-
-    @Override
-    public TabPreferenceSetting getTabPreferenceSetting(final PreferenceTabbedPane gui) {
-        return gui.getDisplayPreference();
-    }
 }

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

@@ -12 +12 @@
 import javax.swing.JCheckBox;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
-import javax.swing.JScrollPane;
 
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.ExpertToggleAction;
+import org.openstreetmap.josm.gui.preferences.DefaultTabPreferenceSetting;
 import org.openstreetmap.josm.gui.preferences.PreferenceSetting;
 import org.openstreetmap.josm.gui.preferences.PreferenceSettingFactory;
 import org.openstreetmap.josm.gui.preferences.PreferenceTabbedPane;
-import org.openstreetmap.josm.gui.preferences.SubPreferenceSetting;
-import org.openstreetmap.josm.gui.preferences.TabPreferenceSetting;
 import org.openstreetmap.josm.tools.GBC;
 
 /**
  * Map drawing preferences.
  */
-public class DrawingPreference implements SubPreferenceSetting {
+public class DrawingPreference extends DefaultTabPreferenceSetting {
 
     /**
      * Factory used to create a new {@code DrawingPreference}.
@@ -38 +36 @@
         }
     }
 
-    private GPXSettingsPanel gpxPanel;
     private JCheckBox directionHint = new JCheckBox(tr("Draw Direction Arrows"));
     private JCheckBox headArrow = new JCheckBox(tr("Only on the head of a way."));
     private JCheckBox onewayArrow = new JCheckBox(tr("Draw oneway arrows."));
@@ -55 +52 @@
     private JCheckBox useWireframeAntialiasing = new JCheckBox(tr("Smooth map graphics in wireframe mode (antialiasing)"));
     private JCheckBox outlineOnly = new JCheckBox(tr("Draw only outlines of areas"));
 
-    @Override
+    public DrawingPreference() {
+        super(null, tr("OSM Data"), tr("Settings that control the drawing of OSM data."));
+    }
+
     public void addGui(PreferenceTabbedPane gui) {
-        gpxPanel = new GPXSettingsPanel();
-        gui.addValidationListener(gpxPanel);
-        JPanel panel = gpxPanel;
 
-        JScrollPane scrollpane = new JScrollPane(panel);
-        scrollpane.setBorder(BorderFactory.createEmptyBorder( 0, 0, 0, 0 ));
-        gui.getDisplayPreference().addSubTab(this, tr("GPS Points"), scrollpane);
-        panel = new JPanel(new GridBagLayout());
+        JPanel panel = new JPanel(new GridBagLayout());
         panel.setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
 
         // directionHint
@@ -164 +158 @@
         ExpertToggleAction.addVisibilitySwitcher(discardableKeys);
 
         panel.add(Box.createVerticalGlue(), GBC.eol().fill(GBC.BOTH));
-        scrollpane = new JScrollPane(panel);
-        scrollpane.setBorder(BorderFactory.createEmptyBorder( 0, 0, 0, 0 ));
-        gui.getDisplayPreference().addSubTab(this, tr("OSM Data"), scrollpane);
+        createPreferenceTabWithScrollPane(gui, panel);
     }
 
     @Override
     public boolean ok() {
-        boolean restart = gpxPanel.savePreferences();
         Main.pref.put("draw.data.area_outline_only", outlineOnly.isSelected());
         Main.pref.put("draw.segment.direction", directionHint.isSelected());
         Main.pref.put("draw.segment.head_only", headArrow.isSelected());
@@ -194 +185 @@
             vn = 0;
         }
         Main.pref.putInteger("mappaint.node.virtual-size", vn);
-        return restart;
+        return false;
     }
 
     @Override
     public boolean isExpert() {
         return false;
     }
-
-    @Override
-    public TabPreferenceSetting getTabPreferenceSetting(final PreferenceTabbedPane gui) {
-        return gui.getDisplayPreference();
-    }
 }

src/org/openstreetmap/josm/gui/preferences/display/GPXSettingsPanel.java

@@ -24 +24 @@
 import org.openstreetmap.josm.actions.ExpertToggleAction;
 import org.openstreetmap.josm.gui.layer.markerlayer.Marker;
 import org.openstreetmap.josm.gui.layer.markerlayer.Marker.TemplateEntryProperty;
+import org.openstreetmap.josm.gui.preferences.DefaultTabPreferenceSetting;
+import org.openstreetmap.josm.gui.preferences.PreferenceSetting;
+import org.openstreetmap.josm.gui.preferences.PreferenceSettingFactory;
+import org.openstreetmap.josm.gui.preferences.PreferenceTabbedPane;
 import org.openstreetmap.josm.gui.preferences.PreferenceTabbedPane.ValidationListener;
 import org.openstreetmap.josm.gui.widgets.JosmComboBox;
 import org.openstreetmap.josm.gui.widgets.JosmTextField;
@@ -36 +40 @@
  */
 public class GPXSettingsPanel extends JPanel implements ValidationListener {
 
+    public static class Factory implements PreferenceSettingFactory {
+
+        @Override
+        public PreferenceSetting createPreferenceSetting() {
+            return new DefaultTabPreferenceSetting(null, tr("GPS Points"), tr("Settings that control the drawing of GPS tracks.")) {
+
+                private GPXSettingsPanel gpx;
+
+                @Override
+                public void addGui(PreferenceTabbedPane gui) {
+                    gpx = new GPXSettingsPanel();
+                    createPreferenceTabWithScrollPane(gui, gpx);
+                    gui.addValidationListener(gpx);
+                }
+
+                @Override
+                public boolean ok() {
+                    gpx.savePreferences();
+                    return false;
+                }
+            };
+        }
+    }
+
     private static final int WAYPOINT_LABEL_CUSTOM = 6;
     private static final String[] LABEL_PATTERN_TEMPLATE = new String[] {Marker.LABEL_PATTERN_AUTO, Marker.LABEL_PATTERN_NAME,
         Marker.LABEL_PATTERN_DESC, "{special:everything}", "?{ '{name}' | '{desc}' | '{formattedWaypointOffset}' }", ""};

src/org/openstreetmap/josm/gui/preferences/display/LafPreference.java

@@ -13 +13 @@
 import javax.swing.JLabel;
 import javax.swing.JList;
 import javax.swing.JPanel;
-import javax.swing.JScrollPane;
 import javax.swing.ListCellRenderer;
 import javax.swing.LookAndFeel;
 import javax.swing.UIManager;
@@ -21 +20 @@
 
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.ExpertToggleAction;
+import org.openstreetmap.josm.gui.preferences.DefaultTabPreferenceSetting;
 import org.openstreetmap.josm.gui.dialogs.ToggleDialog;
 import org.openstreetmap.josm.gui.preferences.PreferenceSetting;
 import org.openstreetmap.josm.gui.preferences.PreferenceSettingFactory;
 import org.openstreetmap.josm.gui.preferences.PreferenceTabbedPane;
-import org.openstreetmap.josm.gui.preferences.SubPreferenceSetting;
-import org.openstreetmap.josm.gui.preferences.TabPreferenceSetting;
 import org.openstreetmap.josm.gui.widgets.JosmComboBox;
 import org.openstreetmap.josm.tools.GBC;
 
 /**
  * Look-and-feel preferences.
  */
-public class LafPreference implements SubPreferenceSetting {
+public class LafPreference extends DefaultTabPreferenceSetting {
 
     /**
      * Factory used to create a new {@code LafPreference}.
@@ -56 +54 @@
     private JCheckBox modeless = new JCheckBox(tr("Modeless working (Potlatch style)"));
     private JCheckBox dynamicButtons = new JCheckBox(tr("Dynamic buttons in side menus"));
 
+    public LafPreference() {
+        super(null, tr("Look and Feel"), tr("Change the Look and Feel of the program"));
+    }
+
     @Override
     public void addGui(PreferenceTabbedPane gui) {
         lafCombo = new JosmComboBox<>(UIManager.getInstalledLookAndFeels());
@@ -127 +129 @@
         panel.add(GBC.glue(5,0), GBC.std().fill(GBC.HORIZONTAL));
         panel.add(lafCombo, GBC.eol().fill(GBC.HORIZONTAL));
 
-        JScrollPane scrollpane = new JScrollPane(panel);
-        scrollpane.setBorder(BorderFactory.createEmptyBorder( 0, 0, 0, 0 ));
-        gui.getDisplayPreference().addSubTab(this, tr("Look and Feel"), scrollpane);
+        panel.add(Box.createVerticalGlue(), GBC.eol().fill(GBC.BOTH));
+
+        createPreferenceTabWithScrollPane(gui, panel);
     }
 
     @Override
@@ -148 +150 @@
     public boolean isExpert() {
         return false;
     }
-
-    @Override
-    public TabPreferenceSetting getTabPreferenceSetting(final PreferenceTabbedPane gui) {
-        return gui.getDisplayPreference();
-    }
 }

src/org/openstreetmap/josm/gui/preferences/display/LanguagePreference.java

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.gui.preferences.display;
 
-import static org.openstreetmap.josm.tools.I18n.tr;
-
-import java.awt.Component;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Locale;
-
-import javax.swing.Box;
-import javax.swing.DefaultComboBoxModel;
-import javax.swing.DefaultListCellRenderer;
-import javax.swing.JLabel;
-import javax.swing.JList;
-import javax.swing.JPanel;
-import javax.swing.ListCellRenderer;
-
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.gui.preferences.DefaultTabPreferenceSetting;
 import org.openstreetmap.josm.gui.preferences.PreferenceSetting;
 import org.openstreetmap.josm.gui.preferences.PreferenceSettingFactory;
 import org.openstreetmap.josm.gui.preferences.PreferenceTabbedPane;
-import org.openstreetmap.josm.gui.preferences.SubPreferenceSetting;
-import org.openstreetmap.josm.gui.preferences.TabPreferenceSetting;
-import org.openstreetmap.josm.gui.widgets.JosmComboBox;
 import org.openstreetmap.josm.tools.GBC;
 import org.openstreetmap.josm.tools.I18n;
 
+import javax.swing.BorderFactory;
+import javax.swing.DefaultListCellRenderer;
+import javax.swing.JList;
+import javax.swing.JPanel;
+import javax.swing.ListCellRenderer;
+import java.awt.Component;
+import java.awt.GridBagLayout;
+import java.util.List;
+import java.util.Locale;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+
 /**
  * Language preferences.
  */
-public class LanguagePreference implements SubPreferenceSetting {
+public class LanguagePreference extends DefaultTabPreferenceSetting {
 
     /**
      * Factory used to create a new {@code LanguagePreference}.
@@ -43 +37 @@
     }
 
     /** the combo box with the available locales */
-    private JosmComboBox<Locale> langCombo;
+    private JList<Locale> langCombo;
+
+    public LanguagePreference() {
+        super(null, tr("Language"), tr("Change the language of JOSM."));
+    }
 
     @Override
     public void addGui(final PreferenceTabbedPane gui) {
-        LanguageComboBoxModel model = new LanguageComboBoxModel();
-        // Selecting the language BEFORE the JComboBox listens to model changes speed up initialization by ~35ms (see #7386)
-        // See https://stackoverflow.com/questions/3194958/fast-replacement-for-jcombobox-basiccomboboxui
-        model.selectLanguage(Main.pref.get("language"));
-        langCombo = new JosmComboBox<>(model);
-        langCombo.setRenderer(new LanguageCellRenderer());
+        List<Locale> tr = I18n.getAvailableTranslationsAsList();
+        tr.add(0, null);
+        langCombo = new JList<>(tr.toArray(new Locale[tr.size()]));
+        langCombo.setCellRenderer(new LanguageCellRenderer());
+        langCombo.setVisibleRowCount(langCombo.getModel().getSize());
+        selectLanguage(Main.pref.get("language"));
 
-        LafPreference lafPreference = gui.getSetting(LafPreference.class);
-        final JPanel panel = lafPreference.panel;
-        panel.add(new JLabel(tr("Language")), GBC.std().insets(20, 0, 0, 0));
-        panel.add(GBC.glue(5,0), GBC.std().fill(GBC.HORIZONTAL));
-        panel.add(langCombo, GBC.eol().fill(GBC.HORIZONTAL));
-        panel.add(Box.createVerticalGlue(), GBC.eol().fill(GBC.BOTH));
+        final JPanel panel = new JPanel(new GridBagLayout());
+        panel.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
+        panel.add(langCombo, GBC.eol().fill(GBC.BOTH));
+        createPreferenceTabWithScrollPane(gui, panel);
+    }
 
-        TabPreferenceSetting tabPref = lafPreference.getTabPreferenceSetting(gui);
-        tabPref.registerSubTab(this, tabPref.getSubTab(lafPreference));
+    protected void selectLanguage(final String languageCode) {
+        if (languageCode == null || languageCode.isEmpty()) {
+            langCombo.setSelectedIndex(0);
+        } else {
+            langCombo.setSelectedValue(Locale.forLanguageTag(languageCode), true);
+        }
     }
 
     @Override
     public boolean ok() {
-        if(langCombo.getSelectedItem() == null)
+        if (langCombo.getSelectedValue() == null) {
             return Main.pref.put("language", null);
-        else
-            return Main.pref.put("language",
-                    ((Locale)langCombo.getSelectedItem()).toString());
-    }
-
-    private static class LanguageComboBoxModel extends DefaultComboBoxModel<Locale> {
-        private final List<Locale> data = new ArrayList<>();
-
-        public LanguageComboBoxModel(){
-            data.add(0,null);
-            data.addAll(Arrays.asList(I18n.getAvailableTranslations()));
-        }
-
-        public void selectLanguage(String language) {
-            setSelectedItem(null);
-            if (language != null) {
-                for (Locale locale: data) {
-                    if (locale == null) {
-                        continue;
-                    }
-                    if (locale.toString().equals(language)) {
-                        setSelectedItem(locale);
-                        return;
-                    }
-                }
-            }
-        }
-
-        @Override
-        public Locale getElementAt(int index) {
-            return data.get(index);
-        }
-
-        @Override
-        public int getSize() {
-            return data.size();
+        } else {
+            return Main.pref.put("language", langCombo.getSelectedValue().toString());
         }
     }
 
     private static class LanguageCellRenderer implements ListCellRenderer<Locale> {
         private final DefaultListCellRenderer dispatch;
+
         public LanguageCellRenderer() {
             this.dispatch = new DefaultListCellRenderer();
         }
+
         @Override
-        public Component getListCellRendererComponent(JList<? extends Locale> list, Locale l, 
+        public Component getListCellRendererComponent(JList<? extends Locale> list, Locale l,
                 int index, boolean isSelected, boolean cellHasFocus) {
             return dispatch.getListCellRendererComponent(list,
                     l == null ? tr("Default (Auto determined)") : l.getDisplayName(l),
@@ -126 +95 @@
     public boolean isExpert() {
         return false;
     }
-
-    @Override
-    public TabPreferenceSetting getTabPreferenceSetting(final PreferenceTabbedPane gui) {
-        return gui.getSetting(LafPreference.class).getTabPreferenceSetting(gui);
-    }
 }

src/org/openstreetmap/josm/gui/preferences/map/BackupPreference.java

@@ -17 +17 @@
 
 import org.openstreetmap.josm.data.AutosaveTask;
 import org.openstreetmap.josm.data.preferences.BooleanProperty;
+import org.openstreetmap.josm.gui.preferences.DefaultTabPreferenceSetting;
 import org.openstreetmap.josm.gui.preferences.PreferenceSettingFactory;
 import org.openstreetmap.josm.gui.preferences.PreferenceTabbedPane;
 import org.openstreetmap.josm.gui.preferences.SubPreferenceSetting;
@@ -30 +31 @@
 /**
  * Preference settings for data layer autosave.
  */
-public class BackupPreference implements SubPreferenceSetting {
+public class BackupPreference extends DefaultTabPreferenceSetting {
 
     /**
      * Factory used to create a new {@code BackupPreference}.
@@ -112 +113 @@
         autosaveEnabled.actionPerformed(null);
 
         panel.add(Box.createVerticalGlue(), GBC.eol().fill(GBC.BOTH));
-        JScrollPane sp = GuiHelper.embedInVerticalScrollPane(panel);
 
-        gui.getMapPreference().addSubTab(this, tr("File backup"), sp, tr("Configure whether to create backup files"));
+        createPreferenceTabWithScrollPane(gui, panel);
+    }
+
+    @Override
+    public String getIconName() {
+        return null;
+    }
+
+    @Override
+    public String getTitle() {
+        return tr("File backup");
+    }
+
+    @Override
+    public String getTooltip() {
+        return tr("Configure whether to create backup files");
     }
 
     @Override
@@ -130 +145 @@
     }
 
     @Override
+    public String getDescription() {
+        return getTooltip();
+    }
+
+    @Override
     public boolean isExpert() {
         return false;
     }
-
-    @Override
-    public TabPreferenceSetting getTabPreferenceSetting(final PreferenceTabbedPane gui) {
-        return gui.getMapPreference();
-    }
 }

src/org/openstreetmap/josm/gui/preferences/map/MapPaintPreference.java

@@ -13 +13 @@
 import java.util.Map;
 import java.util.Objects;
 import java.util.TreeSet;
-
 import javax.swing.BorderFactory;
 import javax.swing.JCheckBox;
 import javax.swing.JPanel;
-
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.gui.mappaint.MapPaintStyles;
+import org.openstreetmap.josm.gui.preferences.DefaultTabPreferenceSetting;
 import org.openstreetmap.josm.gui.preferences.PreferenceSetting;
 import org.openstreetmap.josm.gui.preferences.PreferenceSettingFactory;
 import org.openstreetmap.josm.gui.preferences.PreferenceTabbedPane;
@@ -37 +36 @@
 /**
  * Preference settings for map paint styles.
  */
-public class MapPaintPreference implements SubPreferenceSetting {
+public class MapPaintPreference extends DefaultTabPreferenceSetting {
     private SourceEditor sources;
     private JCheckBox enableIconDefault;
 
@@ -64 +63 @@
         }
     }
 
+    public MapPaintPreference() {
+        super(null, tr("Map Paint Styles"), tr("Styles for rendering the OSM data."));
+    }
+
     @Override
-    public void addGui(PreferenceTabbedPane gui) {
+    public void addGui(final PreferenceTabbedPane gui) {
         enableIconDefault = new JCheckBox(tr("Enable built-in icon defaults"),
                 Main.pref.getBoolean("mappaint.icon.enable-defaults", true));
 
@@ -77 +80 @@
         panel.add(sources, GBC.eol().fill(GBC.BOTH));
         panel.add(enableIconDefault, GBC.eol().insets(11,2,5,0));
 
-        final MapPreference mapPref = gui.getMapPreference();
-        mapPref.addSubTab(this, tr("Map Paint Styles"), panel);
-        sources.deferLoading(mapPref, panel);
+        //createPreferenceTabWithScrollPane(gui, panel);
+        gui.createPreferenceTab(this).add(panel, GBC.eol().fill(GBC.BOTH));
+
+        sources.initiallyLoadAvailableSources();
     }
 
     static class MapPaintSourceEditor extends SourceEditor {
@@ -313 +317 @@
     public boolean isExpert() {
         return false;
     }
-
-    @Override
-    public TabPreferenceSetting getTabPreferenceSetting(final PreferenceTabbedPane gui) {
-        return gui.getMapPreference();
-    }
 }

deleted file src/org/openstreetmap/josm/gui/preferences/map/MapPreference.java

@@ -1 @@
-//License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.gui.preferences.map;
-
-import static org.openstreetmap.josm.tools.I18n.tr;
-
-import javax.swing.JTabbedPane;
-
-import org.openstreetmap.josm.gui.preferences.DefaultTabPreferenceSetting;
-import org.openstreetmap.josm.gui.preferences.PreferenceSetting;
-import org.openstreetmap.josm.gui.preferences.PreferenceSettingFactory;
-import org.openstreetmap.josm.gui.preferences.PreferenceTabbedPane;
-import org.openstreetmap.josm.tools.GBC;
-
-/**
- * Map preferences, including map paint styles, tagging presets and autosave sub-preferences.
- */
-public final class MapPreference extends DefaultTabPreferenceSetting {
-
-    /**
-     * Factory used to create a new {@code MapPreference}.
-     */
-    public static class Factory implements PreferenceSettingFactory {
-        @Override
-        public PreferenceSetting createPreferenceSetting() {
-            return new MapPreference();
-        }
-    }
-    
-    private MapPreference() {
-        super("map", tr("Map Settings"), tr("Settings for the map projection and data interpretation."), false, new JTabbedPane());
-    }
-    
-    @Override
-    public boolean ok() {
-        return false;
-    }
-
-    @Override
-    public void addGui(PreferenceTabbedPane gui) {
-        gui.createPreferenceTab(this).add(getTabPane(), GBC.eol().fill(GBC.BOTH));
-    }
-}

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

@@ -12 +12 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-
 import javax.swing.BorderFactory;
 import javax.swing.JCheckBox;
 import javax.swing.JLabel;
 import javax.swing.JOptionPane;
 import javax.swing.JPanel;
-
+import javax.swing.JSeparator;
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.gui.ExtendedDialog;
+import org.openstreetmap.josm.gui.preferences.DefaultTabPreferenceSetting;
 import org.openstreetmap.josm.gui.preferences.PreferenceSetting;
 import org.openstreetmap.josm.gui.preferences.PreferenceSettingFactory;
 import org.openstreetmap.josm.gui.preferences.PreferenceTabbedPane;
@@ -29 +29 @@
 import org.openstreetmap.josm.gui.preferences.SourceEditor.ExtendedSourceEntry;
 import org.openstreetmap.josm.gui.preferences.SourceEntry;
 import org.openstreetmap.josm.gui.preferences.SourceProvider;
+import org.openstreetmap.josm.gui.tagging.TaggingPreset;
+import org.openstreetmap.josm.gui.tagging.TaggingPresetMenu;
+import org.openstreetmap.josm.gui.tagging.TaggingPresetSeparator;
+import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionManager;
 import org.openstreetmap.josm.gui.preferences.SourceType;
 import org.openstreetmap.josm.gui.preferences.SubPreferenceSetting;
 import org.openstreetmap.josm.gui.preferences.TabPreferenceSetting;
@@ -40 +44 @@
 /**
  * Preference settings for tagging presets.
  */
-public final class TaggingPresetPreference implements SubPreferenceSetting {
+public class TaggingPresetPreference extends DefaultTabPreferenceSetting {
 
     /**
      * Factory used to create a new {@code TaggingPresetPreference}.
@@ -53 +57 @@
     }
 
     private TaggingPresetPreference() {
-        super();
+        super(null, tr("Tagging Presets"), tr("Presets give meaning to OSM tag combinations."));
     }
 
     private static final List<SourceProvider> presetSourceProviders = new ArrayList<>();
@@ -160 +164 @@
     };
 
     @Override
-    public void addGui(PreferenceTabbedPane gui) {
+    public void addGui(final PreferenceTabbedPane gui) {
         sortMenu = new JCheckBox(tr("Sort presets menu"),
                 Main.pref.getBoolean("taggingpreset.sortmenu", false));
 
@@ -169 +173 @@
         panel.add(sortMenu, GBC.eol().insets(5,5,5,0));
         sources = new TaggingPresetSourceEditor();
         panel.add(sources, GBC.eol().fill(GBC.BOTH));
-        final MapPreference mapPref = gui.getMapPreference();
-        mapPref.addSubTab(this, tr("Tagging Presets"), panel);
-        sources.deferLoading(mapPref, panel);
-        gui.addValidationListener(validationListener);
+
+        //createPreferenceTabWithScrollPane(gui, panel);
+        gui.createPreferenceTab(this).add(panel, GBC.eol().fill(GBC.BOTH));
+
+        sources.initiallyLoadAvailableSources();
     }
 
     static class TaggingPresetSourceEditor extends SourceEditor {
@@ -304 +309 @@
     public boolean isExpert() {
         return false;
     }
-
-    @Override
-    public TabPreferenceSetting getTabPreferenceSetting(final PreferenceTabbedPane gui) {
-        return gui.getMapPreference();
-    }
 }

src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreference.java

@@ -30 +30 @@
 import javax.swing.JOptionPane;
 import javax.swing.JPanel;
 import javax.swing.JScrollPane;
-import javax.swing.JTabbedPane;
 import javax.swing.SwingUtilities;
 import javax.swing.UIManager;
 import javax.swing.event.DocumentEvent;
@@ -45 +44 @@
 import org.openstreetmap.josm.gui.preferences.PreferenceSetting;
 import org.openstreetmap.josm.gui.preferences.PreferenceSettingFactory;
 import org.openstreetmap.josm.gui.preferences.PreferenceTabbedPane;
-import org.openstreetmap.josm.gui.preferences.PreferenceTabbedPane.PreferencePanel;
 import org.openstreetmap.josm.gui.util.GuiHelper;
 import org.openstreetmap.josm.gui.widgets.JosmTextField;
 import org.openstreetmap.josm.gui.widgets.SelectAllOnFocusGainedDecorator;
@@ -73 +71 @@
     }
 
     private PluginPreference() {
-        super("plugin", tr("Plugins"), tr("Configure available plugins."), false, new JTabbedPane());
+        super("plugin", tr("Plugins"), tr("Configure available plugins."));
     }
 
     /**
@@ -148 +146 @@
     private PluginListPanel pnlPluginPreferences;
     private PluginPreferencesModel model;
     private JScrollPane spPluginPreferences;
-    private PluginUpdatePolicyPanel pnlPluginUpdatePolicy;
 
     /**
      * is set to true if this preference pane has been selected
@@ -210 +207 @@
         return pnl;
     }
 
-    protected JTabbedPane buildContentPane() {
-        JTabbedPane pane = getTabPane();
-        pnlPluginUpdatePolicy = new PluginUpdatePolicyPanel();
-        pane.addTab(tr("Plugins"), buildPluginListPanel());
-        pane.addTab(tr("Plugin update policy"), pnlPluginUpdatePolicy);
-        return pane;
-    }
-
     @Override
     public void addGui(final PreferenceTabbedPane gui) {
         GridBagConstraints gc = new GridBagConstraints();
@@ -225 +214 @@
         gc.weighty = 1.0;
         gc.anchor = GridBagConstraints.NORTHWEST;
         gc.fill = GridBagConstraints.BOTH;
-        PreferencePanel plugins = gui.createPreferenceTab(this);
-        plugins.add(buildContentPane(), gc);
+        gui.createPreferenceTab(this).add(buildPluginListPanel(), gc);
         readLocalPluginInformation();
         pluginPreferencesActivated = true;
     }
@@ -277 +265 @@
     public boolean ok() {
         if (! pluginPreferencesActivated)
             return false;
-        pnlPluginUpdatePolicy.rememberInPreferences();
         if (model.isActivePluginsChanged()) {
             LinkedList<String> l = new LinkedList<>(model.getSelectedPluginNames());
             Collections.sort(l);

src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java

@@ -18 +18 @@
 import javax.swing.event.ChangeListener;
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.gui.preferences.DefaultTabPreferenceSetting;
+import org.openstreetmap.josm.gui.preferences.PreferenceSetting;
+import org.openstreetmap.josm.gui.preferences.PreferenceSettingFactory;
+import org.openstreetmap.josm.gui.preferences.PreferenceTabbedPane;
 import org.openstreetmap.josm.gui.widgets.JMultilineLabel;
 import org.openstreetmap.josm.gui.widgets.SelectAllOnFocusGainedDecorator;
 import org.openstreetmap.josm.plugins.PluginHandler;
 import org.openstreetmap.josm.gui.widgets.JosmTextField;
+import org.openstreetmap.josm.tools.GBC;
 
 /**
  * A panel for configuring whether JOSM shall update plugins at startup.
@@ -29 +34 @@
  */
 public class PluginUpdatePolicyPanel extends JPanel {
 
+    /**
+     * Factory used to create a new {@code PluginUpdatePolicy}.
+     */
+    public static class Factory implements PreferenceSettingFactory {
+
+        protected final PluginUpdatePolicyPanel panel = new PluginUpdatePolicyPanel();
+
+        @Override
+        public PreferenceSetting createPreferenceSetting() {
+            return new DefaultTabPreferenceSetting(null, tr("Plugin update policy"), tr("Change the policy for updating plugins.")) {
+                @Override
+                public void addGui(PreferenceTabbedPane gui) {
+                    gui.createPreferenceTab(this).add(panel, GBC.std().fill(GBC.BOTH));
+                }
+
+                @Override
+                public boolean ok() {
+                    panel.rememberInPreferences();
+                    return false;
+                }
+            };
+        }
+    }
+
     private enum Policy {
         ASK ("ask"),
         ALWAYS("always"),

src/org/openstreetmap/josm/gui/preferences/projection/ProjectionPreference.java

@@ -14 +14 @@
 import java.util.List;
 import java.util.Map;
 
-import javax.swing.BorderFactory;
-import javax.swing.JLabel;
-import javax.swing.JOptionPane;
-import javax.swing.JPanel;
-import javax.swing.JScrollPane;
-import javax.swing.JSeparator;
+import javax.swing.*;
 
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.Bounds;
@@ -30 +25 @@
 import org.openstreetmap.josm.data.projection.CustomProjection;
 import org.openstreetmap.josm.data.projection.Projection;
 import org.openstreetmap.josm.gui.NavigatableComponent;
+import org.openstreetmap.josm.gui.preferences.DefaultTabPreferenceSetting;
 import org.openstreetmap.josm.gui.preferences.PreferenceSetting;
 import org.openstreetmap.josm.gui.preferences.PreferenceSettingFactory;
 import org.openstreetmap.josm.gui.preferences.PreferenceTabbedPane;
-import org.openstreetmap.josm.gui.preferences.SubPreferenceSetting;
-import org.openstreetmap.josm.gui.preferences.TabPreferenceSetting;
 import org.openstreetmap.josm.gui.widgets.JosmComboBox;
 import org.openstreetmap.josm.tools.GBC;
 
@@ -54 +48 @@
  *    a manual implementation of the projection. Use {@link CustomProjection}
  *    if possible.
  */
-public class ProjectionPreference implements SubPreferenceSetting {
+public class ProjectionPreference extends DefaultTabPreferenceSetting {
 
     /**
      * Factory used to create a new {@code ProjectionPreference}.
@@ -66 +60 @@
         }
     }
 
+    private ProjectionPreference() {
+        super("map", tr("Map Projection"), tr("Settings for the map projection and data interpretation."));
+    }
+
     private static List<ProjectionChoice> projectionChoices = new ArrayList<>();
     private static Map<String, ProjectionChoice> projectionChoicesById = new HashMap<>();
 
@@ -337 +335 @@
         projPanel.add(unitsCombo, GBC.eop().fill(GBC.HORIZONTAL).insets(0,5,5,5));
         projPanel.add(GBC.glue(1,1), GBC.std().fill(GBC.HORIZONTAL).weight(1.0, 1.0));
 
-        JScrollPane scrollpane = new JScrollPane(projPanel);
-        gui.getMapPreference().addSubTab(this, tr("Map Projection"), scrollpane);
+        createPreferenceTabWithScrollPane(gui, projPanel);
 
         selectedProjectionChanged(pc);
     }
@@ -350 +347 @@
         projectionName.setText(proj.toString());
         Bounds b = proj.getWorldBoundsLatLon();
         CoordinateFormat cf = CoordinateFormat.getDefaultFormat();
-        bounds.setText(b.getMin().lonToString(cf)+", "+b.getMin().latToString(cf)+" : "+b.getMax().lonToString(cf)+", "+b.getMax().latToString(cf));
+        bounds.setText(b.getMin().lonToString(cf) + ", " + b.getMin().latToString(cf) + " : " + b.getMax().lonToString(cf) + ", " + b.getMax().latToString(cf));
         boolean showCode = true;
         boolean showName = false;
         if (pc instanceof SubPrefsOptions) {
@@ -404 +401 @@
         id = pc.getId();
         PROP_PROJECTION.put(id);
         PROP_SUB_PROJECTION.put(pref);
-        Main.pref.putCollection("projection.sub."+id, pref);
+        Main.pref.putCollection("projection.sub." + id, pref);
         pc.setPreferences(pref);
         Projection proj = pc.getProjection();
         Main.setProjection(proj);
@@ -476 +473 @@
         return false;
     }
 
-    @Override
-    public TabPreferenceSetting getTabPreferenceSetting(final PreferenceTabbedPane gui) {
-        return gui.getMapPreference();
-    }
-
     /**
      * Selects the given projection.
      * @param projection The projection to select.

src/org/openstreetmap/josm/gui/preferences/remotecontrol/RemoteControlPreference.java

@@ -113 +113 @@
         };
         enableRemoteControl.addActionListener(remoteControlEnabled);
         remoteControlEnabled.actionPerformed(null);
-        createPreferenceTabWithScrollPane(gui, remote);
+        //createPreferenceTabWithScrollPane(gui, remote);
+        gui.createPreferenceTab(this).add(remote, GBC.eol().fill(GBC.BOTH));
     }
 
     @Override

deleted file src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreference.java

@@ -1 @@
-// License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.gui.preferences.server;
-
-import static org.openstreetmap.josm.tools.I18n.tr;
-
-import org.openstreetmap.josm.gui.preferences.PreferenceSetting;
-import org.openstreetmap.josm.gui.preferences.PreferenceSettingFactory;
-import org.openstreetmap.josm.gui.preferences.PreferenceTabbedPane;
-import org.openstreetmap.josm.gui.preferences.SubPreferenceSetting;
-import org.openstreetmap.josm.gui.preferences.TabPreferenceSetting;
-
-/**
- * Authentication sub-preferences in server preferences.
- * @since 6523
- */
-public final class AuthenticationPreference implements SubPreferenceSetting {
-
-    /**
-     * Factory used to create a new {@code AuthenticationPreference}.
-     */
-    public static class Factory implements PreferenceSettingFactory {
-        @Override
-        public PreferenceSetting createPreferenceSetting() {
-            return new AuthenticationPreference();
-        }
-    }
-
-    AuthenticationPreferencesPanel pnlAuthPreferences;
-
-    private AuthenticationPreference() {
-        super();
-    }
-
-    @Override
-    public void addGui(PreferenceTabbedPane gui) {
-        pnlAuthPreferences = new AuthenticationPreferencesPanel();
-        gui.getServerPreference().addApiUrlChangeListener(pnlAuthPreferences);
-        gui.getServerPreference().addSubTab(this, tr("Authentication"),
-                pnlAuthPreferences.getVerticalScrollPane(),
-                tr("Configure your identity and how to authenticate at the OSM server"));
-    }
-
-    @Override
-    public boolean ok() {
-        pnlAuthPreferences.saveToPreferences();
-        return false;
-    }
-
-    @Override
-    public boolean isExpert() {
-        return false;
-    }
-
-    @Override
-    public TabPreferenceSetting getTabPreferenceSetting(PreferenceTabbedPane gui) {
-        return gui.getServerPreference();
-    }
-}

src/org/openstreetmap/josm/gui/preferences/server/ProxyPreference.java

@@ -16 +16 @@
  * Proxy sub-preferences in server preferences.
  * @since 6523
  */
-public final class ProxyPreference implements SubPreferenceSetting {
-
-    /**
-     * Factory used to create a new {@code ProxyPreference}.
-     */
-    public static class Factory implements PreferenceSettingFactory {
-        @Override
-        public PreferenceSetting createPreferenceSetting() {
-            return new ProxyPreference();
-        }
-    }
+public final class ProxyPreference {
 
     private static Set<ProxyPreferenceListener> listeners = new HashSet<>();
     
@@ -36 +26 @@
         super();
     }
 
-    @Override
-    public void addGui(PreferenceTabbedPane gui) {
-        pnlProxyPreferences = new ProxyPreferencesPanel();
-        gui.getServerPreference().addSubTab(this, tr("Proxy settings"),
-                pnlProxyPreferences.getVerticalScrollPane(),
-                tr("Configure whether to use a proxy server"));
-    }
-
-    @Override
-    public boolean ok() {
-        pnlProxyPreferences.saveToPreferences();
-        for (ProxyPreferenceListener listener : listeners) {
-            listener.proxyPreferenceChanged();
-        }
-        return false;
-    }
-
-    @Override
-    public boolean isExpert() {
-        return false;
-    }
-
-    @Override
-    public TabPreferenceSetting getTabPreferenceSetting(PreferenceTabbedPane gui) {
-        return gui.getServerPreference();
-    }
-    
     /**
      * Adds a new ProxyPreferenceListener.
      * @param listener the listener to add

src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java

@@ -17 +17 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import javax.swing.BorderFactory;
+import javax.swing.Box;
 import javax.swing.ButtonGroup;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
@@ -25 +25 @@
 
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.gui.help.HelpUtil;
+import org.openstreetmap.josm.gui.preferences.DefaultTabPreferenceSetting;
+import org.openstreetmap.josm.gui.preferences.PreferenceSetting;
+import org.openstreetmap.josm.gui.preferences.PreferenceSettingFactory;
+import org.openstreetmap.josm.gui.preferences.PreferenceTabbedPane;
 import org.openstreetmap.josm.gui.widgets.JMultilineLabel;
 import org.openstreetmap.josm.gui.widgets.JosmPasswordField;
 import org.openstreetmap.josm.gui.widgets.JosmTextField;
@@ -40 +44 @@
  */
 public class ProxyPreferencesPanel extends VerticallyScrollablePanel {
 
+    public static class Factory implements PreferenceSettingFactory {
+
+        @Override
+        public PreferenceSetting createPreferenceSetting() {
+            return new DefaultTabPreferenceSetting(null, tr("Proxy settings"), tr("Configure whether to use a proxy server")) {
+
+                private ProxyPreferencesPanel pnlProxyPreferences;
+
+                @Override
+                public void addGui(PreferenceTabbedPane gui) {
+                    //createPreferenceTabWithScrollPane(gui, pnlProxyPreferences = new ProxyPreferencesPanel());
+                    pnlProxyPreferences = new ProxyPreferencesPanel();
+                    gui.createPreferenceTab(this).add(pnlProxyPreferences, GBC.eol().fill(GBC.BOTH));
+                    pnlProxyPreferences.initFromPreferences();
+                }
+
+                @Override
+                public boolean ok() {
+                    pnlProxyPreferences.saveToPreferences();
+                    return false;
+                }
+            };
+        }
+    }
+
     /**
      * The proxy policy is how JOSM will use proxy information.
      */
@@ -392 +421 @@
      */
     public ProxyPreferencesPanel() {
         setLayout(new GridBagLayout());
-        setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
-        add(buildProxySettingsPanel(), GBC.eop().anchor(GridBagConstraints.NORTHWEST).fill(GridBagConstraints.BOTH));
+        add(buildProxySettingsPanel(), GBC.eop().fill(GBC.HORIZONTAL));
+        add(Box.createVerticalGlue(), GBC.eol().fill(GBC.BOTH));
 
         initFromPreferences();
         updateEnabledState();

src/org/openstreetmap/josm/gui/preferences/server/ServerAccessPreference.java

@@ -3 +3 @@
 
 import static org.openstreetmap.josm.tools.I18n.tr;
 
-import java.awt.BorderLayout;
-import java.awt.GridBagConstraints;
-import java.awt.GridBagLayout;
-import java.awt.Insets;
-import java.beans.PropertyChangeListener;
-
-import javax.swing.JPanel;
-import javax.swing.JTabbedPane;
-
 import org.openstreetmap.josm.gui.help.HelpUtil;
 import org.openstreetmap.josm.gui.preferences.DefaultTabPreferenceSetting;
 import org.openstreetmap.josm.gui.preferences.PreferenceSetting;
 import org.openstreetmap.josm.gui.preferences.PreferenceSettingFactory;
 import org.openstreetmap.josm.gui.preferences.PreferenceTabbedPane;
+import org.openstreetmap.josm.tools.GBC;
+import java.awt.GridBagLayout;
+import javax.swing.Box;
+import javax.swing.JPanel;
 
-/**
- * Connection preferences, including authentication and proxy sub-preferences.
- */
-public final class ServerAccessPreference extends DefaultTabPreferenceSetting {
+public class ServerAccessPreference extends DefaultTabPreferenceSetting {
 
-    /**
-     * Factory used to create a new {@code ServerAccessPreference}.
-     */
     public static class Factory implements PreferenceSettingFactory {
-        @Override
         public PreferenceSetting createPreferenceSetting() {
             return new ServerAccessPreference();
         }
     }
 
     private ServerAccessPreference() {
-        super("connection", tr("Connection Settings"), tr("Connection Settings for the OSM server."), false, new JTabbedPane());
+        super("connection", tr("Connection Settings"),
+                tr("Connection Settings for the OSM server as well as your identity and how to authenticate at the OSM server."));
     }
 
-    /** indicates whether to use the default OSM URL or not */
     private OsmApiUrlInputPanel pnlApiUrlPreferences;
 
-    /**
-     * Builds the tabbed pane with the server preferences
-     *
-     * @return panel with server preferences tabs
-     */
-    protected JPanel buildTabbedServerPreferences() {
-        JPanel pnl = new JPanel(new BorderLayout());
-        pnl.add(getTabPane(), BorderLayout.CENTER);
-        return pnl;
-    }
+    /** indicates whether to use the default OSM URL or not */
+    /** panel for configuring authentication preferences */
+    private AuthenticationPreferencesPanel pnlAuthPreferences;
 
     /**
      * Builds the panel for entering the server access preferences
      *
-     * @return preferences panel for server settings
+     * @return
      */
     protected JPanel buildContentPanel() {
         JPanel pnl = new JPanel(new GridBagLayout());
-        GridBagConstraints gc = new GridBagConstraints();
 
-        // the checkbox for the default UL
-        gc.fill = GridBagConstraints.HORIZONTAL;
-        gc.anchor = GridBagConstraints.NORTHWEST;
-        gc.weightx = 1.0;
-        gc.insets = new Insets(0,0,0,0);
-        pnlApiUrlPreferences = new OsmApiUrlInputPanel();
-        pnl.add(pnlApiUrlPreferences, gc);
+        pnl.add(pnlApiUrlPreferences = new OsmApiUrlInputPanel(), GBC.eop().fill(GBC.HORIZONTAL));
+        pnl.add(pnlAuthPreferences = new AuthenticationPreferencesPanel(), GBC.eop().fill(GBC.HORIZONTAL));
+        pnl.add(Box.createVerticalGlue(), GBC.eol().fill(GBC.BOTH));
 
-        // the remaining access properties
-        gc.gridy = 1;
-        gc.fill = GridBagConstraints.BOTH;
-        gc.weightx = 1.0;
-        gc.weighty = 1.0;
-        gc.insets = new Insets(10,0,3,3);
-        pnl.add(buildTabbedServerPreferences(), gc);
+        // let the AuthPreferencesPanel know when the API URL changes
+        pnlApiUrlPreferences.addPropertyChangeListener(pnlAuthPreferences);
 
         HelpUtil.setHelpContext(pnl, HelpUtil.ht("/Preferences/Connection"));
         return pnl;
     }
 
-    /**
-     * Adds a listener that will be notified of API URL change.
-     * @param listener the listener
-     * @since 6523
-     */
-    public final void addApiUrlChangeListener(PropertyChangeListener listener) {
-        pnlApiUrlPreferences.addPropertyChangeListener(listener);
-    }
-
-    @Override
     public void addGui(PreferenceTabbedPane gui) {
-        GridBagConstraints gc = new GridBagConstraints();
-        gc.fill = GridBagConstraints.BOTH;
-        gc.weightx = 1.0;
-        gc.weighty = 1.0;
-        gc.anchor = GridBagConstraints.NORTHWEST;
-        gui.createPreferenceTab(this).add(buildContentPanel(), gc);
+        //createPreferenceTabWithScrollPane(gui, buildContentPanel());
+        gui.createPreferenceTab(this).add(buildContentPanel(), GBC.eol().fill(GBC.BOTH));
+        initFromPreferences();
+    }
 
+    /**
+     * Initializes the configuration panel with values from the preferences
+     */
+    public void initFromPreferences() {
         pnlApiUrlPreferences.initFromPreferences();
+        pnlAuthPreferences.initFromPreferences();
     }
 
     /**
      * Saves the values to the preferences
      */
-    @Override
     public boolean ok() {
         pnlApiUrlPreferences.saveToPreferences();
+        pnlAuthPreferences.saveToPreferences();
         return false;
     }
 }

src/org/openstreetmap/josm/gui/preferences/validator/ValidatorPreference.java

@@ -3 +3 @@
 
 import static org.openstreetmap.josm.tools.I18n.tr;
 
+import javax.swing.BorderFactory;
+import javax.swing.JCheckBox;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
 import javax.swing.JTabbedPane;
 
+import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.preferences.BooleanProperty;
+import org.openstreetmap.josm.data.validation.OsmValidator;
+import org.openstreetmap.josm.data.validation.Test;
+import org.openstreetmap.josm.data.validation.tests.MapCSSTagChecker;
 import org.openstreetmap.josm.gui.preferences.DefaultTabPreferenceSetting;
 import org.openstreetmap.josm.gui.preferences.PreferenceSetting;
 import org.openstreetmap.josm.gui.preferences.PreferenceSettingFactory;
 import org.openstreetmap.josm.gui.preferences.PreferenceTabbedPane;
 import org.openstreetmap.josm.tools.GBC;
 
+import java.awt.GridBagLayout;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.LinkedList;
+import java.util.List;
+
 /**
  * Preference settings for the validator.
  *
@@ -62 +78 @@
      */
     public static final String PREF_FILTER_BY_SELECTION = PREFIX + ".selectionFilter";
 
+    private JCheckBox prefUseIgnore;
+    private JCheckBox prefUseLayer;
+    private JCheckBox prefOtherUpload;
+    private JCheckBox prefOther;
+
+    /** The list of all tests */
+    private Collection<Test> allTests;
+
     @Override
     public void addGui(PreferenceTabbedPane gui) {
-        gui.createPreferenceTab(this).add(getTabPane(), GBC.eol().fill(GBC.BOTH));
+        JPanel testPanel = new JPanel(new GridBagLayout());
+        testPanel.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
+
+        prefUseIgnore = new JCheckBox(tr("Use ignore list."), Main.pref.getBoolean(ValidatorPreference.PREF_USE_IGNORE, true));
+        prefUseIgnore.setToolTipText(tr("Use the ignore list to suppress warnings."));
+        testPanel.add(prefUseIgnore, GBC.eol());
+
+        prefUseLayer = new JCheckBox(tr("Use error layer."), Main.pref.getBoolean(ValidatorPreference.PREF_LAYER, true));
+        prefUseLayer.setToolTipText(tr("Use the error layer to display problematic elements."));
+        testPanel.add(prefUseLayer, GBC.eol());
+
+        prefOther = new JCheckBox(tr("Show informational level."), ValidatorPreference.PREF_OTHER.get());
+        prefOther.setToolTipText(tr("Show the informational tests."));
+        testPanel.add(prefOther, GBC.eol());
+
+        prefOtherUpload = new JCheckBox(tr("Show informational level on upload."), Main.pref.getBoolean(ValidatorPreference.PREF_OTHER_UPLOAD, false));
+        prefOtherUpload.setToolTipText(tr("Show the informational tests in the upload check windows."));
+        testPanel.add(prefOtherUpload, GBC.eol());
+
+        ActionListener otherUploadEnabled = new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                prefOtherUpload.setEnabled(prefOther.isSelected());
+            }
+        };
+        prefOther.addActionListener(otherUploadEnabled);
+        otherUploadEnabled.actionPerformed(null);
+
+        GBC a = GBC.eol().insets(-5,0,0,0);
+        a.anchor = GBC.EAST;
+        testPanel.add( new JLabel(tr("On demand")), GBC.std() );
+        testPanel.add( new JLabel(tr("On upload")), a );
+
+        allTests = OsmValidator.getTests();
+        for (Test test: allTests) {
+            test.addGui(testPanel);
+        }
+
+        createPreferenceTabWithScrollPane(gui, testPanel);
     }
 
     @Override
     public boolean ok() {
+        Collection<String> tests = new LinkedList<>();
+        Collection<String> testsBeforeUpload = new LinkedList<>();
+
+        for (Test test : allTests) {
+            test.ok();
+            String name = test.getClass().getSimpleName();
+            if(!test.enabled)
+                tests.add(name);
+            if(!test.testBeforeUpload)
+                testsBeforeUpload.add(name);
+        }
+
+        // Initializes all tests but MapCSSTagChecker because it is initialized
+        // later in ValidatorTagCheckerRulesPreference.ok(),
+        // after its list of rules has been saved to preferences
+        List<Test> testsToInitialize = new ArrayList<>(allTests);
+        testsToInitialize.remove(OsmValidator.getTest(MapCSSTagChecker.class));
+        OsmValidator.initializeTests(testsToInitialize);
+
+        Main.pref.putCollection(ValidatorPreference.PREF_SKIP_TESTS, tests);
+        Main.pref.putCollection(ValidatorPreference.PREF_SKIP_TESTS_BEFORE_UPLOAD, testsBeforeUpload);
+        Main.pref.put(ValidatorPreference.PREF_USE_IGNORE, prefUseIgnore.isSelected());
+        ValidatorPreference.PREF_OTHER.put(prefOther.isSelected());
+        Main.pref.put(ValidatorPreference.PREF_OTHER_UPLOAD, prefOtherUpload.isSelected());
+        Main.pref.put(ValidatorPreference.PREF_LAYER, prefUseLayer.isSelected());
         return false;
     }
+
+    @Override
+    public boolean isExpert() {
+        return false;
+    }
+
 }

src/org/openstreetmap/josm/gui/preferences/validator/ValidatorTagCheckerRulesPreference.java

@@ -14 +14 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.validation.OsmValidator;
 import org.openstreetmap.josm.data.validation.tests.MapCSSTagChecker;
+import org.openstreetmap.josm.gui.preferences.DefaultTabPreferenceSetting;
 import org.openstreetmap.josm.gui.preferences.PreferenceSetting;
 import org.openstreetmap.josm.gui.preferences.PreferenceSettingFactory;
 import org.openstreetmap.josm.gui.preferences.PreferenceTabbedPane;
@@ -22 +23 @@
 import org.openstreetmap.josm.gui.preferences.SourceEntry;
 import org.openstreetmap.josm.gui.preferences.SourceProvider;
 import org.openstreetmap.josm.gui.preferences.SourceType;
-import org.openstreetmap.josm.gui.preferences.SubPreferenceSetting;
-import org.openstreetmap.josm.gui.preferences.TabPreferenceSetting;
+import org.openstreetmap.josm.tools.GBC;
 
 /**
  * The general validator preferences, allowing to enable/disable tests.
  * @since 6669
  */
-public class ValidatorTagCheckerRulesPreference implements SubPreferenceSetting {
+public class ValidatorTagCheckerRulesPreference extends DefaultTabPreferenceSetting {
 
     /**
      * Factory used to create a new {@code ValidatorTagCheckerRulesPreference}.
@@ -41 +41 @@
         }
     }
 
+    private ValidatorTagCheckerRulesPreference() {
+        super("validator", tr("Tag checker rules"), tr("Choose Tag checker rules to enable"));
+    }
+
     private static final List<SourceProvider> ruleSourceProviders = new ArrayList<>();
 
     /**
@@ -48 +52 @@
      * @param provider The rule source provider
      * @return {@code true}, if the provider has been added, {@code false} otherwise
      */
-    public static final boolean registerSourceProvider(SourceProvider provider) {
+    public static boolean registerSourceProvider(SourceProvider provider) {
         if (provider != null)
             return ruleSourceProviders.add(provider);
         return false;
@@ -178 +182 @@
 
     @Override
     public void addGui(PreferenceTabbedPane gui) {
-        final ValidatorPreference valPref = gui.getValidatorPreference();
         sources = new TagCheckerRulesSourceEditor();
-        
-        valPref.addSubTab(this, tr("Tag checker rules"),
-                sources, tr("Choose Tag checker rules to enable"));
-        sources.deferLoading(valPref, sources);
+        gui.createPreferenceTab(this).add(sources, GBC.eol().fill(GBC.BOTH));
     }
 
     @Override
@@ -203 +203 @@
     public boolean isExpert() {
         return false;
     }
-
-    @Override
-    public TabPreferenceSetting getTabPreferenceSetting(PreferenceTabbedPane gui) {
-        return gui.getValidatorPreference();
-    }
 }

src/org/openstreetmap/josm/tools/I18n.java

@@ -10 +10 @@
 import java.nio.charset.StandardCharsets;
 import java.text.MessageFormat;
 import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
+import java.util.Collections;
 import java.util.Comparator;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 import java.util.jar.JarInputStream;
@@ -321 +321 @@
 
     /**
      * Get a list of all available JOSM Translations.
-     * @return an array of locale objects.
+     * @return a sorted list of locale objects.
      */
-    public static final Locale[] getAvailableTranslations() {
-        Collection<Locale> v = new ArrayList<>(languages.size());
-        if(getTranslationFile("en") != null)
-        {
+    public static final List<Locale> getAvailableTranslationsAsList() {
+        List<Locale> v = new ArrayList<>(languages.size());
+        if (getTranslationFile("en") != null) {
             for (String loc : languages.keySet()) {
-                if(getTranslationFile(loc) != null) {
+                if (getTranslationFile(loc) != null) {
                     v.add(LanguageInfo.getLocale(loc));
                 }
             }
         }
         v.add(Locale.ENGLISH);
-        Locale[] l = new Locale[v.size()];
-        l = v.toArray(l);
-        Arrays.sort(l, new Comparator<Locale>() {
+        Collections.sort(v, new Comparator<Locale>() {
             @Override
             public int compare(Locale o1, Locale o2) {
                 return o1.toString().compareTo(o2.toString());
             }
         });
-        return l;
+        return v;
+    }
+
+    /**
+     * Get an array of all available JOSM Translations.
+     * @return an array of locale objects.
+     */
+    public static final Locale[] getAvailableTranslations() {
+        List<Locale> locales = getAvailableTranslationsAsList();
+        return locales.toArray(new Locale[locales.size()]);
     }
 
     public static boolean hasCode(String code)