Attachment 187601 Details for Bug 335408 – Patch with the original fix + all version / copyright updates

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] Patch with the original fix + all version / copyright updates

terminalMiddleButton.diff.txt (text/plain), 38.30 KB, created by Martin Oberhuber

on 2011-01-25 21:21:39 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Oberhuber

Created: 2011-01-25 21:21:39 EST

Size: 38.30 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.rse
>Index: META-INF/MANIFEST.MF
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.tm.rse/plugins/org.eclipse.rse/META-INF/MANIFEST.MF,v
>retrieving revision 1.5
>diff -u -r1.5 MANIFEST.MF
>--- META-INF/MANIFEST.MF	6 Nov 2009 15:24:57 -0000	1.5
>+++ META-INF/MANIFEST.MF	26 Jan 2011 02:19:41 -0000
>@@ -2,7 +2,7 @@
> Bundle-ManifestVersion: 2
> Bundle-Name: %pluginName
> Bundle-SymbolicName: org.eclipse.rse
>-Bundle-Version: 3.2.0.qualifier
>+Bundle-Version: 3.2.2.qualifier
> Bundle-Vendor: %providerName
> Bundle-Localization: plugin
> Bundle-RequiredExecutionEnvironment: J2SE-1.4
>Index: about.properties
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.tm.rse/plugins/org.eclipse.rse/about.properties,v
>retrieving revision 1.8
>diff -u -r1.8 about.properties
>--- about.properties	15 Mar 2010 20:25:41 -0000	1.8
>+++ about.properties	26 Jan 2011 02:19:41 -0000
>@@ -1,5 +1,5 @@
> ################################################################################
>-# Copyright (c) 2006, 2010 Wind River Systems, Inc. and others
>+# Copyright (c) 2006, 2011 Wind River Systems, Inc. and others
> # All rights reserved. This program and the accompanying materials 
> # are made available under the terms of the Eclipse Public License v1.0 
> # which accompanies this distribution, and is available at 
>@@ -25,8 +25,8 @@
> Version: {featureVersion}\n\
> Build id: {0}\n\
> \n\
>-(c) Copyright IBM Corporation and others 2000, 2010.  All rights reserved.\n\
>-Visit http://www.eclipse.org/dsdp/tm\n\
>+(c) Copyright IBM Corporation and others 2000, 2011.  All rights reserved.\n\
>+Visit http://www.eclipse.org/tm\n\
> \n\
> This product includes software developed by the\n\
> Apache Software Foundation http://www.apache.org/
>#P org.eclipse.rse-feature
>Index: feature.properties
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.tm.rse/features/org.eclipse.rse-feature/feature.properties,v
>retrieving revision 1.16
>diff -u -r1.16 feature.properties
>--- feature.properties	3 May 2010 19:53:04 -0000	1.16
>+++ feature.properties	26 Jan 2011 02:19:42 -0000
>@@ -1,5 +1,5 @@
> ###############################################################################
>-# Copyright (c) 2006, 2010 IBM Corporation and others.
>+# Copyright (c) 2006, 2011 IBM Corporation and others.
> # All rights reserved. This program and the accompanying materials
> # are made available under the terms of the Eclipse Public License v1.0
> # which accompanies this distribution, and is available at
>@@ -28,7 +28,7 @@
> 
> # "copyright" property - text of the "Feature Update Copyright"
> copyright=\
>-Copyright (c) 2000, 2010 IBM Corporation and others.\n\
>+Copyright (c) 2000, 2011 IBM Corporation and others.\n\
> All rights reserved. This program and the accompanying materials\n\
> are made available under the terms of the Eclipse Public License v1.0\n\
> which accompanies this distribution, and is available at\n\
>Index: feature.xml
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.tm.rse/features/org.eclipse.rse-feature/feature.xml,v
>retrieving revision 1.19.2.1
>diff -u -r1.19.2.1 feature.xml
>--- feature.xml	6 Oct 2010 07:48:30 -0000	1.19.2.1
>+++ feature.xml	26 Jan 2011 02:19:42 -0000
>@@ -1,6 +1,6 @@
> <?xml version="1.0" encoding="UTF-8"?>
> <!--
>-     Copyright (c) 2005, 2010 IBM Corporation and others.
>+     Copyright (c) 2005, 2011 IBM Corporation and others.
>      All rights reserved. This program and the accompanying materials
>      are made available under the terms of the Eclipse Public License v1.0
>      which accompanies this distribution, and is available at
>@@ -30,8 +30,8 @@
>    </license>
> 
>    <url>
>-      <update label="%tmUpdateSiteName" url="http://download.eclipse.org/dsdp/tm/updates/3.2"/>
>-      <discovery label="%tmUpdateSiteName" url="http://download.eclipse.org/dsdp/tm/updates/3.2"/>
>+      <update label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/3.2"/>
>+      <discovery label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/3.2"/>
>    </url>
> 
>    <includes
>#P org.eclipse.rse.sdk
>Index: META-INF/MANIFEST.MF
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.tm.rse/plugins/org.eclipse.rse.sdk/META-INF/MANIFEST.MF,v
>retrieving revision 1.9
>diff -u -r1.9 MANIFEST.MF
>--- META-INF/MANIFEST.MF	6 Nov 2009 15:25:14 -0000	1.9
>+++ META-INF/MANIFEST.MF	26 Jan 2011 02:19:42 -0000
>@@ -2,7 +2,7 @@
> Bundle-ManifestVersion: 2
> Bundle-Name: %pluginName
> Bundle-SymbolicName: org.eclipse.rse.sdk
>-Bundle-Version: 3.2.0.qualifier
>+Bundle-Version: 3.2.2.qualifier
> Bundle-Vendor: %providerName
> Bundle-Localization: plugin
> Bundle-RequiredExecutionEnvironment: J2SE-1.4
>Index: about.properties
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.tm.rse/plugins/org.eclipse.rse.sdk/about.properties,v
>retrieving revision 1.10
>diff -u -r1.10 about.properties
>--- about.properties	15 Mar 2010 20:27:11 -0000	1.10
>+++ about.properties	26 Jan 2011 02:19:42 -0000
>@@ -1,5 +1,5 @@
> ################################################################################
>-# Copyright (c) 2006, 2010 Wind River Systems, Inc and others.
>+# Copyright (c) 2006, 2011 Wind River Systems, Inc and others.
> # All rights reserved. This program and the accompanying materials 
> # are made available under the terms of the Eclipse Public License v1.0 
> # which accompanies this distribution, and is available at 
>@@ -25,8 +25,8 @@
> Version: {featureVersion}\n\
> Build id: {0}\n\
> \n\
>-(c) Copyright IBM Corporation and others 2000, 2010.  All rights reserved.\n\
>-Visit http://www.eclipse.org/dsdp/tm\n\
>+(c) Copyright IBM Corporation and others 2000, 2011.  All rights reserved.\n\
>+Visit http://www.eclipse.org/tm\n\
> \n\
> This product includes software developed by the\n\
> Apache Software Foundation http://www.apache.org/
>#P org.eclipse.rse.sdk-feature
>Index: feature.properties
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.tm.rse/features/org.eclipse.rse.sdk-feature/feature.properties,v
>retrieving revision 1.19
>diff -u -r1.19 feature.properties
>--- feature.properties	3 May 2010 19:51:38 -0000	1.19
>+++ feature.properties	26 Jan 2011 02:19:43 -0000
>@@ -1,5 +1,5 @@
> ###############################################################################
>-# Copyright (c) 2006, 2010 IBM Corporation and others.
>+# Copyright (c) 2006, 2011 IBM Corporation and others.
> # All rights reserved. This program and the accompanying materials
> # are made available under the terms of the Eclipse Public License v1.0
> # which accompanies this distribution, and is available at
>@@ -28,7 +28,7 @@
> 
> # "copyright" property - text of the "Feature Update Copyright"
> copyright=\
>-Copyright (c) 2000, 2010 IBM Corporation and others.\n\
>+Copyright (c) 2000, 2011 IBM Corporation and others.\n\
> All rights reserved. This program and the accompanying materials\n\
> are made available under the terms of the Eclipse Public License v1.0\n\
> which accompanies this distribution, and is available at\n\
>Index: feature.xml
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.tm.rse/features/org.eclipse.rse.sdk-feature/feature.xml,v
>retrieving revision 1.38.2.1
>diff -u -r1.38.2.1 feature.xml
>--- feature.xml	6 Oct 2010 07:48:40 -0000	1.38.2.1
>+++ feature.xml	26 Jan 2011 02:19:43 -0000
>@@ -1,6 +1,6 @@
> <?xml version="1.0" encoding="UTF-8"?>
> <!--
>-     Copyright (c) 2005, 2010 IBM Corporation and others.
>+     Copyright (c) 2005, 2011 IBM Corporation and others.
>      All rights reserved. This program and the accompanying materials
>      are made available under the terms of the Eclipse Public License v1.0
>      which accompanies this distribution, and is available at
>@@ -29,8 +29,8 @@
>    </license>
> 
>    <url>
>-      <update label="%tmUpdateSiteName" url="http://download.eclipse.org/dsdp/tm/updates/3.2"/>
>-      <discovery label="%tmUpdateSiteName" url="http://download.eclipse.org/dsdp/tm/updates/3.2"/>
>+      <update label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/3.2"/>
>+      <discovery label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/3.2"/>
>    </url>
> 
>    <includes
>#P org.eclipse.rse.terminals-feature
>Index: feature.properties
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.tm.rse/features/org.eclipse.rse.terminals-feature/feature.properties,v
>retrieving revision 1.9
>diff -u -r1.9 feature.properties
>--- feature.properties	3 May 2010 19:51:52 -0000	1.9
>+++ feature.properties	26 Jan 2011 02:19:45 -0000
>@@ -1,5 +1,5 @@
> ################################################################################
>-# Copyright (c) 2006, 2010 Wind River Systems, Inc. and others.
>+# Copyright (c) 2006, 2011 Wind River Systems, Inc. and others.
> # All rights reserved. This program and the accompanying materials 
> # are made available under the terms of the Eclipse Public License v1.0 
> # which accompanies this distribution, and is available at 
>@@ -26,7 +26,7 @@
> 
> # "copyright" property - text of the "Feature Update Copyright"
> copyright=\
>-Copyright (c) 2002, 2010 MontaVista Software, Inc. and others.\n\
>+Copyright (c) 2002, 2011 MontaVista Software, Inc. and others.\n\
> All rights reserved. This program and the accompanying materials\n\
> are made available under the terms of the Eclipse Public License v1.0\n\
> which accompanies this distribution, and is available at\n\
>Index: feature.xml
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.tm.rse/features/org.eclipse.rse.terminals-feature/feature.xml,v
>retrieving revision 1.16
>diff -u -r1.16 feature.xml
>--- feature.xml	19 Aug 2010 13:37:08 -0000	1.16
>+++ feature.xml	26 Jan 2011 02:19:45 -0000
>@@ -1,6 +1,6 @@
> <?xml version="1.0" encoding="UTF-8"?>
> <!--
>-     Copyright (c) 2005, 2010 IBM Corporation and others.
>+     Copyright (c) 2005, 2011 IBM Corporation and others.
>      All rights reserved. This program and the accompanying materials
>      are made available under the terms of the Eclipse Public License v1.0
>      which accompanies this distribution, and is available at
>@@ -12,7 +12,7 @@
> <feature
>       id="org.eclipse.rse.terminals"
>       label="%featureName"
>-      version="1.0.101.qualifier"
>+      version="1.0.102.qualifier"
>       provider-name="%providerName"
>       plugin="org.eclipse.rse.terminals.ui"
>       image="eclipse_update_120.jpg">
>@@ -30,8 +30,8 @@
>    </license>
> 
>    <url>
>-      <update label="%tmUpdateSiteName" url="http://download.eclipse.org/dsdp/tm/updates/3.2"/>
>-      <discovery label="%tmUpdateSiteName" url="http://download.eclipse.org/dsdp/tm/updates/3.2"/>
>+      <update label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/3.2"/>
>+      <discovery label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/3.2"/>
>    </url>
> 
>    <includes
>Index: sourceTemplateFeature/feature.properties
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.tm.rse/features/org.eclipse.rse.terminals-feature/sourceTemplateFeature/feature.properties,v
>retrieving revision 1.9
>diff -u -r1.9 feature.properties
>--- sourceTemplateFeature/feature.properties	3 May 2010 19:51:51 -0000	1.9
>+++ sourceTemplateFeature/feature.properties	26 Jan 2011 02:19:45 -0000
>@@ -1,5 +1,5 @@
> ################################################################################
>-# Copyright (c) 2006, 2010 Wind River Systems, Inc. and others.
>+# Copyright (c) 2006, 2011 Wind River Systems, Inc. and others.
> # All rights reserved. This program and the accompanying materials 
> # are made available under the terms of the Eclipse Public License v1.0 
> # which accompanies this distribution, and is available at 
>@@ -32,7 +32,7 @@
> 
> # "copyright" property - text of the "Feature Update Copyright"
> copyright=\
>-Copyright (c) 2002, 2010 MontaVista Software, Inc. and others.\n\
>+Copyright (c) 2002, 2011 MontaVista Software, Inc. and others.\n\
> All rights reserved. This program and the accompanying materials\n\
> are made available under the terms of the Eclipse Public License v1.0\n\
> which accompanies this distribution, and is available at\n\
>Index: sourceTemplatePlugin/about.properties
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.tm.rse/features/org.eclipse.rse.terminals-feature/sourceTemplatePlugin/about.properties,v
>retrieving revision 1.4
>diff -u -r1.4 about.properties
>--- sourceTemplatePlugin/about.properties	22 May 2010 10:54:08 -0000	1.4
>+++ sourceTemplatePlugin/about.properties	26 Jan 2011 02:19:45 -0000
>@@ -1,5 +1,5 @@
> ################################################################################
>-# Copyright (c) 2006, 2010 Wind River Systems, Inc. and others.
>+# Copyright (c) 2006, 2011 Wind River Systems, Inc. and others.
> # All rights reserved. This program and the accompanying materials 
> # are made available under the terms of the Eclipse Public License v1.0 
> # which accompanies this distribution, and is available at 
>@@ -25,5 +25,5 @@
> Version: {featureVersion}\n\
> Build id: {0}\n\
> \n\
>-(c) Copyright MontaVista Software, Inc. and others 2002, 2010.  All rights reserved.\n\
>-Visit http://www.eclipse.org/dsdp/tm
>+(c) Copyright MontaVista Software, Inc. and others 2002, 2011.  All rights reserved.\n\
>+Visit http://www.eclipse.org/tm
>#P org.eclipse.tm.terminal
>Index: META-INF/MANIFEST.MF
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.tm.core/terminal/org.eclipse.tm.terminal/META-INF/MANIFEST.MF,v
>retrieving revision 1.30
>diff -u -r1.30 MANIFEST.MF
>--- META-INF/MANIFEST.MF	19 Aug 2010 13:36:37 -0000	1.30
>+++ META-INF/MANIFEST.MF	26 Jan 2011 02:19:46 -0000
>@@ -2,7 +2,7 @@
> Bundle-ManifestVersion: 2
> Bundle-Name: %pluginName
> Bundle-SymbolicName: org.eclipse.tm.terminal; singleton:=true
>-Bundle-Version: 3.0.101.qualifier
>+Bundle-Version: 3.0.102.qualifier
> Bundle-Activator: org.eclipse.tm.internal.terminal.control.impl.TerminalPlugin
> Bundle-Vendor: %providerName
> Bundle-Localization: plugin
>Index: about.properties
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.tm.core/terminal/org.eclipse.tm.terminal/about.properties,v
>retrieving revision 1.4
>diff -u -r1.4 about.properties
>--- about.properties	1 Feb 2009 15:15:29 -0000	1.4
>+++ about.properties	26 Jan 2011 02:19:46 -0000
>@@ -1,5 +1,5 @@
> ################################################################################
>-# Copyright (c) 2006, 2009 Wind River Systems, Inc. and others.
>+# Copyright (c) 2006, 2011 Wind River Systems, Inc. and others.
> # All rights reserved. This program and the accompanying materials 
> # are made available under the terms of the Eclipse Public License v1.0 
> # which accompanies this distribution, and is available at 
>@@ -21,5 +21,5 @@
> Version: {featureVersion}\n\
> Build id: {0}\n\
> \n\
>-(c) Copyright Wind River Systems, Inc. and others 2003, 2009.  All rights reserved.\n\
>-Visit http://www.eclipse.org/dsdp/tm
>+(c) Copyright Wind River Systems, Inc. and others 2003, 2011.  All rights reserved.\n\
>+Visit http://www.eclipse.org/tm
>Index: src/org/eclipse/tm/internal/terminal/emulator/VT100TerminalControl.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.tm.core/terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/emulator/VT100TerminalControl.java,v
>retrieving revision 1.27
>diff -u -r1.27 VT100TerminalControl.java
>--- src/org/eclipse/tm/internal/terminal/emulator/VT100TerminalControl.java	4 Dec 2008 19:37:11 -0000	1.27
>+++ src/org/eclipse/tm/internal/terminal/emulator/VT100TerminalControl.java	26 Jan 2011 02:19:46 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2003, 2008 Wind River Systems, Inc. and others.
>+ * Copyright (c) 2003, 2011 Wind River Systems, Inc. and others.
>  * All rights reserved. This program and the accompanying materials
>  * are made available under the terms of the Eclipse Public License v1.0
>  * which accompanies this distribution, and is available at
>@@ -25,6 +25,7 @@
>  * Michael Scharf (Wind River) - [237398] Terminal get Invalid Thread Access when the title is set
>  * Martin Oberhuber (Wind River) - [240745] Pressing Ctrl+F1 in the Terminal should bring up context help
>  * Michael Scharf (Wind River) - [240098] The cursor should not blink when the terminal is disconnected
>+ * Anton Leherbauer (Wind River) - [335021] Middle mouse button copy/paste does not work with the terminal
>  *******************************************************************************/
> package org.eclipse.tm.internal.terminal.emulator;
> 
>@@ -42,12 +43,16 @@
> import org.eclipse.osgi.util.NLS;
> import org.eclipse.swt.SWT;
> import org.eclipse.swt.dnd.Clipboard;
>+import org.eclipse.swt.dnd.DND;
> import org.eclipse.swt.dnd.TextTransfer;
>+import org.eclipse.swt.dnd.Transfer;
> import org.eclipse.swt.events.FocusEvent;
> import org.eclipse.swt.events.FocusListener;
> import org.eclipse.swt.events.KeyAdapter;
> import org.eclipse.swt.events.KeyEvent;
> import org.eclipse.swt.events.KeyListener;
>+import org.eclipse.swt.events.MouseAdapter;
>+import org.eclipse.swt.events.MouseEvent;
> import org.eclipse.swt.graphics.Font;
> import org.eclipse.swt.layout.GridData;
> import org.eclipse.swt.layout.GridLayout;
>@@ -173,16 +178,20 @@
> 	 * @see org.eclipse.tm.internal.terminal.provisional.api.ITerminalControl#copy()
> 	 */
> 	public void copy() {
>-		getCtlText().copy();
>+		copy(DND.CLIPBOARD);
>+	}
>+
>+	private void copy(int clipboardType) {
>+		Object[] data = new Object[] { getSelection() };
>+		Transfer[] types = new Transfer[] { TextTransfer.getInstance() };
>+		fClipboard.setContents(data, types, clipboardType);
> 	}
> 
> 	/* (non-Javadoc)
> 	 * @see org.eclipse.tm.internal.terminal.provisional.api.ITerminalControl#paste()
> 	 */
> 	public void paste() {
>-		TextTransfer textTransfer = TextTransfer.getInstance();
>-		String strText = (String) fClipboard.getContents(textTransfer);
>-		pasteString(strText);
>+		paste(DND.CLIPBOARD);
> // TODO paste in another thread.... to avoid blocking
> //		new Thread() {
> //			public void run() {
>@@ -194,6 +203,12 @@
> //		}.start();
> 	}
> 
>+	private void paste(int clipboardType) {
>+		TextTransfer textTransfer = TextTransfer.getInstance();
>+		String strText = (String) fClipboard.getContents(textTransfer, clipboardType);
>+		pasteString(strText);
>+	}
>+	
> 	/**
> 	 * @param strText the text to paste
> 	 */
>@@ -584,7 +599,14 @@
> 				fTerminalText.setDimensions(lines, columns);
> 			}
> 		});
>-
>+		fCtlText.addMouseListener(new MouseAdapter() {
>+			public void mouseUp(MouseEvent e) {
>+				// update selection used by middle mouse button paste
>+				if (e.button == 1 && getSelection().length() > 0) {
>+					copy(DND.SELECTION_CLIPBOARD);
>+				}
>+			}
>+		});
> 
> 		fDisplay = getCtlText().getDisplay();
> 		fClipboard = new Clipboard(fDisplay);
>#P org.eclipse.tm.terminal-feature
>Index: feature.properties
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.tm.core/terminal/org.eclipse.tm.terminal-feature/feature.properties,v
>retrieving revision 1.15
>diff -u -r1.15 feature.properties
>--- feature.properties	3 May 2010 19:52:47 -0000	1.15
>+++ feature.properties	26 Jan 2011 02:19:47 -0000
>@@ -29,7 +29,7 @@
> 
> # "copyright" property - text of the "Feature Update Copyright"
> copyright=\
>-Copyright (c) 2003, 2010 Wind River Systems, Inc. and others.\n\
>+Copyright (c) 2003, 2011 Wind River Systems, Inc. and others.\n\
> All rights reserved. This program and the accompanying materials\n\
> are made available under the terms of the Eclipse Public License v1.0\n\
> which accompanies this distribution, and is available at\n\
>Index: feature.xml
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.tm.core/terminal/org.eclipse.tm.terminal-feature/feature.xml,v
>retrieving revision 1.24
>diff -u -r1.24 feature.xml
>--- feature.xml	19 Aug 2010 13:36:27 -0000	1.24
>+++ feature.xml	26 Jan 2011 02:19:47 -0000
>@@ -13,7 +13,7 @@
> <feature
>       id="org.eclipse.tm.terminal"
>       label="%featureName"
>-      version="3.0.201.qualifier"
>+      version="3.0.202.qualifier"
>       provider-name="%providerName">
> 
>    <description>
>@@ -29,8 +29,8 @@
>    </license>
> 
>    <url>
>-      <update label="%tmUpdateSiteName" url="http://download.eclipse.org/dsdp/tm/updates/3.2"/>
>-      <discovery label="%tmUpdateSiteName" url="http://download.eclipse.org/dsdp/tm/updates/3.2"/>
>+      <update label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/3.2"/>
>+      <discovery label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/3.2"/>
>    </url>
> 
>    <requires>
>Index: sourceTemplateFeature/feature.properties
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.tm.core/terminal/org.eclipse.tm.terminal-feature/sourceTemplateFeature/feature.properties,v
>retrieving revision 1.16
>diff -u -r1.16 feature.properties
>--- sourceTemplateFeature/feature.properties	3 May 2010 19:52:48 -0000	1.16
>+++ sourceTemplateFeature/feature.properties	26 Jan 2011 02:19:47 -0000
>@@ -1,5 +1,5 @@
> ###############################################################################
>-# Copyright (c) 2006, 2010 Wind River Systems, Inc. and others.
>+# Copyright (c) 2006, 2011 Wind River Systems, Inc. and others.
> # All rights reserved. This program and the accompanying materials
> # are made available under the terms of the Eclipse Public License v1.0
> # which accompanies this distribution, and is available at
>@@ -28,7 +28,7 @@
> 
> # "copyright" property - text of the "Feature Update Copyright"
> copyright=\
>-Copyright (c) 2003, 2010 Wind River Systems, Inc. and others.\n\
>+Copyright (c) 2003, 2011 Wind River Systems, Inc. and others.\n\
> All rights reserved. This program and the accompanying materials\n\
> are made available under the terms of the Eclipse Public License v1.0\n\
> which accompanies this distribution, and is available at\n\
>Index: sourceTemplatePlugin/about.properties
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.tm.core/terminal/org.eclipse.tm.terminal-feature/sourceTemplatePlugin/about.properties,v
>retrieving revision 1.4
>diff -u -r1.4 about.properties
>--- sourceTemplatePlugin/about.properties	1 Feb 2009 15:15:14 -0000	1.4
>+++ sourceTemplatePlugin/about.properties	26 Jan 2011 02:19:47 -0000
>@@ -1,5 +1,5 @@
> ################################################################################
>-# Copyright (c) 2006, 2009 Wind River Systems, Inc. and others.
>+# Copyright (c) 2006, 2011 Wind River Systems, Inc. and others.
> # All rights reserved. This program and the accompanying materials 
> # are made available under the terms of the Eclipse Public License v1.0 
> # which accompanies this distribution, and is available at 
>@@ -21,5 +21,5 @@
> Version: {featureVersion}\n\
> Build id: {0}\n\
> \n\
>-(c) Copyright Wind River Systems, Inc. and others 2003, 2009.  All rights reserved.\n\
>-Visit http://www.eclipse.org/dsdp/tm
>+(c) Copyright Wind River Systems, Inc. and others 2003, 2011.  All rights reserved.\n\
>+Visit http://www.eclipse.org/tm
>#P org.eclipse.tm.terminal.local.sdk-feature
>Index: feature.properties
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.local.sdk-feature/feature.properties,v
>retrieving revision 1.1
>diff -u -r1.1 feature.properties
>--- feature.properties	3 Jun 2010 07:22:21 -0000	1.1
>+++ feature.properties	26 Jan 2011 02:19:48 -0000
>@@ -1,5 +1,5 @@
> ####################################################################################################
>-# Copyright (c) 2008, 2010 Mirko Raner and others.
>+# Copyright (c) 2008, 2011 Mirko Raner and others.
> # All rights reserved. This program and the accompanying materials
> # are made available under the terms of the Eclipse Public License v1.0
> # which accompanies this distribution, and is available at
>@@ -31,7 +31,7 @@
> 
> # "copyright" property - text of the "Feature Update Copyright"
> copyright=\
>-Copyright (c) 2008, 2010 Mirko Raner and others.\n\
>+Copyright (c) 2008, 2011 Mirko Raner and others.\n\
> All rights reserved. This program and the accompanying materials\n\
> are made available under the terms of the Eclipse Public License v1.0\n\
> which accompanies this distribution, and is available at\n\
>Index: feature.xml
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.local.sdk-feature/feature.xml,v
>retrieving revision 1.2.2.1
>diff -u -r1.2.2.1 feature.xml
>--- feature.xml	12 Nov 2010 13:40:57 -0000	1.2.2.1
>+++ feature.xml	26 Jan 2011 02:19:48 -0000
>@@ -1,6 +1,6 @@
> <?xml version="1.0" encoding="UTF-8"?>
> <!--
>-     Copyright (c) 2008, 2010 Mirko Raner and others
>+     Copyright (c) 2008, 2011 Mirko Raner and others
>      All rights reserved. This program and the accompanying materials
>      are made available under the terms of the Eclipse Public License v1.0
>      which accompanies this distribution, and is available at
>@@ -30,8 +30,8 @@
>    </license>
> 
>    <url>
>-      <update label="%tmUpdateSiteName" url="http://download.eclipse.org/dsdp/tm/updates/3.2"/>
>-      <discovery label="%tmUpdateSiteName" url="http://download.eclipse.org/dsdp/tm/updates/3.2"/>
>+      <update label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/3.2"/>
>+      <discovery label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/3.2"/>
>    </url>
> 
>    <includes
>#P org.eclipse.tm.terminal.sdk-feature
>Index: feature.properties
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.sdk-feature/feature.properties,v
>retrieving revision 1.20
>diff -u -r1.20 feature.properties
>--- feature.properties	3 May 2010 19:52:22 -0000	1.20
>+++ feature.properties	26 Jan 2011 02:19:49 -0000
>@@ -1,5 +1,5 @@
> ###############################################################################
>-# Copyright (c) 2006, 2010 Wind River Systems, Inc. and others.
>+# Copyright (c) 2006, 2011 Wind River Systems, Inc. and others.
> # All rights reserved. This program and the accompanying materials
> # are made available under the terms of the Eclipse Public License v1.0
> # which accompanies this distribution, and is available at
>@@ -29,7 +29,7 @@
> 
> # "copyright" property - text of the "Feature Update Copyright"
> copyright=\
>-Copyright (c) 2003, 2010 Wind River Systems, Inc. and others.\n\
>+Copyright (c) 2003, 2011 Wind River Systems, Inc. and others.\n\
> All rights reserved. This program and the accompanying materials\n\
> are made available under the terms of the Eclipse Public License v1.0\n\
> which accompanies this distribution, and is available at\n\
>Index: feature.xml
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.sdk-feature/feature.xml,v
>retrieving revision 1.34.2.1
>diff -u -r1.34.2.1 feature.xml
>--- feature.xml	12 Nov 2010 13:40:54 -0000	1.34.2.1
>+++ feature.xml	26 Jan 2011 02:19:49 -0000
>@@ -1,6 +1,6 @@
> <?xml version="1.0" encoding="UTF-8"?>
> <!--
>-     Copyright (c) 2006, 2010 Wind River Systems, Inc. and others.
>+     Copyright (c) 2006, 2011 Wind River Systems, Inc. and others.
>      All rights reserved. This program and the accompanying materials
>      are made available under the terms of the Eclipse Public License v1.0
>      which accompanies this distribution, and is available at
>@@ -30,8 +30,8 @@
>    </license>
> 
>    <url>
>-      <update label="%tmUpdateSiteName" url="http://download.eclipse.org/dsdp/tm/updates/3.2"/>
>-      <discovery label="%tmUpdateSiteName" url="http://download.eclipse.org/dsdp/tm/updates/3.2"/>
>+      <update label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/3.2"/>
>+      <discovery label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/3.2"/>
>    </url>
> 
>    <includes
>#P org.eclipse.tm.terminal.view
>Index: META-INF/MANIFEST.MF
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.view/META-INF/MANIFEST.MF,v
>retrieving revision 1.18.2.1
>diff -u -r1.18.2.1 MANIFEST.MF
>--- META-INF/MANIFEST.MF	12 Nov 2010 13:40:48 -0000	1.18.2.1
>+++ META-INF/MANIFEST.MF	26 Jan 2011 02:19:50 -0000
>@@ -2,7 +2,7 @@
> Bundle-ManifestVersion: 2
> Bundle-Name: %pluginName
> Bundle-SymbolicName: org.eclipse.tm.terminal.view;singleton:=true
>-Bundle-Version: 2.1.1.qualifier
>+Bundle-Version: 2.1.2.qualifier
> Bundle-Activator: org.eclipse.tm.internal.terminal.view.TerminalViewPlugin
> Bundle-Localization: plugin
> Require-Bundle: org.eclipse.ui,
>Index: about.properties
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.view/about.properties,v
>retrieving revision 1.5
>diff -u -r1.5 about.properties
>--- about.properties	3 Jun 2010 08:33:02 -0000	1.5
>+++ about.properties	26 Jan 2011 02:19:50 -0000
>@@ -1,5 +1,5 @@
> ################################################################################
>-# Copyright (c) 2006, 2010 Wind River Systems, Inc. and others.
>+# Copyright (c) 2006, 2011 Wind River Systems, Inc. and others.
> # All rights reserved. This program and the accompanying materials 
> # are made available under the terms of the Eclipse Public License v1.0 
> # which accompanies this distribution, and is available at 
>@@ -21,5 +21,5 @@
> Version: {featureVersion}\n\
> Build id: {0}\n\
> \n\
>-(c) Copyright Wind River Systems, Inc. and others 2003, 2010.  All rights reserved.\n\
>-Visit http://www.eclipse.org/dsdp/tm
>+(c) Copyright Wind River Systems, Inc. and others 2003, 2011.  All rights reserved.\n\
>+Visit http://www.eclipse.org/tm
>Index: src/org/eclipse/tm/internal/terminal/view/TerminalViewConnection.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/TerminalViewConnection.java,v
>retrieving revision 1.5
>diff -u -r1.5 TerminalViewConnection.java
>--- src/org/eclipse/tm/internal/terminal/view/TerminalViewConnection.java	1 Feb 2009 12:40:14 -0000	1.5
>+++ src/org/eclipse/tm/internal/terminal/view/TerminalViewConnection.java	26 Jan 2011 02:19:50 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2008, 2009 Wind River Systems, Inc. and others.
>+ * Copyright (c) 2008, 2011 Wind River Systems, Inc. and others.
>  * All rights reserved. This program and the accompanying materials
>  * are made available under the terms of the Eclipse Public License v1.0
>  * which accompanies this distribution, and is available at
>@@ -9,13 +9,14 @@
>  * Michael Scharf (Wind River) - initial API and implementation
>  * Michael Scharf (Wind River) - [240097] Allow paste with the middle mouse button
>  * Michael Scharf (Wind River) - [262996] get rid of TerminalState.OPENED
>+ * Anton Leherbauer (Wind River) - [335021] Middle mouse button copy/paste does not work with the terminal
>  *******************************************************************************/
>-/**
>- *
>- */
> package org.eclipse.tm.internal.terminal.view;
> 
> import org.eclipse.jface.resource.ImageDescriptor;
>+import org.eclipse.swt.dnd.Clipboard;
>+import org.eclipse.swt.dnd.DND;
>+import org.eclipse.swt.dnd.TextTransfer;
> import org.eclipse.swt.events.MouseAdapter;
> import org.eclipse.swt.events.MouseEvent;
> import org.eclipse.tm.internal.terminal.control.CommandInputFieldWithHistory;
>@@ -46,11 +47,20 @@
> 	public TerminalViewConnection(ITerminalViewControl ctl) {
> 		fCtlTerminal = ctl;
> 		fCtlTerminal.getControl().addMouseListener(new MouseAdapter(){
>-			public void mouseUp(MouseEvent e) {
>+			public void mouseDown(MouseEvent e) {
> 				// paste when the middle button is clicked
>-				if(e.button==2) // middle button
>-					fCtlTerminal.paste();
>-			}});
>+				if (e.button == 2) { // middle button
>+					int clipboardType = DND.SELECTION_CLIPBOARD;
>+					Clipboard clipboard = fCtlTerminal.getClipboard();
>+					if (clipboard.getAvailableTypes(clipboardType).length == 0)
>+						// use normal clipboard if selection clipboard is not available
>+						clipboardType = DND.CLIPBOARD;
>+					String text = (String) clipboard.getContents(TextTransfer.getInstance(), clipboardType);
>+					if (text != null && text.length() > 0)
>+						fCtlTerminal.pasteString(text);
>+				}
>+			}
>+		});
> 	}
> 
> 	/* (non-Javadoc)
>#P org.eclipse.tm.terminal.view-feature
>Index: feature.properties
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.view-feature/feature.properties,v
>retrieving revision 1.15
>diff -u -r1.15 feature.properties
>--- feature.properties	3 May 2010 19:51:47 -0000	1.15
>+++ feature.properties	26 Jan 2011 02:19:51 -0000
>@@ -1,5 +1,5 @@
> ###############################################################################
>-# Copyright (c) 2006, 2010 Wind River Systems, Inc. and others.
>+# Copyright (c) 2006, 2011 Wind River Systems, Inc. and others.
> # All rights reserved. This program and the accompanying materials
> # are made available under the terms of the Eclipse Public License v1.0
> # which accompanies this distribution, and is available at
>@@ -28,7 +28,7 @@
> 
> # "copyright" property - text of the "Feature Update Copyright"
> copyright=\
>-Copyright (c) 2003, 2010 Wind River Systems, Inc. and others.\n\
>+Copyright (c) 2003, 2011 Wind River Systems, Inc. and others.\n\
> All rights reserved. This program and the accompanying materials\n\
> are made available under the terms of the Eclipse Public License v1.0\n\
> which accompanies this distribution, and is available at\n\
>Index: feature.xml
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.view-feature/feature.xml,v
>retrieving revision 1.23.2.1
>diff -u -r1.23.2.1 feature.xml
>--- feature.xml	12 Nov 2010 13:40:51 -0000	1.23.2.1
>+++ feature.xml	26 Jan 2011 02:19:51 -0000
>@@ -1,6 +1,6 @@
> <?xml version="1.0" encoding="UTF-8"?>
> <!--
>-     Copyright (c) 2006, 2010 Wind River Systems, Inc. and others.
>+     Copyright (c) 2006, 2011 Wind River Systems, Inc. and others.
>      All rights reserved. This program and the accompanying materials
>      are made available under the terms of the Eclipse Public License v1.0
>      which accompanies this distribution, and is available at
>@@ -13,7 +13,7 @@
> <feature
>       id="org.eclipse.tm.terminal.view"
>       label="%featureName"
>-      version="2.1.1.qualifier"
>+      version="2.1.2.qualifier"
>       provider-name="%providerName">
> 
>    <description>
>@@ -29,8 +29,8 @@
>    </license>
> 
>    <url>
>-      <update label="%tmUpdateSiteName" url="http://download.eclipse.org/dsdp/tm/updates/3.2"/>
>-      <discovery label="%tmUpdateSiteName" url="http://download.eclipse.org/dsdp/tm/updates/3.2"/>
>+      <update label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/3.2"/>
>+      <discovery label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/3.2"/>
>    </url>
> 
>    <requires>
>Index: sourceTemplateFeature/feature.properties
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.view-feature/sourceTemplateFeature/feature.properties,v
>retrieving revision 1.16
>diff -u -r1.16 feature.properties
>--- sourceTemplateFeature/feature.properties	3 May 2010 19:51:47 -0000	1.16
>+++ sourceTemplateFeature/feature.properties	26 Jan 2011 02:19:51 -0000
>@@ -1,5 +1,5 @@
> ###############################################################################
>-# Copyright (c) 2006, 2010 Wind River Systems, Inc. and others.
>+# Copyright (c) 2006, 2011 Wind River Systems, Inc. and others.
> # All rights reserved. This program and the accompanying materials
> # are made available under the terms of the Eclipse Public License v1.0
> # which accompanies this distribution, and is available at
>@@ -28,7 +28,7 @@
> 
> # "copyright" property - text of the "Feature Update Copyright"
> copyright=\
>-Copyright (c) 2003, 2010 Wind River Systems, Inc. and others.\n\
>+Copyright (c) 2003, 2011 Wind River Systems, Inc. and others.\n\
> All rights reserved. This program and the accompanying materials\n\
> are made available under the terms of the Eclipse Public License v1.0\n\
> which accompanies this distribution, and is available at\n\
>Index: sourceTemplatePlugin/about.properties
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.view-feature/sourceTemplatePlugin/about.properties,v
>retrieving revision 1.4
>diff -u -r1.4 about.properties
>--- sourceTemplatePlugin/about.properties	1 Feb 2009 15:14:40 -0000	1.4
>+++ sourceTemplatePlugin/about.properties	26 Jan 2011 02:19:51 -0000
>@@ -1,5 +1,5 @@
> ################################################################################
>-# Copyright (c) 2006, 2009 Wind River Systems, Inc. and others.
>+# Copyright (c) 2006, 2011 Wind River Systems, Inc. and others.
> # All rights reserved. This program and the accompanying materials 
> # are made available under the terms of the Eclipse Public License v1.0 
> # which accompanies this distribution, and is available at 
>@@ -21,5 +21,5 @@
> Version: {featureVersion}\n\
> Build id: {0}\n\
> \n\
>-(c) Copyright Wind River Systems, Inc. and others 2003, 2009.  All rights reserved.\n\
>-Visit http://www.eclipse.org/dsdp/tm
>+(c) Copyright Wind River Systems, Inc. and others 2003, 2011.  All rights reserved.\n\
>+Visit http://www.eclipse.org/tm

Actions: View | Diff

Attachments on bug 335408: 187601