Changeset 2015 in josm for trunk/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java

Timestamp:

30.08.2009 18:57:05 (3 years ago)

Author:

stoecker

Message:

fixed #3112 - patch by bastiK - cleanup password hook

File:

• trunk/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java (modified) (2 diffs)

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

@@ -4 +4 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
-import java.awt.Font;
-
-import javax.swing.JLabel;
-import javax.swing.JPasswordField;
-import javax.swing.JTextField;
-
-import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.tools.GBC;
 import org.openstreetmap.josm.io.OsmConnection;
-import org.openstreetmap.josm.io.CredentialsManager.PreferenceAdditions;
+import org.openstreetmap.josm.io.CredentialsManager;
 
 public class ServerAccessPreference implements PreferenceSetting {
@@ -24 +16 @@
 
     /**
-     * Editfield for the Base url to the REST API from OSM.
-     */
-    private JTextField osmDataServer = new JTextField(20);
-    /**
      * Provide username and password input editfields.
      * Store the values if user hits OK.
      */
-    private PreferenceAdditions credentialsPA = OsmConnection.credentialsManager.newPreferenceAdditions();
+    private CredentialsManager.PreferenceAdditions credentialsPA = OsmConnection.credentialsManager.newPreferenceAdditions();
 
     public void addGui(PreferenceDialog gui) {
-        osmDataServer.setText(Main.pref.get("osm-server.url", "http://api.openstreetmap.org/api"));
-        osmDataServer.setToolTipText(tr("The base URL for the OSM server (REST API)"));
-        gui.connection.add(new JLabel(tr("Base Server URL")), GBC.std());
-        gui.connection.add(osmDataServer, GBC.eol().fill(GBC.HORIZONTAL).insets(5,0,0,5));
         credentialsPA.addPreferenceOptions(gui.connection);
     }
 
     public boolean ok() {
-        Main.pref.put("osm-server.url", osmDataServer.getText());
         credentialsPA.preferencesChanged();
         return false;