Changeset 1760 in josm for trunk/src/org/openstreetmap/josm/io

Timestamp:

2009-07-11T06:38:06+02:00 (16 years ago)

Author:

Gubaer

Message:

fixed #2882: Handling error message

File:

• trunk/src/org/openstreetmap/josm/io/OsmApiException.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/io/OsmApiException.java

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.io;
+import static org.openstreetmap.josm.tools.I18n.tr;
 
 public class OsmApiException extends OsmTransferException {
@@ -65 +66 @@
         }
         if (errorBody != null) {
-            errorBody = errorBody.replaceAll("^[ \n\t\r]+", "").replaceAll("[ \n\t\r]+$", "");
+            errorBody = errorBody.trim();
             if(!errorBody.equals(errorHeader)) {
                 sb.append(", Error Body=<")
@@ -74 +75 @@
         return sb.toString();
     }
+
+    /**
+     * Replies a message suitable to be displayed in a message dialog
+     * 
+     * @return a message which is suitable to be displayed in a message dialog
+     */
+    public String getDisplayMessage() {
+        StringBuilder sb = new StringBuilder();
+        if (errorHeader != null) {
+            sb.append(tr(errorHeader));
+            sb.append(tr("(Code={0})", responseCode));
+        } else if (errorBody != null) {
+            errorBody = errorBody.trim();
+            sb.append(tr(errorBody));
+            sb.append(tr("(Code={0})", responseCode));
+        } else {
+            sb.append(tr("The server replied an error with code {0}", responseCode));
+        }
+        return sb.toString();
+    }
 }