Changeset 17159 in josm for trunk/src/org/openstreetmap/josm/gui/preferences/display/LanguagePreference.java

Timestamp:

2020-10-11T10:30:14+02:00 (4 years ago)

Author:

simon04

Message:

see #7548 - Re-organize the preference dialog (display preferences)

File:

• trunk/src/org/openstreetmap/josm/gui/preferences/display/LanguagePreference.java (modified) (7 diffs)

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

@@ -5 +5 @@
 
 import java.awt.Component;
+import java.awt.GridBagLayout;
 import java.util.ArrayList;
 import java.util.Comparator;
@@ -18 +19 @@
 import javax.swing.ListCellRenderer;
 
+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.spi.preferences.Config;
@@ -33 +33 @@
  * @since 1065
  */
-public class LanguagePreference implements SubPreferenceSetting {
+public class LanguagePreference extends DefaultTabPreferenceSetting {
 
     private static final String LANGUAGE = "language";
@@ -45 +45 @@
             return new LanguagePreference();
         }
+    }
+
+    LanguagePreference() {
+        super(null, tr("Language"), tr("Change the language of JOSM."));
     }
 
@@ -59 +63 @@
         langCombo.setRenderer(new LanguageCellRenderer());
 
-        LafPreference lafPreference = gui.getSetting(LafPreference.class);
-        final JPanel panel = lafPreference.panel;
+        final JPanel panel = new JPanel(new GridBagLayout());
         panel.add(new JLabel(tr("Language")), GBC.std().insets(20, 0, 0, 0));
         panel.add(GBC.glue(5, 0), GBC.std().fill(GBC.HORIZONTAL));
@@ -66 +69 @@
         panel.add(Box.createVerticalGlue(), GBC.eol().fill(GBC.BOTH));
 
-        TabPreferenceSetting tabPref = lafPreference.getTabPreferenceSetting(gui);
-        tabPref.registerSubTab(this, tabPref.getSubTab(lafPreference));
+        createPreferenceTabWithScrollPane(gui, panel);
     }
 
@@ -137 +139 @@
     }
 
-    @Override
-    public TabPreferenceSetting getTabPreferenceSetting(final PreferenceTabbedPane gui) {
-        return gui.getSetting(LafPreference.class).getTabPreferenceSetting(gui);
-    }
 }