Ticket #4332: josm-typos.diff

src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java

@@ -33 +33 @@
     private JTextField tfConsumerSecret;
     private JTextField tfRequestTokenURL;
     private JTextField tfAccessTokenURL;
-    private JTextField tfAutoriseURL;
+    private JTextField tfAuthoriseURL;
     private UseDefaultItemListener ilUseDefault;
 
     protected void build() {
@@ -94 +94 @@
         SelectAllOnFocusGainedDecorator.decorate(tfAccessTokenURL);
 
 
-        // -- autorise URL
+        // -- authorise URL
         gc.gridy = 5;
         gc.gridx = 0;
         gc.weightx = 0.0;
-        add(new JLabel(tr("Autorise URL:")), gc);
+        add(new JLabel(tr("Authorise URL:")), gc);
 
         gc.gridx = 1;
         gc.weightx = 1.0;
-        add(tfAutoriseURL = new JTextField(), gc);
-        SelectAllOnFocusGainedDecorator.decorate(tfAutoriseURL);
+        add(tfAuthoriseURL = new JTextField(), gc);
+        SelectAllOnFocusGainedDecorator.decorate(tfAuthoriseURL);
 
         cbUseDefaults.addItemListener(ilUseDefault = new UseDefaultItemListener());
     }
@@ -114 +114 @@
         || ! tfConsumerSecret.getText().equals( OAuthParameters.DEFAULT_JOSM_CONSUMER_SECRET)
         || ! tfRequestTokenURL.getText().equals( OAuthParameters.DEFAULT_REQUEST_TOKEN_URL)
         || ! tfAccessTokenURL.getText().equals( OAuthParameters.DEFAULT_ACCESS_TOKEN_URL)
-        || ! tfAutoriseURL.getText().equals( OAuthParameters.DEFAULT_AUTHORISE_URL);
+        || ! tfAuthoriseURL.getText().equals( OAuthParameters.DEFAULT_AUTHORISE_URL);
     }
 
     protected boolean confirmOverwriteCustomSettings() {
@@ -155 +155 @@
         tfConsumerSecret.setText( OAuthParameters.DEFAULT_JOSM_CONSUMER_SECRET);
         tfRequestTokenURL.setText(OAuthParameters.DEFAULT_REQUEST_TOKEN_URL);
         tfAccessTokenURL.setText(OAuthParameters.DEFAULT_ACCESS_TOKEN_URL);
-        tfAutoriseURL.setText(OAuthParameters.DEFAULT_AUTHORISE_URL);
+        tfAuthoriseURL.setText(OAuthParameters.DEFAULT_AUTHORISE_URL);
 
         setChildComponentsEnabled(false);
     }
@@ -181 +181 @@
         parameters.setConsumerSecret(tfConsumerSecret.getText());
         parameters.setRequestTokenUrl(tfRequestTokenURL.getText());
         parameters.setAccessTokenUrl(tfAccessTokenURL.getText());
-        parameters.setAuthoriseUrl(tfAutoriseURL.getText());
+        parameters.setAuthoriseUrl(tfAuthoriseURL.getText());
         return parameters;
     }
 
@@ -203 +203 @@
             tfConsumerSecret.setText( parameters.getConsumerSecret() == null ? "" : parameters.getConsumerSecret());
             tfRequestTokenURL.setText(parameters.getRequestTokenUrl() == null ? "" : parameters.getRequestTokenUrl());
             tfAccessTokenURL.setText(parameters.getAccessTokenUrl() == null ? "" : parameters.getAccessTokenUrl());
-            tfAutoriseURL.setText(parameters.getAuthoriseUrl() == null ? "" : parameters.getAuthoriseUrl());
+            tfAuthoriseURL.setText(parameters.getAuthoriseUrl() == null ? "" : parameters.getAuthoriseUrl());
         }
     }
 
@@ -229 +229 @@
             tfConsumerSecret.setText(pref.get("oauth.settings.consumer-secret", ""));
             tfRequestTokenURL.setText(pref.get("oauth.settings.request-token-url", ""));
             tfAccessTokenURL.setText(pref.get("oauth.settings.access-token-url", ""));
-            tfAutoriseURL.setText(pref.get("oauth.settings.authorise-url", ""));
+            tfAuthoriseURL.setText(pref.get("oauth.settings.authorise-url", ""));
             setChildComponentsEnabled(true);
         }
         ilUseDefault.setEnabled(true);
@@ -255 +255 @@
             pref.put("oauth.settings.consumer-secret", tfConsumerSecret.getText().trim());
             pref.put("oauth.settings.request-token-url", tfRequestTokenURL.getText().trim());
             pref.put("oauth.settings.access-token-url", tfAccessTokenURL.getText().trim());
-            pref.put("oauth.settings.authorise-url", tfAutoriseURL.getText().trim());
+            pref.put("oauth.settings.authorise-url", tfAuthoriseURL.getText().trim());
         }
     }
 

src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java

@@ -434 +434 @@
 
             int retCode = connection.getResponseCode();
             if (retCode != HttpURLConnection.HTTP_MOVED_TEMP)
-                throw new OsmOAuthAuthorisationException(tr("Failed to autorise OAuth request  ''{0}''", requestToken.getKey()));
+                throw new OsmOAuthAuthorisationException(tr("Failed to authorise OAuth request ''{0}''", requestToken.getKey()));
         } catch(MalformedURLException e) {
             throw new OsmOAuthAuthorisationException(e);
         } catch(IOException e) {

src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java

@@ -238 +238 @@
                 + "You''ve sucessfully retrieved an OAuth Access Token from the OSM website. "
                 + "Click on <strong>{0}</strong> to accept the token. JOSM will use it in "
                 + "subsequent requests to gain access to the OSM API."
-                + "</html",
+                + "</html>",
                 lbl
         ));
         pnl.add(msg, gc);
@@ -450 +450 @@
         @Override
         protected void finish() {}
 
-        protected void alertAutorisationFailed(OsmOAuthAuthorisationException e) {
+        protected void alertAuthorisationFailed(OsmOAuthAuthorisationException e) {
             HelpAwareOptionPane.showOptionDialog(
                     FullyAutomaticAuthorisationUI.this,
                     tr("<html>"
@@ -472 +472 @@
                     tr("<html>"
                             + "The automatic process for retrieving an OAuth Access Token<br>"
                             + "from the OSM server failed because JOSM wasn't able to build<br>"
-                            + "a valid login URL from the OAuth Autorise Endpoint URL ''{0}''.<br><br>"
+                            + "a valid login URL from the OAuth Authorise Endpoint URL ''{0}''.<br><br>"
                             + "Please check your advanced setting and try again."
                             +"</html>",
                             getAdvancedPropertiesPanel().getAdvancedParameters().getAuthoriseUrl()
@@ -514 +514 @@
                     if (e instanceof OsmLoginFailedException) {
                         alertLoginFailed((OsmLoginFailedException)e);
                     } else {
-                        alertAutorisationFailed(e);
+                        alertAuthorisationFailed(e);
                     }
                 }
             };

src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java

@@ -233 +233 @@
             gc.gridy = 1;
             gc.weightx = 0.0;
             gc.gridwidth = 1;
-            pnl.add(new JLabel(tr("Autorise URL:")), gc);
+            pnl.add(new JLabel(tr("Authorise URL:")), gc);
 
             gc.gridx = 1;
             gc.weightx = 1.0;