diff options
author | Andrey Loskutov | 2015-11-17 13:39:50 +0000 |
---|---|---|
committer | Andrey Loskutov | 2015-11-22 20:39:48 +0000 |
commit | aae4f9a46fe0c9c405656cbf9c1ecf706cb62f6f (patch) | |
tree | 56577c01f5e45bf84aa47a088f7590ac8486fd4e | |
parent | 5987551acfa800096c0d908175e5a813abced853 (diff) | |
download | eclipse.platform.ui-aae4f9a46fe0c9c405656cbf9c1ecf706cb62f6f.tar.gz eclipse.platform.ui-aae4f9a46fe0c9c405656cbf9c1ecf706cb62f6f.tar.xz eclipse.platform.ui-aae4f9a46fe0c9c405656cbf9c1ecf706cb62f6f.zip |
Bug 205678 - [Clipboard] Using x11vnc with clipboard transfer causes
eclipse to OOM
Updated message on Linux systems with a better hint what could be wrong
and how to fix.
Change-Id: I029fbf48d6730b5d4218955c83d11950ba6cc7eb
Signed-off-by: Andrey Loskutov <loskutov@gmx.de>
-rw-r--r-- | bundles/org.eclipse.ui.ide/extensions/org/eclipse/ui/part/ResourceTransfer.java | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/bundles/org.eclipse.ui.ide/extensions/org/eclipse/ui/part/ResourceTransfer.java b/bundles/org.eclipse.ui.ide/extensions/org/eclipse/ui/part/ResourceTransfer.java index c148fe973a4..90eaa6302ab 100644 --- a/bundles/org.eclipse.ui.ide/extensions/org/eclipse/ui/part/ResourceTransfer.java +++ b/bundles/org.eclipse.ui.ide/extensions/org/eclipse/ui/part/ResourceTransfer.java @@ -21,6 +21,7 @@ import org.eclipse.core.resources.IResource; import org.eclipse.core.resources.IWorkspace; import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.Path; +import org.eclipse.jface.util.Util; import org.eclipse.swt.dnd.ByteArrayTransfer; import org.eclipse.swt.dnd.TransferData; import org.eclipse.ui.internal.ide.IDEWorkbenchPlugin; @@ -164,7 +165,12 @@ public class ResourceTransfer extends ByteArrayTransfer { try { int count = in.readInt(); if (count > MAX_RESOURCES_TO_TRANSFER) { - String message = "Transfer aborted, too many resources: " + count; //$NON-NLS-1$ + String message = "Transfer aborted, too many resources: " + count + "."; //$NON-NLS-1$ //$NON-NLS-2$ + if (Util.isLinux()) { + message += "\nIf you are running in x11vnc environment please consider to switch to vncserver " + //$NON-NLS-1$ + "+ vncviewer or to run x11vnc without clipboard support " + //$NON-NLS-1$ + "(use '-noclipboard' and '-nosetclipboard' arguments)."; //$NON-NLS-1$ + } IDEWorkbenchPlugin.log(message, new IllegalArgumentException( "Maximum limit of resources to transfer is: " + MAX_RESOURCES_TO_TRANSFER)); //$NON-NLS-1$ return null; |