Changeset 9916 in josm for trunk/src/org/openstreetmap/josm/tools

Timestamp:

2016-03-02T22:54:34+01:00 (9 years ago)

Author:

Don-vip

Message:

ChangesetCacheManager: add unit tests

File:

• trunk/src/org/openstreetmap/josm/tools/Utils.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/tools/Utils.java

@@ -8 +8 @@
 import java.awt.Color;
 import java.awt.Font;
+import java.awt.HeadlessException;
 import java.awt.Toolkit;
 import java.awt.datatransfer.Clipboard;
@@ -635 +636 @@
      */
     public static String getClipboardContent() {
-        Transferable t = getTransferableContent(Toolkit.getDefaultToolkit().getSystemClipboard());
         try {
+            Transferable t = getTransferableContent(Toolkit.getDefaultToolkit().getSystemClipboard());
             if (t != null && t.isDataFlavorSupported(DataFlavor.stringFlavor)) {
                 return (String) t.getTransferData(DataFlavor.stringFlavor);
             }
-        } catch (UnsupportedFlavorException | IOException ex) {
+        } catch (UnsupportedFlavorException | IOException | HeadlessException ex) {
             Main.error(ex);
             return null;