Changeset 15084 in josm for trunk/src/org/openstreetmap/josm/io/OsmApiException.java

Timestamp:

2019-05-18T16:29:09+02:00 (5 years ago)

Author:

Don-vip

Message:

see #17722 - proper notification of user block

File:

• trunk/src/org/openstreetmap/josm/io/OsmApiException.java (modified) (1 diff)

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

@@ -213 +213 @@
     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.trim().isEmpty()) {
-            errorBody = errorBody.trim();
-            sb.append(tr(errorBody));
-            sb.append(tr("(Code={0})", responseCode));
+        String header = Utils.strip(errorHeader);
+        String body = Utils.strip(errorBody);
+        if ((header == null || header.isEmpty()) && (body == null || body.isEmpty())) {
+            sb.append(tr("The server replied an error with code {0}.", responseCode));
         } else {
-            sb.append(tr("The server replied an error with code {0}.", responseCode));
+            if (header != null && !header.isEmpty()) {
+                sb.append(tr(header));
+            }
+            if (body != null && !body.isEmpty()) {
+                if (sb.length() > 0) {
+                    sb.append(". ");
+                }
+                sb.append(tr(body));
+            }
+            sb.append(' ').append(tr("(Code={0})", responseCode));
         }
         return sb.toString();