Changeset 6666 in josm for trunk/src/org/openstreetmap/josm/gui/preferences/server

Timestamp:

2014-01-10T19:24:34+01:00 (10 years ago)

Author:

Don-vip

Message:

see #9508 - refactor validator preferences + handling of JScrollPane policies ("vertical as needed" / "horizontal as needed" are default policies)

Location:

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

Files:

• AuthenticationPreference.java (modified) (1 diff)
• ProxyPreference.java (modified) (1 diff)
• ServerAccessPreference.java (modified) (3 diffs)

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

@@ -37 +37 @@
         gui.getServerPreference().addApiUrlChangeListener(pnlAuthPreferences);
         gui.getServerPreference().addSubTab(this, tr("Authentication"),
-                ServerAccessPreference.wrapVerticallyScrollablePanel(pnlAuthPreferences),
+                pnlAuthPreferences.getVerticalScrollPane(),
                 tr("Configure your identity and how to authenticate at the OSM server"));
     }

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

@@ -41 +41 @@
         pnlProxyPreferences = new ProxyPreferencesPanel();
         gui.getServerPreference().addSubTab(this, tr("Proxy settings"),
-                ServerAccessPreference.wrapVerticallyScrollablePanel(pnlProxyPreferences),
+                pnlProxyPreferences.getVerticalScrollPane(),
                 tr("Configure whether to use a proxy server"));
     }

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

@@ -11 +11 @@
 
 import javax.swing.JPanel;
-import javax.swing.JScrollPane;
 import javax.swing.JTabbedPane;
 
@@ -19 +18 @@
 import org.openstreetmap.josm.gui.preferences.PreferenceSettingFactory;
 import org.openstreetmap.josm.gui.preferences.PreferenceTabbedPane;
-import org.openstreetmap.josm.gui.widgets.VerticallyScrollablePanel;
 
 /**
@@ -42 +40 @@
     /** indicates whether to use the default OSM URL or not */
     private OsmApiUrlInputPanel pnlApiUrlPreferences;
-
-    /**
-     * Embeds a vertically scrollable panel in a {@link JScrollPane}
-     * @param panel the panel
-     * @return the scroll pane
-     */
-    public static JScrollPane wrapVerticallyScrollablePanel(VerticallyScrollablePanel panel) {
-        JScrollPane sp = new JScrollPane(panel);
-        sp.setHorizontalScrollBarPolicy(JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);
-        sp.setVerticalScrollBarPolicy(JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED);
-        return sp;
-    }
 
     /**