Index: trunk/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java	(revision 6312)
+++ trunk/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java	(revision 6313)
@@ -105,5 +105,5 @@
                         });
                     } catch (InterruptedException ex) {
-                        Main.warn(ex);
+                        Main.warn("InterruptedException while displaying error dialog");
                     } catch (InvocationTargetException ex) {
                         Main.warn(ex);
Index: trunk/src/org/openstreetmap/josm/data/CustomConfigurator.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/CustomConfigurator.java	(revision 6312)
+++ trunk/src/org/openstreetmap/josm/data/CustomConfigurator.java	(revision 6313)
@@ -336,5 +336,5 @@
                     while (busy) CustomConfigurator.class.wait();
                 } catch (InterruptedException ex) {
-                    Main.warn(ex);
+                    Main.warn("InterruptedException while reading local plugin information");
                 }
 
Index: trunk/src/org/openstreetmap/josm/data/conflict/Conflict.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/conflict/Conflict.java	(revision 6312)
+++ trunk/src/org/openstreetmap/josm/data/conflict/Conflict.java	(revision 6313)
@@ -124,3 +124,8 @@
         this.mergedMap = mergedMap;
     }
+
+    @Override
+    public String toString() {
+        return "Conflict [my=" + my + ", their=" + their + "]";
+    }
 }
Index: trunk/src/org/openstreetmap/josm/gui/MapStatus.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/MapStatus.java	(revision 6312)
+++ trunk/src/org/openstreetmap/josm/gui/MapStatus.java	(revision 6313)
@@ -221,5 +221,6 @@
                             wait(1000);
                         } catch (InterruptedException e) {
-                            Main.warn(e);
+                            // Occurs frequently during JOSM shutdown, log set to debug only
+                            Main.debug("InterruptedException in "+MapStatus.class.getSimpleName());
                         }
                         ms.modifiers = mouseState.modifiers;
Index: trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java	(revision 6312)
+++ trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java	(revision 6313)
@@ -497,5 +497,5 @@
                             Thread.sleep(1000 / fps);
                         } catch (InterruptedException ex) {
-                            Main.warn(ex);
+                            Main.warn("InterruptedException in "+NavigatableComponent.class.getSimpleName()+" during smooth scrolling");
                         }
                     }
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java	(revision 6312)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java	(revision 6313)
@@ -507,5 +507,5 @@
                             future.get();
                         } catch(InterruptedException e) {
-                            e.printStackTrace();
+                            Main.warn("InterruptedException in "+getClass().getSimpleName()+" while downloading changeset header");
                         } catch(ExecutionException e){
                             e.printStackTrace();
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetHeaderDownloadTask.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetHeaderDownloadTask.java	(revision 6312)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetHeaderDownloadTask.java	(revision 6313)
@@ -159,5 +159,5 @@
                 SwingUtilities.invokeAndWait(r);
             } catch(InterruptedException e) {
-                e.printStackTrace();
+                Main.warn("InterruptedException in "+getClass().getSimpleName()+" while updating changeset cache");
             } catch(InvocationTargetException e) {
                 Throwable t = e.getTargetException();
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryTask.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryTask.java	(revision 6312)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryTask.java	(revision 6313)
@@ -127,5 +127,5 @@
                 SwingUtilities.invokeAndWait(r);
             } catch(InterruptedException e) {
-                e.printStackTrace();
+                Main.warn("InterruptedException in "+getClass().getSimpleName()+" while updating changeset cache");
             } catch(InvocationTargetException e) {
                 Throwable t = e.getTargetException();
Index: trunk/src/org/openstreetmap/josm/gui/layer/WMSLayer.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/layer/WMSLayer.java	(revision 6312)
+++ trunk/src/org/openstreetmap/josm/gui/layer/WMSLayer.java	(revision 6313)
@@ -573,5 +573,5 @@
                     sortRequests(localOnly);
                 } catch (InterruptedException e) {
-                    // Shouldn't happen
+                    Main.warn("InterruptedException in "+getClass().getSimpleName()+" during WMS request");
                 }
             }
@@ -930,6 +930,5 @@
                     t.join();
                 } catch (InterruptedException e) {
-                    // Shouldn't happen
-                    e.printStackTrace();
+                    Main.warn("InterruptedException in "+getClass().getSimpleName()+" while cancelling grabber threads");
                 }
             }
Index: trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java	(revision 6312)
+++ trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java	(revision 6313)
@@ -80,5 +80,5 @@
                     Thread.sleep(5);
                 } catch (InterruptedException e) {
-                    Main.warn(e);
+                    Main.warn("InterruptedException in "+getClass().getSimpleName()+" while loading image "+file.getPath());
                 }
             }
Index: trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ThumbsLoader.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ThumbsLoader.java	(revision 6312)
+++ trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ThumbsLoader.java	(revision 6313)
@@ -70,5 +70,5 @@
             tracker.waitForID(0);
         } catch (InterruptedException e) {
-            Main.error(" InterruptedException");
+            Main.error(" InterruptedException while loading thumb");
             return null;
         }
@@ -86,5 +86,5 @@
                 Thread.sleep(10);
             } catch(InterruptedException ie) {
-                Main.warn(ie);
+                Main.warn("InterruptedException while drawing thumb");
             }
         }
Index: trunk/src/org/openstreetmap/josm/gui/layer/gpx/DownloadWmsAlongTrackAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/layer/gpx/DownloadWmsAlongTrackAction.java	(revision 6312)
+++ trunk/src/org/openstreetmap/josm/gui/layer/gpx/DownloadWmsAlongTrackAction.java	(revision 6313)
@@ -70,5 +70,5 @@
                                 wait(200);
                             } catch (InterruptedException e) {
-                                e.printStackTrace();
+                                Main.warn("InterruptedException in "+getClass().getSimpleName()+" while precaching WMS");
                             }
                         }
Index: trunk/src/org/openstreetmap/josm/io/OsmApi.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/OsmApi.java	(revision 6312)
+++ trunk/src/org/openstreetmap/josm/io/OsmApi.java	(revision 6313)
@@ -547,5 +547,5 @@
                 Thread.sleep(1000);
             } catch (InterruptedException ex) {
-                Main.warn(ex);
+                Main.warn("InterruptedException in "+getClass().getSimpleName()+" during sleep");
             }
         }
Index: trunk/src/org/openstreetmap/josm/io/OsmConnection.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/OsmConnection.java	(revision 6312)
+++ trunk/src/org/openstreetmap/josm/io/OsmConnection.java	(revision 6313)
@@ -56,4 +56,5 @@
             Thread.sleep(100);
         } catch (InterruptedException ex) {
+            Main.warn("InterruptedException in "+getClass().getSimpleName()+" during cancel");
         }
 
Index: trunk/src/org/openstreetmap/josm/io/imagery/Grabber.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/imagery/Grabber.java	(revision 6312)
+++ trunk/src/org/openstreetmap/josm/io/imagery/Grabber.java	(revision 6313)
@@ -67,5 +67,5 @@
                     Thread.sleep(random(1000, 2000));
                 } catch (InterruptedException e1) {
-                    Main.debug(e1.getMessage());
+                    Main.debug("InterruptedException in "+getClass().getSimpleName()+" during WMS request");
                 }
                 if(i == maxTries) {
Index: trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java
===================================================================
--- trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java	(revision 6312)
+++ trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java	(revision 6313)
@@ -687,5 +687,5 @@
                 return null;
             } catch(InterruptedException e) {
-                e.printStackTrace();
+                Main.warn("InterruptedException in "+PluginHandler.class.getSimpleName()+" while loading locally available plugin information");
                 return null;
             }
@@ -858,10 +858,9 @@
                 plugins = buildListOfPluginsToLoad(parent,monitor.createSubTaskMonitor(1, false));
             } catch (ExecutionException e) {
-                Main.warn(tr("Failed to download plugin information list"));
+                Main.warn(tr("Failed to download plugin information list")+": ExecutionException");
                 e.printStackTrace();
                 // don't abort in case of error, continue with downloading plugins below
             } catch (InterruptedException e) {
-                Main.warn(tr("Failed to download plugin information list"));
-                e.printStackTrace();
+                Main.warn(tr("Failed to download plugin information list")+": InterruptedException");
                 // don't abort in case of error, continue with downloading plugins below
             }
@@ -911,5 +910,5 @@
                     return plugins;
                 } catch(InterruptedException e) {
-                    e.printStackTrace();
+                    Main.warn("InterruptedException in "+PluginHandler.class.getSimpleName()+" while updating plugins");
                     alertFailedPluginUpdate(parent, pluginsToUpdate);
                     return plugins;
Index: trunk/src/org/openstreetmap/josm/tools/Utils.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/Utils.java	(revision 6312)
+++ trunk/src/org/openstreetmap/josm/tools/Utils.java	(revision 6313)
@@ -394,5 +394,5 @@
                     Thread.sleep(1);
                 } catch (InterruptedException ex) {
-                    Main.warn(ex);
+                    Main.warn("InterruptedException in "+Utils.class.getSimpleName()+" while getting clipboard content");
                 }
             }