Changeset 13173 in josm for trunk/src/org/openstreetmap/josm/data/oauth/OAuthParameters.java

Timestamp:

2017-11-28T00:56:29+01:00 (6 years ago)

Author:

Don-vip

Message:

see #15310 - remove most of deprecated APIs

File:

• trunk/src/org/openstreetmap/josm/data/oauth/OAuthParameters.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/data/oauth/OAuthParameters.java

@@ -5 +5 @@
 
 import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.data.Preferences;
 import org.openstreetmap.josm.io.OsmApi;
 import org.openstreetmap.josm.spi.preferences.Config;
@@ -96 +95 @@
 
     /**
-     * Replies a set of parameters as defined in the preferences.
-     *
-     * @param pref the preferences
-     * @return the parameters
-     * @deprecated (since 12928) replaced by {@link #createFromApiUrl(java.lang.String)}
-     */
-    @Deprecated
-    public static OAuthParameters createFromPreferences(Preferences pref) {
-        OAuthParameters parameters = createDefault(pref.get("osm-server.url"));
-        return new OAuthParameters(
-                pref.get("oauth.settings.consumer-key", parameters.getConsumerKey()),
-                pref.get("oauth.settings.consumer-secret", parameters.getConsumerSecret()),
-                pref.get("oauth.settings.request-token-url", parameters.getRequestTokenUrl()),
-                pref.get("oauth.settings.access-token-url", parameters.getAccessTokenUrl()),
-                pref.get("oauth.settings.authorise-url", parameters.getAuthoriseUrl()),
-                pref.get("oauth.settings.osm-login-url", parameters.getOsmLoginUrl()),
-                pref.get("oauth.settings.osm-logout-url", parameters.getOsmLogoutUrl()));
-    }
-
-    /**
      * Remembers the current values in the preferences.
      */
@@ -126 +105 @@
         Config.getPref().put("oauth.settings.osm-login-url", getOsmLoginUrl());
         Config.getPref().put("oauth.settings.osm-logout-url", getOsmLogoutUrl());
-    }
-
-    /**
-     * Remembers the current values in the preferences <code>pref</code>.
-     *
-     * @param pref the preferences. Must not be null.
-     * @throws IllegalArgumentException if pref is null.
-     * @deprecated (since 12928) replaced by {@link #rememberPreferences()}
-     */
-    @Deprecated
-    public void rememberPreferences(Preferences pref) {
-        CheckParameterUtil.ensureParameterNotNull(pref, "pref");
-        pref.put("oauth.settings.consumer-key", getConsumerKey());
-        pref.put("oauth.settings.consumer-secret", getConsumerSecret());
-        pref.put("oauth.settings.request-token-url", getRequestTokenUrl());
-        pref.put("oauth.settings.access-token-url", getAccessTokenUrl());
-        pref.put("oauth.settings.authorise-url", getAuthoriseUrl());
-        pref.put("oauth.settings.osm-login-url", getOsmLoginUrl());
-        pref.put("oauth.settings.osm-logout-url", getOsmLogoutUrl());
     }