From fb7ae1925d7def4b646a52b9390ff24f8732a559 Mon Sep 17 00:00:00 2001
From: Konstantin Bulenkov <kb@jetbrains.com>
Date: Mon, 5 Jul 2010 13:57:07 +0400
Subject: [PATCH] don't play with clipboard inside swing thread (JVM bug on mac
 & linux)

---
 .../unscramble/AnalyzeStacktraceUtil.java        | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/platform/lang-impl/src/com/intellij/unscramble/AnalyzeStacktraceUtil.java b/platform/lang-impl/src/com/intellij/unscramble/AnalyzeStacktraceUtil.java
index 5a62e1b22d77..474ac2003e0a 100644
--- a/platform/lang-impl/src/com/intellij/unscramble/AnalyzeStacktraceUtil.java
+++ b/platform/lang-impl/src/com/intellij/unscramble/AnalyzeStacktraceUtil.java
@@ -27,6 +27,7 @@ import com.intellij.execution.ui.ConsoleViewContentType;
 import com.intellij.execution.ui.ExecutionConsole;
 import com.intellij.execution.ui.RunContentDescriptor;
 import com.intellij.execution.ui.actions.CloseAction;
+import com.intellij.ide.CopyPasteManagerEx;
 import com.intellij.openapi.Disposable;
 import com.intellij.openapi.actionSystem.*;
 import com.intellij.openapi.application.ApplicationManager;
@@ -71,16 +72,15 @@ public class AnalyzeStacktraceUtil {
 
   @Nullable
   public static String getTextInClipboard() {
-    String text = null;
-    try {
-      Transferable contents = Toolkit.getDefaultToolkit().getSystemClipboard().getContents(AnalyzeStacktraceUtil.class);
-      if (contents != null) {
-        text = (String)contents.getTransferData(DataFlavor.stringFlavor);
+    final Transferable contents = CopyPasteManagerEx.getInstance().getContents();
+    if (contents != null) {
+      try {
+        return (String)contents.getTransferData(DataFlavor.stringFlavor);
+      } catch (Exception e) {
+        //no luck
       }
     }
-    catch (Exception ignore) {
-    }
-    return text;
+    return null;
   }
 
   public interface ConsoleFactory {