From f403df07eeba6508f2b504c04dda428b6743dbe5 Mon Sep 17 00:00:00 2001 From: Konstantin Bulenkov Date: Wed, 7 Jul 2010 16:18:03 +0400 Subject: [PATCH] don't show any messages in case of clipboard operation failure --- .../intellij/unscramble/AnalyzeStacktraceUtil.java | 2 +- .../src/com/intellij/ide/CopyPasteManagerEx.java | 12 +++++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/platform/lang-impl/src/com/intellij/unscramble/AnalyzeStacktraceUtil.java b/platform/lang-impl/src/com/intellij/unscramble/AnalyzeStacktraceUtil.java index 474ac2003e0a..6a639037024d 100644 --- a/platform/lang-impl/src/com/intellij/unscramble/AnalyzeStacktraceUtil.java +++ b/platform/lang-impl/src/com/intellij/unscramble/AnalyzeStacktraceUtil.java @@ -72,7 +72,7 @@ public class AnalyzeStacktraceUtil { @Nullable public static String getTextInClipboard() { - final Transferable contents = CopyPasteManagerEx.getInstance().getContents(); + final Transferable contents = CopyPasteManagerEx.getInstanceEx().getSystemClipboardContents(false); if (contents != null) { try { return (String)contents.getTransferData(DataFlavor.stringFlavor); diff --git a/platform/platform-impl/src/com/intellij/ide/CopyPasteManagerEx.java b/platform/platform-impl/src/com/intellij/ide/CopyPasteManagerEx.java index 6bc9d8e85607..ad575c90862d 100644 --- a/platform/platform-impl/src/com/intellij/ide/CopyPasteManagerEx.java +++ b/platform/platform-impl/src/com/intellij/ide/CopyPasteManagerEx.java @@ -51,11 +51,19 @@ public class CopyPasteManagerEx extends CopyPasteManager implements ClipboardOwn private static final int DELAY_UNTIL_ABORT_CLIPBOARD_ACCESS = 2000; private boolean myIsWarningShown = false; + public static CopyPasteManagerEx getInstanceEx() { + return (CopyPasteManagerEx)getInstance(); + } + public CopyPasteManagerEx() { myDatas = new ArrayList(); } public Transferable getSystemClipboardContents() { + return getSystemClipboardContents(true); + } + + public Transferable getSystemClipboardContents(boolean showMessage) { final Transferable[] contents = new Transferable[] {null}; final boolean[] success = new boolean[] {false}; Runnable accessor = new Runnable() { @@ -105,7 +113,9 @@ public class CopyPasteManagerEx extends CopyPasteManager implements ClipboardOwn if (success[0]) return contents[0]; accessorFuture.cancel(true); - showWorkaroundMessage(); + if (showMessage) { + showWorkaroundMessage(); + } return null; }