Changeset 17162 in josm for trunk/src

Timestamp:

2020-10-11T12:39:49+02:00 (4 years ago)

Author:

simon04

Message:

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

Location:

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

Files:

• PreferenceTabbedPane.java (modified) (2 diffs)
• server/ConnectionPreference.java (deleted)
• server/OverpassServerPanel.java (moved) (moved from trunk/src/org/openstreetmap/josm/gui/preferences/server/OverpassServerPreference.java ) (2 diffs)
• server/ProxyPreferencesPanel.java (modified) (1 diff)
• server/ServerAccessPreference.java (modified) (4 diffs)

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

@@ -56 +56 @@
 import org.openstreetmap.josm.gui.preferences.projection.ProjectionPreference;
 import org.openstreetmap.josm.gui.preferences.remotecontrol.RemoteControlPreference;
-import org.openstreetmap.josm.gui.preferences.server.ConnectionPreference;
-import org.openstreetmap.josm.gui.preferences.server.OverpassServerPreference;
 import org.openstreetmap.josm.gui.preferences.server.ProxyPreference;
 import org.openstreetmap.josm.gui.preferences.server.ServerAccessPreference;
@@ -583 +581 @@
         SETTINGS_FACTORIES.add(new LanguagePreference.Factory());
 
-        SETTINGS_FACTORIES.add(new ConnectionPreference.Factory());
         SETTINGS_FACTORIES.add(new ServerAccessPreference.Factory());
         SETTINGS_FACTORIES.add(new ProxyPreference.Factory());
-        SETTINGS_FACTORIES.add(new OverpassServerPreference.Factory());
         SETTINGS_FACTORIES.add(new MapPreference.Factory());
         SETTINGS_FACTORIES.add(new ProjectionPreference.Factory());

trunk/src/org/openstreetmap/josm/gui/preferences/server/OverpassServerPanel.java

@@ -12 +12 @@
 import javax.swing.JPanel;
 
-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.actions.ExpertToggleAction;
 import org.openstreetmap.josm.gui.widgets.HistoryComboBox;
 import org.openstreetmap.josm.io.OverpassDownloadReader;
@@ -23 +20 @@
  * Preferences related to Overpass API servers.
  *
- * @since 9142
+ * @since 17162
  */
-public class OverpassServerPreference extends DefaultTabPreferenceSetting {
+public class OverpassServerPanel extends JPanel {
 
     private final HistoryComboBox overpassServer = new HistoryComboBox();
     private final JCheckBox forMultiFetch = new JCheckBox(tr("Use Overpass server for object downloads"));
 
-    /**
-     * Factory used to create a new {@link OverpassServerPreference}.
-     */
-    public static class Factory implements PreferenceSettingFactory {
-        @Override
-        public PreferenceSetting createPreferenceSetting() {
-            return new OverpassServerPreference();
-        }
-    }
-
-    OverpassServerPreference() {
-        super(null, tr("Overpass server"), tr("Configure Overpass server"));
-    }
-
-    @Override
-    public void addGui(PreferenceTabbedPane gui) {
-        final JPanel panel = new JPanel(new GridBagLayout());
-
+    OverpassServerPanel() {
+        super(new GridBagLayout());
+        ExpertToggleAction.addVisibilitySwitcher(this);
+        final JPanel panel = this;
         panel.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
         panel.add(new JLabel(tr("Overpass server: ")), GBC.std().insets(5, 5, 5, 5));
         panel.add(overpassServer, GBC.eop().fill(GBC.HORIZONTAL));
+        panel.add(forMultiFetch, GBC.eop());
+        panel.add(Box.createVerticalGlue(), GBC.eol().fill());
+    }
+
+    /**
+     * Initializes the panel from preferences
+     */
+    public final void initFromPreferences() {
         overpassServer.setPossibleItems(OverpassDownloadReader.OVERPASS_SERVER_HISTORY.get());
         overpassServer.setText(OverpassDownloadReader.OVERPASS_SERVER.get());
-
-        panel.add(forMultiFetch, GBC.eop());
         forMultiFetch.setSelected(OverpassDownloadReader.FOR_MULTI_FETCH.get());
-
-        panel.add(Box.createVerticalGlue(), GBC.eol().fill());
-        gui.createPreferenceTab(this).add(panel, GBC.eol().fill());
     }
 
-    @Override
-    public boolean ok() {
+    /**
+     * Saves the current values to the preferences
+     */
+    public final void saveToPreferences() {
         OverpassDownloadReader.OVERPASS_SERVER.put(overpassServer.getText());
         OverpassDownloadReader.OVERPASS_SERVER_HISTORY.put(overpassServer.getHistory());
         OverpassDownloadReader.FOR_MULTI_FETCH.put(forMultiFetch.isSelected());
-        return false;
-    }
-
-    @Override
-    public boolean isExpert() {
-        return true;
     }
 }

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

@@ -192 +192 @@
 
         // radio button "No proxy"
-        gc.gridx = 0;
-        gc.gridy = 0;
-        gc.fill = GridBagConstraints.HORIZONTAL;
-        gc.anchor = GridBagConstraints.NORTHWEST;
-        gc.weightx = 0.0;
-        pnl.add(rbProxyPolicy.get(ProxyPolicy.NO_PROXY), gc);
-
-        gc.gridx = 1;
-        gc.weightx = 1.0;
-        pnl.add(new JLabel(tr("No proxy")), gc);
+        rbProxyPolicy.get(ProxyPolicy.NO_PROXY).setText(tr("No proxy"));
+        pnl.add(rbProxyPolicy.get(ProxyPolicy.NO_PROXY), GBC.eop().anchor(GBC.NORTHWEST));
 
         // radio button "System settings"
-        gc.gridx = 0;
-        gc.gridy = 1;
-        gc.weightx = 0.0;
-        pnl.add(rbProxyPolicy.get(ProxyPolicy.USE_SYSTEM_SETTINGS), gc);
-
-        gc.gridx = 1;
-        gc.weightx = 1.0;
-        String msg;
-        if (DefaultProxySelector.willJvmRetrieveSystemProxies()) {
-            msg = tr("Use standard system settings");
-        } else {
-            msg = tr("Use standard system settings (disabled. Start JOSM with <tt>-Djava.net.useSystemProxies=true</tt> to enable)");
-        }
-        pnl.add(new JMultilineLabel("<html>" + msg + "</html>"), gc);
+        pnl.add(rbProxyPolicy.get(ProxyPolicy.USE_SYSTEM_SETTINGS), GBC.eol());
+        rbProxyPolicy.get(ProxyPolicy.USE_SYSTEM_SETTINGS).setText(tr("Use standard system settings"));
+        if (!DefaultProxySelector.willJvmRetrieveSystemProxies()) {
+            String msg = tr("Use standard system settings (disabled. Start JOSM with <tt>-Djava.net.useSystemProxies=true</tt> to enable)");
+            pnl.add(new JMultilineLabel("<html>" + msg + "</html>"), GBC.eop());
+        }
 
         // radio button http proxy
-        gc.gridx = 0;
-        gc.gridy = 2;
-        gc.weightx = 0.0;
-        pnl.add(rbProxyPolicy.get(ProxyPolicy.USE_HTTP_PROXY), gc);
-
-        gc.gridx = 1;
-        gc.weightx = 1.0;
-        pnl.add(new JLabel(tr("Manually configure a HTTP proxy")), gc);
+        rbProxyPolicy.get(ProxyPolicy.USE_HTTP_PROXY).setText(tr("Manually configure a HTTP proxy"));
+        pnl.add(rbProxyPolicy.get(ProxyPolicy.USE_HTTP_PROXY), GBC.eol());
 
         // the panel with the http proxy configuration parameters
-        gc.gridx = 1;
-        gc.gridy = 3;
-        gc.fill = GridBagConstraints.HORIZONTAL;
-        gc.weightx = 1.0;
-        gc.weighty = 0.0;
         pnlHttpProxyConfigurationPanel = buildHttpProxyConfigurationPanel();
-        pnl.add(pnlHttpProxyConfigurationPanel, gc);
+        pnl.add(pnlHttpProxyConfigurationPanel, GBC.eop().fill(GBC.HORIZONTAL));
 
         // radio button SOCKS proxy
-        gc.gridx = 0;
-        gc.gridy = 4;
-        gc.weightx = 0.0;
-        pnl.add(rbProxyPolicy.get(ProxyPolicy.USE_SOCKS_PROXY), gc);
-
-        gc.gridx = 1;
-        gc.weightx = 1.0;
-        pnl.add(new JLabel(tr("Use a SOCKS proxy")), gc);
+        pnl.add(rbProxyPolicy.get(ProxyPolicy.USE_SOCKS_PROXY), GBC.eol());
+        rbProxyPolicy.get(ProxyPolicy.USE_SOCKS_PROXY).setText(tr("Use a SOCKS proxy"));
 
         // the panel with the SOCKS configuration parameters
-        gc.gridx = 1;
-        gc.gridy = 5;
-        gc.fill = GridBagConstraints.BOTH;
-        gc.anchor = GridBagConstraints.WEST;
-        gc.weightx = 1.0;
-        gc.weighty = 0.0;
         pnlSocksProxyConfigurationPanel = buildSocksProxyConfigurationPanel();
-        pnl.add(pnlSocksProxyConfigurationPanel, gc);
+        pnl.add(pnlSocksProxyConfigurationPanel, GBC.eop().fill(GBC.HORIZONTAL));
 
         return pnl;

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

@@ -10 +10 @@
 import javax.swing.JPanel;
 import javax.swing.JSeparator;
-import javax.swing.JTabbedPane;
 
 import org.openstreetmap.josm.gui.help.HelpUtil;
@@ -39 +38 @@
     /** the panel for messages notifier preferences */
     private final FeaturesPanel pnlFeaturesPreferences = new FeaturesPanel();
+    private final OverpassServerPanel pnlOverpassPreferences = new OverpassServerPanel();
 
     private ServerAccessPreference() {
-        super(null, tr("OSM Server"), tr("Connection Settings for the OSM server."), false, new JTabbedPane());
+        super(/* ICON(preferences/) */ "connection", tr("OSM Server"), tr("Connection Settings for the OSM server."));
     }
 
@@ -61 +61 @@
         panel.add(new JSeparator(), GBC.eop().fill(GBC.HORIZONTAL));
         panel.add(pnlFeaturesPreferences, GBC.eop().fill(GBC.HORIZONTAL));
+        panel.add(new JSeparator(), GBC.eop().fill(GBC.HORIZONTAL));
+        panel.add(pnlOverpassPreferences, GBC.eop().fill(GBC.HORIZONTAL));
 
         pnlApiUrlPreferences.initFromPreferences();
         pnlAuthPreferences.initFromPreferences();
         pnlFeaturesPreferences.initFromPreferences();
+        pnlOverpassPreferences.initFromPreferences();
         addApiUrlChangeListener(pnlAuthPreferences);
 
@@ -81 +84 @@
         // save message notifications preferences. To be done after authentication preferences.
         pnlFeaturesPreferences.saveToPreferences();
+        pnlOverpassPreferences.saveToPreferences();
         return false;
     }