Changeset 2861 in josm for trunk/src

Timestamp:

2010-01-15T10:44:16+01:00 (14 years ago)

Author:

Gubaer

Message:

fixed #4375: authorise -> authorize

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• oauth/AbstractAuthorizationUI.java (moved) (moved from trunk/src/org/openstreetmap/josm/gui/oauth/AbstractAuthorisationUI.java ) (2 diffs)
• oauth/AuthorizationProcedure.java (moved) (moved from trunk/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedure.java ) (1 diff)
• oauth/AuthorizationProcedureComboBox.java (moved) (moved from trunk/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java ) (5 diffs)
• oauth/FullyAutomaticAuthorizationUI.java (moved) (moved from trunk/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java ) (11 diffs)
• oauth/ManualAuthorizationUI.java (moved) (moved from trunk/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java ) (4 diffs)
• oauth/OAuthAuthorizationWizard.java (moved) (moved from trunk/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java ) (9 diffs)
• oauth/OsmLoginFailedException.java (modified) (1 diff)
• oauth/OsmOAuthAuthorizationClient.java (moved) (moved from trunk/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java ) (23 diffs)
• oauth/OsmOAuthAuthorizationException.java (moved) (moved from trunk/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationException.java ) (1 diff)
• oauth/RetrieveAccessTokenTask.java (modified) (3 diffs)
• oauth/RetrieveRequestTokenTask.java (modified) (3 diffs)
• oauth/SemiAutomaticAuthorizationUI.java (moved) (moved from trunk/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java ) (6 diffs)
• oauth/TestAccessTokenTask.java (modified) (3 diffs)
• preferences/server/OAuthAuthenticationPreferencesPanel.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/oauth/AbstractAuthorizationUI.java

@@ -13 +13 @@
  * 
  */
-public abstract class AbstractAuthorisationUI extends VerticallyScrollablePanel{
+public abstract class AbstractAuthorizationUI extends VerticallyScrollablePanel{
     /**
      * The property name for the Access Token property
      */
-    static public final String ACCESS_TOKEN_PROP = AbstractAuthorisationUI.class.getName() + ".accessToken";
+    static public final String ACCESS_TOKEN_PROP = AbstractAuthorizationUI.class.getName() + ".accessToken";
 
     private String apiUrl;
@@ -27 +27 @@
     }
 
-    public AbstractAuthorisationUI() {
+    public AbstractAuthorizationUI() {
         pnlAdvancedProperties = new AdvancedOAuthPropertiesPanel();
     }

trunk/src/org/openstreetmap/josm/gui/oauth/AuthorizationProcedure.java

@@ -2 +2 @@
 package org.openstreetmap.josm.gui.oauth;
 
-public enum AuthorisationProcedure {
+public enum AuthorizationProcedure {
     /**
      * Run a fully automatic procedure to get an access token from the OSM website.

trunk/src/org/openstreetmap/josm/gui/oauth/AuthorizationProcedureComboBox.java

@@ -13 +13 @@
 import javax.swing.UIManager;
 
-public class AuthorisationProcedureComboBox extends JComboBox {
+public class AuthorizationProcedureComboBox extends JComboBox {
 
-    public AuthorisationProcedureComboBox() {
+    public AuthorizationProcedureComboBox() {
         setModel(new AuthorisationProcedureComboBoxModel());
         setRenderer(new AuthorisationProcedureCellRenderer());
-        setSelectedItem(AuthorisationProcedure.FULLY_AUTOMATIC);
+        setSelectedItem(AuthorizationProcedure.FULLY_AUTOMATIC);
     }
 
@@ -25 +25 @@
         public Object getElementAt(int index) {
             switch(index) {
-            case 0: return AuthorisationProcedure.FULLY_AUTOMATIC;
-            case 1: return AuthorisationProcedure.SEMI_AUTOMATIC;
-            case 2: return AuthorisationProcedure.MANUALLY;
+            case 0: return AuthorizationProcedure.FULLY_AUTOMATIC;
+            case 1: return AuthorizationProcedure.SEMI_AUTOMATIC;
+            case 2: return AuthorizationProcedure.MANUALLY;
             }
             return null;
@@ -53 +53 @@
         }
 
-        protected void renderText(AuthorisationProcedure value) {
+        protected void renderText(AuthorizationProcedure value) {
             switch(value) {
             case FULLY_AUTOMATIC:
@@ -67 +67 @@
         }
 
-        protected void renderToolTipText(AuthorisationProcedure value) {
+        protected void renderToolTipText(AuthorizationProcedure value) {
             switch(value) {
             case FULLY_AUTOMATIC:
@@ -94 +94 @@
 
         public Component getListCellRendererComponent(JList list, Object value, int idx, boolean isSelected, boolean hasFocus) {
-            AuthorisationProcedure procedure = (AuthorisationProcedure)value;
+            AuthorizationProcedure procedure = (AuthorizationProcedure)value;
             renderColors(isSelected);
             renderText(procedure);

trunk/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java

@@ -54 +54 @@
  * 
  */
-public class FullyAutomaticAuthorisationUI extends AbstractAuthorisationUI {
+public class FullyAutomaticAuthorizationUI extends AbstractAuthorizationUI {
 
     private JTextField tfUserName;
@@ -311 +311 @@
     }
 
-    public FullyAutomaticAuthorisationUI() {
+    public FullyAutomaticAuthorizationUI() {
         build();
     }
@@ -338 +338 @@
 
         public void actionPerformed(ActionEvent evt) {
-            Main.worker.submit(new FullyAutomaticAuthorisationTask(FullyAutomaticAuthorisationUI.this));
+            Main.worker.submit(new FullyAutomaticAuthorisationTask(FullyAutomaticAuthorizationUI.this));
         }
 
@@ -385 +385 @@
         public void actionPerformed(ActionEvent arg0) {
             Main.worker.submit(new TestAccessTokenTask(
-                    FullyAutomaticAuthorisationUI.this,
+                    FullyAutomaticAuthorizationUI.this,
                     getApiUrl(),
                     getAdvancedPropertiesPanel().getAdvancedParameters(),
@@ -437 +437 @@
     class FullyAutomaticAuthorisationTask extends PleaseWaitRunnable {
         private boolean canceled;
-        private OsmOAuthAuthorisationClient authClient;
+        private OsmOAuthAuthorizationClient authClient;
 
         public FullyAutomaticAuthorisationTask(Component parent) {
@@ -451 +451 @@
         protected void finish() {}
 
-        protected void alertAuthorisationFailed(OsmOAuthAuthorisationException e) {
+        protected void alertAuthorisationFailed(OsmOAuthAuthorizationException e) {
             HelpAwareOptionPane.showOptionDialog(
-                    FullyAutomaticAuthorisationUI.this,
+                    FullyAutomaticAuthorizationUI.this,
                     tr("<html>"
                             + "The automatic process for retrieving an OAuth Access Token<br>"
@@ -469 +469 @@
         protected void alertInvalidLoginUrl() {
             HelpAwareOptionPane.showOptionDialog(
-                    FullyAutomaticAuthorisationUI.this,
+                    FullyAutomaticAuthorizationUI.this,
                     tr("<html>"
                             + "The automatic process for retrieving an OAuth Access Token<br>"
@@ -488 +488 @@
             try {
                 loginUrl = authClient.buildOsmLoginUrl();
-            } catch(OsmOAuthAuthorisationException e1) {
+            } catch(OsmOAuthAuthorizationException e1) {
                 alertInvalidLoginUrl();
                 return;
             }
             HelpAwareOptionPane.showOptionDialog(
-                    FullyAutomaticAuthorisationUI.this,
+                    FullyAutomaticAuthorizationUI.this,
                     tr("<html>"
                             + "The automatic process for retrieving an OAuth Access Token<br>"
@@ -509 +509 @@
         }
 
-        protected void handleException(final OsmOAuthAuthorisationException e) {
+        protected void handleException(final OsmOAuthAuthorizationException e) {
             Runnable r = new Runnable() {
                 public void run() {
@@ -531 +531 @@
             try {
                 getProgressMonitor().setTicksCount(3);
-                authClient = new OsmOAuthAuthorisationClient(
+                authClient = new OsmOAuthAuthorizationClient(
                         getAdvancedPropertiesPanel().getAdvancedParameters()
                 );
@@ -564 +564 @@
                     SwingUtilities.invokeLater(r);
                 }
-            } catch(final OsmOAuthAuthorisationException e) {
+            } catch(final OsmOAuthAuthorizationException e) {
                 handleException(e);
             }

trunk/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java

@@ -33 +33 @@
 import org.openstreetmap.josm.tools.ImageProvider;
 
-public class ManualAuthorisationUI extends AbstractAuthorisationUI{
+public class ManualAuthorizationUI extends AbstractAuthorizationUI{
 
     private JTextField tfAccessTokenKey;
@@ -152 +152 @@
     }
 
-    public ManualAuthorisationUI() {
+    public ManualAuthorizationUI() {
         build();
     }
@@ -237 +237 @@
         public void actionPerformed(ActionEvent evt) {
             TestAccessTokenTask task = new TestAccessTokenTask(
-                    ManualAuthorisationUI.this,
+                    ManualAuthorizationUI.this,
                     getApiUrl(),
                     getAdvancedPropertiesPanel().getAdvancedParameters(),
@@ -250 +250 @@
 
         public void propertyChange(PropertyChangeEvent evt) {
-            if (! evt.getPropertyName().equals(AbstractAuthorisationUI.ACCESS_TOKEN_PROP))
+            if (! evt.getPropertyName().equals(AbstractAuthorizationUI.ACCESS_TOKEN_PROP))
                 return;
             updateEnabledState();

trunk/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java

@@ -51 +51 @@
  * 
  */
-public class OAuthAuthorisationWizard extends JDialog {
-    static private final Logger logger = Logger.getLogger(OAuthAuthorisationWizard.class.getName());
+public class OAuthAuthorizationWizard extends JDialog {
+    static private final Logger logger = Logger.getLogger(OAuthAuthorizationWizard.class.getName());
 
     private HtmlPanel pnlMessage;
@@ -58 +58 @@
     private String apiUrl;
 
-    private AuthorisationProcedureComboBox cbAuthorisationProcedure;
-    private FullyAutomaticAuthorisationUI pnlFullyAutomaticAuthorisationUI;
-    private SemiAutomaticAuthorisationUI pnlSemiAutomaticAuthorisationUI;
-    private ManualAuthorisationUI pnlManualAuthorisationUI;
+    private AuthorizationProcedureComboBox cbAuthorisationProcedure;
+    private FullyAutomaticAuthorizationUI pnlFullyAutomaticAuthorisationUI;
+    private SemiAutomaticAuthorizationUI pnlSemiAutomaticAuthorisationUI;
+    private ManualAuthorizationUI pnlManualAuthorisationUI;
     private JScrollPane spAuthorisationProcedureUI;
 
@@ -126 +126 @@
         gc.gridwidth = 1;
         gc.weightx = 1.0;
-        pnl.add(cbAuthorisationProcedure = new AuthorisationProcedureComboBox(),gc);
+        pnl.add(cbAuthorisationProcedure = new AuthorizationProcedureComboBox(),gc);
         cbAuthorisationProcedure.addItemListener(new AuthorisationProcedureChangeListener());
         return pnl;
@@ -136 +136 @@
      */
     protected void refreshAuthorisationProcedurePanel() {
-        AuthorisationProcedure procedure = (AuthorisationProcedure)cbAuthorisationProcedure.getSelectedItem();
+        AuthorizationProcedure procedure = (AuthorizationProcedure)cbAuthorisationProcedure.getSelectedItem();
         switch(procedure) {
         case FULLY_AUTOMATIC:
@@ -162 +162 @@
         getContentPane().add(buildHeaderInfoPanel(), BorderLayout.NORTH);
 
-        pnlFullyAutomaticAuthorisationUI = new FullyAutomaticAuthorisationUI();
+        pnlFullyAutomaticAuthorisationUI = new FullyAutomaticAuthorizationUI();
         pnlFullyAutomaticAuthorisationUI.setApiUrl(apiUrl);
 
-        pnlSemiAutomaticAuthorisationUI = new SemiAutomaticAuthorisationUI();
+        pnlSemiAutomaticAuthorisationUI = new SemiAutomaticAuthorizationUI();
         pnlSemiAutomaticAuthorisationUI.setApiUrl(apiUrl);
 
-        pnlManualAuthorisationUI = new ManualAuthorisationUI();
+        pnlManualAuthorisationUI = new ManualAuthorizationUI();
         pnlManualAuthorisationUI.setApiUrl(apiUrl);
 
@@ -206 +206 @@
      * @throws IllegalArgumentException thrown if apiUrl is null
      */
-    public OAuthAuthorisationWizard(String apiUrl) throws IllegalArgumentException {
+    public OAuthAuthorizationWizard(String apiUrl) throws IllegalArgumentException {
         super(JOptionPane.getFrameForComponent(Main.parent),true /* modal */);
         CheckParameterUtil.ensureParameterNotNull(apiUrl, "apiUrl");
@@ -220 +220 @@
      * @throws IllegalArgumentException thrown if apiUrl is null
      */
-    public OAuthAuthorisationWizard(Component parent, String apiUrl) {
+    public OAuthAuthorizationWizard(Component parent, String apiUrl) {
         super(JOptionPane.getFrameForComponent(parent),true /* modal */);
         CheckParameterUtil.ensureParameterNotNull(apiUrl, "apiUrl");
@@ -259 +259 @@
     }
 
-    protected AbstractAuthorisationUI getCurrentAuthorisationUI() {
-        switch((AuthorisationProcedure)cbAuthorisationProcedure.getSelectedItem()) {
+    protected AbstractAuthorizationUI getCurrentAuthorisationUI() {
+        switch((AuthorizationProcedure)cbAuthorisationProcedure.getSelectedItem()) {
         case FULLY_AUTOMATIC: return pnlFullyAutomaticAuthorisationUI;
         case MANUALLY: return pnlManualAuthorisationUI;
@@ -371 +371 @@
 
         public void propertyChange(PropertyChangeEvent evt) {
-            if (!evt.getPropertyName().equals(AbstractAuthorisationUI.ACCESS_TOKEN_PROP))
+            if (!evt.getPropertyName().equals(AbstractAuthorizationUI.ACCESS_TOKEN_PROP))
                 return;
             token = (OAuthToken)evt.getNewValue();

trunk/src/org/openstreetmap/josm/gui/oauth/OsmLoginFailedException.java

@@ -2 +2 @@
 package org.openstreetmap.josm.gui.oauth;
 
-public class OsmLoginFailedException extends OsmOAuthAuthorisationException{
+public class OsmLoginFailedException extends OsmOAuthAuthorizationException{
 
     public OsmLoginFailedException() {

trunk/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java

@@ -35 +35 @@
 import org.openstreetmap.josm.tools.CheckParameterUtil;
 
-public class OsmOAuthAuthorisationClient {
-    static private final Logger logger = Logger.getLogger(OsmOAuthAuthorisationClient.class.getName());
+public class OsmOAuthAuthorizationClient {
+    static private final Logger logger = Logger.getLogger(OsmOAuthAuthorizationClient.class.getName());
 
     private OAuthParameters oauthProviderParameters;
@@ -48 +48 @@
      * 
      */
-    public OsmOAuthAuthorisationClient() {
+    public OsmOAuthAuthorizationClient() {
         oauthProviderParameters = OAuthParameters.createDefault();
         consumer = oauthProviderParameters.buildConsumer();
@@ -60 +60 @@
      * @throws IllegalArgumentException thrown if parameters is null
      */
-    public OsmOAuthAuthorisationClient(OAuthParameters parameters) throws IllegalArgumentException {
+    public OsmOAuthAuthorizationClient(OAuthParameters parameters) throws IllegalArgumentException {
         CheckParameterUtil.ensureParameterNotNull(parameters, "parameters");
         oauthProviderParameters = new OAuthParameters(parameters);
@@ -76 +76 @@
      * @throws IllegalArgumentException thrown if requestToken is null
      */
-    public OsmOAuthAuthorisationClient(OAuthParameters parameters, OAuthToken requestToken) throws IllegalArgumentException {
+    public OsmOAuthAuthorizationClient(OAuthParameters parameters, OAuthToken requestToken) throws IllegalArgumentException {
         CheckParameterUtil.ensureParameterNotNull(parameters, "parameters");
         oauthProviderParameters = new OAuthParameters(parameters);
@@ -119 +119 @@
      * @param monitor a progress monitor. Defaults to {@see NullProgressMonitor#INSTANCE} if null
      * @return the OAuth Request Token
-     * @throws OsmOAuthAuthorisationException thrown if something goes wrong when retrieving the request token
-     */
-    public OAuthToken getRequestToken(ProgressMonitor monitor) throws OsmOAuthAuthorisationException, OsmTransferCancelledException {
+     * @throws OsmOAuthAuthorizationException thrown if something goes wrong when retrieving the request token
+     */
+    public OAuthToken getRequestToken(ProgressMonitor monitor) throws OsmOAuthAuthorizationException, OsmTransferCancelledException {
         if (monitor == null) {
             monitor = NullProgressMonitor.INSTANCE;
@@ -133 +133 @@
             if (canceled)
                 throw new OsmTransferCancelledException();
-            throw new OsmOAuthAuthorisationException(e);
+            throw new OsmOAuthAuthorizationException(e);
         } catch(OAuthException e){
             if (canceled)
                 throw new OsmTransferCancelledException();
-            throw new OsmOAuthAuthorisationException(e);
+            throw new OsmOAuthAuthorizationException(e);
         } finally {
             monitor.finishTask();
@@ -151 +151 @@
      * @param monitor a progress monitor. Defaults to {@see NullProgressMonitor#INSTANCE} if null
      * @return the OAuth Access Token
-     * @throws OsmOAuthAuthorisationException thrown if something goes wrong when retrieving the request token
+     * @throws OsmOAuthAuthorizationException thrown if something goes wrong when retrieving the request token
      * @see #getRequestToken(ProgressMonitor)
      */
-    public OAuthToken getAccessToken(ProgressMonitor monitor) throws OsmOAuthAuthorisationException, OsmTransferCancelledException {
+    public OAuthToken getAccessToken(ProgressMonitor monitor) throws OsmOAuthAuthorizationException, OsmTransferCancelledException {
         if (monitor == null) {
             monitor = NullProgressMonitor.INSTANCE;
@@ -166 +166 @@
             if (canceled)
                 throw new OsmTransferCancelledException();
-            throw new OsmOAuthAuthorisationException(e);
+            throw new OsmOAuthAuthorizationException(e);
         } catch(OAuthException e){
             if (canceled)
                 throw new OsmTransferCancelledException();
-            throw new OsmOAuthAuthorisationException(e);
+            throw new OsmOAuthAuthorizationException(e);
         } finally {
             monitor.finishTask();
@@ -219 +219 @@
     }
 
-    protected String buildPostRequest(Map<String,String> parameters) throws OsmOAuthAuthorisationException {
+    protected String buildPostRequest(Map<String,String> parameters) throws OsmOAuthAuthorizationException {
         try {
             StringBuilder sb = new StringBuilder();
@@ -234 +234 @@
             return sb.toString();
         } catch(UnsupportedEncodingException e) {
-            throw new OsmOAuthAuthorisationException(e);
+            throw new OsmOAuthAuthorizationException(e);
         }
     }
@@ -242 +242 @@
      * 
      * @return the OSM login URL
-     * @throws OsmOAuthAuthorisationException thrown if something went wrong, in particular if the
+     * @throws OsmOAuthAuthorizationException thrown if something went wrong, in particular if the
      * URLs are malformed
      */
-    public String buildOsmLoginUrl() throws OsmOAuthAuthorisationException{
+    public String buildOsmLoginUrl() throws OsmOAuthAuthorizationException{
         try {
             URL autUrl = new URL(oauthProviderParameters.getAuthoriseUrl());
@@ -254 +254 @@
             return url.toString();
         } catch(MalformedURLException e) {
-            throw new OsmOAuthAuthorisationException(e);
+            throw new OsmOAuthAuthorizationException(e);
         }
     }
@@ -262 +262 @@
      * 
      * @return the OSM logout URL
-     * @throws OsmOAuthAuthorisationException thrown if something went wrong, in particular if the
+     * @throws OsmOAuthAuthorizationException thrown if something went wrong, in particular if the
      * URLs are malformed
      */
-    protected String buildOsmLogoutUrl() throws OsmOAuthAuthorisationException{
+    protected String buildOsmLogoutUrl() throws OsmOAuthAuthorizationException{
         try {
             URL autUrl = new URL(oauthProviderParameters.getAuthoriseUrl());
@@ -271 +271 @@
             return url.toString();
         } catch(MalformedURLException e) {
-            throw new OsmOAuthAuthorisationException(e);
+            throw new OsmOAuthAuthorizationException(e);
         }
     }
@@ -280 +280 @@
      * 
      * @return the session ID
-     * @throws OsmOAuthAuthorisationException thrown if something went wrong
-     */
-    protected String fetchOsmWebsiteSessionId() throws OsmOAuthAuthorisationException {
+     * @throws OsmOAuthAuthorizationException thrown if something went wrong
+     */
+    protected String fetchOsmWebsiteSessionId() throws OsmOAuthAuthorizationException {
         try {
             StringBuilder sb = new StringBuilder();
@@ -297 +297 @@
             String sessionId = extractOsmSession(connection);
             if (sessionId == null)
-                throw new OsmOAuthAuthorisationException(tr("OSM website did not return a session cookie in response to ''{0}'',", url.toString()));
+                throw new OsmOAuthAuthorizationException(tr("OSM website did not return a session cookie in response to ''{0}'',", url.toString()));
             return sessionId;
         } catch(IOException e) {
-            throw new OsmOAuthAuthorisationException(e);
+            throw new OsmOAuthAuthorizationException(e);
         } finally {
             synchronized(this) {
@@ -348 +348 @@
             int retCode = connection.getResponseCode();
             if (retCode != HttpURLConnection.HTTP_MOVED_TEMP)
-                throw new OsmOAuthAuthorisationException(tr("Failed to authenticate user ''{0}'' with password ''***'' as OAuth user", userName));
-        } catch(OsmOAuthAuthorisationException e) {
+                throw new OsmOAuthAuthorizationException(tr("Failed to authenticate user ''{0}'' with password ''***'' as OAuth user", userName));
+        } catch(OsmOAuthAuthorizationException e) {
             throw new OsmLoginFailedException(e.getCause());
         } catch(IOException e) {
@@ -365 +365 @@
     }
 
-    protected void logoutOsmSession(String sessionId) throws OsmOAuthAuthorisationException {
+    protected void logoutOsmSession(String sessionId) throws OsmOAuthAuthorizationException {
         try {
             URL url = new URL(buildOsmLogoutUrl());
@@ -377 +377 @@
             connection.connect();
         }catch(MalformedURLException e) {
-            throw new OsmOAuthAuthorisationException(e);
+            throw new OsmOAuthAuthorizationException(e);
         } catch(IOException e) {
-            throw new OsmOAuthAuthorisationException(e);
+            throw new OsmOAuthAuthorizationException(e);
         }  finally {
             synchronized(this) {
@@ -387 +387 @@
     }
 
-    protected void sendAuthorisationRequest(String sessionId, OAuthToken requestToken, OsmPrivileges privileges) throws OsmOAuthAuthorisationException {
+    protected void sendAuthorisationRequest(String sessionId, OAuthToken requestToken, OsmPrivileges privileges) throws OsmOAuthAuthorizationException {
         Map<String, String> parameters = new HashMap<String, String>();
         parameters.put("oauth_token", requestToken.getKey());
@@ -435 +435 @@
             int retCode = connection.getResponseCode();
             if (retCode != HttpURLConnection.HTTP_MOVED_TEMP)
-                throw new OsmOAuthAuthorisationException(tr("Failed to authorise OAuth request  ''{0}''", requestToken.getKey()));
+                throw new OsmOAuthAuthorizationException(tr("Failed to authorise OAuth request  ''{0}''", requestToken.getKey()));
         } catch(MalformedURLException e) {
-            throw new OsmOAuthAuthorisationException(e);
+            throw new OsmOAuthAuthorizationException(e);
         } catch(IOException e) {
-            throw new OsmOAuthAuthorisationException(e);
+            throw new OsmOAuthAuthorizationException(e);
         } finally {
             if (dout != null) {
@@ -469 +469 @@
      * @throws IllegalArgumentException thrown if osmPassword is null
      * @throws IllegalArgumentException thrown if privileges is null
-     * @throws OsmOAuthAuthorisationException thrown if the authorisation fails
+     * @throws OsmOAuthAuthorizationException thrown if the authorisation fails
      * @throws OsmTransferCancelledException thrown if the task is cancelled by the user
      */
-    public void authorise(OAuthToken requestToken, String osmUserName, String osmPassword, OsmPrivileges privileges, ProgressMonitor monitor) throws IllegalArgumentException, OsmOAuthAuthorisationException, OsmTransferCancelledException{
+    public void authorise(OAuthToken requestToken, String osmUserName, String osmPassword, OsmPrivileges privileges, ProgressMonitor monitor) throws IllegalArgumentException, OsmOAuthAuthorizationException, OsmTransferCancelledException{
         CheckParameterUtil.ensureParameterNotNull(requestToken, "requestToken");
         CheckParameterUtil.ensureParameterNotNull(osmUserName, "osmUserName");
@@ -507 +507 @@
                 throw new OsmTransferCancelledException();
             monitor.worked(1);
-        } catch(OsmOAuthAuthorisationException e) {
+        } catch(OsmOAuthAuthorizationException e) {
             if (canceled)
                 throw new OsmTransferCancelledException();

trunk/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationException.java

@@ -2 +2 @@
 package org.openstreetmap.josm.gui.oauth;
 
-public class OsmOAuthAuthorisationException extends Exception {
+public class OsmOAuthAuthorizationException extends Exception {
 
-    public OsmOAuthAuthorisationException() {
+    public OsmOAuthAuthorizationException() {
         super();
     }
 
-    public OsmOAuthAuthorisationException(String arg0, Throwable arg1) {
+    public OsmOAuthAuthorizationException(String arg0, Throwable arg1) {
         super(arg0, arg1);
     }
 
-    public OsmOAuthAuthorisationException(String arg0) {
+    public OsmOAuthAuthorizationException(String arg0) {
         super(arg0);
     }
 
-    public OsmOAuthAuthorisationException(Throwable arg0) {
+    public OsmOAuthAuthorizationException(Throwable arg0) {
         super(arg0);
     }

trunk/src/org/openstreetmap/josm/gui/oauth/RetrieveAccessTokenTask.java

@@ -28 +28 @@
     private OAuthToken accessToken;
     private OAuthParameters parameters;
-    private OsmOAuthAuthorisationClient client;
+    private OsmOAuthAuthorizationClient client;
     private OAuthToken requestToken;
     private Component parent;
@@ -64 +64 @@
     protected void finish() { /* not used in this task */}
 
-    protected void alertRetrievingAccessTokenFailed(OsmOAuthAuthorisationException e) {
+    protected void alertRetrievingAccessTokenFailed(OsmOAuthAuthorizationException e) {
         HelpAwareOptionPane.showOptionDialog(
                 parent,
@@ -81 +81 @@
         try {
             synchronized(this) {
-                client = new OsmOAuthAuthorisationClient(parameters, requestToken);
+                client = new OsmOAuthAuthorizationClient(parameters, requestToken);
             }
             accessToken = client.getAccessToken(getProgressMonitor().createSubTaskMonitor(0, false));
         } catch(OsmTransferCancelledException e) {
             return;
-        } catch (OsmOAuthAuthorisationException e) {
+        } catch (OsmOAuthAuthorizationException e) {
             e.printStackTrace();
             alertRetrievingAccessTokenFailed(e);

trunk/src/org/openstreetmap/josm/gui/oauth/RetrieveRequestTokenTask.java

@@ -27 +27 @@
     private OAuthToken requestToken;
     private OAuthParameters parameters;
-    private OsmOAuthAuthorisationClient client;
+    private OsmOAuthAuthorizationClient client;
     private Component parent;
 
@@ -58 +58 @@
     protected void finish() { /* not used in this task */}
 
-    protected void alertRetrievingRequestTokenFailed(OsmOAuthAuthorisationException e) {
+    protected void alertRetrievingRequestTokenFailed(OsmOAuthAuthorizationException e) {
         HelpAwareOptionPane.showOptionDialog(
                 parent,
@@ -75 +75 @@
         try {
             synchronized(this) {
-                client = new OsmOAuthAuthorisationClient(parameters);
+                client = new OsmOAuthAuthorizationClient(parameters);
             }
             requestToken = client.getRequestToken(getProgressMonitor().createSubTaskMonitor(0, false));
         } catch(OsmTransferCancelledException e) {
             return;
-        } catch (OsmOAuthAuthorisationException e) {
+        } catch (OsmOAuthAuthorizationException e) {
             e.printStackTrace();
             alertRetrievingRequestTokenFailed(e);

trunk/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java

@@ -38 +38 @@
  * external browser for login and authorisation.
  */
-public class SemiAutomaticAuthorisationUI extends AbstractAuthorisationUI {
+public class SemiAutomaticAuthorizationUI extends AbstractAuthorizationUI {
     private AccessTokenInfoPanel pnlAccessTokenInfo;
     private OAuthToken requestToken;
@@ -58 +58 @@
     }
 
-    public SemiAutomaticAuthorisationUI() {
+    public SemiAutomaticAuthorizationUI() {
         build();
     }
@@ -68 +68 @@
 
     protected void transitionToRetrieveAccessToken() {
-        OsmOAuthAuthorisationClient client = new OsmOAuthAuthorisationClient(
+        OsmOAuthAuthorizationClient client = new OsmOAuthAuthorizationClient(
                 getAdvancedPropertiesPanel().getAdvancedParameters()
         );
@@ -374 +374 @@
         public void actionPerformed(ActionEvent evt) {
             final RetrieveRequestTokenTask task = new RetrieveRequestTokenTask(
-                    SemiAutomaticAuthorisationUI.this,
+                    SemiAutomaticAuthorizationUI.this,
                     getAdvancedPropertiesPanel().getAdvancedParameters()
             );
@@ -407 +407 @@
         public void actionPerformed(ActionEvent evt) {
             final RetrieveAccessTokenTask task = new RetrieveAccessTokenTask(
-                    SemiAutomaticAuthorisationUI.this,
+                    SemiAutomaticAuthorizationUI.this,
                     getAdvancedPropertiesPanel().getAdvancedParameters(),
                     requestToken
@@ -441 +441 @@
         public void actionPerformed(ActionEvent evt) {
             TestAccessTokenTask task = new TestAccessTokenTask(
-                    SemiAutomaticAuthorisationUI.this,
+                    SemiAutomaticAuthorizationUI.this,
                     getApiUrl(),
                     getAdvancedPropertiesPanel().getAdvancedParameters(),

trunk/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java

@@ -97 +97 @@
     }
 
-    protected UserInfo getUserDetails() throws OsmOAuthAuthorisationException, OsmDataParsingException,OsmTransferException {
+    protected UserInfo getUserDetails() throws OsmOAuthAuthorizationException, OsmDataParsingException,OsmTransferException {
         boolean authenticatorEnabled = true;
         try {
@@ -133 +133 @@
             throw new OsmTransferException(e);
         } catch(OAuthException e) {
-            throw new OsmOAuthAuthorisationException(e);
+            throw new OsmOAuthAuthorizationException(e);
         } finally {
             DefaultAuthenticator.getInstance().setEnabled(authenticatorEnabled);
@@ -253 +253 @@
             if (canceled) return;
             notifySuccess(userInfo);
-        }catch(OsmOAuthAuthorisationException e) {
+        }catch(OsmOAuthAuthorizationException e) {
             if (canceled) return;
             e.printStackTrace();

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

@@ -31 +31 @@
 import org.openstreetmap.josm.gui.SideButton;
 import org.openstreetmap.josm.gui.oauth.AdvancedOAuthPropertiesPanel;
-import org.openstreetmap.josm.gui.oauth.OAuthAuthorisationWizard;
+import org.openstreetmap.josm.gui.oauth.OAuthAuthorizationWizard;
 import org.openstreetmap.josm.gui.oauth.TestAccessTokenTask;
 import org.openstreetmap.josm.io.auth.CredentialsManagerFactory;
@@ -309 +309 @@
         }
         public void actionPerformed(ActionEvent arg0) {
-            OAuthAuthorisationWizard wizard = new OAuthAuthorisationWizard(
+            OAuthAuthorizationWizard wizard = new OAuthAuthorizationWizard(
                     OAuthAuthenticationPreferencesPanel.this,
                     apiUrl
@@ -334 +334 @@
         }
         public void actionPerformed(ActionEvent arg0) {
-            OAuthAuthorisationWizard wizard = new OAuthAuthorisationWizard(
+            OAuthAuthorizationWizard wizard = new OAuthAuthorizationWizard(
                     OAuthAuthenticationPreferencesPanel.this,
                     apiUrl