Changeset 8342 in josm for trunk/src/org/openstreetmap/josm/gui/io

Timestamp:

2015-05-09T12:49:35+02:00 (9 years ago)

Author:

Don-vip

Message:

code style - Close curly brace and the next "else", "catch" and "finally" keywords should be located on the same line

File:

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

trunk/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java

@@ -320 +320 @@
         if (e instanceof OsmApiException) {
             OsmApiException ex = (OsmApiException)e;
-            // There was an upload conflict. Let the user decide whether
-            // and how to resolve it
-            //
             if(ex.getResponseCode() == HttpURLConnection.HTTP_CONFLICT) {
+                // There was an upload conflict. Let the user decide whether and how to resolve it
                 handleUploadConflict(ex);
                 return;
+            } else if (ex.getResponseCode() == HttpURLConnection.HTTP_PRECON_FAILED) {
+                // There was a precondition failed. Notify the user.
+                handlePreconditionFailed(ex);
+                return;
+            } else if (ex.getResponseCode() == HttpURLConnection.HTTP_NOT_FOUND) {
+                // Tried to update or delete a primitive which never existed on the server?
+                ExceptionDialogUtil.explainNotFound(ex);
+                return;
             }
-            // There was a precondition failed. Notify the user.
-            //
-            else if (ex.getResponseCode() == HttpURLConnection.HTTP_PRECON_FAILED) {
-                handlePreconditionFailed(ex);
-                return;
-            }
-            // Tried to update or delete a primitive which never existed on
-            // the server?
-            //
-            else if (ex.getResponseCode() == HttpURLConnection.HTTP_NOT_FOUND) {
-                ExceptionDialogUtil.explainNotFound(ex);
-                return;
-            }
         }