Changeset 2804 in josm for trunk/src/org/openstreetmap/josm/gui

Timestamp:

2010-01-10T12:46:10+01:00 (14 years ago)

Author:

stoecker

Message:

typos

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• oauth/AdvancedOAuthPropertiesPanel.java (modified) (8 diffs)
• oauth/FullyAutomaticAuthorisationUI.java (modified) (6 diffs)
• oauth/OsmOAuthAuthorisationClient.java (modified) (1 diff)
• oauth/SemiAutomaticAuthorisationUI.java (modified) (1 diff)
• preferences/server/OAuthAuthenticationPreferencesPanel.java (modified) (3 diffs)

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

@@ -34 +34 @@
     private JTextField tfRequestTokenURL;
     private JTextField tfAccessTokenURL;
-    private JTextField tfAutoriseURL;
+    private JTextField tfAuthoriseURL;
     private UseDefaultItemListener ilUseDefault;
 
@@ -95 +95 @@
 
 
-        // -- autorise URL
+        // -- authorise URL
         gc.gridy = 5;
         gc.gridx = 0;
         gc.weightx = 0.0;
-        add(new JLabel(tr("Autorise URL:")), gc);
-
-        gc.gridx = 1;
-        gc.weightx = 1.0;
-        add(tfAutoriseURL = new JTextField(), gc);
-        SelectAllOnFocusGainedDecorator.decorate(tfAutoriseURL);
+        add(new JLabel(tr("Authorise URL:")), gc);
+
+        gc.gridx = 1;
+        gc.weightx = 1.0;
+        add(tfAuthoriseURL = new JTextField(), gc);
+        SelectAllOnFocusGainedDecorator.decorate(tfAuthoriseURL);
 
         cbUseDefaults.addItemListener(ilUseDefault = new UseDefaultItemListener());
@@ -115 +115 @@
         || ! 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);
     }
 
@@ -156 +156 @@
         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);
@@ -182 +182 @@
         parameters.setRequestTokenUrl(tfRequestTokenURL.getText());
         parameters.setAccessTokenUrl(tfAccessTokenURL.getText());
-        parameters.setAuthoriseUrl(tfAutoriseURL.getText());
+        parameters.setAuthoriseUrl(tfAuthoriseURL.getText());
         return parameters;
     }
@@ -204 +204 @@
             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());
         }
     }
@@ -230 +230 @@
             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);
         }
@@ -256 +256 @@
             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());
         }
     }

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

@@ -451 +451 @@
         protected void finish() {}
 
-        protected void alertAutorisationFailed(OsmOAuthAuthorisationException e) {
+        protected void alertAuthorisationFailed(OsmOAuthAuthorisationException e) {
             HelpAwareOptionPane.showOptionDialog(
                     FullyAutomaticAuthorisationUI.this,
@@ -463 +463 @@
                     tr("OAuth authorisation failed"),
                     JOptionPane.ERROR_MESSAGE,
-                    HelpUtil.ht("/Dialog/OAuthAutorisationWizard#FullyAutomaticProcessFailed")
+                    HelpUtil.ht("/Dialog/OAuthAuthorisationWizard#FullyAutomaticProcessFailed")
             );
         }
@@ -473 +473 @@
                             + "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>",
@@ -480 +480 @@
                     tr("OAuth authorisation failed"),
                     JOptionPane.ERROR_MESSAGE,
-                    HelpUtil.ht("/Dialog/OAuthAutorisationWizard#FullyAutomaticProcessFailed")
+                    HelpUtil.ht("/Dialog/OAuthAuthorisationWizard#FullyAutomaticProcessFailed")
             );
         }
@@ -505 +505 @@
                     tr("OAuth authorisation failed"),
                     JOptionPane.ERROR_MESSAGE,
-                    HelpUtil.ht("/Dialog/OAuthAutorisationWizard#FullyAutomaticProcessFailed")
+                    HelpUtil.ht("/Dialog/OAuthAuthorisationWizard#FullyAutomaticProcessFailed")
             );
         }
@@ -515 +515 @@
                         alertLoginFailed((OsmLoginFailedException)e);
                     } else {
-                        alertAutorisationFailed(e);
+                        alertAuthorisationFailed(e);
                     }
                 }

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

@@ -435 +435 @@
             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);

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

@@ -234 +234 @@
             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;

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

@@ -48 +48 @@
 
     private JPanel pnlAuthorisationMessage;
-    private NotYetAuthorisedPanel pnlNotYetAutorised;
-    private AlreadyAuthorisedPanel pnlAlreadyAutorised;
+    private NotYetAuthorisedPanel pnlNotYetAuthorised;
+    private AlreadyAuthorisedPanel pnlAlreadyAuthorised;
     private AdvancedOAuthPropertiesPanel pnlAdvancedProperties;
     private String apiUrl;
@@ -123 +123 @@
         // create these two panels, they are going to be used later in refreshView
         //
-        pnlAlreadyAutorised = new AlreadyAuthorisedPanel();
-        pnlNotYetAutorised = new NotYetAuthorisedPanel();
+        pnlAlreadyAuthorised = new AlreadyAuthorisedPanel();
+        pnlNotYetAuthorised = new NotYetAuthorisedPanel();
     }
 
@@ -130 +130 @@
         pnlAuthorisationMessage.removeAll();
         if (OAuthAccessTokenHolder.getInstance().containsAccessToken()) {
-            pnlAuthorisationMessage.add(pnlAlreadyAutorised, BorderLayout.CENTER);
-            pnlAlreadyAutorised.refreshView();
-            pnlAlreadyAutorised.revalidate();
+            pnlAuthorisationMessage.add(pnlAlreadyAuthorised, BorderLayout.CENTER);
+            pnlAlreadyAuthorised.refreshView();
+            pnlAlreadyAuthorised.revalidate();
         } else {
-            pnlAuthorisationMessage.add(pnlNotYetAutorised, BorderLayout.CENTER);
-            pnlNotYetAutorised.revalidate();
+            pnlAuthorisationMessage.add(pnlNotYetAuthorised, BorderLayout.CENTER);
+            pnlNotYetAuthorised.revalidate();
         }
         repaint();