Changeset 6883 in josm for trunk/src/org/openstreetmap/josm/data/oauth
- Timestamp:
- 2014-02-25T01:31:24+01:00 (10 years ago)
- Location:
- trunk/src/org/openstreetmap/josm/data/oauth
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/data/oauth/OAuthParameters.java
r6847 r6883 24 24 * The default JOSM OAuth consumer key (created by user josmeditor). 25 25 */ 26 static public final String DEFAULT_JOSM_CONSUMER_KEY = "F7zPYlVCqE2BUH9Hr4SsWZSOnrKjpug1EgqkbsSb";26 public static final String DEFAULT_JOSM_CONSUMER_KEY = "F7zPYlVCqE2BUH9Hr4SsWZSOnrKjpug1EgqkbsSb"; 27 27 /** 28 28 * The default JOSM OAuth consumer secret (created by user josmeditor). 29 29 */ 30 static public final String DEFAULT_JOSM_CONSUMER_SECRET = "rIkjpPcBNkMQxrqzcOvOC4RRuYupYr7k8mfP13H5";30 public static final String DEFAULT_JOSM_CONSUMER_SECRET = "rIkjpPcBNkMQxrqzcOvOC4RRuYupYr7k8mfP13H5"; 31 31 /** 32 32 * The default OSM OAuth request token URL. 33 33 */ 34 static public final String DEFAULT_REQUEST_TOKEN_URL = Main.OSM_WEBSITE + "/oauth/request_token";34 public static final String DEFAULT_REQUEST_TOKEN_URL = Main.OSM_WEBSITE + "/oauth/request_token"; 35 35 /** 36 36 * The default OSM OAuth access token URL. 37 37 */ 38 static public final String DEFAULT_ACCESS_TOKEN_URL = Main.OSM_WEBSITE + "/oauth/access_token";38 public static final String DEFAULT_ACCESS_TOKEN_URL = Main.OSM_WEBSITE + "/oauth/access_token"; 39 39 /** 40 40 * The default OSM OAuth authorize URL. 41 41 */ 42 static public final String DEFAULT_AUTHORISE_URL = Main.OSM_WEBSITE + "/oauth/authorize";42 public static final String DEFAULT_AUTHORISE_URL = Main.OSM_WEBSITE + "/oauth/authorize"; 43 43 44 44 … … 49 49 * @return a set of default parameters 50 50 */ 51 static public OAuthParameters createDefault() {51 public static OAuthParameters createDefault() { 52 52 return createDefault(null); 53 53 } … … 62 62 * @since 5422 63 63 */ 64 static public OAuthParameters createDefault(String apiUrl) {64 public static OAuthParameters createDefault(String apiUrl) { 65 65 OAuthParameters parameters = new OAuthParameters(); 66 66 parameters.setConsumerKey(DEFAULT_JOSM_CONSUMER_KEY); … … 90 90 * @return the parameters 91 91 */ 92 static public OAuthParameters createFromPreferences(Preferences pref) {92 public static OAuthParameters createFromPreferences(Preferences pref) { 93 93 OAuthParameters parameters = createDefault(pref.get("osm-server.url")); 94 94 parameters.setConsumerKey(pref.get("oauth.settings.consumer-key", parameters.getConsumerKey())); -
trunk/src/org/openstreetmap/josm/data/oauth/OAuthToken.java
r5266 r6883 14 14 * @return the token 15 15 */ 16 static public OAuthToken createToken(OAuthConsumer consumer) {16 public static OAuthToken createToken(OAuthConsumer consumer) { 17 17 return new OAuthToken(consumer.getToken(), consumer.getTokenSecret()); 18 18 }
Note:
See TracChangeset
for help on using the changeset viewer.