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

Timestamp:

2016-07-24T14:48:47+02:00 (8 years ago)

Author:

Don-vip

Message:

sonar - squid:S1166 - Exception handlers should preserve the original exceptions

Location:

trunk/src/org/openstreetmap/josm/gui/io

Files:

• CredentialDialog.java (modified) (1 diff)
• DownloadOpenChangesetsTask.java (modified) (1 diff)
• SaveLayersDialog.java (modified) (2 diffs)
• UploadPrimitivesTask.java (modified) (1 diff)

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

@@ -110 +110 @@
             setAlwaysOnTop(true);
         } catch (SecurityException e) {
-            Main.warn(tr("Failed to put Credential Dialog always on top. Caught security exception."));
+            Main.warn(e, tr("Failed to put Credential Dialog always on top. Caught security exception."));
         }
         build();

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

@@ -110 +110 @@
                 im.setPartiallyIdentified(im.getUserName());
             }
-            Main.warn(tr("Failed to retrieve user infos for the current JOSM user. Exception was: {0}", e.toString()));
+            Main.warn(e, tr("Failed to retrieve user infos for the current JOSM user. Exception was: {0}", e.toString()));
         }
     }

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

@@ -493 +493 @@
                     currentFuture.get();
                 } catch (CancellationException e) {
+                    Main.trace(e);
                     model.setUploadState(layer, UploadOrSaveState.CANCELED);
                 } catch (InterruptedException | ExecutionException e) {
@@ -534 +535 @@
                     currentFuture.get();
                 } catch (CancellationException e) {
+                    Main.trace(e);
                     model.setSaveState(layerInfo.getLayer(), UploadOrSaveState.CANCELED);
                 } catch (InterruptedException | ExecutionException e) {

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

@@ -228 +228 @@
             SwingUtilities.invokeAndWait(r);
         } catch (InterruptedException e) {
+            Main.trace(e);
             lastException = e;
         } catch (InvocationTargetException e) {
+            Main.trace(e);
             lastException = new OsmTransferException(e.getCause());
         }