Changeset 5584 in josm for trunk/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java

Timestamp:

2012-11-17T14:08:43+01:00 (11 years ago)

Author:

Don-vip

Message:

fix #8201 - Error handling or redacted items

File:

• trunk/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java

@@ -10 +10 @@
 import java.net.SocketException;
 import java.net.UnknownHostException;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 import javax.swing.JOptionPane;
@@ -242 +244 @@
     }
 
+    private static boolean isOAuth() {
+        return Main.pref.get("osm-server.auth-method", "basic").equals("oauth");
+    }
+    
     /**
      * Explains a {@link OsmApiException} which was thrown because the authentication at
@@ -249 +255 @@
      */
     public static void explainAuthenticationFailed(OsmApiException e) {
-        String authMethod = Main.pref.get("osm-server.auth-method", "basic");
         String msg;
-        if (authMethod.equals("oauth")) {
+        if (isOAuth()) {
             msg = ExceptionUtil.explainFailedOAuthAuthentication(e);
         } else {
@@ -268 +273 @@
     /**
      * Explains a {@link OsmApiException} which was thrown because accessing a protected
-     * resource was forbidden.
+     * resource was forbidden (HTTP 403).
      *
      * @param e the exception
      */
     public static void explainAuthorizationFailed(OsmApiException e) {
-        // Fixme: add special handling that calls ExceptionUtil.explainFailedOAuthAuthorisation(e)
-        HelpAwareOptionPane.showOptionDialog(
-                Main.parent,
-                ExceptionUtil.explainFailedAuthorisation(e),
+        
+        Matcher m;
+        String msg;
+        String url = e.getAccessedUrl();
+        Pattern p = Pattern.compile("http://.*/api/0.6/(node|way|relation)/(\\d+)/(\\d+)");
+        
+        // Special case for individual access to redacted versions
+        // See http://wiki.openstreetmap.org/wiki/Open_Database_License/Changes_in_the_API
+        if (url != null && (m = p.matcher(url)).matches()) {
+            String type = m.group(1);
+            String id = m.group(2);
+            String version = m.group(3);
+            // {1} is the translation of "node", "way" or "relation"
+            msg = tr("Access to redacted version ''{0}'' of {1} {2} is forbidden.",
+                    version, tr(type), id);
+        } else if (isOAuth()) {
+            msg = ExceptionUtil.explainFailedOAuthAuthorisation(e);
+        } else {
+            msg = ExceptionUtil.explainFailedAuthorisation(e);
+        }
+        
+        HelpAwareOptionPane.showOptionDialog(
+                Main.parent,
+                msg,
                 tr("Authorisation Failed"),
                 JOptionPane.ERROR_MESSAGE,
-                ht("/ErrorMessages#AuthenticationFailed")
+                ht("/ErrorMessages#AuthorizationFailed")
         );
     }