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

Timestamp:

2011-07-14T19:52:24+02:00 (13 years ago)

Author:

bastiK

Message:

some renames to simplify further development

Location:

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

Files:

• AuthenticationPreferencesPanel.java (modified) (2 diffs)
• BasicAuthenticationPreferencesPanel.java (modified) (5 diffs)
• OAuthAccessTokenHolder.java (modified) (5 diffs)
• OAuthAuthenticationPreferencesPanel.java (modified) (2 diffs)
• ProxyPreferencesPanel.java (modified) (5 diffs)

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

@@ -20 +20 @@
 import org.openstreetmap.josm.gui.help.HelpUtil;
 import org.openstreetmap.josm.gui.widgets.VerticallyScrollablePanel;
-import org.openstreetmap.josm.io.auth.CredentialsManagerFactory;
+import org.openstreetmap.josm.io.auth.CredentialsManager;
 
 /**
@@ -124 +124 @@
             pnlBasicAuthPreferences.saveToPreferences();
             OAuthAccessTokenHolder.getInstance().clear();
-            OAuthAccessTokenHolder.getInstance().save(Main.pref, CredentialsManagerFactory.getCredentialManager());
+            OAuthAccessTokenHolder.getInstance().save(Main.pref, CredentialsManager.getInstance());
         } else if (authMethod.equals("oauth")) {
             // clear the password in the preferences

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

@@ -20 +20 @@
 import org.openstreetmap.josm.gui.widgets.HtmlPanel;
 import org.openstreetmap.josm.gui.widgets.SelectAllOnFocusGainedDecorator;
+import org.openstreetmap.josm.io.auth.CredentialsAgent;
+import org.openstreetmap.josm.io.auth.CredentialsAgentException;
 import org.openstreetmap.josm.io.auth.CredentialsManager;
-import org.openstreetmap.josm.io.auth.CredentialsManagerException;
-import org.openstreetmap.josm.io.auth.CredentialsManagerFactory;
-import org.openstreetmap.josm.io.auth.JosmPreferencesCredentialManager;
+import org.openstreetmap.josm.io.auth.JosmPreferencesCredentialAgent;
 
 /**
@@ -103 +103 @@
 
     public void initFromPreferences() {
-        CredentialsManager cm = CredentialsManagerFactory.getCredentialManager();
+        CredentialsAgent cm = CredentialsManager.getInstance();
         try {
             PasswordAuthentication pa = cm.lookup(RequestorType.SERVER);
@@ -113 +113 @@
                 tfOsmPassword.setText(pa.getPassword() == null ? "" : String.valueOf(pa.getPassword()));
             }
-        } catch(CredentialsManagerException e) {
+        } catch(CredentialsAgentException e) {
             e.printStackTrace();
             System.err.println(tr("Warning: failed to retrieve OSM credentials from credential manager."));
@@ -123 +123 @@
 
     public void saveToPreferences() {
-        CredentialsManager cm = CredentialsManagerFactory.getCredentialManager();
+        CredentialsAgent cm = CredentialsManager.getInstance();
         try {
             PasswordAuthentication pa = new PasswordAuthentication(
@@ -132 +132 @@
             // always save the username to the preferences if it isn't already saved there
             // by the credential manager
-            if (! (cm instanceof JosmPreferencesCredentialManager)) {
+            if (! (cm instanceof JosmPreferencesCredentialAgent)) {
                 Main.pref.put("osm-server.username", tfOsmUserName.getText().trim());
             }
-        } catch(CredentialsManagerException e) {
+        } catch(CredentialsAgentException e) {
             e.printStackTrace();
             System.err.println(tr("Warning: failed to save OSM credentials to credential manager."));

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

@@ -6 +6 @@
 import org.openstreetmap.josm.data.Preferences;
 import org.openstreetmap.josm.data.oauth.OAuthToken;
-import org.openstreetmap.josm.io.auth.CredentialsManager;
-import org.openstreetmap.josm.io.auth.CredentialsManagerException;
+import org.openstreetmap.josm.io.auth.CredentialsAgent;
+import org.openstreetmap.josm.io.auth.CredentialsAgentException;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
 
@@ -136 +136 @@
      * @throws IllegalArgumentException thrown if cm is null
      */
-    public void init(Preferences pref, CredentialsManager cm) throws IllegalArgumentException {
+    public void init(Preferences pref, CredentialsAgent cm) throws IllegalArgumentException {
         CheckParameterUtil.ensureParameterNotNull(pref, "pref");
         CheckParameterUtil.ensureParameterNotNull(cm, "cm");
@@ -142 +142 @@
         try {
             token = cm.lookupOAuthAccessToken();
-        } catch(CredentialsManagerException e) {
+        } catch(CredentialsAgentException e) {
             e.printStackTrace();
             System.err.println(tr("Warning: Failed to retrieve OAuth Access Token from credential manager"));
@@ -163 +163 @@
      * @throws IllegalArgumentException thrown if cm is null
      */
-    public void save(Preferences preferences, CredentialsManager cm) throws IllegalArgumentException {
+    public void save(Preferences preferences, CredentialsAgent cm) throws IllegalArgumentException {
         CheckParameterUtil.ensureParameterNotNull(preferences, "preferences");
         CheckParameterUtil.ensureParameterNotNull(cm, "cm");
@@ -173 +173 @@
                 cm.storeOAuthAccessToken(new OAuthToken(accessTokenKey, accessTokenSecret));
             }
-        } catch(CredentialsManagerException e){
+        } catch(CredentialsAgentException e){
             e.printStackTrace();
             System.err.println(tr("Warning: Failed to store OAuth Access Token to credentials manager"));

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

@@ -32 +32 @@
 import org.openstreetmap.josm.gui.oauth.OAuthAuthorizationWizard;
 import org.openstreetmap.josm.gui.oauth.TestAccessTokenTask;
-import org.openstreetmap.josm.io.auth.CredentialsManagerFactory;
+import org.openstreetmap.josm.io.auth.CredentialsManager;
 import org.openstreetmap.josm.tools.ImageProvider;
 
@@ -161 +161 @@
     public void saveToPreferences() {
         OAuthAccessTokenHolder.getInstance().setSaveToPreferences(cbSaveToPreferences.isSelected());
-        OAuthAccessTokenHolder.getInstance().save(Main.pref, CredentialsManagerFactory.getCredentialManager());
+        OAuthAccessTokenHolder.getInstance().save(Main.pref, CredentialsManager.getInstance());
         pnlAdvancedProperties.getAdvancedParameters().saveToPreferences(Main.pref);
     }

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

@@ -31 +31 @@
 import org.openstreetmap.josm.gui.widgets.VerticallyScrollablePanel;
 import org.openstreetmap.josm.io.DefaultProxySelector;
+import org.openstreetmap.josm.io.auth.CredentialsAgent;
+import org.openstreetmap.josm.io.auth.CredentialsAgentException;
 import org.openstreetmap.josm.io.auth.CredentialsManager;
-import org.openstreetmap.josm.io.auth.CredentialsManagerException;
-import org.openstreetmap.josm.io.auth.CredentialsManagerFactory;
 import org.openstreetmap.josm.tools.GBC;
 
@@ -321 +321 @@
         // save the proxy user and the proxy password to a credentials store managed by
         // the credentials manager
-        CredentialsManager cm = CredentialsManagerFactory.getCredentialManager();
+        CredentialsAgent cm = CredentialsManager.getInstance();
         try {
             PasswordAuthentication pa = cm.lookup(RequestorType.PROXY);
@@ -331 +331 @@
                 tfProxyHttpPassword.setText(pa.getPassword() == null ? "" : String.valueOf(pa.getPassword()));
             }
-        } catch(CredentialsManagerException e) {
+        } catch(CredentialsAgentException e) {
             e.printStackTrace();
             tfProxyHttpUser.setText("");
@@ -395 +395 @@
         }
 
-        CredentialsManager cm = CredentialsManagerFactory.getCredentialManager();
+        CredentialsAgent cm = CredentialsManager.getInstance();
         try {
             PasswordAuthentication pa = new PasswordAuthentication(
@@ -402 +402 @@
             );
             cm.store(RequestorType.PROXY, pa);
-        } catch(CredentialsManagerException e) {
+        } catch(CredentialsAgentException e) {
             e.printStackTrace();
         }