1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-27 19:05:38 +02:00

Terminal: Merge o.e.tm.terminal.serial to o.e.tm.terminal.view.ui.serial

This commit is contained in:
Uwe Stieber 2015-04-16 15:27:25 +02:00
parent bcca3ecf9f
commit 8df909e014
51 changed files with 277 additions and 1136 deletions

View file

@ -33,8 +33,7 @@
</license>
<url>
<update label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/4.0"/>
<discovery label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/3.7"/>
<update label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/terminal/updates/4.0"/>
</url>
<requires>

View file

@ -32,8 +32,7 @@
</license>
<url>
<update label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/4.0"/>
<discovery label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/3.7"/>
<update label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/terminal/updates/4.0"/>
</url>
<includes

View file

@ -1,168 +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 (Wind River) - initial API and implementation
###############################################################################
# feature.properties
# contains externalized strings for feature.xml
# "%foo" in feature.xml corresponds to the key "foo" in this file
# java.io.Properties file (ISO 8859-1 with "\" escapes)
# This file should be translated.
# "featureName" property - name of the feature
featureName=Target Management Terminal Serial Connector
# "providerName" property - name of the company that provides the feature
providerName=Eclipse TM Project
# "tmUpdateSiteName" property - label for the update site
tmUpdateSiteName=Target Management 3.7 Updates
# "description" property - description of the feature
description=A serial line connector for the Terminal using RXTX API
# "copyright" property - text of the "Feature Update Copyright"
copyright=\
Copyright (c) 2003, 2015 Wind River Systems, Inc. and others.\n\
All rights reserved. This program and the accompanying materials\n\
are made available under the terms of the Eclipse Public License v1.0\n\
which accompanies this distribution, and is available at\n\
http://www.eclipse.org/legal/epl-v10.html
################ end of copyright property ####################################
# "licenseURL" property - URL of the "Feature License"
# do not translate value - just change to point to a locale-specific HTML page
licenseURL=license.html
# "license" property - text of the "Feature Update License"
# should be plain text version of license agreement pointed to be "licenseURL"
license=\
Eclipse Foundation Software User Agreement\n\
February 1, 2011\n\
\n\
Usage Of Content\n\
\n\
THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
\n\
Applicable Licenses\n\
\n\
Unless otherwise indicated, all Content made available by the\n\
Eclipse Foundation is provided to you under the terms and conditions of\n\
the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
For purposes of the EPL, "Program" will mean the Content.\n\
\n\
Content includes, but is not limited to, source code, object code,\n\
documentation and other files maintained in the Eclipse Foundation source code\n\
repository ("Repository") in software modules ("Modules") and made available\n\
as downloadable archives ("Downloads").\n\
\n\
- Content may be structured and packaged into modules to facilitate delivering,\n\
extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
plug-in fragments ("Fragments"), and features ("Features").\n\
- Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
in a directory named "plugins".\n\
- A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
Each Feature may be packaged as a sub-directory in a directory named "features".\n\
Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
- Features may also include other Features ("Included Features"). Within a Feature, files\n\
named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
\n\
The terms and conditions governing Plug-ins and Fragments should be\n\
contained in files named "about.html" ("Abouts"). The terms and\n\
conditions governing Features and Included Features should be contained\n\
in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
Licenses may be located in any directory of a Download or Module\n\
including, but not limited to the following locations:\n\
\n\
- The top-level (root) directory\n\
- Plug-in and Fragment directories\n\
- Inside Plug-ins and Fragments packaged as JARs\n\
- Sub-directories of the directory named "src" of certain Plug-ins\n\
- Feature directories\n\
\n\
Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
Update License") during the installation process. If the Feature contains\n\
Included Features, the Feature Update License should either provide you\n\
with the terms and conditions governing the Included Features or inform\n\
you where you can locate them. Feature Update Licenses may be found in\n\
the "license" property of files named "feature.properties" found within a Feature.\n\
Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\
terms and conditions (or references to such terms and conditions) that\n\
govern your use of the associated Content in that directory.\n\
\n\
THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
\n\
- Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)\n\
- Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
- Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
- Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
- Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
- Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
\n\
IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\
is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
govern that particular Content.\n\
\n\
\n\Use of Provisioning Technology\n\
\n\
The Eclipse Foundation makes available provisioning software, examples of which include,\n\
but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
the purpose of allowing users to install software, documentation, information and/or\n\
other materials (collectively "Installable Software"). This capability is provided with\n\
the intent of allowing such users to install, extend and update Eclipse-based products.\n\
Information about packaging Installable Software is available at\n\
http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
\n\
You may use Provisioning Technology to allow other parties to install Installable Software.\n\
You shall be responsible for enabling the applicable license agreements relating to the\n\
Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
making it available in accordance with the Specification, you further acknowledge your\n\
agreement to, and the acquisition of all necessary rights to permit the following:\n\
\n\
1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
extending or updating the functionality of an Eclipse-based product.\n\
2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
govern the use of the Installable Software ("Installable Software Agreement") and such\n\
Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
with the Specification. Such Installable Software Agreement must inform the user of the\n\
terms and conditions that govern the Installable Software and must solicit acceptance by\n\
the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
indication of agreement by the user, the provisioning Technology will complete installation\n\
of the Installable Software.\n\
\n\
Cryptography\n\
\n\
Content may contain encryption software. The country in which you are\n\
currently may have restrictions on the import, possession, and use,\n\
and/or re-export to another country, of encryption software. BEFORE\n\
using any encryption software, please check the country's laws,\n\
regulations and policies concerning the import, possession, or use, and\n\
re-export of encryption software, to see if this is permitted.\n\
\n\
Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n
########### end of license property ##########################################

View file

@ -1,168 +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 (Wind River) - initial API and implementation
###############################################################################
# feature.properties
# contains externalized strings for feature.xml
# "%foo" in feature.xml corresponds to the key "foo" in this file
# java.io.Properties file (ISO 8859-1 with "\" escapes)
# This file should be translated.
# "featureName" property - name of the feature
featureName=Target Management Terminal Serial Connector, SDK
# "providerName" property - name of the company that provides the feature
providerName=Eclipse TM Project
# "tmUpdateSiteName" property - label for the update site
tmUpdateSiteName=Target Management 3.7 Updates
# "description" property - description of the feature
description=A serial line connector for the Terminal using RXTX API
# "copyright" property - text of the "Feature Update Copyright"
copyright=\
Copyright (c) 2003, 2015 Wind River Systems, Inc. and others.\n\
All rights reserved. This program and the accompanying materials\n\
are made available under the terms of the Eclipse Public License v1.0\n\
which accompanies this distribution, and is available at\n\
http://www.eclipse.org/legal/epl-v10.html
################ end of copyright property ####################################
# "licenseURL" property - URL of the "Feature License"
# do not translate value - just change to point to a locale-specific HTML page
licenseURL=license.html
# "license" property - text of the "Feature Update License"
# should be plain text version of license agreement pointed to be "licenseURL"
license=\
Eclipse Foundation Software User Agreement\n\
February 1, 2011\n\
\n\
Usage Of Content\n\
\n\
THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
\n\
Applicable Licenses\n\
\n\
Unless otherwise indicated, all Content made available by the\n\
Eclipse Foundation is provided to you under the terms and conditions of\n\
the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
For purposes of the EPL, "Program" will mean the Content.\n\
\n\
Content includes, but is not limited to, source code, object code,\n\
documentation and other files maintained in the Eclipse Foundation source code\n\
repository ("Repository") in software modules ("Modules") and made available\n\
as downloadable archives ("Downloads").\n\
\n\
- Content may be structured and packaged into modules to facilitate delivering,\n\
extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
plug-in fragments ("Fragments"), and features ("Features").\n\
- Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
in a directory named "plugins".\n\
- A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
Each Feature may be packaged as a sub-directory in a directory named "features".\n\
Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
- Features may also include other Features ("Included Features"). Within a Feature, files\n\
named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
\n\
The terms and conditions governing Plug-ins and Fragments should be\n\
contained in files named "about.html" ("Abouts"). The terms and\n\
conditions governing Features and Included Features should be contained\n\
in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
Licenses may be located in any directory of a Download or Module\n\
including, but not limited to the following locations:\n\
\n\
- The top-level (root) directory\n\
- Plug-in and Fragment directories\n\
- Inside Plug-ins and Fragments packaged as JARs\n\
- Sub-directories of the directory named "src" of certain Plug-ins\n\
- Feature directories\n\
\n\
Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
Update License") during the installation process. If the Feature contains\n\
Included Features, the Feature Update License should either provide you\n\
with the terms and conditions governing the Included Features or inform\n\
you where you can locate them. Feature Update Licenses may be found in\n\
the "license" property of files named "feature.properties" found within a Feature.\n\
Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\
terms and conditions (or references to such terms and conditions) that\n\
govern your use of the associated Content in that directory.\n\
\n\
THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
\n\
- Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)\n\
- Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
- Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
- Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
- Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
- Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
\n\
IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\
is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
govern that particular Content.\n\
\n\
\n\Use of Provisioning Technology\n\
\n\
The Eclipse Foundation makes available provisioning software, examples of which include,\n\
but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
the purpose of allowing users to install software, documentation, information and/or\n\
other materials (collectively "Installable Software"). This capability is provided with\n\
the intent of allowing such users to install, extend and update Eclipse-based products.\n\
Information about packaging Installable Software is available at\n\
http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
\n\
You may use Provisioning Technology to allow other parties to install Installable Software.\n\
You shall be responsible for enabling the applicable license agreements relating to the\n\
Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
making it available in accordance with the Specification, you further acknowledge your\n\
agreement to, and the acquisition of all necessary rights to permit the following:\n\
\n\
1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
extending or updating the functionality of an Eclipse-based product.\n\
2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
govern the use of the Installable Software ("Installable Software Agreement") and such\n\
Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
with the Specification. Such Installable Software Agreement must inform the user of the\n\
terms and conditions that govern the Installable Software and must solicit acceptance by\n\
the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
indication of agreement by the user, the provisioning Technology will complete installation\n\
of the Installable Software.\n\
\n\
Cryptography\n\
\n\
Content may contain encryption software. The country in which you are\n\
currently may have restrictions on the import, possession, and use,\n\
and/or re-export to another country, of encryption software. BEFORE\n\
using any encryption software, please check the country's laws,\n\
regulations and policies concerning the import, possession, or use, and\n\
re-export of encryption software, to see if this is permitted.\n\
\n\
Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n
########### end of license property ##########################################

View file

@ -33,11 +33,11 @@
<import plugin="org.eclipse.tm.terminal.view.ui" version="4.0.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.tm.terminal.view.ui.process" version="4.0.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.equinox.security" version="1.1.100" match="greaterOrEqual"/>
<import plugin="org.eclipse.tm.terminal.serial" version="4.0.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.tm.terminal.ssh" version="4.0.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.tm.terminal.telnet" version="4.0.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.tm.terminal" version="4.0.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.cdt.core.native"/>
<import feature="org.eclipse.tm.terminal.view.serial.feature" version="4.0.0" match="greaterOrEqual"/>
</requires>
<plugin
@ -68,13 +68,6 @@
version="0.0.0"
unpack="false"/>
<plugin
id="org.eclipse.tm.terminal.view.ui.serial"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.eclipse.tm.terminal.view.ui.ssh"
download-size="0"

View file

@ -25,6 +25,7 @@
<requires>
<import feature="org.eclipse.tm.terminal.view.feature" version="4.0.0" match="greaterOrEqual"/>
<import feature="org.eclipse.tm.terminal.view.serial.sdk.feature" version="4.0.0" match="greaterOrEqual"/>
</requires>
<plugin
@ -55,13 +56,6 @@
version="0.0.0"
unpack="false"/>
<plugin
id="org.eclipse.tm.terminal.view.ui.serial.source"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.eclipse.tm.terminal.view.ui.ssh.source"
download-size="0"

View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>org.eclipse.tm.terminal.serial.feature</name>
<name>org.eclipse.tm.terminal.view.serial.feature</name>
<comment></comment>
<projects>
</projects>

View file

@ -0,0 +1,36 @@
###############################################################################
# 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 (Wind River) - initial API and implementation
###############################################################################
# feature.properties
# contains externalized strings for feature.xml
# "%foo" in feature.xml corresponds to the key "foo" in this file
# java.io.Properties file (ISO 8859-1 with "\" escapes)
# This file should be translated.
# "featureName" property - name of the feature
featureName=TM Terminal Serial Connector Extensions
# "providerName" property - name of the company that provides the feature
providerName=Eclipse TM Project
# "tmUpdateSiteName" property - label for the update site
tmUpdateSiteName=TM Terminal 4.0 Updates
# "description" property - description of the feature
description=A serial line connector for the Terminal using RXTX API
# "copyright" property - text of the "Feature Update Copyright"
copyright=\
Copyright (c) 2003, 2015 Wind River Systems, Inc. and others.\n\
All rights reserved. This program and the accompanying materials\n\
are made available under the terms of the Eclipse Public License v1.0\n\
which accompanies this distribution, and is available at\n\
http://www.eclipse.org/legal/epl-v10.html
################ end of copyright property ####################################

View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2006, 2014 Wind River Systems, Inc. and others.
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
@ -11,11 +11,10 @@
Uwe Stieber (Wind River) - Bug 434937 - Releng: The Terminal Features have an incorrect license
-->
<feature
id="org.eclipse.tm.terminal.serial.feature"
id="org.eclipse.tm.terminal.view.serial.feature"
label="%featureName"
version="4.0.0.qualifier"
provider-name="%providerName"
plugin="org.eclipse.tm.terminal.serial"
license-feature="org.eclipse.license"
license-feature-version="1.0.1.qualifier">
@ -32,21 +31,20 @@
</license>
<url>
<update label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/4.0"/>
<discovery label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/3.7"/>
<update label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/terminal/updates/4.0"/>
</url>
<requires>
<import plugin="org.eclipse.ui"/>
<import plugin="org.eclipse.core.runtime"/>
<import plugin="org.eclipse.tm.terminal" version="3.3.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.tm.terminal" version="4.0.0" match="greaterOrEqual"/>
<import feature="org.eclipse.tm.terminal.feature" version="4.0.0" match="compatible"/>
</requires>
<plugin
id="org.eclipse.tm.terminal.serial"
download-size="19"
install-size="19"
id="org.eclipse.tm.terminal.view.ui.serial"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>

View file

@ -12,7 +12,7 @@
</parent>
<version>4.0.0.qualifier</version>
<artifactId>org.eclipse.tm.terminal.serial.sdk.feature</artifactId>
<artifactId>org.eclipse.tm.terminal.view.serial.feature</artifactId>
<packaging>eclipse-feature</packaging>
<build>

View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>org.eclipse.tm.terminal.serial.sdk.feature</name>
<name>org.eclipse.tm.terminal.view.serial.sdk.feature</name>
<comment></comment>
<projects>
</projects>

View file

@ -0,0 +1,36 @@
###############################################################################
# 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 (Wind River) - initial API and implementation
###############################################################################
# feature.properties
# contains externalized strings for feature.xml
# "%foo" in feature.xml corresponds to the key "foo" in this file
# java.io.Properties file (ISO 8859-1 with "\" escapes)
# This file should be translated.
# "featureName" property - name of the feature
featureName=TM Terminal Serial Connector Extensions, SDK
# "providerName" property - name of the company that provides the feature
providerName=Eclipse TM Project
# "tmUpdateSiteName" property - label for the update site
tmUpdateSiteName=TM Terminal 4.0 Updates
# "description" property - description of the feature
description=A serial line connector for the Terminal using RXTX API
# "copyright" property - text of the "Feature Update Copyright"
copyright=\
Copyright (c) 2003, 2015 Wind River Systems, Inc. and others.\n\
All rights reserved. This program and the accompanying materials\n\
are made available under the terms of the Eclipse Public License v1.0\n\
which accompanies this distribution, and is available at\n\
http://www.eclipse.org/legal/epl-v10.html
################ end of copyright property ####################################

View file

@ -11,7 +11,7 @@
Uwe Stieber (Wind River) - Bug 434937 - Releng: The Terminal Features have an incorrect license
-->
<feature
id="org.eclipse.tm.terminal.serial.sdk.feature"
id="org.eclipse.tm.terminal.view.serial.sdk.feature"
label="%featureName"
version="4.0.0.qualifier"
provider-name="%providerName"
@ -31,12 +31,11 @@
</license>
<url>
<update label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/4.0"/>
<discovery label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/3.7"/>
<update label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/terminal/updates/4.0"/>
</url>
<includes
id="org.eclipse.tm.terminal.serial.feature"
id="org.eclipse.tm.terminal.view.serial.feature"
version="0.0.0"/>
<requires>
@ -44,9 +43,9 @@
</requires>
<plugin
id="org.eclipse.tm.terminal.serial.source"
download-size="19"
install-size="19"
id="org.eclipse.tm.terminal.view.ui.serial.source"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>

View file

@ -12,7 +12,7 @@
</parent>
<version>4.0.0.qualifier</version>
<artifactId>org.eclipse.tm.terminal.serial.feature</artifactId>
<artifactId>org.eclipse.tm.terminal.view.serial.sdk.feature</artifactId>
<packaging>eclipse-feature</packaging>
<build>

View file

@ -1,7 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
</classpath>

View file

@ -1 +0,0 @@
/bin/

View file

@ -1,34 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>org.eclipse.tm.terminal.serial</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.pde.ManifestBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.pde.SchemaBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
</natures>
</projectDescription>

View file

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

View file

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

View file

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

View file

@ -1,28 +0,0 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
<title>About</title>
</head>
<body lang="EN-US">
<h2>About This Content</h2>
<p>June 5, 2007</p>
<h3>License</h3>
<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;). Unless otherwise
indicated below, the Content is provided to you under the terms and conditions of the
Eclipse Public License Version 1.0 (&quot;EPL&quot;). A copy of the EPL is available
at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
being redistributed by another party (&quot;Redistributor&quot;) 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 <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>
</body>
</html>

View file

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

View file

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

View file

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

View file

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

View file

@ -1,21 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<?eclipse version="3.2"?>
<!--
# Copyright (c) 2006, 2008 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
-->
<plugin>
<extension
point="org.eclipse.tm.terminal.terminalConnectors">
<connector name="%serialConnection"
id="org.eclipse.tm.internal.terminal.serial.SerialConnector"
class="org.eclipse.tm.internal.terminal.serial.SerialConnector"/>
</extension>
</plugin>

View file

@ -1,17 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.eclipse.tm.terminal</groupId>
<artifactId>org.eclipse.tm.terminal.maven-build</artifactId>
<version>4.0.0-SNAPSHOT</version>
<relativePath>../../admin/pom-build.xml</relativePath>
</parent>
<version>4.0.0.qualifier</version>
<artifactId>org.eclipse.tm.terminal.serial</artifactId>
<packaging>eclipse-plugin</packaging>
</project>

View file

@ -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;
}
}

View file

@ -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;
}

View file

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

View file

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

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.2 KiB

View file

@ -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,

View file

@ -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
SerialLauncherDelegate.label=Serial Terminal
# ----- Terminal Connectors -----
SerialConnector.label = Serial

View file

@ -1,8 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<?eclipse version="3.4"?>
<plugin>
<!-- Terminal connector contributions -->
<extension point="org.eclipse.tm.terminal.terminalConnectors">
<connector
name="%SerialConnector.label"
id="org.eclipse.tm.terminal.connectors.serial"
class="org.eclipse.tm.terminal.view.ui.serial.connector.SerialConnector"/>
</extension>
<!-- Terminals launcher delegate contributions -->
<!-- Terminal launcher delegate contributions -->
<extension point="org.eclipse.tm.terminal.view.ui.launcherDelegates">
<delegate
class="org.eclipse.tm.terminal.view.ui.serial.launcher.SerialLauncherDelegate"

View file

@ -9,7 +9,7 @@
* Michael Scharf (Wind River) - initial API and implementation
* 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 org.eclipse.tm.internal.terminal.provisional.api.ISettingsStore;

View file

@ -19,7 +19,7 @@
* Martin Oberhuber (Wind River) - [221184] Redesign Serial Terminal Ownership Handling
* Michael Scharf (Wind River) - [262996] get rid of TerminalState.OPENED
*******************************************************************************/
package org.eclipse.tm.internal.terminal.serial;
package org.eclipse.tm.terminal.view.ui.serial.connector;
import gnu.io.CommPortIdentifier;
import gnu.io.NoSuchPortException;
@ -36,9 +36,11 @@ import org.eclipse.swt.widgets.MessageBox;
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.terminal.view.ui.serial.nls.Messages;
@SuppressWarnings("restriction")
public class SerialConnectWorker extends Thread {
private final ITerminalControl fControl;
/* default */ final ITerminalControl fControl;
private final SerialConnector fConn;
/**
@ -74,7 +76,7 @@ public class SerialConnectWorker extends Thread {
// ports it finds by scanning the system.
// iterate over the known ports and add them to the property
Enumeration portIdEnum= CommPortIdentifier.getPortIdentifiers();
Enumeration<?> 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);

View file

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

View file

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

View file

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

View file

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

View file

@ -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;
}
}

View file

@ -65,7 +65,7 @@ public class SerialConfigurationPanel extends AbstractExtendedConfigurationPanel
@Override
public void extractData(Map<String, Object> 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());

View file

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

View file

@ -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;
}

View file

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

View file

@ -20,15 +20,12 @@
<modules>
<!-- Terminal Widget features and plug-ins -->
<module>plugins/org.eclipse.tm.terminal</module>
<module>plugins/org.eclipse.tm.terminal.serial</module>
<module>plugins/org.eclipse.tm.terminal.ssh</module>
<module>plugins/org.eclipse.tm.terminal.telnet</module>
<module>plugins/org.eclipse.tm.terminal.remote</module>
<module>features/org.eclipse.tm.terminal.feature</module>
<module>features/org.eclipse.tm.terminal.sdk.feature</module>
<module>features/org.eclipse.tm.terminal.serial.feature</module>
<module>features/org.eclipse.tm.terminal.serial.sdk.feature</module>
<module>features/org.eclipse.tm.terminal.ssh.feature</module>
<module>features/org.eclipse.tm.terminal.ssh.sdk.feature</module>
<module>features/org.eclipse.tm.terminal.telnet.feature</module>
@ -50,6 +47,8 @@
<module>features/org.eclipse.tm.terminal.view.sdk.feature</module>
<module>features/org.eclipse.tm.terminal.view.rse.feature</module>
<module>features/org.eclipse.tm.terminal.view.rse.sdk.feature</module>
<module>features/org.eclipse.tm.terminal.view.serial.feature</module>
<module>features/org.eclipse.tm.terminal.view.serial.sdk.feature</module>
<!-- TM Terminal Repository -->
<module>repos/org.eclipse.tm.terminal.repo</module>

View file

@ -7,12 +7,6 @@
<feature url="features/org.eclipse.tm.terminal.sdk.feature_0.0.0.jar" id="org.eclipse.tm.terminal.sdk.feature" version="0.0.0">
<category name="tm_main"/>
</feature>
<feature url="features/org.eclipse.tm.terminal.serial.feature_0.0.0.jar" id="org.eclipse.tm.terminal.serial.feature" version="0.0.0">
<category name="tm_main"/>
</feature>
<feature url="features/org.eclipse.tm.terminal.serial.sdk.feature_0.0.0.jar" id="org.eclipse.tm.terminal.serial.sdk.feature" version="0.0.0">
<category name="tm_main"/>
</feature>
<feature url="features/org.eclipse.tm.terminal.ssh.feature_0.0.0.jar" id="org.eclipse.tm.terminal.ssh.feature" version="0.0.0">
<category name="tm_main"/>
</feature>
@ -45,6 +39,12 @@
<feature url="features/org.eclipse.tm.terminal.view.rse.sdk.feature_0.0.0.jar" id="org.eclipse.tm.terminal.view.rse.sdk.feature" version="0.0.0">
<category name="tm_main"/>
</feature>
<feature url="features/org.eclipse.tm.terminal.view.serial.feature_0.0.0.jar" id="org.eclipse.tm.terminal.view.serial.feature" version="0.0.0">
<category name="tm_main"/>
</feature>
<feature url="features/org.eclipse.tm.terminal.view.serial.sdk.feature_0.0.0.jar" id="org.eclipse.tm.terminal.view.serial.sdk.feature" version="0.0.0">
<category name="tm_main"/>
</feature>
<category-def name="tm_main" label="TM Terminal 4.0 Main Features">
<description>