Attachment #187601 for bug #335408

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

View | Details | Raw Unified | Return to bug 335408
Collapse All | Expand All

Lines 2-8 Link Here

(-)META-INF/MANIFEST.MF (-1 / +1 lines)
2	Bundle-ManifestVersion: 2	2	Bundle-ManifestVersion: 2
3	Bundle-Name: %pluginName	3	Bundle-Name: %pluginName
4	Bundle-SymbolicName: org.eclipse.rse	4	Bundle-SymbolicName: org.eclipse.rse
5	Bundle-Version: 3.2.0.qualifier	5	Bundle-Version: 3.2.2.qualifier
6	Bundle-Vendor: %providerName	6	Bundle-Vendor: %providerName
7	Bundle-Localization: plugin	7	Bundle-Localization: plugin
8	Bundle-RequiredExecutionEnvironment: J2SE-1.4	8	Bundle-RequiredExecutionEnvironment: J2SE-1.4

Lines 1-5 Link Here

(-)about.properties (-3 / +3 lines)
1	################################################################################	1	################################################################################
2	# Copyright (c) 2006, 2010 Wind River Systems, Inc. and others	2	# Copyright (c) 2006, 2011 Wind River Systems, Inc. and others
3	# All rights reserved. This program and the accompanying materials	3	# All rights reserved. This program and the accompanying materials
4	# are made available under the terms of the Eclipse Public License v1.0	4	# are made available under the terms of the Eclipse Public License v1.0
5	# which accompanies this distribution, and is available at	5	# which accompanies this distribution, and is available at
Lines 25-32 Link Here
25	Version: {featureVersion}\n\	25	Version: {featureVersion}\n\
26	Build id: {0}\n\	26	Build id: {0}\n\
27	\n\	27	\n\
28	(c) Copyright IBM Corporation and others 2000, 2010. All rights reserved.\n\	28	(c) Copyright IBM Corporation and others 2000, 2011. All rights reserved.\n\
29	Visit http://www.eclipse.org/dsdp/tm\n\	29	Visit http://www.eclipse.org/tm\n\
30	\n\	30	\n\
31	This product includes software developed by the\n\	31	This product includes software developed by the\n\
32	Apache Software Foundation http://www.apache.org/	32	Apache Software Foundation http://www.apache.org/

Lines 1-5 Link Here

(-)feature.properties (-2 / +2 lines)
1	###############################################################################	1	###############################################################################
2	# Copyright (c) 2006, 2010 IBM Corporation and others.	2	# Copyright (c) 2006, 2011 IBM Corporation and others.
3	# All rights reserved. This program and the accompanying materials	3	# All rights reserved. This program and the accompanying materials
4	# are made available under the terms of the Eclipse Public License v1.0	4	# are made available under the terms of the Eclipse Public License v1.0
5	# which accompanies this distribution, and is available at	5	# which accompanies this distribution, and is available at
Lines 28-34 Link Here
28		28
29	# "copyright" property - text of the "Feature Update Copyright"	29	# "copyright" property - text of the "Feature Update Copyright"
30	copyright=\	30	copyright=\
31	Copyright (c) 2000, 2010 IBM Corporation and others.\n\	31	Copyright (c) 2000, 2011 IBM Corporation and others.\n\
32	All rights reserved. This program and the accompanying materials\n\	32	All rights reserved. This program and the accompanying materials\n\
33	are made available under the terms of the Eclipse Public License v1.0\n\	33	are made available under the terms of the Eclipse Public License v1.0\n\
34	which accompanies this distribution, and is available at\n\	34	which accompanies this distribution, and is available at\n\

Lines 1-6 Link Here

(-)feature.xml (-3 / +3 lines)
1	<?xml version="1.0" encoding="UTF-8"?>	1	<?xml version="1.0" encoding="UTF-8"?>
2	<!--	2	<!--
3	Copyright (c) 2005, 2010 IBM Corporation and others.	3	Copyright (c) 2005, 2011 IBM Corporation and others.
4	All rights reserved. This program and the accompanying materials	4	All rights reserved. This program and the accompanying materials
5	are made available under the terms of the Eclipse Public License v1.0	5	are made available under the terms of the Eclipse Public License v1.0
6	which accompanies this distribution, and is available at	6	which accompanies this distribution, and is available at
Lines 30-37 Link Here
30	</license>	30	</license>
31		31
32	<url>	32	<url>
33	<update label="%tmUpdateSiteName" url="http://download.eclipse.org/dsdp/tm/updates/3.2"/>	33	<update label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/3.2"/>
34	<discovery label="%tmUpdateSiteName" url="http://download.eclipse.org/dsdp/tm/updates/3.2"/>	34	<discovery label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/3.2"/>
35	</url>	35	</url>
36		36
37	<includes	37	<includes

Lines 2-8 Link Here

(-)META-INF/MANIFEST.MF (-1 / +1 lines)
2	Bundle-ManifestVersion: 2	2	Bundle-ManifestVersion: 2
3	Bundle-Name: %pluginName	3	Bundle-Name: %pluginName
4	Bundle-SymbolicName: org.eclipse.rse.sdk	4	Bundle-SymbolicName: org.eclipse.rse.sdk
5	Bundle-Version: 3.2.0.qualifier	5	Bundle-Version: 3.2.2.qualifier
6	Bundle-Vendor: %providerName	6	Bundle-Vendor: %providerName
7	Bundle-Localization: plugin	7	Bundle-Localization: plugin
8	Bundle-RequiredExecutionEnvironment: J2SE-1.4	8	Bundle-RequiredExecutionEnvironment: J2SE-1.4

Lines 1-5 Link Here

(-)about.properties (-3 / +3 lines)
1	################################################################################	1	################################################################################
2	# Copyright (c) 2006, 2010 Wind River Systems, Inc and others.	2	# Copyright (c) 2006, 2011 Wind River Systems, Inc and others.
3	# All rights reserved. This program and the accompanying materials	3	# All rights reserved. This program and the accompanying materials
4	# are made available under the terms of the Eclipse Public License v1.0	4	# are made available under the terms of the Eclipse Public License v1.0
5	# which accompanies this distribution, and is available at	5	# which accompanies this distribution, and is available at
Lines 25-32 Link Here
25	Version: {featureVersion}\n\	25	Version: {featureVersion}\n\
26	Build id: {0}\n\	26	Build id: {0}\n\
27	\n\	27	\n\
28	(c) Copyright IBM Corporation and others 2000, 2010. All rights reserved.\n\	28	(c) Copyright IBM Corporation and others 2000, 2011. All rights reserved.\n\
29	Visit http://www.eclipse.org/dsdp/tm\n\	29	Visit http://www.eclipse.org/tm\n\
30	\n\	30	\n\
31	This product includes software developed by the\n\	31	This product includes software developed by the\n\
32	Apache Software Foundation http://www.apache.org/	32	Apache Software Foundation http://www.apache.org/

Lines 1-5 Link Here

(-)feature.properties (-2 / +2 lines)
1	###############################################################################	1	###############################################################################
2	# Copyright (c) 2006, 2010 IBM Corporation and others.	2	# Copyright (c) 2006, 2011 IBM Corporation and others.
3	# All rights reserved. This program and the accompanying materials	3	# All rights reserved. This program and the accompanying materials
4	# are made available under the terms of the Eclipse Public License v1.0	4	# are made available under the terms of the Eclipse Public License v1.0
5	# which accompanies this distribution, and is available at	5	# which accompanies this distribution, and is available at
Lines 28-34 Link Here
28		28
29	# "copyright" property - text of the "Feature Update Copyright"	29	# "copyright" property - text of the "Feature Update Copyright"
30	copyright=\	30	copyright=\
31	Copyright (c) 2000, 2010 IBM Corporation and others.\n\	31	Copyright (c) 2000, 2011 IBM Corporation and others.\n\
32	All rights reserved. This program and the accompanying materials\n\	32	All rights reserved. This program and the accompanying materials\n\
33	are made available under the terms of the Eclipse Public License v1.0\n\	33	are made available under the terms of the Eclipse Public License v1.0\n\
34	which accompanies this distribution, and is available at\n\	34	which accompanies this distribution, and is available at\n\

Lines 1-6 Link Here

(-)feature.xml (-3 / +3 lines)
1	<?xml version="1.0" encoding="UTF-8"?>	1	<?xml version="1.0" encoding="UTF-8"?>
2	<!--	2	<!--
3	Copyright (c) 2005, 2010 IBM Corporation and others.	3	Copyright (c) 2005, 2011 IBM Corporation and others.
4	All rights reserved. This program and the accompanying materials	4	All rights reserved. This program and the accompanying materials
5	are made available under the terms of the Eclipse Public License v1.0	5	are made available under the terms of the Eclipse Public License v1.0
6	which accompanies this distribution, and is available at	6	which accompanies this distribution, and is available at
Lines 29-36 Link Here
29	</license>	29	</license>
30		30
31	<url>	31	<url>
32	<update label="%tmUpdateSiteName" url="http://download.eclipse.org/dsdp/tm/updates/3.2"/>	32	<update label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/3.2"/>
33	<discovery label="%tmUpdateSiteName" url="http://download.eclipse.org/dsdp/tm/updates/3.2"/>	33	<discovery label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/3.2"/>
34	</url>	34	</url>
35		35
36	<includes	36	<includes

Lines 1-5 Link Here

(-)feature.properties (-2 / +2 lines)
1	################################################################################	1	################################################################################
2	# Copyright (c) 2006, 2010 Wind River Systems, Inc. and others.	2	# Copyright (c) 2006, 2011 Wind River Systems, Inc. and others.
3	# All rights reserved. This program and the accompanying materials	3	# All rights reserved. This program and the accompanying materials
4	# are made available under the terms of the Eclipse Public License v1.0	4	# are made available under the terms of the Eclipse Public License v1.0
5	# which accompanies this distribution, and is available at	5	# which accompanies this distribution, and is available at
Lines 26-32 Link Here
26		26
27	# "copyright" property - text of the "Feature Update Copyright"	27	# "copyright" property - text of the "Feature Update Copyright"
28	copyright=\	28	copyright=\
29	Copyright (c) 2002, 2010 MontaVista Software, Inc. and others.\n\	29	Copyright (c) 2002, 2011 MontaVista Software, Inc. and others.\n\
30	All rights reserved. This program and the accompanying materials\n\	30	All rights reserved. This program and the accompanying materials\n\
31	are made available under the terms of the Eclipse Public License v1.0\n\	31	are made available under the terms of the Eclipse Public License v1.0\n\
32	which accompanies this distribution, and is available at\n\	32	which accompanies this distribution, and is available at\n\




<?xml version="1.0" encoding="UTF-8"?>
<!--
     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

<feature
      id="org.eclipse.rse.terminals"
      label="%featureName"
      version="1.0.102.qualifier"
      provider-name="%providerName"
      plugin="org.eclipse.rse.terminals.ui"
      image="eclipse_update_120.jpg">

   </license>

   <url>
      <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

Lines 1-5 Link Here

(-)sourceTemplateFeature/feature.properties (-2 / +2 lines)
1	################################################################################	1	################################################################################
2	# Copyright (c) 2006, 2010 Wind River Systems, Inc. and others.	2	# Copyright (c) 2006, 2011 Wind River Systems, Inc. and others.
3	# All rights reserved. This program and the accompanying materials	3	# All rights reserved. This program and the accompanying materials
4	# are made available under the terms of the Eclipse Public License v1.0	4	# are made available under the terms of the Eclipse Public License v1.0
5	# which accompanies this distribution, and is available at	5	# which accompanies this distribution, and is available at
Lines 32-38 Link Here
32		32
33	# "copyright" property - text of the "Feature Update Copyright"	33	# "copyright" property - text of the "Feature Update Copyright"
34	copyright=\	34	copyright=\
35	Copyright (c) 2002, 2010 MontaVista Software, Inc. and others.\n\	35	Copyright (c) 2002, 2011 MontaVista Software, Inc. and others.\n\
36	All rights reserved. This program and the accompanying materials\n\	36	All rights reserved. This program and the accompanying materials\n\
37	are made available under the terms of the Eclipse Public License v1.0\n\	37	are made available under the terms of the Eclipse Public License v1.0\n\
38	which accompanies this distribution, and is available at\n\	38	which accompanies this distribution, and is available at\n\

Lines 1-5 Link Here

(-)sourceTemplatePlugin/about.properties (-3 / +3 lines)
1	################################################################################	1	################################################################################
2	# Copyright (c) 2006, 2010 Wind River Systems, Inc. and others.	2	# Copyright (c) 2006, 2011 Wind River Systems, Inc. and others.
3	# All rights reserved. This program and the accompanying materials	3	# All rights reserved. This program and the accompanying materials
4	# are made available under the terms of the Eclipse Public License v1.0	4	# are made available under the terms of the Eclipse Public License v1.0
5	# which accompanies this distribution, and is available at	5	# which accompanies this distribution, and is available at
Lines 25-29 Link Here
25	Version: {featureVersion}\n\	25	Version: {featureVersion}\n\
26	Build id: {0}\n\	26	Build id: {0}\n\
27	\n\	27	\n\
28	(c) Copyright MontaVista Software, Inc. and others 2002, 2010. All rights reserved.\n\	28	(c) Copyright MontaVista Software, Inc. and others 2002, 2011. All rights reserved.\n\
29	Visit http://www.eclipse.org/dsdp/tm	29	Visit http://www.eclipse.org/tm

Lines 2-8 Link Here

(-)META-INF/MANIFEST.MF (-1 / +1 lines)
2	Bundle-ManifestVersion: 2	2	Bundle-ManifestVersion: 2
3	Bundle-Name: %pluginName	3	Bundle-Name: %pluginName
4	Bundle-SymbolicName: org.eclipse.tm.terminal; singleton:=true	4	Bundle-SymbolicName: org.eclipse.tm.terminal; singleton:=true
5	Bundle-Version: 3.0.101.qualifier	5	Bundle-Version: 3.0.102.qualifier
6	Bundle-Activator: org.eclipse.tm.internal.terminal.control.impl.TerminalPlugin	6	Bundle-Activator: org.eclipse.tm.internal.terminal.control.impl.TerminalPlugin
7	Bundle-Vendor: %providerName	7	Bundle-Vendor: %providerName
8	Bundle-Localization: plugin	8	Bundle-Localization: plugin

Lines 1-5 Link Here

(-)about.properties (-3 / +3 lines)
1	################################################################################	1	################################################################################
2	# Copyright (c) 2006, 2009 Wind River Systems, Inc. and others.	2	# Copyright (c) 2006, 2011 Wind River Systems, Inc. and others.
3	# All rights reserved. This program and the accompanying materials	3	# All rights reserved. This program and the accompanying materials
4	# are made available under the terms of the Eclipse Public License v1.0	4	# are made available under the terms of the Eclipse Public License v1.0
5	# which accompanies this distribution, and is available at	5	# which accompanies this distribution, and is available at
Lines 21-25 Link Here
21	Version: {featureVersion}\n\	21	Version: {featureVersion}\n\
22	Build id: {0}\n\	22	Build id: {0}\n\
23	\n\	23	\n\
24	(c) Copyright Wind River Systems, Inc. and others 2003, 2009. All rights reserved.\n\	24	(c) Copyright Wind River Systems, Inc. and others 2003, 2011. All rights reserved.\n\
25	Visit http://www.eclipse.org/dsdp/tm	25	Visit http://www.eclipse.org/tm




/*******************************************************************************
 * 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

 * 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;


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;

	 * @see org.eclipse.tm.internal.terminal.provisional.api.ITerminalControl#copy()
	 */
	public void 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() {
		paste(DND.CLIPBOARD);
		String strText = (String) fClipboard.getContents(textTransfer);
		pasteString(strText);
// TODO paste in another thread.... to avoid blocking
//		new Thread() {
//			public void run() {

//		}.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
	 */

				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);

Lines 29-35 Link Here

(-)feature.properties (-1 / +1 lines)
29		29
30	# "copyright" property - text of the "Feature Update Copyright"	30	# "copyright" property - text of the "Feature Update Copyright"
31	copyright=\	31	copyright=\
32	Copyright (c) 2003, 2010 Wind River Systems, Inc. and others.\n\	32	Copyright (c) 2003, 2011 Wind River Systems, Inc. and others.\n\
33	All rights reserved. This program and the accompanying materials\n\	33	All rights reserved. This program and the accompanying materials\n\
34	are made available under the terms of the Eclipse Public License v1.0\n\	34	are made available under the terms of the Eclipse Public License v1.0\n\
35	which accompanies this distribution, and is available at\n\	35	which accompanies this distribution, and is available at\n\

Lines 13-19 Link Here

(-)feature.xml (-3 / +3 lines)
13	<feature	13	<feature
14	id="org.eclipse.tm.terminal"	14	id="org.eclipse.tm.terminal"
15	label="%featureName"	15	label="%featureName"
16	version="3.0.201.qualifier"	16	version="3.0.202.qualifier"
17	provider-name="%providerName">	17	provider-name="%providerName">
18		18
19	<description>	19	<description>
Lines 29-36 Link Here
29	</license>	29	</license>
30		30
31	<url>	31	<url>
32	<update label="%tmUpdateSiteName" url="http://download.eclipse.org/dsdp/tm/updates/3.2"/>	32	<update label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/3.2"/>
33	<discovery label="%tmUpdateSiteName" url="http://download.eclipse.org/dsdp/tm/updates/3.2"/>	33	<discovery label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/3.2"/>
34	</url>	34	</url>
35		35
36	<requires>	36	<requires>

Lines 1-5 Link Here

(-)sourceTemplateFeature/feature.properties (-2 / +2 lines)
1	###############################################################################	1	###############################################################################
2	# Copyright (c) 2006, 2010 Wind River Systems, Inc. and others.	2	# Copyright (c) 2006, 2011 Wind River Systems, Inc. and others.
3	# All rights reserved. This program and the accompanying materials	3	# All rights reserved. This program and the accompanying materials
4	# are made available under the terms of the Eclipse Public License v1.0	4	# are made available under the terms of the Eclipse Public License v1.0
5	# which accompanies this distribution, and is available at	5	# which accompanies this distribution, and is available at
Lines 28-34 Link Here
28		28
29	# "copyright" property - text of the "Feature Update Copyright"	29	# "copyright" property - text of the "Feature Update Copyright"
30	copyright=\	30	copyright=\
31	Copyright (c) 2003, 2010 Wind River Systems, Inc. and others.\n\	31	Copyright (c) 2003, 2011 Wind River Systems, Inc. and others.\n\
32	All rights reserved. This program and the accompanying materials\n\	32	All rights reserved. This program and the accompanying materials\n\
33	are made available under the terms of the Eclipse Public License v1.0\n\	33	are made available under the terms of the Eclipse Public License v1.0\n\
34	which accompanies this distribution, and is available at\n\	34	which accompanies this distribution, and is available at\n\

Lines 1-5 Link Here

(-)sourceTemplatePlugin/about.properties (-3 / +3 lines)
1	################################################################################	1	################################################################################
2	# Copyright (c) 2006, 2009 Wind River Systems, Inc. and others.	2	# Copyright (c) 2006, 2011 Wind River Systems, Inc. and others.
3	# All rights reserved. This program and the accompanying materials	3	# All rights reserved. This program and the accompanying materials
4	# are made available under the terms of the Eclipse Public License v1.0	4	# are made available under the terms of the Eclipse Public License v1.0
5	# which accompanies this distribution, and is available at	5	# which accompanies this distribution, and is available at
Lines 21-25 Link Here
21	Version: {featureVersion}\n\	21	Version: {featureVersion}\n\
22	Build id: {0}\n\	22	Build id: {0}\n\
23	\n\	23	\n\
24	(c) Copyright Wind River Systems, Inc. and others 2003, 2009. All rights reserved.\n\	24	(c) Copyright Wind River Systems, Inc. and others 2003, 2011. All rights reserved.\n\
25	Visit http://www.eclipse.org/dsdp/tm	25	Visit http://www.eclipse.org/tm

Lines 1-5 Link Here

(-)feature.properties (-2 / +2 lines)
1	####################################################################################################	1	####################################################################################################
2	# Copyright (c) 2008, 2010 Mirko Raner and others.	2	# Copyright (c) 2008, 2011 Mirko Raner and others.
3	# All rights reserved. This program and the accompanying materials	3	# All rights reserved. This program and the accompanying materials
4	# are made available under the terms of the Eclipse Public License v1.0	4	# are made available under the terms of the Eclipse Public License v1.0
5	# which accompanies this distribution, and is available at	5	# which accompanies this distribution, and is available at
Lines 31-37 Link Here
31		31
32	# "copyright" property - text of the "Feature Update Copyright"	32	# "copyright" property - text of the "Feature Update Copyright"
33	copyright=\	33	copyright=\
34	Copyright (c) 2008, 2010 Mirko Raner and others.\n\	34	Copyright (c) 2008, 2011 Mirko Raner and others.\n\
35	All rights reserved. This program and the accompanying materials\n\	35	All rights reserved. This program and the accompanying materials\n\
36	are made available under the terms of the Eclipse Public License v1.0\n\	36	are made available under the terms of the Eclipse Public License v1.0\n\
37	which accompanies this distribution, and is available at\n\	37	which accompanies this distribution, and is available at\n\

Lines 1-6 Link Here

(-)feature.xml (-3 / +3 lines)
1	<?xml version="1.0" encoding="UTF-8"?>	1	<?xml version="1.0" encoding="UTF-8"?>
2	<!--	2	<!--
3	Copyright (c) 2008, 2010 Mirko Raner and others	3	Copyright (c) 2008, 2011 Mirko Raner and others
4	All rights reserved. This program and the accompanying materials	4	All rights reserved. This program and the accompanying materials
5	are made available under the terms of the Eclipse Public License v1.0	5	are made available under the terms of the Eclipse Public License v1.0
6	which accompanies this distribution, and is available at	6	which accompanies this distribution, and is available at
Lines 30-37 Link Here
30	</license>	30	</license>
31		31
32	<url>	32	<url>
33	<update label="%tmUpdateSiteName" url="http://download.eclipse.org/dsdp/tm/updates/3.2"/>	33	<update label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/3.2"/>
34	<discovery label="%tmUpdateSiteName" url="http://download.eclipse.org/dsdp/tm/updates/3.2"/>	34	<discovery label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/3.2"/>
35	</url>	35	</url>
36		36
37	<includes	37	<includes

Lines 1-5 Link Here

(-)feature.properties (-2 / +2 lines)
1	###############################################################################	1	###############################################################################
2	# Copyright (c) 2006, 2010 Wind River Systems, Inc. and others.	2	# Copyright (c) 2006, 2011 Wind River Systems, Inc. and others.
3	# All rights reserved. This program and the accompanying materials	3	# All rights reserved. This program and the accompanying materials
4	# are made available under the terms of the Eclipse Public License v1.0	4	# are made available under the terms of the Eclipse Public License v1.0
5	# which accompanies this distribution, and is available at	5	# which accompanies this distribution, and is available at
Lines 29-35 Link Here
29		29
30	# "copyright" property - text of the "Feature Update Copyright"	30	# "copyright" property - text of the "Feature Update Copyright"
31	copyright=\	31	copyright=\
32	Copyright (c) 2003, 2010 Wind River Systems, Inc. and others.\n\	32	Copyright (c) 2003, 2011 Wind River Systems, Inc. and others.\n\
33	All rights reserved. This program and the accompanying materials\n\	33	All rights reserved. This program and the accompanying materials\n\
34	are made available under the terms of the Eclipse Public License v1.0\n\	34	are made available under the terms of the Eclipse Public License v1.0\n\
35	which accompanies this distribution, and is available at\n\	35	which accompanies this distribution, and is available at\n\

Lines 1-6 Link Here

(-)feature.xml (-3 / +3 lines)
1	<?xml version="1.0" encoding="UTF-8"?>	1	<?xml version="1.0" encoding="UTF-8"?>
2	<!--	2	<!--
3	Copyright (c) 2006, 2010 Wind River Systems, Inc. and others.	3	Copyright (c) 2006, 2011 Wind River Systems, Inc. and others.
4	All rights reserved. This program and the accompanying materials	4	All rights reserved. This program and the accompanying materials
5	are made available under the terms of the Eclipse Public License v1.0	5	are made available under the terms of the Eclipse Public License v1.0
6	which accompanies this distribution, and is available at	6	which accompanies this distribution, and is available at
Lines 30-37 Link Here
30	</license>	30	</license>
31		31
32	<url>	32	<url>
33	<update label="%tmUpdateSiteName" url="http://download.eclipse.org/dsdp/tm/updates/3.2"/>	33	<update label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/3.2"/>
34	<discovery label="%tmUpdateSiteName" url="http://download.eclipse.org/dsdp/tm/updates/3.2"/>	34	<discovery label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/3.2"/>
35	</url>	35	</url>
36		36
37	<includes	37	<includes

Lines 2-8 Link Here

(-)META-INF/MANIFEST.MF (-1 / +1 lines)
2	Bundle-ManifestVersion: 2	2	Bundle-ManifestVersion: 2
3	Bundle-Name: %pluginName	3	Bundle-Name: %pluginName
4	Bundle-SymbolicName: org.eclipse.tm.terminal.view;singleton:=true	4	Bundle-SymbolicName: org.eclipse.tm.terminal.view;singleton:=true
5	Bundle-Version: 2.1.1.qualifier	5	Bundle-Version: 2.1.2.qualifier
6	Bundle-Activator: org.eclipse.tm.internal.terminal.view.TerminalViewPlugin	6	Bundle-Activator: org.eclipse.tm.internal.terminal.view.TerminalViewPlugin
7	Bundle-Localization: plugin	7	Bundle-Localization: plugin
8	Require-Bundle: org.eclipse.ui,	8	Require-Bundle: org.eclipse.ui,

Lines 1-5 Link Here

(-)about.properties (-3 / +3 lines)
1	################################################################################	1	################################################################################
2	# Copyright (c) 2006, 2010 Wind River Systems, Inc. and others.	2	# Copyright (c) 2006, 2011 Wind River Systems, Inc. and others.
3	# All rights reserved. This program and the accompanying materials	3	# All rights reserved. This program and the accompanying materials
4	# are made available under the terms of the Eclipse Public License v1.0	4	# are made available under the terms of the Eclipse Public License v1.0
5	# which accompanies this distribution, and is available at	5	# which accompanies this distribution, and is available at
Lines 21-25 Link Here
21	Version: {featureVersion}\n\	21	Version: {featureVersion}\n\
22	Build id: {0}\n\	22	Build id: {0}\n\
23	\n\	23	\n\
24	(c) Copyright Wind River Systems, Inc. and others 2003, 2010. All rights reserved.\n\	24	(c) Copyright Wind River Systems, Inc. and others 2003, 2011. All rights reserved.\n\
25	Visit http://www.eclipse.org/dsdp/tm	25	Visit http://www.eclipse.org/tm

Lines 1-5 Link Here

(-)src/org/eclipse/tm/internal/terminal/view/TerminalViewConnection.java (-8 / +18 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2008, 2009 Wind River Systems, Inc. and others.	2	* Copyright (c) 2008, 2011 Wind River Systems, Inc. and others.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 9-21 Link Here
9	* Michael Scharf (Wind River) - initial API and implementation	9	* Michael Scharf (Wind River) - initial API and implementation
10	* Michael Scharf (Wind River) - [240097] Allow paste with the middle mouse button	10	* Michael Scharf (Wind River) - [240097] Allow paste with the middle mouse button
11	* Michael Scharf (Wind River) - [262996] get rid of TerminalState.OPENED	11	* Michael Scharf (Wind River) - [262996] get rid of TerminalState.OPENED
		12	* Anton Leherbauer (Wind River) - [335021] Middle mouse button copy/paste does not work with the terminal
12	*******************************************************************************/	13	*******************************************************************************/
13	/**
14	*
15	*/
16	package org.eclipse.tm.internal.terminal.view;	14	package org.eclipse.tm.internal.terminal.view;
17		15
18	import org.eclipse.jface.resource.ImageDescriptor;	16	import org.eclipse.jface.resource.ImageDescriptor;
		17	import org.eclipse.swt.dnd.Clipboard;
		18	import org.eclipse.swt.dnd.DND;
		19	import org.eclipse.swt.dnd.TextTransfer;
19	import org.eclipse.swt.events.MouseAdapter;	20	import org.eclipse.swt.events.MouseAdapter;
20	import org.eclipse.swt.events.MouseEvent;	21	import org.eclipse.swt.events.MouseEvent;
21	import org.eclipse.tm.internal.terminal.control.CommandInputFieldWithHistory;	22	import org.eclipse.tm.internal.terminal.control.CommandInputFieldWithHistory;
Lines 46-56 Link Here
46	public TerminalViewConnection(ITerminalViewControl ctl) {	47	public TerminalViewConnection(ITerminalViewControl ctl) {
47	fCtlTerminal = ctl;	48	fCtlTerminal = ctl;
48	fCtlTerminal.getControl().addMouseListener(new MouseAdapter(){	49	fCtlTerminal.getControl().addMouseListener(new MouseAdapter(){
49	public void mouseUp(MouseEvent e) {	50	public void mouseDown(MouseEvent e) {
50	// paste when the middle button is clicked	51	// paste when the middle button is clicked
51	if(e.button==2) // middle button	52	if (e.button == 2) { // middle button
52	fCtlTerminal.paste();	53	int clipboardType = DND.SELECTION_CLIPBOARD;
53	}});	54	Clipboard clipboard = fCtlTerminal.getClipboard();
		55	if (clipboard.getAvailableTypes(clipboardType).length == 0)
		56	// use normal clipboard if selection clipboard is not available
		57	clipboardType = DND.CLIPBOARD;
		58	String text = (String) clipboard.getContents(TextTransfer.getInstance(), clipboardType);
		59	if (text != null && text.length() > 0)
		60	fCtlTerminal.pasteString(text);
		61	}
		62	}
		63	});
54	}	64	}
55		65
56	/* (non-Javadoc)	66	/* (non-Javadoc)

Lines 1-5 Link Here

(-)feature.properties (-2 / +2 lines)
1	###############################################################################	1	###############################################################################
2	# Copyright (c) 2006, 2010 Wind River Systems, Inc. and others.	2	# Copyright (c) 2006, 2011 Wind River Systems, Inc. and others.
3	# All rights reserved. This program and the accompanying materials	3	# All rights reserved. This program and the accompanying materials
4	# are made available under the terms of the Eclipse Public License v1.0	4	# are made available under the terms of the Eclipse Public License v1.0
5	# which accompanies this distribution, and is available at	5	# which accompanies this distribution, and is available at
Lines 28-34 Link Here
28		28
29	# "copyright" property - text of the "Feature Update Copyright"	29	# "copyright" property - text of the "Feature Update Copyright"
30	copyright=\	30	copyright=\
31	Copyright (c) 2003, 2010 Wind River Systems, Inc. and others.\n\	31	Copyright (c) 2003, 2011 Wind River Systems, Inc. and others.\n\
32	All rights reserved. This program and the accompanying materials\n\	32	All rights reserved. This program and the accompanying materials\n\
33	are made available under the terms of the Eclipse Public License v1.0\n\	33	are made available under the terms of the Eclipse Public License v1.0\n\
34	which accompanies this distribution, and is available at\n\	34	which accompanies this distribution, and is available at\n\




<?xml version="1.0" encoding="UTF-8"?>
<!--
     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

<feature
      id="org.eclipse.tm.terminal.view"
      label="%featureName"
      version="2.1.2.qualifier"
      provider-name="%providerName">

   <description>

   </license>

   <url>
      <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>

Lines 1-5 Link Here

(-)sourceTemplateFeature/feature.properties (-2 / +2 lines)
1	###############################################################################	1	###############################################################################
2	# Copyright (c) 2006, 2010 Wind River Systems, Inc. and others.	2	# Copyright (c) 2006, 2011 Wind River Systems, Inc. and others.
3	# All rights reserved. This program and the accompanying materials	3	# All rights reserved. This program and the accompanying materials
4	# are made available under the terms of the Eclipse Public License v1.0	4	# are made available under the terms of the Eclipse Public License v1.0
5	# which accompanies this distribution, and is available at	5	# which accompanies this distribution, and is available at
Lines 28-34 Link Here
28		28
29	# "copyright" property - text of the "Feature Update Copyright"	29	# "copyright" property - text of the "Feature Update Copyright"
30	copyright=\	30	copyright=\
31	Copyright (c) 2003, 2010 Wind River Systems, Inc. and others.\n\	31	Copyright (c) 2003, 2011 Wind River Systems, Inc. and others.\n\
32	All rights reserved. This program and the accompanying materials\n\	32	All rights reserved. This program and the accompanying materials\n\
33	are made available under the terms of the Eclipse Public License v1.0\n\	33	are made available under the terms of the Eclipse Public License v1.0\n\
34	which accompanies this distribution, and is available at\n\	34	which accompanies this distribution, and is available at\n\

Lines 1-5 Link Here

(-)sourceTemplatePlugin/about.properties (-3 / +3 lines)
1	################################################################################	1	################################################################################
2	# Copyright (c) 2006, 2009 Wind River Systems, Inc. and others.	2	# Copyright (c) 2006, 2011 Wind River Systems, Inc. and others.
3	# All rights reserved. This program and the accompanying materials	3	# All rights reserved. This program and the accompanying materials
4	# are made available under the terms of the Eclipse Public License v1.0	4	# are made available under the terms of the Eclipse Public License v1.0
5	# which accompanies this distribution, and is available at	5	# which accompanies this distribution, and is available at
Lines 21-25 Link Here
21	Version: {featureVersion}\n\	21	Version: {featureVersion}\n\
22	Build id: {0}\n\	22	Build id: {0}\n\
23	\n\	23	\n\
24	(c) Copyright Wind River Systems, Inc. and others 2003, 2009. All rights reserved.\n\	24	(c) Copyright Wind River Systems, Inc. and others 2003, 2011. All rights reserved.\n\
25	Visit http://www.eclipse.org/dsdp/tm	25	Visit http://www.eclipse.org/tm

Return to bug 335408

Lines 1-6 Link Here

(-)feature.xml (-4 / +4 lines)
1	<?xml version="1.0" encoding="UTF-8"?>	1	<?xml version="1.0" encoding="UTF-8"?>
2	<!--	2	<!--
3	Copyright (c) 2005, 2010 IBM Corporation and others.	3	Copyright (c) 2005, 2011 IBM Corporation and others.
4	All rights reserved. This program and the accompanying materials	4	All rights reserved. This program and the accompanying materials
5	are made available under the terms of the Eclipse Public License v1.0	5	are made available under the terms of the Eclipse Public License v1.0
6	which accompanies this distribution, and is available at	6	which accompanies this distribution, and is available at
Lines 12-18 Link Here
12	<feature	12	<feature
13	id="org.eclipse.rse.terminals"	13	id="org.eclipse.rse.terminals"
14	label="%featureName"	14	label="%featureName"
15	version="1.0.101.qualifier"	15	version="1.0.102.qualifier"
16	provider-name="%providerName"	16	provider-name="%providerName"
17	plugin="org.eclipse.rse.terminals.ui"	17	plugin="org.eclipse.rse.terminals.ui"
18	image="eclipse_update_120.jpg">	18	image="eclipse_update_120.jpg">
Lines 30-37 Link Here
30	</license>	30	</license>
31		31
32	<url>	32	<url>
33	<update label="%tmUpdateSiteName" url="http://download.eclipse.org/dsdp/tm/updates/3.2"/>	33	<update label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/3.2"/>
34	<discovery label="%tmUpdateSiteName" url="http://download.eclipse.org/dsdp/tm/updates/3.2"/>	34	<discovery label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/3.2"/>
35	</url>	35	</url>
36		36
37	<includes	37	<includes