Changeset 8151 in josm

Timestamp:

2015-03-23T23:13:28+01:00 (9 years ago)

Author:

Don-vip

Message:

fix #11259 - catch InvalidDnDOperationException

File:

• trunk/src/org/openstreetmap/josm/gui/FileDrop.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/FileDrop.java

@@ -15 +15 @@
 import java.awt.dnd.DropTargetEvent;
 import java.awt.dnd.DropTargetListener;
+import java.awt.dnd.InvalidDnDOperationException;
 import java.awt.event.HierarchyEvent;
 import java.awt.event.HierarchyListener;
@@ -224 +225 @@
                 }   // end else: not a file list
             }   // end try
-            catch ( IOException io)
-            {   Main.warn("FileDrop: IOException - abort:" );
-            Main.error(io);
-            evt.rejectDrop();
-            }   // end catch IOException
-            catch (UnsupportedFlavorException ufe)
-            {   Main.warn("FileDrop: UnsupportedFlavorException - abort:" );
-            Main.error(ufe);
-            evt.rejectDrop();
-            }   // end catch: UnsupportedFlavorException
-            finally
-            {
+            catch (IOException | UnsupportedFlavorException e) {
+                Main.warn("FileDrop: "+e.getClass().getSimpleName()+" - abort:" );
+                Main.error(e);
+                try {
+                    evt.rejectDrop();
+                } catch (InvalidDnDOperationException ex) {
+                    // Catch InvalidDnDOperationException to fix #11259
+                    Main.error(ex);
+                }
+            } finally {
                 // If it's a Swing component, reset its border
                 if( c instanceof JComponent )