Changeset 8444 in josm for trunk/src/org/openstreetmap/josm/gui/oauth
- Timestamp:
- 2015-06-02T16:41:37+02:00 (9 years ago)
- Location:
- trunk/src/org/openstreetmap/josm/gui/oauth
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java
r8308 r8444 126 126 OAuthParameters params = OAuthParameters.createDefault(apiUrl); 127 127 return 128 ! 129 || ! 130 || ! 131 || ! 132 || ! 128 !tfConsumerKey.getText().equals(params.getConsumerKey()) 129 || !tfConsumerSecret.getText().equals(params.getConsumerSecret()) 130 || !tfRequestTokenURL.getText().equals(params.getRequestTokenUrl()) 131 || !tfAccessTokenURL.getText().equals(params.getAccessTokenUrl()) 132 || !tfAuthoriseURL.getText().equals(params.getAuthoriseUrl()); 133 133 } 134 134 … … 216 216 cbUseDefaults.setSelected(false); 217 217 setChildComponentsEnabled(true); 218 tfConsumerKey.setText( 219 tfConsumerSecret.setText( 218 tfConsumerKey.setText(parameters.getConsumerKey() == null ? "" : parameters.getConsumerKey()); 219 tfConsumerSecret.setText(parameters.getConsumerSecret() == null ? "" : parameters.getConsumerSecret()); 220 220 tfRequestTokenURL.setText(parameters.getRequestTokenUrl() == null ? "" : parameters.getRequestTokenUrl()); 221 221 tfAccessTokenURL.setText(parameters.getAccessTokenUrl() == null ? "" : parameters.getAccessTokenUrl()); -
trunk/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java
r8442 r8444 219 219 220 220 public void build() { 221 if (! 221 if (!valAccessTokenKey.isValid() || !valAccessTokenSecret.isValid()) { 222 222 setAccessToken(null); 223 223 } else { … … 269 269 @Override 270 270 public void propertyChange(PropertyChangeEvent evt) { 271 if (! 271 if (!evt.getPropertyName().equals(AbstractAuthorizationUI.ACCESS_TOKEN_PROP)) 272 272 return; 273 273 updateEnabledState(); -
trunk/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java
r8415 r8444 228 228 for (String kvPair : kvPairs) { 229 229 kvPair = kvPair.trim(); 230 String 230 String[] kv = kvPair.split("="); 231 231 if (kv == null || kv.length != 2) { 232 232 continue; -
trunk/src/org/openstreetmap/josm/gui/oauth/RetrieveRequestTokenTask.java
r8291 r8444 39 39 * @throws IllegalArgumentException if parameters is null. 40 40 */ 41 public RetrieveRequestTokenTask(Component parent, OAuthParameters parameters 41 public RetrieveRequestTokenTask(Component parent, OAuthParameters parameters) { 42 42 super(parent, tr("Retrieving OAuth Request Token..."), false /* don't ignore exceptions */); 43 43 CheckParameterUtil.ensureParameterNotNull(parameters, "parameters");
Note:
See TracChangeset
for help on using the changeset viewer.