diff --git a/plugins/org.eclipse.tm.terminal.serial/.classpath b/plugins/org.eclipse.tm.terminal.serial/.classpath
deleted file mode 100644
index ad32c83a788..00000000000
--- a/plugins/org.eclipse.tm.terminal.serial/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.tm.terminal.serial/.cvsignore b/plugins/org.eclipse.tm.terminal.serial/.cvsignore
deleted file mode 100644
index ba077a4031a..00000000000
--- a/plugins/org.eclipse.tm.terminal.serial/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-bin
diff --git a/plugins/org.eclipse.tm.terminal.serial/.gitignore b/plugins/org.eclipse.tm.terminal.serial/.gitignore
deleted file mode 100644
index ae3c1726048..00000000000
--- a/plugins/org.eclipse.tm.terminal.serial/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/bin/
diff --git a/plugins/org.eclipse.tm.terminal.serial/.project b/plugins/org.eclipse.tm.terminal.serial/.project
deleted file mode 100644
index a06d0caecb3..00000000000
--- a/plugins/org.eclipse.tm.terminal.serial/.project
+++ /dev/null
@@ -1,34 +0,0 @@
-
-
- org.eclipse.tm.terminal.serial
-
-
-
-
-
- org.eclipse.jdt.core.javabuilder
-
-
-
-
- org.eclipse.pde.ManifestBuilder
-
-
-
-
- org.eclipse.pde.SchemaBuilder
-
-
-
-
- org.eclipse.pde.api.tools.apiAnalysisBuilder
-
-
-
-
-
- org.eclipse.pde.PluginNature
- org.eclipse.jdt.core.javanature
- org.eclipse.pde.api.tools.apiAnalysisNature
-
-
diff --git a/plugins/org.eclipse.tm.terminal.serial/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.tm.terminal.serial/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 94637dfe13b..00000000000
--- a/plugins/org.eclipse.tm.terminal.serial/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,61 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.autoboxing=warning
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=enabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning
-org.eclipse.jdt.core.compiler.problem.fieldHiding=warning
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
-org.eclipse.jdt.core.compiler.problem.nullReference=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=error
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.6
diff --git a/plugins/org.eclipse.tm.terminal.serial/META-INF/MANIFEST.MF b/plugins/org.eclipse.tm.terminal.serial/META-INF/MANIFEST.MF
deleted file mode 100644
index b915b0ce4e5..00000000000
--- a/plugins/org.eclipse.tm.terminal.serial/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,18 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.tm.terminal.serial;singleton:=true
-Bundle-Version: 4.0.0.qualifier
-Bundle-Localization: plugin
-Import-Package: gnu.io;resolution:=optional
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.tm.terminal;bundle-version="3.3.0"
-Bundle-ActivationPolicy: lazy
-Eclipse-LazyStart: true
-Eclipse-BuddyPolicy: ext
-Bundle-Vendor: %providerName
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Bundle-ClassPath: .
-Bundle-Activator: org.eclipse.tm.internal.terminal.serial.Activator
-Export-Package: org.eclipse.tm.internal.terminal.serial;x-internal:=true
diff --git a/plugins/org.eclipse.tm.terminal.serial/README.txt b/plugins/org.eclipse.tm.terminal.serial/README.txt
deleted file mode 100644
index f06224544a0..00000000000
--- a/plugins/org.eclipse.tm.terminal.serial/README.txt
+++ /dev/null
@@ -1,64 +0,0 @@
-Important note:
----------------
-This README is for terminal.serial version 1.0.0 and later, corresponding
-to RSE downloads after 2.0M4. Instructions for previous versions (using
-Sun javacomm / javax.comm package instead of gnu.io) are still available from
-http://dev.eclipse.org/viewcvs/index.cgi/org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.serial/README.txt?root=Tools_Project&view=markup&pathrev=R1_0_1
-
-
-Prerequisites:
---------------
-In order to compile and run this plugin, RXTX has to be installed.
-There are two options: Either installing RXTX as an Eclipse plugin,
-or installing RXTX as a JVM extension. For installation as plugin,
-you can download a ZIP archive or use the Update Manager; if an
-Eclipse plugin is not available for your Platform, you'll need
-to install RXTX into the JVM (option B, below).
-
-In either case, once RXTX is installed, you'll need to quit and
-re-start Eclipse PDE in order to recompute the classpath.
-
-
-Option A.1: Installation as an Eclipse Plugin via Update Manager:
------------------------------------------------------------------
-* In Eclipse, choose Help > Software Updates...
- - Add New Remote Site:
- Name = RXTX
- URL = http://rxtx.qbang.org/eclipse/
- - Finish, select proper version, Install All
-
-
-Option A.2: Installation as an Eclipse Plugin via Download:
------------------------------------------------------------
-* Download RXTX SDK or Runtime ZIP from
- http://rxtx.qbang.org/eclipse/downloads/
- and extract it into your Eclipse installation. The download
- link mentioned also has a README with version and licensing
- information.
-
-
-Option B: Installation as a JVM Extension:
-------------------------------------------
-* Get RXTX binaries from
- ftp://ftp.qbang.org/pub/rxtx/rxtx-2.1-7-bins-r2.zip
-* Copy RXTXcomm.jar into $JRE/lib/ext
-* Copy the native libs for your Platform (*.so, *.jnilib, *.dll)
- into the respective native lib folder of your RSE
-* More installation instructions are at
- http://rxtx.qbang.org/wiki/index.php/Main_Page
-* More downloads for other platforms (currently about 30)
- are available from the "ToyBox" link on
- http://users.frii.com/jarvi/rxtx/download.html
-
-
-For help, contact the RXTX mailing list available via the
-RXTX website at http://www.rxtx.org or see the notes on
-https://bugs.eclipse.org/bugs/show_bug.cgi?id=175336
-
-
-Changelog:
-----------
-2.0.1 - Revised Update Site text to comply with P2 in Eclipse 3.4
-1.0.1 - Added options for installing RXTX as an Eclipse Plugin
-0.9.100 - switched from Sun javax.comm to rxtx gnu.io for serial support
-0.9.0 - first version
diff --git a/plugins/org.eclipse.tm.terminal.serial/about.html b/plugins/org.eclipse.tm.terminal.serial/about.html
deleted file mode 100644
index d4cc693f9f0..00000000000
--- a/plugins/org.eclipse.tm.terminal.serial/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-
-
-
-
-About
-
-
-About This Content
-
-June 5, 2007
-License
-
-The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available
-at http://www.eclipse.org/legal/epl-v10.html.
-For purposes of the EPL, "Program" will mean the Content.
-
-If you did not receive this Content directly from the Eclipse Foundation, the Content is
-being redistributed by another party ("Redistributor") and different terms and conditions may
-apply to your use of any object code in the Content. Check the Redistributor's license that was
-provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at http://www.eclipse.org.
-
-
-
\ No newline at end of file
diff --git a/plugins/org.eclipse.tm.terminal.serial/about.ini b/plugins/org.eclipse.tm.terminal.serial/about.ini
deleted file mode 100644
index 3adc27ab587..00000000000
--- a/plugins/org.eclipse.tm.terminal.serial/about.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# about.ini
-# contains information about a feature
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# "%key" are externalized strings defined in about.properties
-# This file does not need to be translated.
-
-# Property "aboutText" contains blurb for "About" dialog (translated)
-aboutText=%blurb
-
-# Property "windowImage" contains path to window icon (16x16)
-# needed for primary features only
-
-# Property "featureImage" contains path to feature image (32x32)
-featureImage=tm32.png
-
-# Property "aboutImage" contains path to product image (500x330 or 115x164)
-# needed for primary features only
-
-# Property "appName" contains name of the application (not translated)
-# needed for primary features only
-
-# Property "welcomePage" contains path to welcome page (special XML-based format)
-# optional
-
-# Property "welcomePerspective" contains the id of the perspective in which the
-# welcome page is to be opened.
-# optional
\ No newline at end of file
diff --git a/plugins/org.eclipse.tm.terminal.serial/about.properties b/plugins/org.eclipse.tm.terminal.serial/about.properties
deleted file mode 100644
index d3b0791fe45..00000000000
--- a/plugins/org.eclipse.tm.terminal.serial/about.properties
+++ /dev/null
@@ -1,24 +0,0 @@
-################################################################################
-# Copyright (c) 2006, 2015 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
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# Martin Oberhuber - initial API and implementation
-################################################################################
-# about.properties
-# contains externalized strings for about.ini
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# fill-ins are supplied by about.mappings
-# This file should be translated.
-#
-# Do not translate any values surrounded by {}
-
-blurb=Target Management Terminal Serial Connector\n\
-\n\
-Version: {featureVersion}\n\
-\n\
-(c) Copyright Wind River Systems, Inc. and others 2003, 2015. All rights reserved.\n\
-Visit http://www.eclipse.org/tm
diff --git a/plugins/org.eclipse.tm.terminal.serial/build.properties b/plugins/org.eclipse.tm.terminal.serial/build.properties
deleted file mode 100644
index 6da951b9f99..00000000000
--- a/plugins/org.eclipse.tm.terminal.serial/build.properties
+++ /dev/null
@@ -1,29 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2012 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
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Initial Contributors:
-# The following Wind River employees contributed to the Terminal component
-# that contains this file: Chris Thew, Fran Litterio, Stephen Lamb,
-# Helmut Haigermoser and Ted Williams.
-#
-# Contributors:
-# Michael Scharf (Wind River) - split into core, view and connector plugins
-# Martin Oberhuber (Wind River) - fixed copyright headers and beautified
-###############################################################################
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
- .,\
- plugin.xml,\
- plugin.properties,\
- README.txt,\
- about.html,\
- about.ini,\
- about.properties,\
- tm32.png
-src.includes = README.txt,\
- about.html
diff --git a/plugins/org.eclipse.tm.terminal.serial/plugin.properties b/plugins/org.eclipse.tm.terminal.serial/plugin.properties
deleted file mode 100644
index 9d225da7bd2..00000000000
--- a/plugins/org.eclipse.tm.terminal.serial/plugin.properties
+++ /dev/null
@@ -1,19 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2012 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
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Initial Contributors:
-# The following Wind River employees contributed to the Terminal component
-# that contains this file: Chris Thew, Fran Litterio, Stephen Lamb,
-# Helmut Haigermoser and Ted Williams.
-#
-# Contributors:
-# Michael Scharf (Wind River) - split into core, view and connector plugins
-# Martin Oberhuber (Wind River) - fixed copyright headers and beautified
-###############################################################################
-pluginName = Target Management Terminal Serial Connector
-providerName = Eclipse TM Project
-serialConnection = Serial
\ No newline at end of file
diff --git a/plugins/org.eclipse.tm.terminal.serial/plugin.xml b/plugins/org.eclipse.tm.terminal.serial/plugin.xml
deleted file mode 100644
index 9fe07138de0..00000000000
--- a/plugins/org.eclipse.tm.terminal.serial/plugin.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.tm.terminal.serial/pom.xml b/plugins/org.eclipse.tm.terminal.serial/pom.xml
deleted file mode 100644
index 3bec81721f1..00000000000
--- a/plugins/org.eclipse.tm.terminal.serial/pom.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
- 4.0.0
-
-
- org.eclipse.tm.terminal
- org.eclipse.tm.terminal.maven-build
- 4.0.0-SNAPSHOT
- ../../admin/pom-build.xml
-
-
- 4.0.0.qualifier
- org.eclipse.tm.terminal.serial
- eclipse-plugin
-
diff --git a/plugins/org.eclipse.tm.terminal.serial/src/org/eclipse/tm/internal/terminal/serial/Activator.java b/plugins/org.eclipse.tm.terminal.serial/src/org/eclipse/tm/internal/terminal/serial/Activator.java
deleted file mode 100644
index f758aa790e6..00000000000
--- a/plugins/org.eclipse.tm.terminal.serial/src/org/eclipse/tm/internal/terminal/serial/Activator.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2012 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Michael Scharf (Wind River) - initial API and implementation
- * Martin Oberhuber (Wind River) - fixed copyright headers and beautified
- *******************************************************************************/
-package org.eclipse.tm.internal.terminal.serial;
-
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class Activator extends AbstractUIPlugin {
-
- // The plug-in ID
- public static final String PLUGIN_ID = "org.eclipse.tm.terminal.serial"; //$NON-NLS-1$
-
- // The shared instance
- private static Activator plugin;
-
- /**
- * The constructor
- */
- public Activator() {
- plugin = this;
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
- */
- public void start(BundleContext context) throws Exception {
- super.start(context);
- String prop = System.getProperty("gnu.io.rxtx.NoVersionOutput"); //$NON-NLS-1$
- if (prop==null) {
- System.setProperty("gnu.io.rxtx.NoVersionOutput", "true"); //$NON-NLS-1$ //$NON-NLS-2$
- }
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
- */
- public void stop(BundleContext context) throws Exception {
- plugin = null;
- super.stop(context);
- }
-
- /**
- * Returns the shared instance
- *
- * @return the shared instance
- */
- public static Activator getDefault() {
- return plugin;
- }
-
-}
diff --git a/plugins/org.eclipse.tm.terminal.serial/src/org/eclipse/tm/internal/terminal/serial/SerialMessages.java b/plugins/org.eclipse.tm.terminal.serial/src/org/eclipse/tm/internal/terminal/serial/SerialMessages.java
deleted file mode 100644
index 876af882e93..00000000000
--- a/plugins/org.eclipse.tm.terminal.serial/src/org/eclipse/tm/internal/terminal/serial/SerialMessages.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2012 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Initial Contributors:
- * The following Wind River employees contributed to the Terminal component
- * that contains this file: Chris Thew, Fran Litterio, Stephen Lamb,
- * Helmut Haigermoser and Ted Williams.
- *
- * Contributors:
- * Michael Scharf (Wind River) - split into core, view and connector plugins
- * Martin Oberhuber (Wind River) - fixed copyright headers and beautified
- * Martin Oberhuber (Wind River) - [221184] Redesign Serial Terminal Ownership Handling
- *******************************************************************************/
-package org.eclipse.tm.internal.terminal.serial;
-
-import org.eclipse.osgi.util.NLS;
-public class SerialMessages extends NLS {
- static {
- NLS.initializeMessages(SerialMessages.class.getName(), SerialMessages.class);
- }
- public static String PROP_TITLE;
- public static String PORT;
- public static String BAUDRATE;
- public static String DATABITS;
- public static String STOPBITS;
- public static String PARITY;
- public static String FLOWCONTROL;
- public static String TIMEOUT;
-
- public static String ERROR_LIBRARY_NOT_INSTALLED;
-
- public static String PORT_IN_USE;
- public static String ANOTHER_TERMINAL;
- public static String PORT_STOLEN;
- public static String PORT_NOT_STOLEN;
- public static String NO_SUCH_PORT;
-
- public static String OWNERSHIP_GRANTED;
-
-}
diff --git a/plugins/org.eclipse.tm.terminal.serial/src/org/eclipse/tm/internal/terminal/serial/SerialMessages.properties b/plugins/org.eclipse.tm.terminal.serial/src/org/eclipse/tm/internal/terminal/serial/SerialMessages.properties
deleted file mode 100644
index a599c1267bf..00000000000
--- a/plugins/org.eclipse.tm.terminal.serial/src/org/eclipse/tm/internal/terminal/serial/SerialMessages.properties
+++ /dev/null
@@ -1,49 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2012 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
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Initial Contributors:
-# The following Wind River employees contributed to the Terminal component
-# that contains this file: Chris Thew, Fran Litterio, Stephen Lamb,
-# Helmut Haigermoser and Ted Williams.
-#
-# Contributors:
-# Michael Scharf (Wind River) - split into core, view and connector plugins
-# Martin Oberhuber (Wind River) - fixed copyright headers and beautified
-# Martin Oberhuber (Wind River) - [168197] Replace JFace MessagDialog by SWT MessageBox
-# Martin Oberhuber (Wind River) - [221184] Redesign Serial Terminal Ownership Handling
-###############################################################################
-PROP_TITLE = Terminal
-PORT = Port
-BAUDRATE = Baud Rate
-DATABITS = Data Bits
-STOPBITS = Stop Bits
-PARITY = Parity
-FLOWCONTROL = Flow Control
-TIMEOUT = Timeout (sec)
-ERROR_LIBRARY_NOT_INSTALLED = The RXTX library has not been installed properly! \n\
-\n\
-Installation:\n\
--------------\n\
-* Either (a) Use Help > Software Updates, Add Site and install from:\n\
-\ \ \ http://rxtx.qbang.org/eclipse/\n\
-* Or (b) Download and install RXTX for Eclipse from:\n\
-\ \ \ http://rxtx.qbang.org/eclipse/downloads/\n\
-\n\
-For other Platforms, more info and help see\n\
-\ \ \ http://www.rxtx.org/\n\
-\ \ \ https://bugs.eclipse.org/bugs/show_bug.cgi?id=175336#c6\n\
-\n\
-This message is also available in your Error Log for Copy & Paste.
-
-# Port Ownership Handling
-PORT_IN_USE = Serial port \''{0}\'' is currently in use by {1}\!\nDo you want to try and steal the port?
-ANOTHER_TERMINAL = another Terminal View
-PORT_STOLEN = Port \''{0}\'' successfully obtained from {1}\r\n
-PORT_NOT_STOLEN = Connection Error!\r\n \''{0}\'' is already in use by {1}.\r\n
-NO_SUCH_PORT = No such port: \''{0}\''\r\n
-
-OWNERSHIP_GRANTED = Connection canceled due to ownership request from {0}.\r\n
\ No newline at end of file
diff --git a/plugins/org.eclipse.tm.terminal.serial/src/org/eclipse/tm/internal/terminal/serial/SerialSettingsPage.java b/plugins/org.eclipse.tm.terminal.serial/src/org/eclipse/tm/internal/terminal/serial/SerialSettingsPage.java
deleted file mode 100644
index 5646bbfafe2..00000000000
--- a/plugins/org.eclipse.tm.terminal.serial/src/org/eclipse/tm/internal/terminal/serial/SerialSettingsPage.java
+++ /dev/null
@@ -1,183 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2013 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Initial Contributors:
- * The following Wind River employees contributed to the Terminal component
- * that contains this file: Chris Thew, Fran Litterio, Stephen Lamb,
- * Helmut Haigermoser and Ted Williams.
- *
- * Contributors:
- * Michael Scharf (Wind River) - extracted from TerminalSettingsDlg
- * Martin Oberhuber (Wind River) - fixed copyright headers and beautified
- * Martin Oberhuber (Wind River) - [206917] Add validation for Terminal Settings
- *******************************************************************************/
-package org.eclipse.tm.internal.terminal.serial;
-
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.tm.internal.terminal.provisional.api.AbstractSettingsPage;
-
-public class SerialSettingsPage extends AbstractSettingsPage {
- private Combo fSerialPortCombo;
- private Combo fBaudRateCombo;
- private Combo fDataBitsCombo;
- private Combo fStopBitsCombo;
- private Combo fParityCombo;
- private Combo fFlowControlCombo;
- private Text fTimeout;
- private final SerialSettings fTerminalSettings;
-
- public SerialSettingsPage(SerialSettings settings) {
- fTerminalSettings=settings;
- }
- public void saveSettings() {
- fTerminalSettings.setSerialPort(getComboValue(fSerialPortCombo));
- fTerminalSettings.setBaudRate(getComboValue(fBaudRateCombo));
- fTerminalSettings.setDataBits(getComboValue(fDataBitsCombo));
- fTerminalSettings.setStopBits(getComboValue(fStopBitsCombo));
- fTerminalSettings.setParity(getComboValue(fParityCombo));
- fTerminalSettings.setFlowControl(getComboValue(fFlowControlCombo));
- fTerminalSettings.setTimeout(fTimeout.getText());
- }
- public void loadSettings() {
- // Load controls
- SerialProperties properties = fTerminalSettings.getProperties();
- List list;
-
- list = properties.getSerialPortTable();
- loadCombo(fSerialPortCombo, list);
-
- list = properties.getBaudRateTable();
- loadCombo(fBaudRateCombo, list);
-
- list = properties.getDataBitsTable();
- loadCombo(fDataBitsCombo, list);
-
- list = properties.getStopBitsTable();
- loadCombo(fStopBitsCombo, list);
-
- list = properties.getParityTable();
- loadCombo(fParityCombo, list);
-
- list = properties.getFlowControlTable();
- loadCombo(fFlowControlCombo, list);
-
- setCombo(fSerialPortCombo,fTerminalSettings.getSerialPort());
- setCombo(fBaudRateCombo,fTerminalSettings.getBaudRateString());
- setCombo(fDataBitsCombo,fTerminalSettings.getDataBitsString());
- setCombo(fStopBitsCombo,fTerminalSettings.getStopBitsString());
- setCombo(fParityCombo,fTerminalSettings.getParityString());
- setCombo(fFlowControlCombo,fTerminalSettings.getFlowControlString());
- fTimeout.setText(fTerminalSettings.getTimeoutString());
- }
- private void setCombo(Combo combo,String value) {
- if(value==null)
- return;
- int nIndex = combo.indexOf(value);
- if (nIndex == -1) {
- if((combo.getStyle() & SWT.READ_ONLY)==0) {
- combo.add(value);
- nIndex = combo.indexOf(value);
- } else {
- return;
- }
- }
-
- combo.select(nIndex);
-
- }
- private String getComboValue(Combo combo) {
- int nIndex = combo.getSelectionIndex();
- if (nIndex == -1) {
- if((combo.getStyle() & SWT.READ_ONLY)!=0)
- return ""; //$NON-NLS-1$
- return combo.getText();
- }
-
- return combo.getItem(nIndex);
-
- }
- public boolean validateSettings() {
- try {
- int p = Integer.parseInt(fTimeout.getText().trim());
- if (p < 0) {
- return false;
- }
- } catch (Exception e) {
- return false;
- }
- return true;
- }
- public void createControl(Composite parent) {
- Composite composite = new Composite(parent, SWT.NONE);
- GridLayout gridLayout = new GridLayout(2, false);
-
- composite.setLayout(gridLayout);
- composite.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
- fSerialPortCombo=addLabeledCombo(composite, SerialMessages.PORT + ":",false); //$NON-NLS-1$
- fBaudRateCombo=addLabeledCombo(composite, SerialMessages.BAUDRATE + ":"); //$NON-NLS-1$
- fDataBitsCombo=addLabeledCombo(composite, SerialMessages.DATABITS + ":"); //$NON-NLS-1$
- fStopBitsCombo=addLabeledCombo(composite, SerialMessages.STOPBITS + ":"); //$NON-NLS-1$
- fParityCombo=addLabeledCombo(composite, SerialMessages.PARITY + ":"); //$NON-NLS-1$
- fFlowControlCombo=addLabeledCombo(composite, SerialMessages.FLOWCONTROL + ":"); //$NON-NLS-1$
-
- new Label(composite, SWT.RIGHT).setText(SerialMessages.TIMEOUT + ":"); //$NON-NLS-1$
- fTimeout = new Text(composite, SWT.BORDER);
- fTimeout.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
- fTimeout.addModifyListener(new ModifyListener() {
- public void modifyText(ModifyEvent e) {
- fireListeners(fTimeout);
- }
- });
- loadSettings();
- }
-
- private Combo addLabeledCombo(Composite composite, String label) {
- return addLabeledCombo(composite, label, true);
- }
- private Combo addLabeledCombo(Composite composite, String label,boolean readonly) {
- new Label(composite, SWT.RIGHT).setText(label);
- int flags=SWT.DROP_DOWN;
- if(readonly)
- flags|=SWT.READ_ONLY;
- final Combo combo = new Combo(composite, flags);
- combo.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
- if (!readonly) {
- combo.addModifyListener(new ModifyListener() {
- public void modifyText(ModifyEvent e) {
- fireListeners(combo);
- }
- });
- }
- combo.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- fireListeners(combo);
- }
- });
- return combo;
- }
-
- private void loadCombo(Combo ctlCombo, List table) {
- for (Iterator iter = table.iterator(); iter.hasNext();) {
- String label = (String) iter.next();
- ctlCombo.add(label);
- }
- }
-}
diff --git a/plugins/org.eclipse.tm.terminal.serial/tm32.png b/plugins/org.eclipse.tm.terminal.serial/tm32.png
deleted file mode 100644
index 3077b1220dd..00000000000
Binary files a/plugins/org.eclipse.tm.terminal.serial/tm32.png and /dev/null differ
diff --git a/plugins/org.eclipse.tm.terminal.view.ui.serial/META-INF/MANIFEST.MF b/plugins/org.eclipse.tm.terminal.view.ui.serial/META-INF/MANIFEST.MF
index 4e6a2bdd8cb..59b00cfa6e3 100644
--- a/plugins/org.eclipse.tm.terminal.view.ui.serial/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.tm.terminal.view.ui.serial/META-INF/MANIFEST.MF
@@ -11,12 +11,12 @@ Require-Bundle: org.eclipse.core.expressions;bundle-version="3.4.400",
org.eclipse.tm.terminal.view.core;bundle-version="4.0.0",
org.eclipse.tm.terminal.view.ui;bundle-version="4.0.0",
org.eclipse.tm.terminal;bundle-version="4.0.0",
- org.eclipse.tm.terminal.serial;bundle-version="4.0.0",
org.eclipse.ui;bundle-version="3.8.0"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
Bundle-Localization: plugin
Export-Package: org.eclipse.tm.terminal.view.ui.serial.activator;x-internal:=true,
+ org.eclipse.tm.terminal.view.ui.serial.connector,
org.eclipse.tm.terminal.view.ui.serial.controls,
org.eclipse.tm.terminal.view.ui.serial.interfaces,
org.eclipse.tm.terminal.view.ui.serial.launcher,
diff --git a/plugins/org.eclipse.tm.terminal.view.ui.serial/plugin.properties b/plugins/org.eclipse.tm.terminal.view.ui.serial/plugin.properties
index d66a9e897ba..652ddd7c29a 100644
--- a/plugins/org.eclipse.tm.terminal.view.ui.serial/plugin.properties
+++ b/plugins/org.eclipse.tm.terminal.view.ui.serial/plugin.properties
@@ -8,9 +8,13 @@
# Wind River Systems - initial API and implementation
##################################################################################
-pluginName = Terminals Serial Extensions
+pluginName = TM Terminal Serial Connector Extensions
providerName = Eclipse.org - Target Explorer
# ----- Terminal Launcher Delegates -----
-SerialLauncherDelegate.label=Serial Terminal
\ No newline at end of file
+SerialLauncherDelegate.label=Serial Terminal
+
+# ----- Terminal Connectors -----
+
+SerialConnector.label = Serial
diff --git a/plugins/org.eclipse.tm.terminal.view.ui.serial/plugin.xml b/plugins/org.eclipse.tm.terminal.view.ui.serial/plugin.xml
index e68182694a2..90f70da6a40 100644
--- a/plugins/org.eclipse.tm.terminal.view.ui.serial/plugin.xml
+++ b/plugins/org.eclipse.tm.terminal.view.ui.serial/plugin.xml
@@ -1,8 +1,16 @@
+
+
+
+
+
-
+
portIdEnum= CommPortIdentifier.getPortIdentifiers();
while (portIdEnum.hasMoreElements()) {
CommPortIdentifier identifier = (CommPortIdentifier) portIdEnum.nextElement();
if (identifier.getPortType() == CommPortIdentifier.PORT_SERIAL) {
@@ -118,7 +120,8 @@ public class SerialConnectWorker extends Thread {
return "org.eclipse.tm.terminal.serial"; //$NON-NLS-1$
}
- public void run() {
+ @Override
+ public void run() {
String portName=null;
final String strID = getOwnershipId();
SerialPort serialPort = null;
@@ -138,17 +141,18 @@ public class SerialConnectWorker extends Thread {
//Bug 221184: Warn about serial port already in use
String currentOwner = fConn.getSerialPortIdentifier().getCurrentOwner();
if (strID.equals(currentOwner)) {
- currentOwner = SerialMessages.ANOTHER_TERMINAL;
+ currentOwner = Messages.SerialConnectWorker_ANOTHER_TERMINAL;
}
final int[] answer = { SWT.YES };
final String fPortName = portName;
final String fCurrentOwner = currentOwner;
if (currentOwner != null) {
Display.getDefault().syncExec(new Runnable() {
- public void run() {
+ @Override
+ public void run() {
MessageBox mb = new MessageBox(fControl.getShell(), SWT.ICON_QUESTION | SWT.YES | SWT.NO);
- mb.setText(SerialMessages.PROP_TITLE);
- mb.setMessage(NLS.bind(SerialMessages.PORT_IN_USE, fPortName, fCurrentOwner));
+ mb.setText(Messages.SerialConnectWorker_PROP_TITLE);
+ mb.setMessage(NLS.bind(Messages.SerialConnectWorker_PORT_IN_USE, fPortName, fCurrentOwner));
answer[0] = mb.open();
}
});
@@ -159,36 +163,36 @@ public class SerialConnectWorker extends Thread {
fControl.setState(TerminalState.CLOSED);
fConn.setSerialPortHandler(null);
return;
- } else {
- // Try to steal the port -- may throw PortInUseException
- int timeoutInMs = s.getTimeout() * 1000;
- serialPort = (SerialPort) fConn.getSerialPortIdentifier().open(strID, timeoutInMs);
- serialPort.setSerialPortParams(s.getBaudRate(), s.getDataBits(), s.getStopBits(), s.getParity());
- serialPort.setFlowControlMode(s.getFlowControl());
- serialPort.addEventListener(fConn.getSerialPortHandler());
- serialPort.notifyOnDataAvailable(true);
- fConn.getSerialPortIdentifier().addPortOwnershipListener(fConn.getSerialPortHandler());
- fConn.setSerialPort(serialPort);
- if (fCurrentOwner != null) {
- fControl.displayTextInTerminal(NLS.bind(SerialMessages.PORT_STOLEN, fPortName, fCurrentOwner));
-
- }
- fControl.setState(TerminalState.CONNECTED);
}
+ // Try to steal the port -- may throw PortInUseException
+ int timeoutInMs = s.getTimeout() * 1000;
+ serialPort = (SerialPort) fConn.getSerialPortIdentifier().open(strID, timeoutInMs);
+ serialPort.setSerialPortParams(s.getBaudRate(), s.getDataBits(), s.getStopBits(), s.getParity());
+ serialPort.setFlowControlMode(s.getFlowControl());
+ serialPort.addEventListener(fConn.getSerialPortHandler());
+ serialPort.notifyOnDataAvailable(true);
+ fConn.getSerialPortIdentifier().addPortOwnershipListener(fConn.getSerialPortHandler());
+ fConn.setSerialPort(serialPort);
+ if (fCurrentOwner != null) {
+ fControl.displayTextInTerminal(NLS.bind(Messages.SerialConnectWorker_PORT_STOLEN, fPortName, fCurrentOwner));
+
+ }
+ fControl.setState(TerminalState.CONNECTED);
+
} catch (PortInUseException portInUseException) {
fControl.setState(TerminalState.CLOSED);
String theOwner = portInUseException.currentOwner;
if (strID.equals(theOwner)) {
- theOwner = SerialMessages.ANOTHER_TERMINAL;
+ theOwner = Messages.SerialConnectWorker_ANOTHER_TERMINAL;
}
- fControl.displayTextInTerminal(NLS.bind(SerialMessages.PORT_NOT_STOLEN, portName, theOwner));
+ fControl.displayTextInTerminal(NLS.bind(Messages.SerialConnectWorker_PORT_NOT_STOLEN, portName, theOwner));
} catch (NoSuchPortException e) {
fControl.setState(TerminalState.CLOSED);
String msg=e.getMessage();
if(msg==null)
msg=portName;
- fControl.displayTextInTerminal(NLS.bind(SerialMessages.NO_SUCH_PORT, msg));
+ fControl.displayTextInTerminal(NLS.bind(Messages.SerialConnectWorker_NO_SUCH_PORT, msg));
} catch (Exception exception) {
Logger.logException(exception);
diff --git a/plugins/org.eclipse.tm.terminal.serial/src/org/eclipse/tm/internal/terminal/serial/SerialConnector.java b/plugins/org.eclipse.tm.terminal.view.ui.serial/src/org/eclipse/tm/terminal/view/ui/serial/connector/SerialConnector.java
similarity index 87%
rename from plugins/org.eclipse.tm.terminal.serial/src/org/eclipse/tm/internal/terminal/serial/SerialConnector.java
rename to plugins/org.eclipse.tm.terminal.view.ui.serial/src/org/eclipse/tm/terminal/view/ui/serial/connector/SerialConnector.java
index e01a1e079f2..de65beb6551 100644
--- a/plugins/org.eclipse.tm.terminal.serial/src/org/eclipse/tm/internal/terminal/serial/SerialConnector.java
+++ b/plugins/org.eclipse.tm.terminal.view.ui.serial/src/org/eclipse/tm/terminal/view/ui/serial/connector/SerialConnector.java
@@ -15,9 +15,9 @@
* Martin Oberhuber (Wind River) - fixed copyright headers and beautified
* Martin Oberhuber (Wind River) - [206892] Don't connect if already connecting
* Martin Oberhuber (Wind River) - [208029] COM port not released after quick disconnect/reconnect
- * Martin Oberhuber (Wind River) - [225853][api] Provide more default functionality in TerminalConnectorImpl
+ * Martin Oberhuber (Wind River) - [225853][api] Provide more default functionality in TerminalConnectorImpl
*******************************************************************************/
-package org.eclipse.tm.internal.terminal.serial;
+package org.eclipse.tm.terminal.view.ui.serial.connector;
import gnu.io.CommPortIdentifier;
import gnu.io.SerialPort;
@@ -35,7 +35,10 @@ import org.eclipse.tm.internal.terminal.provisional.api.ITerminalControl;
import org.eclipse.tm.internal.terminal.provisional.api.Logger;
import org.eclipse.tm.internal.terminal.provisional.api.TerminalState;
import org.eclipse.tm.internal.terminal.provisional.api.provider.TerminalConnectorImpl;
+import org.eclipse.tm.terminal.view.ui.serial.activator.UIPlugin;
+import org.eclipse.tm.terminal.view.ui.serial.nls.Messages;
+@SuppressWarnings("restriction")
public class SerialConnector extends TerminalConnectorImpl {
private OutputStream fOutputStream;
private InputStream fInputStream;
@@ -44,22 +47,24 @@ public class SerialConnector extends TerminalConnectorImpl {
private SerialPortHandler fTerminalSerialPortHandler;
private SerialSettings fSettings;
private SerialConnectWorker fConnectWorker = null;
- private volatile boolean fDisconnectGoingOn = false;
+ /* default */ volatile boolean fDisconnectGoingOn = false;
public SerialConnector() {
}
public SerialConnector(SerialSettings settings) {
fSettings=settings;
}
- public void initialize() throws Exception {
+ @Override
+ public void initialize() throws Exception {
try {
fSettings=new SerialSettings();
} catch (NoClassDefFoundError e) {
// tell the user how to install the library
- throw new CoreException(new Status(IStatus.WARNING,Activator.PLUGIN_ID,0, SerialMessages.ERROR_LIBRARY_NOT_INSTALLED,e));
+ throw new CoreException(new Status(IStatus.WARNING,UIPlugin.getUniqueIdentifier(),0, Messages.SerialConnector_Error_LiberayNotInstalled,e));
}
}
- public void connect(ITerminalControl control) {
+ @Override
+ public void connect(ITerminalControl control) {
super.connect(control);
synchronized(this) {
if (fConnectWorker!=null || fDisconnectGoingOn) {
@@ -79,7 +84,8 @@ public class SerialConnector extends TerminalConnectorImpl {
fConnectWorker = null;
}
}
- public void doDisconnect() {
+ @Override
+ public void doDisconnect() {
synchronized(this) {
//avoid multiple background connect/disconnect threads at the same time
if (fConnectWorker!=null) {
@@ -106,7 +112,8 @@ public class SerialConnector extends TerminalConnectorImpl {
new Thread("Terminal View Serial Port Disconnect Worker") //$NON-NLS-1$
{
- public void run() {
+ @Override
+ public void run() {
try {
if (getSerialPortIdentifier() != null) {
try {
@@ -161,7 +168,8 @@ public class SerialConnector extends TerminalConnectorImpl {
public InputStream getInputStream() {
return fInputStream;
}
- public OutputStream getTerminalToRemoteStream() {
+ @Override
+ public OutputStream getTerminalToRemoteStream() {
return fOutputStream;
}
private void setInputStream(InputStream inputStream) {
@@ -170,7 +178,8 @@ public class SerialConnector extends TerminalConnectorImpl {
private void setOutputStream(OutputStream outputStream) {
fOutputStream = outputStream;
}
- public void setTerminalSize(int newWidth, int newHeight) {
+ @Override
+ public void setTerminalSize(int newWidth, int newHeight) {
// TODO
}
protected SerialPort getSerialPort() {
@@ -215,16 +224,20 @@ public class SerialConnector extends TerminalConnectorImpl {
public ISerialSettings getSerialSettings() {
return fSettings;
}
- public ISettingsPage makeSettingsPage() {
+ @Override
+ public ISettingsPage makeSettingsPage() {
return new SerialSettingsPage(fSettings);
}
- public String getSettingsSummary() {
+ @Override
+ public String getSettingsSummary() {
return fSettings.getSummary();
}
- public void load(ISettingsStore store) {
+ @Override
+ public void load(ISettingsStore store) {
fSettings.load(store);
}
- public void save(ISettingsStore store) {
+ @Override
+ public void save(ISettingsStore store) {
fSettings.save(store);
}
}
diff --git a/plugins/org.eclipse.tm.terminal.serial/src/org/eclipse/tm/internal/terminal/serial/SerialPortHandler.java b/plugins/org.eclipse.tm.terminal.view.ui.serial/src/org/eclipse/tm/terminal/view/ui/serial/connector/SerialPortHandler.java
similarity index 82%
rename from plugins/org.eclipse.tm.terminal.serial/src/org/eclipse/tm/internal/terminal/serial/SerialPortHandler.java
rename to plugins/org.eclipse.tm.terminal.view.ui.serial/src/org/eclipse/tm/terminal/view/ui/serial/connector/SerialPortHandler.java
index 53a93790e2a..23539d6217e 100644
--- a/plugins/org.eclipse.tm.terminal.serial/src/org/eclipse/tm/internal/terminal/serial/SerialPortHandler.java
+++ b/plugins/org.eclipse.tm.terminal.view.ui.serial/src/org/eclipse/tm/terminal/view/ui/serial/connector/SerialPortHandler.java
@@ -16,7 +16,7 @@
* Martin Oberhuber (Wind River) - [168197] Replace JFace MessagDialog by SWT MessageBox
* Martin Oberhuber (Wind River) - [221184] Redesign Serial Terminal Ownership Handling
*******************************************************************************/
-package org.eclipse.tm.internal.terminal.serial;
+package org.eclipse.tm.terminal.view.ui.serial.connector;
import gnu.io.CommPortOwnershipListener;
import gnu.io.SerialPortEvent;
@@ -28,15 +28,16 @@ import org.eclipse.osgi.util.NLS;
import org.eclipse.swt.widgets.Display;
import org.eclipse.tm.internal.terminal.provisional.api.ITerminalControl;
import org.eclipse.tm.internal.terminal.provisional.api.Logger;
+import org.eclipse.tm.terminal.view.ui.serial.nls.Messages;
/**
* UNDER CONSTRUCTION
*/
-public class SerialPortHandler implements
- SerialPortEventListener, CommPortOwnershipListener {
+@SuppressWarnings("restriction")
+public class SerialPortHandler implements SerialPortEventListener, CommPortOwnershipListener {
- private final ITerminalControl fControl;
- private final SerialConnector fConn;
+ /* default */ final ITerminalControl fControl;
+ /* default */ final SerialConnector fConn;
protected byte[] bytes = new byte[2048];
/**
@@ -75,14 +76,15 @@ public class SerialPortHandler implements
StackTraceElement[] elems = e.getStackTrace();
final String requester = elems[elems.length - 4].getClassName();
Display.getDefault().asyncExec(new Runnable() {
- public void run() {
+ @Override
+ public void run() {
fConn.disconnect();
String req = requester;
String myPackage = this.getClass().getPackage().getName();
if (req.startsWith(myPackage)) {
- req = SerialMessages.ANOTHER_TERMINAL;
+ req = Messages.SerialConnectWorker_ANOTHER_TERMINAL;
}
- fControl.displayTextInTerminal(NLS.bind(SerialMessages.OWNERSHIP_GRANTED, req));
+ fControl.displayTextInTerminal(NLS.bind(Messages.SerialConnectWorker_OWNERSHIP_GRANTED, req));
}
});
fConn.disconnect();
@@ -90,7 +92,8 @@ public class SerialPortHandler implements
}
// SerialPortEventListener interface
- public void serialEvent(SerialPortEvent event) {
+ @Override
+ public void serialEvent(SerialPortEvent event) {
switch (event.getEventType()) {
case SerialPortEvent.DATA_AVAILABLE:
onSerialDataAvailable(null);
@@ -103,7 +106,8 @@ public class SerialPortHandler implements
/**
* UNDER CONSTRUCTION
*/
- public void ownershipChange(int nType) {
+ @Override
+ public void ownershipChange(int nType) {
switch (nType) {
case CommPortOwnershipListener.PORT_OWNERSHIP_REQUESTED:
onSerialOwnershipRequested(null);
diff --git a/plugins/org.eclipse.tm.terminal.serial/src/org/eclipse/tm/internal/terminal/serial/SerialProperties.java b/plugins/org.eclipse.tm.terminal.view.ui.serial/src/org/eclipse/tm/terminal/view/ui/serial/connector/SerialProperties.java
similarity index 98%
rename from plugins/org.eclipse.tm.terminal.serial/src/org/eclipse/tm/internal/terminal/serial/SerialProperties.java
rename to plugins/org.eclipse.tm.terminal.view.ui.serial/src/org/eclipse/tm/terminal/view/ui/serial/connector/SerialProperties.java
index bbb2fdd64c5..7d4b89b90b6 100644
--- a/plugins/org.eclipse.tm.terminal.serial/src/org/eclipse/tm/internal/terminal/serial/SerialProperties.java
+++ b/plugins/org.eclipse.tm.terminal.view.ui.serial/src/org/eclipse/tm/terminal/view/ui/serial/connector/SerialProperties.java
@@ -14,7 +14,7 @@
* Michael Scharf (Wind River) - extracted from TerminalProperties
* Martin Oberhuber (Wind River) - fixed copyright headers and beautified
*******************************************************************************/
-package org.eclipse.tm.internal.terminal.serial;
+package org.eclipse.tm.terminal.view.ui.serial.connector;
import gnu.io.CommPortIdentifier;
diff --git a/plugins/org.eclipse.tm.terminal.serial/src/org/eclipse/tm/internal/terminal/serial/SerialSettings.java b/plugins/org.eclipse.tm.terminal.view.ui.serial/src/org/eclipse/tm/terminal/view/ui/serial/connector/SerialSettings.java
similarity index 98%
rename from plugins/org.eclipse.tm.terminal.serial/src/org/eclipse/tm/internal/terminal/serial/SerialSettings.java
rename to plugins/org.eclipse.tm.terminal.view.ui.serial/src/org/eclipse/tm/terminal/view/ui/serial/connector/SerialSettings.java
index be10ad14a80..a51881704b3 100644
--- a/plugins/org.eclipse.tm.terminal.serial/src/org/eclipse/tm/internal/terminal/serial/SerialSettings.java
+++ b/plugins/org.eclipse.tm.terminal.view.ui.serial/src/org/eclipse/tm/terminal/view/ui/serial/connector/SerialSettings.java
@@ -14,7 +14,7 @@
* Michael Scharf (Wind River) - extracted from TerminalSettings
* Martin Oberhuber (Wind River) - fixed copyright headers and beautified
*******************************************************************************/
-package org.eclipse.tm.internal.terminal.serial;
+package org.eclipse.tm.terminal.view.ui.serial.connector;
import gnu.io.SerialPort;
diff --git a/plugins/org.eclipse.tm.terminal.view.ui.serial/src/org/eclipse/tm/terminal/view/ui/serial/connector/SerialSettingsPage.java b/plugins/org.eclipse.tm.terminal.view.ui.serial/src/org/eclipse/tm/terminal/view/ui/serial/connector/SerialSettingsPage.java
new file mode 100644
index 00000000000..d0e865d04fd
--- /dev/null
+++ b/plugins/org.eclipse.tm.terminal.view.ui.serial/src/org/eclipse/tm/terminal/view/ui/serial/connector/SerialSettingsPage.java
@@ -0,0 +1,47 @@
+/*******************************************************************************
+ * Copyright (c) 2003, 2013 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
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Initial Contributors:
+ * The following Wind River employees contributed to the Terminal component
+ * that contains this file: Chris Thew, Fran Litterio, Stephen Lamb,
+ * Helmut Haigermoser and Ted Williams.
+ *
+ * Contributors:
+ * Michael Scharf (Wind River) - extracted from TerminalSettingsDlg
+ * Martin Oberhuber (Wind River) - fixed copyright headers and beautified
+ * Martin Oberhuber (Wind River) - [206917] Add validation for Terminal Settings
+ *******************************************************************************/
+package org.eclipse.tm.terminal.view.ui.serial.connector;
+
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.tm.internal.terminal.provisional.api.AbstractSettingsPage;
+
+@SuppressWarnings("restriction")
+public class SerialSettingsPage extends AbstractSettingsPage {
+ private final SerialSettings fTerminalSettings;
+
+ public SerialSettingsPage(SerialSettings settings) {
+ fTerminalSettings=settings;
+ }
+
+ @Override
+ public void createControl(Composite parent) {
+ }
+
+ @Override
+ public void loadSettings() {
+ }
+
+ @Override
+ public void saveSettings() {
+ }
+
+ @Override
+ public boolean validateSettings() {
+ return false;
+ }
+}
diff --git a/plugins/org.eclipse.tm.terminal.view.ui.serial/src/org/eclipse/tm/terminal/view/ui/serial/controls/SerialConfigurationPanel.java b/plugins/org.eclipse.tm.terminal.view.ui.serial/src/org/eclipse/tm/terminal/view/ui/serial/controls/SerialConfigurationPanel.java
index 53d33f8678c..27419b7fb56 100644
--- a/plugins/org.eclipse.tm.terminal.view.ui.serial/src/org/eclipse/tm/terminal/view/ui/serial/controls/SerialConfigurationPanel.java
+++ b/plugins/org.eclipse.tm.terminal.view.ui.serial/src/org/eclipse/tm/terminal/view/ui/serial/controls/SerialConfigurationPanel.java
@@ -65,7 +65,7 @@ public class SerialConfigurationPanel extends AbstractExtendedConfigurationPanel
@Override
public void extractData(Map data) {
// set the terminal connector id for serial
- data.put(ITerminalsConnectorConstants.PROP_TERMINAL_CONNECTOR_ID, "org.eclipse.tm.internal.terminal.serial.SerialConnector"); //$NON-NLS-1$
+ data.put(ITerminalsConnectorConstants.PROP_TERMINAL_CONNECTOR_ID, "org.eclipse.tm.terminal.connectors.serial"); //$NON-NLS-1$
serialSettingsPage.extractData(data);
data.put(ITerminalsConnectorConstants.PROP_ENCODING, getEncoding());
diff --git a/plugins/org.eclipse.tm.terminal.view.ui.serial/src/org/eclipse/tm/terminal/view/ui/serial/launcher/SerialLauncherDelegate.java b/plugins/org.eclipse.tm.terminal.view.ui.serial/src/org/eclipse/tm/terminal/view/ui/serial/launcher/SerialLauncherDelegate.java
index b385c78c382..8e22c713e1a 100644
--- a/plugins/org.eclipse.tm.terminal.view.ui.serial/src/org/eclipse/tm/terminal/view/ui/serial/launcher/SerialLauncherDelegate.java
+++ b/plugins/org.eclipse.tm.terminal.view.ui.serial/src/org/eclipse/tm/terminal/view/ui/serial/launcher/SerialLauncherDelegate.java
@@ -18,7 +18,6 @@ import org.eclipse.osgi.util.NLS;
import org.eclipse.tm.internal.terminal.provisional.api.ISettingsStore;
import org.eclipse.tm.internal.terminal.provisional.api.ITerminalConnector;
import org.eclipse.tm.internal.terminal.provisional.api.TerminalConnectorExtension;
-import org.eclipse.tm.internal.terminal.serial.SerialSettings;
import org.eclipse.tm.terminal.view.core.TerminalServiceFactory;
import org.eclipse.tm.terminal.view.core.interfaces.ITerminalService;
import org.eclipse.tm.terminal.view.core.interfaces.constants.ITerminalsConnectorConstants;
@@ -27,6 +26,7 @@ import org.eclipse.tm.terminal.view.ui.interfaces.IConfigurationPanelContainer;
import org.eclipse.tm.terminal.view.ui.interfaces.IMementoHandler;
import org.eclipse.tm.terminal.view.ui.internal.SettingsStore;
import org.eclipse.tm.terminal.view.ui.launcher.AbstractLauncherDelegate;
+import org.eclipse.tm.terminal.view.ui.serial.connector.SerialSettings;
import org.eclipse.tm.terminal.view.ui.serial.controls.SerialConfigurationPanel;
import org.eclipse.tm.terminal.view.ui.serial.nls.Messages;
@@ -113,7 +113,7 @@ public class SerialLauncherDelegate extends AbstractLauncherDelegate {
// Check for the terminal connector id
String connectorId = (String)properties.get(ITerminalsConnectorConstants.PROP_TERMINAL_CONNECTOR_ID);
- if (connectorId == null) connectorId = "org.eclipse.tm.internal.terminal.serial.SerialConnector"; //$NON-NLS-1$
+ if (connectorId == null) connectorId = "org.eclipse.tm.terminal.connectors.serial"; //$NON-NLS-1$
String port = (String)properties.get(ITerminalsConnectorConstants.PROP_SERIAL_DEVICE);
String baud = (String)properties.get(ITerminalsConnectorConstants.PROP_SERIAL_BAUD_RATE);
diff --git a/plugins/org.eclipse.tm.terminal.view.ui.serial/src/org/eclipse/tm/terminal/view/ui/serial/nls/Messages.java b/plugins/org.eclipse.tm.terminal.view.ui.serial/src/org/eclipse/tm/terminal/view/ui/serial/nls/Messages.java
index 8d78203c7c8..7891d1cf2ac 100644
--- a/plugins/org.eclipse.tm.terminal.view.ui.serial/src/org/eclipse/tm/terminal/view/ui/serial/nls/Messages.java
+++ b/plugins/org.eclipse.tm.terminal.view.ui.serial/src/org/eclipse/tm/terminal/view/ui/serial/nls/Messages.java
@@ -65,4 +65,15 @@ public class Messages extends NLS {
public static String SerialPortAddressDialog_Information_MissingPort;
public static String SerialPortAddressDialog_Error_InvalidPort;
public static String SerialPortAddressDialog_Error_InvalidPortRange;
+
+ public static String SerialConnector_Error_LiberayNotInstalled;
+
+ public static String SerialConnectWorker_PROP_TITLE;
+ public static String SerialConnectWorker_PORT_IN_USE;
+ public static String SerialConnectWorker_ANOTHER_TERMINAL;
+ public static String SerialConnectWorker_PORT_STOLEN;
+ public static String SerialConnectWorker_PORT_NOT_STOLEN;
+ public static String SerialConnectWorker_NO_SUCH_PORT;
+ public static String SerialConnectWorker_OWNERSHIP_GRANTED;
+
}
diff --git a/plugins/org.eclipse.tm.terminal.view.ui.serial/src/org/eclipse/tm/terminal/view/ui/serial/nls/Messages.properties b/plugins/org.eclipse.tm.terminal.view.ui.serial/src/org/eclipse/tm/terminal/view/ui/serial/nls/Messages.properties
index 2b89c100940..37a9473d69a 100644
--- a/plugins/org.eclipse.tm.terminal.view.ui.serial/src/org/eclipse/tm/terminal/view/ui/serial/nls/Messages.properties
+++ b/plugins/org.eclipse.tm.terminal.view.ui.serial/src/org/eclipse/tm/terminal/view/ui/serial/nls/Messages.properties
@@ -44,3 +44,28 @@ SerialPortAddressDialog_Error_InvalidTargetIpAddress=Target IP address is not va
SerialPortAddressDialog_Information_MissingPort=Please enter a valid port number.
SerialPortAddressDialog_Error_InvalidPort=Target port number must be a valid number in the range of 0 to 65535.
SerialPortAddressDialog_Error_InvalidPortRange=Target port number must be in the range of 0 to 65535.
+
+
+SerialConnector_Error_LiberayNotInstalled = The RXTX library has not been installed properly! \n\
+\n\
+Installation:\n\
+-------------\n\
+* Either (a) Use Help > Software Updates, Add Site and install from:\n\
+\ \ \ http://rxtx.qbang.org/eclipse/\n\
+* Or (b) Download and install RXTX for Eclipse from:\n\
+\ \ \ http://rxtx.qbang.org/eclipse/downloads/\n\
+\n\
+For other Platforms, more info and help see\n\
+\ \ \ http://www.rxtx.org/\n\
+\ \ \ https://bugs.eclipse.org/bugs/show_bug.cgi?id=175336#c6\n\
+\n\
+This message is also available in your Error Log for Copy & Paste.
+
+# Port Ownership Handling
+SerialConnectWorker_PROP_TITLE = Terminal
+SerialConnectWorker_PORT_IN_USE = Serial port \''{0}\'' is currently in use by {1}\!\nDo you want to try and steal the port?
+SerialConnectWorker_ANOTHER_TERMINAL = another Terminal View
+SerialConnectWorker_PORT_STOLEN = Port \''{0}\'' successfully obtained from {1}\r\n
+SerialConnectWorker_PORT_NOT_STOLEN = Connection Error!\r\n \''{0}\'' is already in use by {1}.\r\n
+SerialConnectWorker_NO_SUCH_PORT = No such port: \''{0}\''\r\n
+SerialConnectWorker_OWNERSHIP_GRANTED = Connection canceled due to ownership request from {0}.\r\n
diff --git a/pom.xml b/pom.xml
index 0836b91f0c9..b482ab6927d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,15 +20,12 @@
plugins/org.eclipse.tm.terminal
- plugins/org.eclipse.tm.terminal.serial
plugins/org.eclipse.tm.terminal.ssh
plugins/org.eclipse.tm.terminal.telnet
plugins/org.eclipse.tm.terminal.remote
features/org.eclipse.tm.terminal.feature
features/org.eclipse.tm.terminal.sdk.feature
- features/org.eclipse.tm.terminal.serial.feature
- features/org.eclipse.tm.terminal.serial.sdk.feature
features/org.eclipse.tm.terminal.ssh.feature
features/org.eclipse.tm.terminal.ssh.sdk.feature
features/org.eclipse.tm.terminal.telnet.feature
@@ -50,6 +47,8 @@
features/org.eclipse.tm.terminal.view.sdk.feature
features/org.eclipse.tm.terminal.view.rse.feature
features/org.eclipse.tm.terminal.view.rse.sdk.feature
+ features/org.eclipse.tm.terminal.view.serial.feature
+ features/org.eclipse.tm.terminal.view.serial.sdk.feature
repos/org.eclipse.tm.terminal.repo
diff --git a/repos/org.eclipse.tm.terminal.repo/category.xml b/repos/org.eclipse.tm.terminal.repo/category.xml
index 803e18d281a..689aed5042c 100644
--- a/repos/org.eclipse.tm.terminal.repo/category.xml
+++ b/repos/org.eclipse.tm.terminal.repo/category.xml
@@ -7,12 +7,6 @@
-
-
-
-
-
-
@@ -45,6 +39,12 @@
+
+
+
+
+
+