diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000000..6f8aa868022 --- /dev/null +++ b/.gitignore @@ -0,0 +1,10 @@ +bin/ +target/ +workspace/ +debug-workspace/ + +# ignore various emacs droppings +*~ +\#*\# + + diff --git a/admin/.gitignore b/admin/.gitignore new file mode 100644 index 00000000000..ea8c4bf7f35 --- /dev/null +++ b/admin/.gitignore @@ -0,0 +1 @@ +/target diff --git a/admin/.project b/admin/.project new file mode 100644 index 00000000000..c4aa4358e6c --- /dev/null +++ b/admin/.project @@ -0,0 +1,11 @@ + + + Administration (TM Terminal) + + + + + + + + diff --git a/admin/findbugs-exclude.xml b/admin/findbugs-exclude.xml new file mode 100644 index 00000000000..148a739f179 --- /dev/null +++ b/admin/findbugs-exclude.xml @@ -0,0 +1,74 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/admin/pom-build.xml b/admin/pom-build.xml new file mode 100644 index 00000000000..c97b08e1778 --- /dev/null +++ b/admin/pom-build.xml @@ -0,0 +1,107 @@ + + + 4.0.0 + + + org.eclipse.tm.terminal + org.eclipse.tm.terminal.maven-config + 4.0.0-SNAPSHOT + pom-config.xml + + + org.eclipse.tm.terminal + org.eclipse.tm.terminal.maven-build + 4.0.0-SNAPSHOT + pom + TM Terminal, Maven Build Master + + + + + org.eclipse.tycho + tycho-maven-plugin + + + org.eclipse.tycho + target-platform-configuration + + + org.eclipse.tycho + tycho-source-plugin + + + + + + + sign + + + + + + + org.eclipse.tycho.extras + tycho-pack200a-plugin + + + org.eclipse.cbi.maven.plugins + eclipse-jarsigner-plugin + + + org.eclipse.tycho.extras + tycho-pack200b-plugin + + + org.eclipse.tycho + tycho-p2-plugin + + + + + + + findbugs + + + + + org.codehaus.mojo + findbugs-maven-plugin + + + + + + + tests + + + + + org.eclipse.tycho + tycho-surefire-plugin + ${tycho-version} + + true + true + false + + + p2-installable-unit + org.eclipse.sdk.feature.group + ${sdk-version} + + + org.eclipse.sdk.ide + -Xms512m -Xmx1024m -XX:PermSize=256m -XX:MaxPermSize=256m -Drse.enableSecureStoreAccess=false -Dorg.eclipse.swt.browser.UseWebKitGTK=true + + + + + + + + diff --git a/admin/pom-config.xml b/admin/pom-config.xml new file mode 100644 index 00000000000..4778841ceba --- /dev/null +++ b/admin/pom-config.xml @@ -0,0 +1,394 @@ + + + 4.0.0 + + + 3.0 + + + org.eclipse.tm.terminal + org.eclipse.tm.terminal.maven-config + 4.0.0-SNAPSHOT + pom + TM Terminal, Maven Configuration Master + + + + Eclipse Public License + http://www.eclipse.org/legal/epl-v10.html + repo + + 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.htm + + + + + + Eclipse Foundation + http://www.eclipse.org/ + + + + + 0.20.0 + 0.20.0 + 2.6 + 1.7 + 1.5 + + 2.5.2 + 1.1.1 + + + ${env.WORKSPACE}/admin + UTF-8 + + scm:git:git://git.eclipse.org/gitroot/tm/org.eclipse.tm.terminal.git + + mars + ${project.artifactId}.zip + /home/data/httpd/download.eclipse.org/tm/terminal/builds/${terminal-stream}/nightly + 4.5 + + + http://download.eclipse.org/cbi/updates/license + http://download.eclipse.org/eclipse/updates/${sdk-version}milestones + http://download.eclipse.org/tools/orbit/downloads/drops/S20150316021154/repository/ + http://download.eclipse.org/tools/cdt/releases/8.6 + http://download.eclipse.org/tm/updates/4.0milestones + http://download.eclipse.org/tools/ptp/builds/remote/mars/milestones + http://download.eclipse.org/technology/swtbot/releases/latest/ + http://archive.eclipse.org/tm/updates/rxtx + + + + + license-feature + ${license-site} + p2 + + + platform + ${platform-site} + p2 + + + orbit + ${orbit-site} + p2 + + + cdt + ${cdt-site} + p2 + + + rse + ${rse-site} + p2 + + + remote + ${remote-site} + p2 + + + swtbot + ${swtbot-site} + p2 + + + rxtx + ${rxtx-site} + p2 + + + + + + sonatype + https://oss.sonatype.org/content/repositories/public + + true + + + true + + + + cbi + https://repo.eclipse.org/content/repositories/cbi-releases/ + + + + + + + kepler + + + kepler + 4.3 + http://download.eclipse.org/eclipse/updates/${sdk-version} + http://download.eclipse.org/tools/cdt/releases/8.4 + + + + + luna + + + luna + 4.4 + http://download.eclipse.org/eclipse/updates/${sdk-version} + http://download.eclipse.org/tools/cdt/releases/8.5 + + + + + + + + org.eclipse.tycho + tycho-maven-plugin + ${tycho-version} + true + + + + + + org.eclipse.tycho + tycho-maven-plugin + ${tycho-version} + true + + + org.eclipse.tycho + target-platform-configuration + ${tycho-version} + + + + linux + gtk + x86 + + + linux + gtk + x86_64 + + + win32 + win32 + x86 + + + win32 + win32 + x86_64 + + + macosx + cocoa + x86 + + + macosx + cocoa + x86_64 + + + p2 + true + true + consider + + + + org.eclipse.tycho + tycho-compiler-plugin + ${tycho-version} + + UTF-8 + + + + org.eclipse.tycho + tycho-source-plugin + ${tycho-version} + + UTF-8 + + + + plugin-source + + plugin-source + + + + + + org.eclipse.tycho + tycho-packaging-plugin + ${tycho-version} + + + org.eclipse.tycho.extras + tycho-buildtimestamp-jgit + ${tycho-version} + + + org.eclipse.tycho.extras + tycho-sourceref-jgit + ${tycho-extras-version} + + + + false + jgit + pom.xml + ignore + + true + + + + + org.eclipse.tycho + tycho-p2-repository-plugin + ${tycho-version} + + ${project.artifactId} + + + + org.apache.maven.plugins + maven-resources-plugin + ${maven-resources-version} + + UTF-8 + + + + org.apache.maven.plugins + maven-antrun-plugin + ${maven-antrun-version} + + + org.codehaus.gmaven + gmaven-plugin + ${gmaven-version} + + + org.codehaus.mojo + findbugs-maven-plugin + ${findbugs-version} + + UTF-8 + Max + Low + true + false + ${adminDir}/findbugs-exclude.xml + + + + + check + + + + + + org.jacoco + jacoco-maven-plugin + ${jacoco-version} + + + + + org.eclipse.tycho.extras + tycho-pack200a-plugin + ${tycho-version} + + + pack200-normalize + verify + + normalize + + + + + + org.eclipse.cbi.maven.plugins + eclipse-jarsigner-plugin + ${eclipse-jarsigner-version} + + + sign + verify + + sign + + + + + + org.eclipse.tycho.extras + tycho-pack200b-plugin + ${tycho-version} + + + pack200-pack + verify + + pack + + + + + + + + org.eclipse.tycho + tycho-p2-plugin + ${tycho-version} + + + + + p2-metadata + package + + p2-metadata + + + + + false + + + + + + diff --git a/terminals-eclipse-4.4.x-luna.target b/admin/target-defs/eclipse-4.4.x-luna.target similarity index 100% rename from terminals-eclipse-4.4.x-luna.target rename to admin/target-defs/eclipse-4.4.x-luna.target diff --git a/features/org.eclipse.tm.terminal.feature/pom.xml b/features/org.eclipse.tm.terminal.feature/pom.xml index da1106db887..a2f63b903fb 100644 --- a/features/org.eclipse.tm.terminal.feature/pom.xml +++ b/features/org.eclipse.tm.terminal.feature/pom.xml @@ -1,16 +1,18 @@ - + 4.0.0 + - org.eclipse.tm.maven-build - org.eclipse.tm + org.eclipse.tm.terminal + org.eclipse.tm.terminal.maven-build 4.0.0-SNAPSHOT - ../../../admin/pom-build.xml + ../../admin/pom-build.xml - org.eclipse.tm.features - org.eclipse.tm.terminal.feature + 4.0.0.qualifier + org.eclipse.tm.terminal.feature eclipse-feature diff --git a/features/org.eclipse.tm.terminal.remote.feature/feature.xml b/features/org.eclipse.tm.terminal.remote.feature/feature.xml index 9e5c25db581..293170ca182 100644 --- a/features/org.eclipse.tm.terminal.remote.feature/feature.xml +++ b/features/org.eclipse.tm.terminal.remote.feature/feature.xml @@ -37,7 +37,7 @@ - + diff --git a/features/org.eclipse.tm.terminal.remote.feature/pom.xml b/features/org.eclipse.tm.terminal.remote.feature/pom.xml index db3f4eba50e..946a6ead885 100644 --- a/features/org.eclipse.tm.terminal.remote.feature/pom.xml +++ b/features/org.eclipse.tm.terminal.remote.feature/pom.xml @@ -1,16 +1,18 @@ - + 4.0.0 + - org.eclipse.tm.maven-build - org.eclipse.tm + org.eclipse.tm.terminal + org.eclipse.tm.terminal.maven-build 4.0.0-SNAPSHOT - ../../../admin/pom-build.xml + ../../admin/pom-build.xml - org.eclipse.tm.features - org.eclipse.tm.terminal.remote.feature + 4.0.0.qualifier + org.eclipse.tm.terminal.remote.feature eclipse-feature diff --git a/features/org.eclipse.tm.terminal.remote.sdk.feature/pom.xml b/features/org.eclipse.tm.terminal.remote.sdk.feature/pom.xml index 23827bd677b..3f0b5f945f1 100644 --- a/features/org.eclipse.tm.terminal.remote.sdk.feature/pom.xml +++ b/features/org.eclipse.tm.terminal.remote.sdk.feature/pom.xml @@ -1,16 +1,18 @@ - + 4.0.0 + - org.eclipse.tm.maven-build - org.eclipse.tm + org.eclipse.tm.terminal + org.eclipse.tm.terminal.maven-build 4.0.0-SNAPSHOT - ../../../admin/pom-build.xml + ../../admin/pom-build.xml - org.eclipse.tm.features - org.eclipse.tm.terminal.remote.sdk.feature + 4.0.0.qualifier + org.eclipse.tm.terminal.remote.sdk.feature eclipse-feature diff --git a/features/org.eclipse.tm.terminal.sdk.feature/pom.xml b/features/org.eclipse.tm.terminal.sdk.feature/pom.xml index f0544bbf64f..f648d7ecaa3 100644 --- a/features/org.eclipse.tm.terminal.sdk.feature/pom.xml +++ b/features/org.eclipse.tm.terminal.sdk.feature/pom.xml @@ -1,16 +1,18 @@ - + 4.0.0 + - org.eclipse.tm.maven-build - org.eclipse.tm + org.eclipse.tm.terminal + org.eclipse.tm.terminal.maven-build 4.0.0-SNAPSHOT - ../../../admin/pom-build.xml + ../../admin/pom-build.xml - org.eclipse.tm.features - org.eclipse.tm.terminal.sdk.feature + 4.0.0.qualifier + org.eclipse.tm.terminal.sdk.feature eclipse-feature diff --git a/features/org.eclipse.tm.terminal.serial.feature/pom.xml b/features/org.eclipse.tm.terminal.serial.feature/pom.xml index 04701647b9a..69d16927fbe 100644 --- a/features/org.eclipse.tm.terminal.serial.feature/pom.xml +++ b/features/org.eclipse.tm.terminal.serial.feature/pom.xml @@ -1,16 +1,18 @@ - + 4.0.0 + - org.eclipse.tm.maven-build - org.eclipse.tm + org.eclipse.tm.terminal + org.eclipse.tm.terminal.maven-build 4.0.0-SNAPSHOT - ../../../admin/pom-build.xml + ../../admin/pom-build.xml - org.eclipse.tm.features - org.eclipse.tm.terminal.serial.feature + 4.0.0.qualifier + org.eclipse.tm.terminal.serial.feature eclipse-feature diff --git a/features/org.eclipse.tm.terminal.serial.sdk.feature/pom.xml b/features/org.eclipse.tm.terminal.serial.sdk.feature/pom.xml index 15eb72bbbb8..12dda0ab3bd 100644 --- a/features/org.eclipse.tm.terminal.serial.sdk.feature/pom.xml +++ b/features/org.eclipse.tm.terminal.serial.sdk.feature/pom.xml @@ -1,16 +1,18 @@ - + 4.0.0 + - org.eclipse.tm.maven-build - org.eclipse.tm + org.eclipse.tm.terminal + org.eclipse.tm.terminal.maven-build 4.0.0-SNAPSHOT - ../../../admin/pom-build.xml + ../../admin/pom-build.xml - org.eclipse.tm.features - org.eclipse.tm.terminal.serial.sdk.feature + 4.0.0.qualifier + org.eclipse.tm.terminal.serial.sdk.feature eclipse-feature diff --git a/features/org.eclipse.tm.terminal.ssh.feature/pom.xml b/features/org.eclipse.tm.terminal.ssh.feature/pom.xml index 1e6ef93121b..260bab28648 100644 --- a/features/org.eclipse.tm.terminal.ssh.feature/pom.xml +++ b/features/org.eclipse.tm.terminal.ssh.feature/pom.xml @@ -1,16 +1,18 @@ - + 4.0.0 + - org.eclipse.tm.maven-build - org.eclipse.tm + org.eclipse.tm.terminal + org.eclipse.tm.terminal.maven-build 4.0.0-SNAPSHOT - ../../../admin/pom-build.xml + ../../admin/pom-build.xml - org.eclipse.tm.features - org.eclipse.tm.terminal.ssh.feature + 4.0.0.qualifier + org.eclipse.tm.terminal.ssh.feature eclipse-feature diff --git a/features/org.eclipse.tm.terminal.ssh.sdk.feature/pom.xml b/features/org.eclipse.tm.terminal.ssh.sdk.feature/pom.xml index 3f0f7429bc7..97e8aae55c8 100644 --- a/features/org.eclipse.tm.terminal.ssh.sdk.feature/pom.xml +++ b/features/org.eclipse.tm.terminal.ssh.sdk.feature/pom.xml @@ -1,16 +1,18 @@ - + 4.0.0 + - org.eclipse.tm.maven-build - org.eclipse.tm + org.eclipse.tm.terminal + org.eclipse.tm.terminal.maven-build 4.0.0-SNAPSHOT - ../../../admin/pom-build.xml + ../../admin/pom-build.xml - org.eclipse.tm.features - org.eclipse.tm.terminal.ssh.sdk.feature + 4.0.0.qualifier + org.eclipse.tm.terminal.ssh.sdk.feature eclipse-feature diff --git a/features/org.eclipse.tm.terminal.telnet.feature/pom.xml b/features/org.eclipse.tm.terminal.telnet.feature/pom.xml index c82be495822..68cd02e37b9 100644 --- a/features/org.eclipse.tm.terminal.telnet.feature/pom.xml +++ b/features/org.eclipse.tm.terminal.telnet.feature/pom.xml @@ -1,16 +1,18 @@ - + 4.0.0 + - org.eclipse.tm.maven-build - org.eclipse.tm + org.eclipse.tm.terminal + org.eclipse.tm.terminal.maven-build 4.0.0-SNAPSHOT - ../../../admin/pom-build.xml + ../../admin/pom-build.xml - org.eclipse.tm.features - org.eclipse.tm.terminal.telnet.feature + 4.0.0.qualifier + org.eclipse.tm.terminal.telnet.feature eclipse-feature diff --git a/features/org.eclipse.tm.terminal.telnet.sdk.feature/pom.xml b/features/org.eclipse.tm.terminal.telnet.sdk.feature/pom.xml index 7d2150e6ece..2139e4760c5 100644 --- a/features/org.eclipse.tm.terminal.telnet.sdk.feature/pom.xml +++ b/features/org.eclipse.tm.terminal.telnet.sdk.feature/pom.xml @@ -1,16 +1,18 @@ - + 4.0.0 + - org.eclipse.tm.maven-build - org.eclipse.tm + org.eclipse.tm.terminal + org.eclipse.tm.terminal.maven-build 4.0.0-SNAPSHOT - ../../../admin/pom-build.xml + ../../admin/pom-build.xml - org.eclipse.tm.features - org.eclipse.tm.terminal.telnet.sdk.feature + 4.0.0.qualifier + org.eclipse.tm.terminal.telnet.sdk.feature eclipse-feature diff --git a/features/org.eclipse.tcf.te.terminals.feature/.project b/features/org.eclipse.tm.terminal.view.feature/.project similarity index 92% rename from features/org.eclipse.tcf.te.terminals.feature/.project rename to features/org.eclipse.tm.terminal.view.feature/.project index 9c5ef5a018f..1320e7a6255 100644 --- a/features/org.eclipse.tcf.te.terminals.feature/.project +++ b/features/org.eclipse.tm.terminal.view.feature/.project @@ -1,6 +1,6 @@ - org.eclipse.tcf.te.terminals.feature + org.eclipse.tm.terminal.view.feature diff --git a/features/org.eclipse.tcf.te.terminals.feature/build.properties b/features/org.eclipse.tm.terminal.view.feature/build.properties similarity index 100% rename from features/org.eclipse.tcf.te.terminals.feature/build.properties rename to features/org.eclipse.tm.terminal.view.feature/build.properties diff --git a/features/org.eclipse.tcf.te.terminals.feature/feature.properties b/features/org.eclipse.tm.terminal.view.feature/feature.properties similarity index 88% rename from features/org.eclipse.tcf.te.terminals.feature/feature.properties rename to features/org.eclipse.tm.terminal.view.feature/feature.properties index 39214dfd3e0..cf94c04841a 100644 --- a/features/org.eclipse.tcf.te.terminals.feature/feature.properties +++ b/features/org.eclipse.tm.terminal.view.feature/feature.properties @@ -24,12 +24,12 @@ updateSiteName=Eclipse Update Site # "description" property - description of the feature description=An integrated Eclipse View for the local command prompt (console) or \ - remote hosts (SSH, Telnet, Serial, TCF). Works on Windows, Linux, Mac and Solaris. \ - Requires Eclipse 3.8.2 or newer and a Java 7 or newer JRE. + remote hosts (SSH, Telnet, Serial). Works on Windows, Linux, Mac and Solaris. \ + Requires Eclipse 3.8.2 or newer and a Java 6 or newer JRE. # "copyright" property - text of the "Feature Update Copyright" copyright=\ -Copyright (c) 2011, 2015 Wind River Systems, Inc. and others.\n\ +Copyright (c) 2011 - 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\ diff --git a/features/org.eclipse.tcf.te.terminals.feature/feature.xml b/features/org.eclipse.tm.terminal.view.feature/feature.xml similarity index 59% rename from features/org.eclipse.tcf.te.terminals.feature/feature.xml rename to features/org.eclipse.tm.terminal.view.feature/feature.xml index a1c2dccdcf0..89db1a13c93 100644 --- a/features/org.eclipse.tcf.te.terminals.feature/feature.xml +++ b/features/org.eclipse.tm.terminal.view.feature/feature.xml @@ -1,10 +1,10 @@ @@ -21,68 +21,69 @@ - + - - + - - + + - - - + + + + + 4.0.0 - org.eclipse.tcf - org.eclipse.tcf.maven-build - 1.3.0-SNAPSHOT - ../../../admin/pom-build.xml + org.eclipse.tm.terminal + org.eclipse.tm.terminal.maven-build + 4.0.0-SNAPSHOT + ../../admin/pom-build.xml - 1.3.0.qualifier - org.eclipse.tcf.te.terminals.feature + 4.0.0.qualifier + org.eclipse.tm.terminal.view.feature eclipse-feature diff --git a/features/org.eclipse.tcf.te.terminals.rse.feature/.project b/features/org.eclipse.tm.terminal.view.rse.feature/.project similarity index 91% rename from features/org.eclipse.tcf.te.terminals.rse.feature/.project rename to features/org.eclipse.tm.terminal.view.rse.feature/.project index 70a2da45c60..7fae4425d90 100644 --- a/features/org.eclipse.tcf.te.terminals.rse.feature/.project +++ b/features/org.eclipse.tm.terminal.view.rse.feature/.project @@ -1,6 +1,6 @@ - org.eclipse.tcf.te.terminals.rse.feature + org.eclipse.tm.terminal.view.rse.feature diff --git a/features/org.eclipse.tcf.te.terminals.rse.feature/build.properties b/features/org.eclipse.tm.terminal.view.rse.feature/build.properties similarity index 100% rename from features/org.eclipse.tcf.te.terminals.rse.feature/build.properties rename to features/org.eclipse.tm.terminal.view.rse.feature/build.properties diff --git a/features/org.eclipse.tcf.te.terminals.rse.feature/feature.properties b/features/org.eclipse.tm.terminal.view.rse.feature/feature.properties similarity index 100% rename from features/org.eclipse.tcf.te.terminals.rse.feature/feature.properties rename to features/org.eclipse.tm.terminal.view.rse.feature/feature.properties diff --git a/features/org.eclipse.tcf.te.terminals.rse.feature/feature.xml b/features/org.eclipse.tm.terminal.view.rse.feature/feature.xml similarity index 67% rename from features/org.eclipse.tcf.te.terminals.rse.feature/feature.xml rename to features/org.eclipse.tm.terminal.view.rse.feature/feature.xml index 43c91f160c1..a36aae3d978 100644 --- a/features/org.eclipse.tcf.te.terminals.rse.feature/feature.xml +++ b/features/org.eclipse.tm.terminal.view.rse.feature/feature.xml @@ -1,10 +1,10 @@ @@ -21,7 +21,7 @@ - + @@ -30,15 +30,15 @@ - - - + + + - + 4.0.0 - org.eclipse.tcf - org.eclipse.tcf.maven-build - 1.3.0-SNAPSHOT - ../../../admin/pom-build.xml + org.eclipse.tm.terminal + org.eclipse.tm.terminal.maven-build + 4.0.0-SNAPSHOT + ../../admin/pom-build.xml - 1.3.0.qualifier - org.eclipse.tcf.te.terminals.sdk.feature + 4.0.0.qualifier + org.eclipse.tm.terminal.view.rse.feature eclipse-feature diff --git a/features/org.eclipse.tcf.te.terminals.rse.sdk.feature/.project b/features/org.eclipse.tm.terminal.view.rse.sdk.feature/.project similarity index 92% rename from features/org.eclipse.tcf.te.terminals.rse.sdk.feature/.project rename to features/org.eclipse.tm.terminal.view.rse.sdk.feature/.project index a750dc9c205..e47910add31 100644 --- a/features/org.eclipse.tcf.te.terminals.rse.sdk.feature/.project +++ b/features/org.eclipse.tm.terminal.view.rse.sdk.feature/.project @@ -1,6 +1,6 @@ - org.eclipse.tcf.te.terminals.rse.sdk.feature + org.eclipse.tm.terminal.view.rse.sdk.feature diff --git a/features/org.eclipse.tcf.te.terminals.rse.sdk.feature/build.properties b/features/org.eclipse.tm.terminal.view.rse.sdk.feature/build.properties similarity index 100% rename from features/org.eclipse.tcf.te.terminals.rse.sdk.feature/build.properties rename to features/org.eclipse.tm.terminal.view.rse.sdk.feature/build.properties diff --git a/features/org.eclipse.tcf.te.terminals.rse.sdk.feature/feature.properties b/features/org.eclipse.tm.terminal.view.rse.sdk.feature/feature.properties similarity index 100% rename from features/org.eclipse.tcf.te.terminals.rse.sdk.feature/feature.properties rename to features/org.eclipse.tm.terminal.view.rse.sdk.feature/feature.properties diff --git a/features/org.eclipse.tcf.te.terminals.rse.sdk.feature/feature.xml b/features/org.eclipse.tm.terminal.view.rse.sdk.feature/feature.xml similarity index 61% rename from features/org.eclipse.tcf.te.terminals.rse.sdk.feature/feature.xml rename to features/org.eclipse.tm.terminal.view.rse.sdk.feature/feature.xml index b1bfa84c7a7..d4859dc775a 100644 --- a/features/org.eclipse.tcf.te.terminals.rse.sdk.feature/feature.xml +++ b/features/org.eclipse.tm.terminal.view.rse.sdk.feature/feature.xml @@ -1,8 +1,8 @@ @@ -20,16 +20,16 @@ - + - - + + 4.0.0 - org.eclipse.tcf - org.eclipse.tcf.maven-build - 1.3.0-SNAPSHOT - ../../../admin/pom-build.xml + org.eclipse.tm.terminal + org.eclipse.tm.terminal.maven-build + 4.0.0-SNAPSHOT + ../../admin/pom-build.xml - 1.3.0.qualifier - org.eclipse.tcf.te.terminals.rse.sdk.feature + 4.0.0.qualifier + org.eclipse.tm.terminal.view.rse.sdk.feature eclipse-feature diff --git a/features/org.eclipse.tcf.te.terminals.sdk.feature/.project b/features/org.eclipse.tm.terminal.view.sdk.feature/.project similarity index 92% rename from features/org.eclipse.tcf.te.terminals.sdk.feature/.project rename to features/org.eclipse.tm.terminal.view.sdk.feature/.project index 22f1191393b..c8ba6fd3f78 100644 --- a/features/org.eclipse.tcf.te.terminals.sdk.feature/.project +++ b/features/org.eclipse.tm.terminal.view.sdk.feature/.project @@ -1,6 +1,6 @@ - org.eclipse.tcf.te.terminals.sdk.feature + org.eclipse.tm.terminal.view.sdk.feature diff --git a/features/org.eclipse.tcf.te.terminals.sdk.feature/build.properties b/features/org.eclipse.tm.terminal.view.sdk.feature/build.properties similarity index 100% rename from features/org.eclipse.tcf.te.terminals.sdk.feature/build.properties rename to features/org.eclipse.tm.terminal.view.sdk.feature/build.properties diff --git a/features/org.eclipse.tcf.te.terminals.sdk.feature/feature.properties b/features/org.eclipse.tm.terminal.view.sdk.feature/feature.properties similarity index 88% rename from features/org.eclipse.tcf.te.terminals.sdk.feature/feature.properties rename to features/org.eclipse.tm.terminal.view.sdk.feature/feature.properties index 0ba33f07709..b47482d1b2d 100644 --- a/features/org.eclipse.tcf.te.terminals.sdk.feature/feature.properties +++ b/features/org.eclipse.tm.terminal.view.sdk.feature/feature.properties @@ -24,12 +24,12 @@ updateSiteName=Eclipse Update Site # "description" property - description of the feature description=An integrated Eclipse View for the local command prompt (console) or \ - remote hosts via (SSH, Telnet, Serial, TCF). Works on Windows, Linux, Mac and Solaris. \ - Requires Eclipse 3.8.2 or newer and a Java 7 or newer JRE. + remote hosts via (SSH, Telnet, Serial). Works on Windows, Linux, Mac and Solaris. \ + Requires Eclipse 3.8.2 or newer and a Java 6 or newer JRE. # "copyright" property - text of the "Feature Update Copyright" copyright=\ -Copyright (c) 2011, 2014 Wind River Systems, Inc. and others.\n\ +Copyright (c) 2011 - 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\ diff --git a/features/org.eclipse.tcf.te.terminals.sdk.feature/feature.xml b/features/org.eclipse.tm.terminal.view.sdk.feature/feature.xml similarity index 68% rename from features/org.eclipse.tcf.te.terminals.sdk.feature/feature.xml rename to features/org.eclipse.tm.terminal.view.sdk.feature/feature.xml index 85d255b6d00..6afabf33ff1 100644 --- a/features/org.eclipse.tcf.te.terminals.sdk.feature/feature.xml +++ b/features/org.eclipse.tm.terminal.view.sdk.feature/feature.xml @@ -1,8 +1,8 @@ @@ -20,57 +20,57 @@ - + - + 4.0.0 - org.eclipse.tcf - org.eclipse.tcf.maven-build - 1.3.0-SNAPSHOT - ../../../admin/pom-build.xml + org.eclipse.tm.terminal + org.eclipse.tm.terminal.maven-build + 4.0.0-SNAPSHOT + ../../admin/pom-build.xml - 1.3.0.qualifier - org.eclipse.tcf.te.terminals.rse.feature + 4.0.0.qualifier + org.eclipse.tm.terminal.view.sdk.feature eclipse-feature diff --git a/plugins/org.eclipse.tcf.te.core.terminals/.options b/plugins/org.eclipse.tcf.te.core.terminals/.options deleted file mode 100644 index cd0d16fd131..00000000000 --- a/plugins/org.eclipse.tcf.te.core.terminals/.options +++ /dev/null @@ -1 +0,0 @@ -org.eclipse.tcf.te.core.terminals/debugmode = 0 diff --git a/plugins/org.eclipse.tcf.te.core.terminals/META-INF/MANIFEST.MF b/plugins/org.eclipse.tcf.te.core.terminals/META-INF/MANIFEST.MF deleted file mode 100644 index 0cf3a8a0ee7..00000000000 --- a/plugins/org.eclipse.tcf.te.core.terminals/META-INF/MANIFEST.MF +++ /dev/null @@ -1,21 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: %pluginName -Bundle-SymbolicName: org.eclipse.tcf.te.core.terminals;singleton:=true -Bundle-Version: 1.3.0.qualifier -Bundle-Activator: org.eclipse.tcf.te.core.terminals.activator.CoreBundleActivator -Bundle-Vendor: %providerName -Require-Bundle: org.eclipse.core.expressions;bundle-version="3.4.400", - org.eclipse.core.runtime;bundle-version="3.8.0" -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 -Bundle-ActivationPolicy: lazy -Bundle-Localization: plugin -Export-Package: org.eclipse.tcf.te.core.terminals, - org.eclipse.tcf.te.core.terminals.activator;x-internal:=true, - org.eclipse.tcf.te.core.terminals.interfaces, - org.eclipse.tcf.te.core.terminals.interfaces.constants, - org.eclipse.tcf.te.core.terminals.internal;x-internal:=true, - org.eclipse.tcf.te.core.terminals.nls;x-internal:=true, - org.eclipse.tcf.te.core.terminals.preferences, - org.eclipse.tcf.te.core.terminals.tracing, - org.eclipse.tcf.te.core.terminals.utils diff --git a/plugins/org.eclipse.tcf.te.core.terminals/te-feature.png b/plugins/org.eclipse.tcf.te.core.terminals/te-feature.png deleted file mode 100644 index 8e1143d7de2..00000000000 Binary files a/plugins/org.eclipse.tcf.te.core.terminals/te-feature.png and /dev/null differ diff --git a/plugins/org.eclipse.tcf.te.ui.terminals.local/META-INF/MANIFEST.MF b/plugins/org.eclipse.tcf.te.ui.terminals.local/META-INF/MANIFEST.MF deleted file mode 100644 index 84f9ad6ac24..00000000000 --- a/plugins/org.eclipse.tcf.te.ui.terminals.local/META-INF/MANIFEST.MF +++ /dev/null @@ -1,30 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: %pluginName -Bundle-SymbolicName: org.eclipse.tcf.te.ui.terminals.local;singleton:=true -Bundle-Version: 1.3.0.qualifier -Bundle-Activator: org.eclipse.tcf.te.ui.terminals.local.activator.UIPlugin -Bundle-Vendor: %providerName -Import-Package: org.eclipse.cdt.utils.pty;mandatory:=native -Require-Bundle: org.eclipse.cdt.core;bundle-version="5.6";resolution:=optional, - org.eclipse.core.expressions;bundle-version="3.4.400", - org.eclipse.core.resources;bundle-version="3.8.1";resolution:=optional, - org.eclipse.core.runtime;bundle-version="3.8.0", - org.eclipse.core.variables;bundle-version="3.2.600", - org.eclipse.debug.ui;bundle-version="3.8.1";resolution:=optional, - org.eclipse.tcf.te.core.terminals;bundle-version="1.3.0", - org.eclipse.tcf.te.ui.terminals;bundle-version="1.3.0", - org.eclipse.tcf.te.ui.terminals.process;bundle-version="1.3.0", - org.eclipse.tm.terminal;bundle-version="3.3.1", - org.eclipse.ui;bundle-version="3.8.0" -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 -Bundle-ActivationPolicy: lazy -Bundle-Localization: plugin -Export-Package: org.eclipse.tcf.te.ui.terminals.local.activator;x-internal:=true, - org.eclipse.tcf.te.ui.terminals.local.controls, - org.eclipse.tcf.te.ui.terminals.local.help, - org.eclipse.tcf.te.ui.terminals.local.launcher, - org.eclipse.tcf.te.ui.terminals.local.nls;x-internal:=true, - org.eclipse.tcf.te.ui.terminals.local.showin, - org.eclipse.tcf.te.ui.terminals.local.showin.interfaces, - org.eclipse.tcf.te.ui.terminals.local.showin.preferences diff --git a/plugins/org.eclipse.tcf.te.ui.terminals.serial/META-INF/MANIFEST.MF b/plugins/org.eclipse.tcf.te.ui.terminals.serial/META-INF/MANIFEST.MF deleted file mode 100644 index beca7769c7c..00000000000 --- a/plugins/org.eclipse.tcf.te.ui.terminals.serial/META-INF/MANIFEST.MF +++ /dev/null @@ -1,24 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: %pluginName -Bundle-SymbolicName: org.eclipse.tcf.te.ui.terminals.serial;singleton:=true -Bundle-Version: 1.3.0.qualifier -Bundle-Activator: org.eclipse.tcf.te.ui.terminals.serial.activator.UIPlugin -Bundle-Vendor: %providerName -Require-Bundle: org.eclipse.core.expressions;bundle-version="3.4.400", - org.eclipse.core.runtime;bundle-version="3.8.0", - org.eclipse.equinox.security;bundle-version="1.1.100", - org.eclipse.tcf.te.core.terminals;bundle-version="1.3.0", - org.eclipse.tcf.te.ui.terminals;bundle-version="1.3.0", - org.eclipse.tm.terminal;bundle-version="3.3.1", - org.eclipse.tm.terminal.serial;bundle-version="2.1.400", - org.eclipse.ui;bundle-version="3.8.0" -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 -Bundle-ActivationPolicy: lazy -Bundle-Localization: plugin -Export-Package: org.eclipse.tcf.te.ui.terminals.serial.activator;x-internal:=true, - org.eclipse.tcf.te.ui.terminals.serial.controls, - org.eclipse.tcf.te.ui.terminals.serial.interfaces, - org.eclipse.tcf.te.ui.terminals.serial.launcher, - org.eclipse.tcf.te.ui.terminals.serial.nls;x-internal:=true -Import-Package: gnu.io;resolution:=optional diff --git a/plugins/org.eclipse.tcf.te.ui.terminals.ssh/META-INF/MANIFEST.MF b/plugins/org.eclipse.tcf.te.ui.terminals.ssh/META-INF/MANIFEST.MF deleted file mode 100644 index 63f461c8f60..00000000000 --- a/plugins/org.eclipse.tcf.te.ui.terminals.ssh/META-INF/MANIFEST.MF +++ /dev/null @@ -1,22 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: %pluginName -Bundle-SymbolicName: org.eclipse.tcf.te.ui.terminals.ssh;singleton:=true -Bundle-Version: 1.3.0.qualifier -Bundle-Activator: org.eclipse.tcf.te.ui.terminals.ssh.activator.UIPlugin -Bundle-Vendor: %providerName -Require-Bundle: org.eclipse.core.expressions;bundle-version="3.4.400", - org.eclipse.core.runtime;bundle-version="3.8.0", - org.eclipse.equinox.security;bundle-version="1.1.100", - org.eclipse.tcf.te.core.terminals;bundle-version="1.3.0", - org.eclipse.tcf.te.ui.terminals;bundle-version="1.3.0", - org.eclipse.tm.terminal;bundle-version="3.3.1", - org.eclipse.tm.terminal.ssh;bundle-version="2.1.400", - org.eclipse.ui;bundle-version="3.8.0" -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 -Bundle-ActivationPolicy: lazy -Bundle-Localization: plugin -Export-Package: org.eclipse.tcf.te.ui.terminals.ssh.activator;x-internal:=true, - org.eclipse.tcf.te.ui.terminals.ssh.controls, - org.eclipse.tcf.te.ui.terminals.ssh.launcher, - org.eclipse.tcf.te.ui.terminals.ssh.nls;x-internal:=true diff --git a/plugins/org.eclipse.tcf.te.ui.terminals.ssh/pom.xml b/plugins/org.eclipse.tcf.te.ui.terminals.ssh/pom.xml deleted file mode 100644 index 4d8aa606121..00000000000 --- a/plugins/org.eclipse.tcf.te.ui.terminals.ssh/pom.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - 4.0.0 - - - org.eclipse.tcf - org.eclipse.tcf.maven-build - 1.3.0-SNAPSHOT - ../../../admin/pom-build.xml - - - 1.3.0.qualifier - org.eclipse.tcf.te.ui.terminals.ssh - eclipse-plugin - diff --git a/plugins/org.eclipse.tcf.te.ui.terminals.telnet/META-INF/MANIFEST.MF b/plugins/org.eclipse.tcf.te.ui.terminals.telnet/META-INF/MANIFEST.MF deleted file mode 100644 index 6c7042e3328..00000000000 --- a/plugins/org.eclipse.tcf.te.ui.terminals.telnet/META-INF/MANIFEST.MF +++ /dev/null @@ -1,22 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: %pluginName -Bundle-SymbolicName: org.eclipse.tcf.te.ui.terminals.telnet;singleton:=true -Bundle-Version: 1.3.0.qualifier -Bundle-Activator: org.eclipse.tcf.te.ui.terminals.telnet.activator.UIPlugin -Bundle-Vendor: %providerName -Require-Bundle: org.eclipse.core.expressions;bundle-version="3.4.400", - org.eclipse.core.runtime;bundle-version="3.8.0", - org.eclipse.equinox.security;bundle-version="1.1.100", - org.eclipse.tcf.te.core.terminals;bundle-version="1.3.0", - org.eclipse.tcf.te.ui.terminals;bundle-version="1.3.0", - org.eclipse.tm.terminal;bundle-version="3.3.1", - org.eclipse.tm.terminal.telnet;bundle-version="2.1.400", - org.eclipse.ui;bundle-version="3.8.0" -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 -Bundle-ActivationPolicy: lazy -Bundle-Localization: plugin -Export-Package: org.eclipse.tcf.te.ui.terminals.telnet.activator;x-internal:=true, - org.eclipse.tcf.te.ui.terminals.telnet.controls, - org.eclipse.tcf.te.ui.terminals.telnet.launcher, - org.eclipse.tcf.te.ui.terminals.telnet.nls;x-internal:=true diff --git a/plugins/org.eclipse.tcf.te.ui.terminals/META-INF/MANIFEST.MF b/plugins/org.eclipse.tcf.te.ui.terminals/META-INF/MANIFEST.MF deleted file mode 100644 index c696e235b59..00000000000 --- a/plugins/org.eclipse.tcf.te.ui.terminals/META-INF/MANIFEST.MF +++ /dev/null @@ -1,34 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: %pluginName -Bundle-SymbolicName: org.eclipse.tcf.te.ui.terminals;singleton:=true -Bundle-Version: 1.3.0.qualifier -Bundle-Activator: org.eclipse.tcf.te.ui.terminals.activator.UIPlugin -Bundle-Vendor: %providerName -Require-Bundle: org.eclipse.core.expressions;bundle-version="3.4.400", - org.eclipse.core.runtime;bundle-version="3.8.0", - org.eclipse.core.resources;bundle-version="3.8.1";resolution:=optional, - org.eclipse.tcf.te.core.terminals;bundle-version="1.3.0", - org.eclipse.tm.terminal;bundle-version="3.3.1", - org.eclipse.ui;bundle-version="3.8.0" -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 -Bundle-ActivationPolicy: lazy -Bundle-Localization: plugin -Export-Package: org.eclipse.tcf.te.ui.terminals.actions, - org.eclipse.tcf.te.ui.terminals.activator;x-internal:=true, - org.eclipse.tcf.te.ui.terminals.controls, - org.eclipse.tcf.te.ui.terminals.help, - org.eclipse.tcf.te.ui.terminals.interfaces, - org.eclipse.tcf.te.ui.terminals.interfaces.tracing;x-internal:=true, - org.eclipse.tcf.te.ui.terminals.internal;x-internal:=true, - org.eclipse.tcf.te.ui.terminals.internal.dialogs;x-internal:=true, - org.eclipse.tcf.te.ui.terminals.internal.handler;x-internal:=true, - org.eclipse.tcf.te.ui.terminals.launcher, - org.eclipse.tcf.te.ui.terminals.listeners, - org.eclipse.tcf.te.ui.terminals.manager, - org.eclipse.tcf.te.ui.terminals.nls;x-internal:=true, - org.eclipse.tcf.te.ui.terminals.panels, - org.eclipse.tcf.te.ui.terminals.services, - org.eclipse.tcf.te.ui.terminals.streams, - org.eclipse.tcf.te.ui.terminals.tabs, - org.eclipse.tcf.te.ui.terminals.view diff --git a/plugins/org.eclipse.tcf.te.ui.terminals/pom.xml b/plugins/org.eclipse.tcf.te.ui.terminals/pom.xml deleted file mode 100644 index 8b5e73f93f0..00000000000 --- a/plugins/org.eclipse.tcf.te.ui.terminals/pom.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - 4.0.0 - - - org.eclipse.tcf - org.eclipse.tcf.maven-build - 1.3.0-SNAPSHOT - ../../../admin/pom-build.xml - - - 1.3.0.qualifier - org.eclipse.tcf.te.ui.terminals - eclipse-plugin - diff --git a/plugins/org.eclipse.tm.terminal.remote/.gitignore b/plugins/org.eclipse.tm.terminal.remote/.gitignore new file mode 100644 index 00000000000..ae3c1726048 --- /dev/null +++ b/plugins/org.eclipse.tm.terminal.remote/.gitignore @@ -0,0 +1 @@ +/bin/ diff --git a/plugins/org.eclipse.tm.terminal.remote/pom.xml b/plugins/org.eclipse.tm.terminal.remote/pom.xml index 6b257540a07..5f11544d2bd 100644 --- a/plugins/org.eclipse.tm.terminal.remote/pom.xml +++ b/plugins/org.eclipse.tm.terminal.remote/pom.xml @@ -1,15 +1,16 @@ - + 4.0.0 - + - org.eclipse.tm - org.eclipse.tm.maven-build + org.eclipse.tm.terminal + org.eclipse.tm.terminal.maven-build 4.0.0-SNAPSHOT - ../../../admin/pom-build.xml + ../../admin/pom-build.xml - org.eclipse.tm + org.eclipse.tm.terminal.remote 1.0.0-SNAPSHOT eclipse-plugin diff --git a/plugins/org.eclipse.tm.terminal.serial/.gitignore b/plugins/org.eclipse.tm.terminal.serial/.gitignore new file mode 100644 index 00000000000..ae3c1726048 --- /dev/null +++ b/plugins/org.eclipse.tm.terminal.serial/.gitignore @@ -0,0 +1 @@ +/bin/ diff --git a/plugins/org.eclipse.tm.terminal.serial/META-INF/MANIFEST.MF b/plugins/org.eclipse.tm.terminal.serial/META-INF/MANIFEST.MF index b27bc126daa..b915b0ce4e5 100644 --- a/plugins/org.eclipse.tm.terminal.serial/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.tm.terminal.serial/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.tm.terminal.serial;singleton:=true -Bundle-Version: 2.1.400.qualifier +Bundle-Version: 4.0.0.qualifier Bundle-Localization: plugin Import-Package: gnu.io;resolution:=optional Require-Bundle: org.eclipse.ui, diff --git a/plugins/org.eclipse.tm.terminal.serial/pom.xml b/plugins/org.eclipse.tm.terminal.serial/pom.xml index d4ae3c31e90..3bec81721f1 100644 --- a/plugins/org.eclipse.tm.terminal.serial/pom.xml +++ b/plugins/org.eclipse.tm.terminal.serial/pom.xml @@ -1,15 +1,17 @@ - + 4.0.0 + - org.eclipse.tm.maven-build - org.eclipse.tm + org.eclipse.tm.terminal + org.eclipse.tm.terminal.maven-build 4.0.0-SNAPSHOT - ../../../admin/pom-build.xml + ../../admin/pom-build.xml - org.eclipse.tm + + 4.0.0.qualifier org.eclipse.tm.terminal.serial - 2.1.400.qualifier eclipse-plugin diff --git a/plugins/org.eclipse.tm.terminal.ssh/.gitignore b/plugins/org.eclipse.tm.terminal.ssh/.gitignore new file mode 100644 index 00000000000..ae3c1726048 --- /dev/null +++ b/plugins/org.eclipse.tm.terminal.ssh/.gitignore @@ -0,0 +1 @@ +/bin/ diff --git a/plugins/org.eclipse.tm.terminal.ssh/META-INF/MANIFEST.MF b/plugins/org.eclipse.tm.terminal.ssh/META-INF/MANIFEST.MF index 4f15d9c50aa..3bfe72556f6 100644 --- a/plugins/org.eclipse.tm.terminal.ssh/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.tm.terminal.ssh/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.tm.terminal.ssh;singleton:=true -Bundle-Version: 2.1.400.qualifier +Bundle-Version: 4.0.0.qualifier Bundle-Vendor: %providerName Bundle-Localization: plugin Require-Bundle: org.eclipse.ui, diff --git a/plugins/org.eclipse.tm.terminal.ssh/pom.xml b/plugins/org.eclipse.tm.terminal.ssh/pom.xml index a6f6a2a7cf4..b30c8877d25 100644 --- a/plugins/org.eclipse.tm.terminal.ssh/pom.xml +++ b/plugins/org.eclipse.tm.terminal.ssh/pom.xml @@ -1,15 +1,17 @@ - + 4.0.0 + - org.eclipse.tm.maven-build - org.eclipse.tm + org.eclipse.tm.terminal + org.eclipse.tm.terminal.maven-build 4.0.0-SNAPSHOT - ../../../admin/pom-build.xml + ../../admin/pom-build.xml - org.eclipse.tm + + 4.0.0.qualifier org.eclipse.tm.terminal.ssh - 2.1.400.qualifier eclipse-plugin diff --git a/plugins/org.eclipse.tm.terminal.telnet/.gitignore b/plugins/org.eclipse.tm.terminal.telnet/.gitignore new file mode 100644 index 00000000000..ae3c1726048 --- /dev/null +++ b/plugins/org.eclipse.tm.terminal.telnet/.gitignore @@ -0,0 +1 @@ +/bin/ diff --git a/plugins/org.eclipse.tm.terminal.telnet/META-INF/MANIFEST.MF b/plugins/org.eclipse.tm.terminal.telnet/META-INF/MANIFEST.MF index ea631367c33..719f8927128 100644 --- a/plugins/org.eclipse.tm.terminal.telnet/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.tm.terminal.telnet/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.tm.terminal.telnet;singleton:=true -Bundle-Version: 2.1.400.qualifier +Bundle-Version: 4.0.0.qualifier Bundle-Vendor: %providerName Bundle-Localization: plugin Require-Bundle: org.eclipse.ui, diff --git a/plugins/org.eclipse.tm.terminal.telnet/pom.xml b/plugins/org.eclipse.tm.terminal.telnet/pom.xml index 0b31fe029ac..dd944f7b55a 100644 --- a/plugins/org.eclipse.tm.terminal.telnet/pom.xml +++ b/plugins/org.eclipse.tm.terminal.telnet/pom.xml @@ -1,15 +1,17 @@ - + 4.0.0 + - org.eclipse.tm.maven-build - org.eclipse.tm + org.eclipse.tm.terminal + org.eclipse.tm.terminal.maven-build 4.0.0-SNAPSHOT - ../../../admin/pom-build.xml + ../../admin/pom-build.xml - org.eclipse.tm + + 4.0.0.qualifier org.eclipse.tm.terminal.telnet - 2.1.400.qualifier eclipse-plugin diff --git a/plugins/org.eclipse.tm.terminal.test/.gitignore b/plugins/org.eclipse.tm.terminal.test/.gitignore new file mode 100644 index 00000000000..ae3c1726048 --- /dev/null +++ b/plugins/org.eclipse.tm.terminal.test/.gitignore @@ -0,0 +1 @@ +/bin/ diff --git a/plugins/org.eclipse.tm.terminal.test/META-INF/MANIFEST.MF b/plugins/org.eclipse.tm.terminal.test/META-INF/MANIFEST.MF index eabe482ba35..fe02fcee652 100644 --- a/plugins/org.eclipse.tm.terminal.test/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.tm.terminal.test/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.tm.terminal.test;singleton:=true -Bundle-Version: 2.3.0.qualifier +Bundle-Version: 4.0.0.qualifier Bundle-Vendor: %providerName Bundle-Localization: plugin Require-Bundle: org.junit, diff --git a/plugins/org.eclipse.tm.terminal.test/pom.xml b/plugins/org.eclipse.tm.terminal.test/pom.xml index f4ab2492681..8ba12191b91 100644 --- a/plugins/org.eclipse.tm.terminal.test/pom.xml +++ b/plugins/org.eclipse.tm.terminal.test/pom.xml @@ -1,32 +1,35 @@ - + 4.0.0 + - org.eclipse.tm.maven-build - org.eclipse.tm + org.eclipse.tm.terminal + org.eclipse.tm.terminal.maven-build 4.0.0-SNAPSHOT - ../../../admin/pom-build.xml + ../../admin/pom-build.xml - org.eclipse.tm + + 4.0.0.qualifier org.eclipse.tm.terminal.test - 2.3.0.qualifier eclipse-test-plugin - - - - org.eclipse.tycho - tycho-surefire-plugin - ${tycho-version} - - org.eclipse.tm.terminal.test - org.eclipse.tm.terminal.test.AutomatedPluginTests - false - false - true - org.eclipse.sdk.ide - - - - + + + + + org.eclipse.tycho + tycho-surefire-plugin + ${tycho-version} + + org.eclipse.tm.terminal.test + org.eclipse.tm.terminal.test.AutomatedPluginTests + false + false + true + org.eclipse.sdk.ide + + + + diff --git a/plugins/org.eclipse.tcf.te.core.terminals/.classpath b/plugins/org.eclipse.tm.terminal.view.core/.classpath similarity index 100% rename from plugins/org.eclipse.tcf.te.core.terminals/.classpath rename to plugins/org.eclipse.tm.terminal.view.core/.classpath diff --git a/plugins/org.eclipse.tm.terminal.view.core/.gitignore b/plugins/org.eclipse.tm.terminal.view.core/.gitignore new file mode 100644 index 00000000000..ae3c1726048 --- /dev/null +++ b/plugins/org.eclipse.tm.terminal.view.core/.gitignore @@ -0,0 +1 @@ +/bin/ diff --git a/plugins/org.eclipse.tm.terminal.view.core/.options b/plugins/org.eclipse.tm.terminal.view.core/.options new file mode 100644 index 00000000000..a0a2c87a3c7 --- /dev/null +++ b/plugins/org.eclipse.tm.terminal.view.core/.options @@ -0,0 +1 @@ +org.eclipse.tm.terminal.view.core/debugmode = 0 diff --git a/plugins/org.eclipse.tcf.te.core.terminals/.project b/plugins/org.eclipse.tm.terminal.view.core/.project similarity index 94% rename from plugins/org.eclipse.tcf.te.core.terminals/.project rename to plugins/org.eclipse.tm.terminal.view.core/.project index 755248325f2..82e91af353c 100644 --- a/plugins/org.eclipse.tcf.te.core.terminals/.project +++ b/plugins/org.eclipse.tm.terminal.view.core/.project @@ -1,6 +1,6 @@ - org.eclipse.tcf.te.core.terminals + org.eclipse.tm.terminal.view.core diff --git a/plugins/org.eclipse.tcf.te.core.terminals/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.tm.terminal.view.core/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from plugins/org.eclipse.tcf.te.core.terminals/.settings/org.eclipse.jdt.core.prefs rename to plugins/org.eclipse.tm.terminal.view.core/.settings/org.eclipse.jdt.core.prefs diff --git a/plugins/org.eclipse.tcf.te.core.terminals/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.tm.terminal.view.core/.settings/org.eclipse.jdt.ui.prefs similarity index 100% rename from plugins/org.eclipse.tcf.te.core.terminals/.settings/org.eclipse.jdt.ui.prefs rename to plugins/org.eclipse.tm.terminal.view.core/.settings/org.eclipse.jdt.ui.prefs diff --git a/plugins/org.eclipse.tcf.te.core.terminals/.settings/org.eclipse.pde.prefs b/plugins/org.eclipse.tm.terminal.view.core/.settings/org.eclipse.pde.prefs similarity index 100% rename from plugins/org.eclipse.tcf.te.core.terminals/.settings/org.eclipse.pde.prefs rename to plugins/org.eclipse.tm.terminal.view.core/.settings/org.eclipse.pde.prefs diff --git a/plugins/org.eclipse.tm.terminal.view.core/META-INF/MANIFEST.MF b/plugins/org.eclipse.tm.terminal.view.core/META-INF/MANIFEST.MF new file mode 100644 index 00000000000..95169afa17b --- /dev/null +++ b/plugins/org.eclipse.tm.terminal.view.core/META-INF/MANIFEST.MF @@ -0,0 +1,21 @@ +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: %pluginName +Bundle-SymbolicName: org.eclipse.tm.terminal.view.core;singleton:=true +Bundle-Version: 4.0.0.qualifier +Bundle-Activator: org.eclipse.tm.terminal.view.core.activator.CoreBundleActivator +Bundle-Vendor: %providerName +Require-Bundle: org.eclipse.core.expressions;bundle-version="3.4.400", + org.eclipse.core.runtime;bundle-version="3.8.0" +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-ActivationPolicy: lazy +Bundle-Localization: plugin +Export-Package: org.eclipse.tm.terminal.view.core, + org.eclipse.tm.terminal.view.core.activator;x-internal:=true, + org.eclipse.tm.terminal.view.core.interfaces, + org.eclipse.tm.terminal.view.core.interfaces.constants, + org.eclipse.tm.terminal.view.core.internal;x-internal:=true, + org.eclipse.tm.terminal.view.core.nls;x-internal:=true, + org.eclipse.tm.terminal.view.core.preferences, + org.eclipse.tm.terminal.view.core.tracing, + org.eclipse.tm.terminal.view.core.utils diff --git a/plugins/org.eclipse.tcf.te.core.terminals/about.html b/plugins/org.eclipse.tm.terminal.view.core/about.html similarity index 100% rename from plugins/org.eclipse.tcf.te.core.terminals/about.html rename to plugins/org.eclipse.tm.terminal.view.core/about.html diff --git a/plugins/org.eclipse.tcf.te.core.terminals/about.ini b/plugins/org.eclipse.tm.terminal.view.core/about.ini similarity index 96% rename from plugins/org.eclipse.tcf.te.core.terminals/about.ini rename to plugins/org.eclipse.tm.terminal.view.core/about.ini index 27e63d60c20..3adc27ab587 100644 --- a/plugins/org.eclipse.tcf.te.core.terminals/about.ini +++ b/plugins/org.eclipse.tm.terminal.view.core/about.ini @@ -11,7 +11,7 @@ aboutText=%blurb # needed for primary features only # Property "featureImage" contains path to feature image (32x32) -featureImage=te-feature.png +featureImage=tm32.png # Property "aboutImage" contains path to product image (500x330 or 115x164) # needed for primary features only diff --git a/plugins/org.eclipse.tcf.te.core.terminals/about.mappings b/plugins/org.eclipse.tm.terminal.view.core/about.mappings similarity index 100% rename from plugins/org.eclipse.tcf.te.core.terminals/about.mappings rename to plugins/org.eclipse.tm.terminal.view.core/about.mappings diff --git a/plugins/org.eclipse.tcf.te.core.terminals/about.properties b/plugins/org.eclipse.tm.terminal.view.core/about.properties similarity index 97% rename from plugins/org.eclipse.tcf.te.core.terminals/about.properties rename to plugins/org.eclipse.tm.terminal.view.core/about.properties index 3c677ca90e1..61b1ee9d928 100644 --- a/plugins/org.eclipse.tcf.te.core.terminals/about.properties +++ b/plugins/org.eclipse.tm.terminal.view.core/about.properties @@ -16,7 +16,7 @@ # # Do not translate any values surrounded by {} -blurb=TCF Terminals\n\ +blurb=TM Terminal\n\ \n\ Version: {featureVersion}\n\ \n\ diff --git a/plugins/org.eclipse.tcf.te.core.terminals/build.properties b/plugins/org.eclipse.tm.terminal.view.core/build.properties similarity index 96% rename from plugins/org.eclipse.tcf.te.core.terminals/build.properties rename to plugins/org.eclipse.tm.terminal.view.core/build.properties index 2cee913a557..01e440a253e 100644 --- a/plugins/org.eclipse.tcf.te.core.terminals/build.properties +++ b/plugins/org.eclipse.tm.terminal.view.core/build.properties @@ -17,4 +17,4 @@ bin.includes = META-INF/,\ about.ini,\ about.mappings,\ about.properties,\ - te-feature.png + tm32.png diff --git a/plugins/org.eclipse.tcf.te.core.terminals/plugin.properties b/plugins/org.eclipse.tm.terminal.view.core/plugin.properties similarity index 95% rename from plugins/org.eclipse.tcf.te.core.terminals/plugin.properties rename to plugins/org.eclipse.tm.terminal.view.core/plugin.properties index 7b9c05f4e64..4a1cc666a12 100644 --- a/plugins/org.eclipse.tcf.te.core.terminals/plugin.properties +++ b/plugins/org.eclipse.tm.terminal.view.core/plugin.properties @@ -8,7 +8,7 @@ # Wind River Systems - initial API and implementation ################################################################################## -pluginName = Terminals Core +pluginName = Terminal View Core providerName = Eclipse.org - Target Explorer ExtensionPoint.contextPropertiesProviders = Terminal Context Properties Providers diff --git a/plugins/org.eclipse.tcf.te.core.terminals/plugin.xml b/plugins/org.eclipse.tm.terminal.view.core/plugin.xml similarity index 72% rename from plugins/org.eclipse.tcf.te.core.terminals/plugin.xml rename to plugins/org.eclipse.tm.terminal.view.core/plugin.xml index 541260cff2d..c9373fa17ff 100644 --- a/plugins/org.eclipse.tcf.te.core.terminals/plugin.xml +++ b/plugins/org.eclipse.tm.terminal.view.core/plugin.xml @@ -6,9 +6,9 @@ diff --git a/plugins/org.eclipse.tcf.te.core.terminals/pom.xml b/plugins/org.eclipse.tm.terminal.view.core/pom.xml similarity index 54% rename from plugins/org.eclipse.tcf.te.core.terminals/pom.xml rename to plugins/org.eclipse.tm.terminal.view.core/pom.xml index bcef6fca921..268e911fa58 100644 --- a/plugins/org.eclipse.tcf.te.core.terminals/pom.xml +++ b/plugins/org.eclipse.tm.terminal.view.core/pom.xml @@ -5,13 +5,13 @@ 4.0.0 - org.eclipse.tcf - org.eclipse.tcf.maven-build - 1.3.0-SNAPSHOT - ../../../admin/pom-build.xml + org.eclipse.tm.terminal + org.eclipse.tm.terminal.maven-build + 4.0.0-SNAPSHOT + ../../admin/pom-build.xml - 1.3.0.qualifier - org.eclipse.tcf.te.core.terminals + 4.0.0.qualifier + org.eclipse.tm.terminal.view.core eclipse-plugin diff --git a/plugins/org.eclipse.tcf.te.core.terminals/schema/contextPropertiesProviders.exsd b/plugins/org.eclipse.tm.terminal.view.core/schema/contextPropertiesProviders.exsd similarity index 90% rename from plugins/org.eclipse.tcf.te.core.terminals/schema/contextPropertiesProviders.exsd rename to plugins/org.eclipse.tm.terminal.view.core/schema/contextPropertiesProviders.exsd index 929f094d543..42db131aa89 100644 --- a/plugins/org.eclipse.tcf.te.core.terminals/schema/contextPropertiesProviders.exsd +++ b/plugins/org.eclipse.tm.terminal.view.core/schema/contextPropertiesProviders.exsd @@ -1,15 +1,14 @@ - + - + This extension point is used to contribute terminal context properties providers. The context properties provider allows querying desired properties for a given context. <p> The terminal context is passed in as default variable to the enablement expression evaluation. The terminal context is not expected to be iteratable or countable. - @@ -65,10 +64,10 @@ The terminal context is passed in as default variable to the enablement expressi - The class that implements <code>org.eclipse.tcf.te.core.terminals.interfaces.ITerminalContextPropertiesProvider</code>. + The class that implements <code>org.eclipse.tm.terminal.view.core.interfaces.ITerminalContextPropertiesProvider</code>. - + @@ -80,7 +79,7 @@ The terminal context is passed in as default variable to the enablement expressi - Target Explorer 1.3.0 + TM Terminal 4.0.0 @@ -92,7 +91,7 @@ The terminal context is passed in as default variable to the enablement expressi This is an example of the extension point usage: <p> <pre><code> - <extension point="org.eclipse.tcf.te.core.terminals.contextPropertiesProviders"> + <extension point="org.eclipse.tm.terminal.view.core.contextPropertiesProviders"> <contextPropertiesProvider class="com.my.contribution.MyContextPropertiesProviderImpl"> </contextPropertiesProvider> @@ -106,7 +105,7 @@ The terminal context is passed in as default variable to the enablement expressi - The provider of a terminal context properties provider must implement <samp>org.eclipse.tcf.te.core.terminals.interfaces.ITerminalContextPropertiesProvider</samp>. + The provider of a terminal context properties provider must implement <samp>org.eclipse.tm.terminal.view.core.interfaces.ITerminalContextPropertiesProvider</samp>. diff --git a/plugins/org.eclipse.tcf.te.core.terminals/src/org/eclipse/tcf/te/core/terminals/TerminalContextPropertiesProviderFactory.java b/plugins/org.eclipse.tm.terminal.view.core/src/org/eclipse/tm/terminal/view/core/TerminalContextPropertiesProviderFactory.java similarity index 96% rename from plugins/org.eclipse.tcf.te.core.terminals/src/org/eclipse/tcf/te/core/terminals/TerminalContextPropertiesProviderFactory.java rename to plugins/org.eclipse.tm.terminal.view.core/src/org/eclipse/tm/terminal/view/core/TerminalContextPropertiesProviderFactory.java index c0bddc9bce8..9d26a00a949 100644 --- a/plugins/org.eclipse.tcf.te.core.terminals/src/org/eclipse/tcf/te/core/terminals/TerminalContextPropertiesProviderFactory.java +++ b/plugins/org.eclipse.tm.terminal.view.core/src/org/eclipse/tm/terminal/view/core/TerminalContextPropertiesProviderFactory.java @@ -7,7 +7,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tcf.te.core.terminals; +package org.eclipse.tm.terminal.view.core; import java.util.ArrayList; import java.util.List; @@ -26,9 +26,9 @@ import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Platform; import org.eclipse.core.runtime.Status; import org.eclipse.osgi.util.NLS; -import org.eclipse.tcf.te.core.terminals.activator.CoreBundleActivator; -import org.eclipse.tcf.te.core.terminals.interfaces.ITerminalContextPropertiesProvider; -import org.eclipse.tcf.te.core.terminals.nls.Messages; +import org.eclipse.tm.terminal.view.core.activator.CoreBundleActivator; +import org.eclipse.tm.terminal.view.core.interfaces.ITerminalContextPropertiesProvider; +import org.eclipse.tm.terminal.view.core.nls.Messages; /** * Terminal context properties provider factory. @@ -178,7 +178,7 @@ public final class TerminalContextPropertiesProviderFactory { * Load the terminal context properties provider contributions. */ private static void loadContributions() { - IExtensionPoint ep = Platform.getExtensionRegistry().getExtensionPoint("org.eclipse.tcf.te.core.terminals.contextPropertiesProviders"); //$NON-NLS-1$ + IExtensionPoint ep = Platform.getExtensionRegistry().getExtensionPoint("org.eclipse.tm.terminal.view.core.contextPropertiesProviders"); //$NON-NLS-1$ if (ep != null) { IExtension[] extensions = ep.getExtensions(); if (extensions != null) { diff --git a/plugins/org.eclipse.tcf.te.core.terminals/src/org/eclipse/tcf/te/core/terminals/TerminalServiceFactory.java b/plugins/org.eclipse.tm.terminal.view.core/src/org/eclipse/tm/terminal/view/core/TerminalServiceFactory.java similarity index 76% rename from plugins/org.eclipse.tcf.te.core.terminals/src/org/eclipse/tcf/te/core/terminals/TerminalServiceFactory.java rename to plugins/org.eclipse.tm.terminal.view.core/src/org/eclipse/tm/terminal/view/core/TerminalServiceFactory.java index 4b5eba9c958..7dd819a8bb9 100644 --- a/plugins/org.eclipse.tcf.te.core.terminals/src/org/eclipse/tcf/te/core/terminals/TerminalServiceFactory.java +++ b/plugins/org.eclipse.tm.terminal.view.core/src/org/eclipse/tm/terminal/view/core/TerminalServiceFactory.java @@ -7,14 +7,14 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tcf.te.core.terminals; +package org.eclipse.tm.terminal.view.core; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Platform; import org.eclipse.core.runtime.Status; -import org.eclipse.tcf.te.core.terminals.activator.CoreBundleActivator; -import org.eclipse.tcf.te.core.terminals.interfaces.ITerminalService; -import org.eclipse.tcf.te.core.terminals.nls.Messages; +import org.eclipse.tm.terminal.view.core.activator.CoreBundleActivator; +import org.eclipse.tm.terminal.view.core.interfaces.ITerminalService; +import org.eclipse.tm.terminal.view.core.nls.Messages; import org.osgi.framework.Bundle; /** @@ -27,11 +27,11 @@ public final class TerminalServiceFactory { static { // Tries to instantiate the terminal service implementation - // from the o.e.tcf.te.ui.terminals bundle - Bundle bundle = Platform.getBundle("org.eclipse.tcf.te.ui.terminals"); //$NON-NLS-1$ + // from the o.e.tm.terminal.view.ui bundle + Bundle bundle = Platform.getBundle("org.eclipse.tm.terminal.view.ui"); //$NON-NLS-1$ if (bundle != null && bundle.getState() != Bundle.UNINSTALLED && bundle.getState() != Bundle.STOPPING) { try { - Class clazz = bundle.loadClass("org.eclipse.tcf.te.ui.terminals.services.TerminalService"); //$NON-NLS-1$ + Class clazz = bundle.loadClass("org.eclipse.tm.terminal.view.ui.services.TerminalService"); //$NON-NLS-1$ instance = (ITerminalService) clazz.newInstance(); } catch (Exception e) { diff --git a/plugins/org.eclipse.tcf.te.core.terminals/src/org/eclipse/tcf/te/core/terminals/activator/CoreBundleActivator.java b/plugins/org.eclipse.tm.terminal.view.core/src/org/eclipse/tm/terminal/view/core/activator/CoreBundleActivator.java similarity index 93% rename from plugins/org.eclipse.tcf.te.core.terminals/src/org/eclipse/tcf/te/core/terminals/activator/CoreBundleActivator.java rename to plugins/org.eclipse.tm.terminal.view.core/src/org/eclipse/tm/terminal/view/core/activator/CoreBundleActivator.java index 054468888df..16e0ed8a31e 100644 --- a/plugins/org.eclipse.tcf.te.core.terminals/src/org/eclipse/tcf/te/core/terminals/activator/CoreBundleActivator.java +++ b/plugins/org.eclipse.tm.terminal.view.core/src/org/eclipse/tm/terminal/view/core/activator/CoreBundleActivator.java @@ -7,7 +7,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tcf.te.core.terminals.activator; +package org.eclipse.tm.terminal.view.core.activator; import org.osgi.framework.BundleActivator; import org.osgi.framework.BundleContext; @@ -29,13 +29,13 @@ public class CoreBundleActivator implements BundleActivator { } /** - * Convenience method which returns the unique identifier of this plugin. + * Convenience method which returns the unique identifier of this plug-in. */ public static String getUniqueIdentifier() { if (getContext() != null && getContext().getBundle() != null) { return getContext().getBundle().getSymbolicName(); } - return "org.eclipse.tcf.te.core.terminals"; //$NON-NLS-1$ + return "org.eclipse.tm.terminal.view.core"; //$NON-NLS-1$ } /* (non-Javadoc) diff --git a/plugins/org.eclipse.tcf.te.core.terminals/src/org/eclipse/tcf/te/core/terminals/interfaces/ITerminalContextPropertiesProvider.java b/plugins/org.eclipse.tm.terminal.view.core/src/org/eclipse/tm/terminal/view/core/interfaces/ITerminalContextPropertiesProvider.java similarity index 97% rename from plugins/org.eclipse.tcf.te.core.terminals/src/org/eclipse/tcf/te/core/terminals/interfaces/ITerminalContextPropertiesProvider.java rename to plugins/org.eclipse.tm.terminal.view.core/src/org/eclipse/tm/terminal/view/core/interfaces/ITerminalContextPropertiesProvider.java index 41f2cd3e79f..86dd363ca06 100644 --- a/plugins/org.eclipse.tcf.te.core.terminals/src/org/eclipse/tcf/te/core/terminals/interfaces/ITerminalContextPropertiesProvider.java +++ b/plugins/org.eclipse.tm.terminal.view.core/src/org/eclipse/tm/terminal/view/core/interfaces/ITerminalContextPropertiesProvider.java @@ -7,7 +7,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tcf.te.core.terminals.interfaces; +package org.eclipse.tm.terminal.view.core.interfaces; import java.util.Map; diff --git a/plugins/org.eclipse.tcf.te.core.terminals/src/org/eclipse/tcf/te/core/terminals/interfaces/ITerminalService.java b/plugins/org.eclipse.tm.terminal.view.core/src/org/eclipse/tm/terminal/view/core/interfaces/ITerminalService.java similarity index 97% rename from plugins/org.eclipse.tcf.te.core.terminals/src/org/eclipse/tcf/te/core/terminals/interfaces/ITerminalService.java rename to plugins/org.eclipse.tm.terminal.view.core/src/org/eclipse/tm/terminal/view/core/interfaces/ITerminalService.java index e4c90c5878c..64af6fbdaa9 100644 --- a/plugins/org.eclipse.tcf.te.core.terminals/src/org/eclipse/tcf/te/core/terminals/interfaces/ITerminalService.java +++ b/plugins/org.eclipse.tm.terminal.view.core/src/org/eclipse/tm/terminal/view/core/interfaces/ITerminalService.java @@ -7,7 +7,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tcf.te.core.terminals.interfaces; +package org.eclipse.tm.terminal.view.core.interfaces; import java.util.Map; diff --git a/plugins/org.eclipse.tcf.te.core.terminals/src/org/eclipse/tcf/te/core/terminals/interfaces/ITerminalServiceOutputStreamMonitorListener.java b/plugins/org.eclipse.tm.terminal.view.core/src/org/eclipse/tm/terminal/view/core/interfaces/ITerminalServiceOutputStreamMonitorListener.java similarity index 95% rename from plugins/org.eclipse.tcf.te.core.terminals/src/org/eclipse/tcf/te/core/terminals/interfaces/ITerminalServiceOutputStreamMonitorListener.java rename to plugins/org.eclipse.tm.terminal.view.core/src/org/eclipse/tm/terminal/view/core/interfaces/ITerminalServiceOutputStreamMonitorListener.java index dda3704b018..0205f4c9d42 100644 --- a/plugins/org.eclipse.tcf.te.core.terminals/src/org/eclipse/tcf/te/core/terminals/interfaces/ITerminalServiceOutputStreamMonitorListener.java +++ b/plugins/org.eclipse.tm.terminal.view.core/src/org/eclipse/tm/terminal/view/core/interfaces/ITerminalServiceOutputStreamMonitorListener.java @@ -7,7 +7,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tcf.te.core.terminals.interfaces; +package org.eclipse.tm.terminal.view.core.interfaces; /** * An interface to be implemented by listeners who want to listen diff --git a/plugins/org.eclipse.tcf.te.core.terminals/src/org/eclipse/tcf/te/core/terminals/interfaces/ITerminalTabListener.java b/plugins/org.eclipse.tm.terminal.view.core/src/org/eclipse/tm/terminal/view/core/interfaces/ITerminalTabListener.java similarity index 95% rename from plugins/org.eclipse.tcf.te.core.terminals/src/org/eclipse/tcf/te/core/terminals/interfaces/ITerminalTabListener.java rename to plugins/org.eclipse.tm.terminal.view.core/src/org/eclipse/tm/terminal/view/core/interfaces/ITerminalTabListener.java index 77e3e04eb13..e4e35fa27bd 100644 --- a/plugins/org.eclipse.tcf.te.core.terminals/src/org/eclipse/tcf/te/core/terminals/interfaces/ITerminalTabListener.java +++ b/plugins/org.eclipse.tm.terminal.view.core/src/org/eclipse/tm/terminal/view/core/interfaces/ITerminalTabListener.java @@ -7,7 +7,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tcf.te.core.terminals.interfaces; +package org.eclipse.tm.terminal.view.core.interfaces; /** * Listener to implement and to register to get notified about diff --git a/plugins/org.eclipse.tcf.te.core.terminals/src/org/eclipse/tcf/te/core/terminals/interfaces/constants/IContextPropertiesConstants.java b/plugins/org.eclipse.tm.terminal.view.core/src/org/eclipse/tm/terminal/view/core/interfaces/constants/IContextPropertiesConstants.java similarity index 96% rename from plugins/org.eclipse.tcf.te.core.terminals/src/org/eclipse/tcf/te/core/terminals/interfaces/constants/IContextPropertiesConstants.java rename to plugins/org.eclipse.tm.terminal.view.core/src/org/eclipse/tm/terminal/view/core/interfaces/constants/IContextPropertiesConstants.java index b2e98aacd39..b9d2b552b5e 100644 --- a/plugins/org.eclipse.tcf.te.core.terminals/src/org/eclipse/tcf/te/core/terminals/interfaces/constants/IContextPropertiesConstants.java +++ b/plugins/org.eclipse.tm.terminal.view.core/src/org/eclipse/tm/terminal/view/core/interfaces/constants/IContextPropertiesConstants.java @@ -7,7 +7,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tcf.te.core.terminals.interfaces.constants; +package org.eclipse.tm.terminal.view.core.interfaces.constants; /** * Defines the terminal context properties constants. diff --git a/plugins/org.eclipse.tcf.te.core.terminals/src/org/eclipse/tcf/te/core/terminals/interfaces/constants/ILineSeparatorConstants.java b/plugins/org.eclipse.tm.terminal.view.core/src/org/eclipse/tm/terminal/view/core/interfaces/constants/ILineSeparatorConstants.java similarity index 87% rename from plugins/org.eclipse.tcf.te.core.terminals/src/org/eclipse/tcf/te/core/terminals/interfaces/constants/ILineSeparatorConstants.java rename to plugins/org.eclipse.tm.terminal.view.core/src/org/eclipse/tm/terminal/view/core/interfaces/constants/ILineSeparatorConstants.java index 8fea4b82df7..7f147c3d7d7 100644 --- a/plugins/org.eclipse.tcf.te.core.terminals/src/org/eclipse/tcf/te/core/terminals/interfaces/constants/ILineSeparatorConstants.java +++ b/plugins/org.eclipse.tm.terminal.view.core/src/org/eclipse/tm/terminal/view/core/interfaces/constants/ILineSeparatorConstants.java @@ -7,12 +7,10 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tcf.te.core.terminals.interfaces.constants; +package org.eclipse.tm.terminal.view.core.interfaces.constants; /** * Line separator constants. - *

- * Copied from org.eclipse.tcf.internal.terminal.local.ILocalTerminalSettings. */ public interface ILineSeparatorConstants { diff --git a/plugins/org.eclipse.tcf.te.core.terminals/src/org/eclipse/tcf/te/core/terminals/interfaces/constants/ITerminalsConnectorConstants.java b/plugins/org.eclipse.tm.terminal.view.core/src/org/eclipse/tm/terminal/view/core/interfaces/constants/ITerminalsConnectorConstants.java similarity index 98% rename from plugins/org.eclipse.tcf.te.core.terminals/src/org/eclipse/tcf/te/core/terminals/interfaces/constants/ITerminalsConnectorConstants.java rename to plugins/org.eclipse.tm.terminal.view.core/src/org/eclipse/tm/terminal/view/core/interfaces/constants/ITerminalsConnectorConstants.java index fe7b65295b5..1447f1b99c3 100644 --- a/plugins/org.eclipse.tcf.te.core.terminals/src/org/eclipse/tcf/te/core/terminals/interfaces/constants/ITerminalsConnectorConstants.java +++ b/plugins/org.eclipse.tm.terminal.view.core/src/org/eclipse/tm/terminal/view/core/interfaces/constants/ITerminalsConnectorConstants.java @@ -8,9 +8,9 @@ * Wind River Systems - initial API and implementation * Max Weninger (Wind River) - [361352] [TERMINALS][SSH] Add SSH terminal support *******************************************************************************/ -package org.eclipse.tcf.te.core.terminals.interfaces.constants; +package org.eclipse.tm.terminal.view.core.interfaces.constants; -import org.eclipse.tcf.te.core.terminals.interfaces.ITerminalServiceOutputStreamMonitorListener; +import org.eclipse.tm.terminal.view.core.interfaces.ITerminalServiceOutputStreamMonitorListener; /** diff --git a/plugins/org.eclipse.tcf.te.core.terminals/src/org/eclipse/tcf/te/core/terminals/internal/PropertyTester.java b/plugins/org.eclipse.tm.terminal.view.core/src/org/eclipse/tm/terminal/view/core/internal/PropertyTester.java similarity index 86% rename from plugins/org.eclipse.tcf.te.core.terminals/src/org/eclipse/tcf/te/core/terminals/internal/PropertyTester.java rename to plugins/org.eclipse.tm.terminal.view.core/src/org/eclipse/tm/terminal/view/core/internal/PropertyTester.java index b2b3dba8d49..ceca0efd26b 100644 --- a/plugins/org.eclipse.tcf.te.core.terminals/src/org/eclipse/tcf/te/core/terminals/internal/PropertyTester.java +++ b/plugins/org.eclipse.tm.terminal.view.core/src/org/eclipse/tm/terminal/view/core/internal/PropertyTester.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011, 2014 Wind River Systems, Inc. and others. All rights reserved. + * Copyright (c) 2011 - 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 @@ -7,9 +7,9 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tcf.te.core.terminals.internal; +package org.eclipse.tm.terminal.view.core.internal; -import org.eclipse.tcf.te.core.terminals.TerminalContextPropertiesProviderFactory; +import org.eclipse.tm.terminal.view.core.TerminalContextPropertiesProviderFactory; diff --git a/plugins/org.eclipse.tcf.te.core.terminals/src/org/eclipse/tcf/te/core/terminals/nls/Messages.java b/plugins/org.eclipse.tm.terminal.view.core/src/org/eclipse/tm/terminal/view/core/nls/Messages.java similarity index 87% rename from plugins/org.eclipse.tcf.te.core.terminals/src/org/eclipse/tcf/te/core/terminals/nls/Messages.java rename to plugins/org.eclipse.tm.terminal.view.core/src/org/eclipse/tm/terminal/view/core/nls/Messages.java index 23cc87c4636..f382eea1887 100644 --- a/plugins/org.eclipse.tcf.te.core.terminals/src/org/eclipse/tcf/te/core/terminals/nls/Messages.java +++ b/plugins/org.eclipse.tm.terminal.view.core/src/org/eclipse/tm/terminal/view/core/nls/Messages.java @@ -7,7 +7,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tcf.te.core.terminals.nls; +package org.eclipse.tm.terminal.view.core.nls; import org.eclipse.osgi.util.NLS; @@ -17,7 +17,7 @@ import org.eclipse.osgi.util.NLS; public class Messages extends NLS { // The plug-in resource bundle name - private static final String BUNDLE_NAME = "org.eclipse.tcf.te.core.terminals.nls.Messages"; //$NON-NLS-1$ + private static final String BUNDLE_NAME = "org.eclipse.tm.terminal.view.core.nls.Messages"; //$NON-NLS-1$ /** * Static constructor. diff --git a/plugins/org.eclipse.tcf.te.core.terminals/src/org/eclipse/tcf/te/core/terminals/nls/Messages.properties b/plugins/org.eclipse.tm.terminal.view.core/src/org/eclipse/tm/terminal/view/core/nls/Messages.properties similarity index 100% rename from plugins/org.eclipse.tcf.te.core.terminals/src/org/eclipse/tcf/te/core/terminals/nls/Messages.properties rename to plugins/org.eclipse.tm.terminal.view.core/src/org/eclipse/tm/terminal/view/core/nls/Messages.properties diff --git a/plugins/org.eclipse.tcf.te.core.terminals/src/org/eclipse/tcf/te/core/terminals/preferences/ScopedEclipsePreferences.java b/plugins/org.eclipse.tm.terminal.view.core/src/org/eclipse/tm/terminal/view/core/preferences/ScopedEclipsePreferences.java similarity index 99% rename from plugins/org.eclipse.tcf.te.core.terminals/src/org/eclipse/tcf/te/core/terminals/preferences/ScopedEclipsePreferences.java rename to plugins/org.eclipse.tm.terminal.view.core/src/org/eclipse/tm/terminal/view/core/preferences/ScopedEclipsePreferences.java index 33d505f2ce6..d9e974bc665 100644 --- a/plugins/org.eclipse.tcf.te.core.terminals/src/org/eclipse/tcf/te/core/terminals/preferences/ScopedEclipsePreferences.java +++ b/plugins/org.eclipse.tm.terminal.view.core/src/org/eclipse/tm/terminal/view/core/preferences/ScopedEclipsePreferences.java @@ -7,7 +7,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tcf.te.core.terminals.preferences; +package org.eclipse.tm.terminal.view.core.preferences; import java.io.OutputStream; import java.util.Map; diff --git a/plugins/org.eclipse.tcf.te.core.terminals/src/org/eclipse/tcf/te/core/terminals/tracing/TraceHandler.java b/plugins/org.eclipse.tm.terminal.view.core/src/org/eclipse/tm/terminal/view/core/tracing/TraceHandler.java similarity index 98% rename from plugins/org.eclipse.tcf.te.core.terminals/src/org/eclipse/tcf/te/core/terminals/tracing/TraceHandler.java rename to plugins/org.eclipse.tm.terminal.view.core/src/org/eclipse/tm/terminal/view/core/tracing/TraceHandler.java index fcce8ab071d..fd8bdeb5d12 100644 --- a/plugins/org.eclipse.tcf.te.core.terminals/src/org/eclipse/tcf/te/core/terminals/tracing/TraceHandler.java +++ b/plugins/org.eclipse.tm.terminal.view.core/src/org/eclipse/tm/terminal/view/core/tracing/TraceHandler.java @@ -7,12 +7,12 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tcf.te.core.terminals.tracing; +package org.eclipse.tm.terminal.view.core.tracing; import org.eclipse.core.runtime.Assert; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Platform; -import org.eclipse.tcf.te.core.terminals.activator.CoreBundleActivator; +import org.eclipse.tm.terminal.view.core.activator.CoreBundleActivator; /** * Helper class to handle tracing using the platforms debug capabilities. diff --git a/plugins/org.eclipse.tcf.te.core.terminals/src/org/eclipse/tcf/te/core/terminals/utils/Env.java b/plugins/org.eclipse.tm.terminal.view.core/src/org/eclipse/tm/terminal/view/core/utils/Env.java similarity index 99% rename from plugins/org.eclipse.tcf.te.core.terminals/src/org/eclipse/tcf/te/core/terminals/utils/Env.java rename to plugins/org.eclipse.tm.terminal.view.core/src/org/eclipse/tm/terminal/view/core/utils/Env.java index 2605d765812..9471c380223 100644 --- a/plugins/org.eclipse.tcf.te.core.terminals/src/org/eclipse/tcf/te/core/terminals/utils/Env.java +++ b/plugins/org.eclipse.tm.terminal.view.core/src/org/eclipse/tm/terminal/view/core/utils/Env.java @@ -7,7 +7,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tcf.te.core.terminals.utils; +package org.eclipse.tm.terminal.view.core.utils; import java.io.BufferedReader; import java.io.IOException; diff --git a/plugins/org.eclipse.tm.terminal.view.core/tm32.png b/plugins/org.eclipse.tm.terminal.view.core/tm32.png new file mode 100644 index 00000000000..3077b1220dd Binary files /dev/null and b/plugins/org.eclipse.tm.terminal.view.core/tm32.png differ diff --git a/plugins/org.eclipse.tcf.te.ui.terminals.local/.classpath b/plugins/org.eclipse.tm.terminal.view.ui.local/.classpath similarity index 100% rename from plugins/org.eclipse.tcf.te.ui.terminals.local/.classpath rename to plugins/org.eclipse.tm.terminal.view.ui.local/.classpath diff --git a/plugins/org.eclipse.tm.terminal.view.ui.local/.gitignore b/plugins/org.eclipse.tm.terminal.view.ui.local/.gitignore new file mode 100644 index 00000000000..ae3c1726048 --- /dev/null +++ b/plugins/org.eclipse.tm.terminal.view.ui.local/.gitignore @@ -0,0 +1 @@ +/bin/ diff --git a/plugins/org.eclipse.tcf.te.ui.terminals.local/.options b/plugins/org.eclipse.tm.terminal.view.ui.local/.options similarity index 100% rename from plugins/org.eclipse.tcf.te.ui.terminals.local/.options rename to plugins/org.eclipse.tm.terminal.view.ui.local/.options diff --git a/plugins/org.eclipse.tcf.te.ui.terminals.local/.project b/plugins/org.eclipse.tm.terminal.view.ui.local/.project similarity index 94% rename from plugins/org.eclipse.tcf.te.ui.terminals.local/.project rename to plugins/org.eclipse.tm.terminal.view.ui.local/.project index f86fbb751ca..2e1b844261f 100644 --- a/plugins/org.eclipse.tcf.te.ui.terminals.local/.project +++ b/plugins/org.eclipse.tm.terminal.view.ui.local/.project @@ -1,6 +1,6 @@ - org.eclipse.tcf.te.ui.terminals.local + org.eclipse.tm.terminal.view.ui.local diff --git a/plugins/org.eclipse.tcf.te.ui.terminals.local/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.tm.terminal.view.ui.local/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from plugins/org.eclipse.tcf.te.ui.terminals.local/.settings/org.eclipse.jdt.core.prefs rename to plugins/org.eclipse.tm.terminal.view.ui.local/.settings/org.eclipse.jdt.core.prefs diff --git a/plugins/org.eclipse.tcf.te.ui.terminals.local/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.tm.terminal.view.ui.local/.settings/org.eclipse.jdt.ui.prefs similarity index 100% rename from plugins/org.eclipse.tcf.te.ui.terminals.local/.settings/org.eclipse.jdt.ui.prefs rename to plugins/org.eclipse.tm.terminal.view.ui.local/.settings/org.eclipse.jdt.ui.prefs diff --git a/plugins/org.eclipse.tcf.te.ui.terminals.local/.settings/org.eclipse.pde.prefs b/plugins/org.eclipse.tm.terminal.view.ui.local/.settings/org.eclipse.pde.prefs similarity index 100% rename from plugins/org.eclipse.tcf.te.ui.terminals.local/.settings/org.eclipse.pde.prefs rename to plugins/org.eclipse.tm.terminal.view.ui.local/.settings/org.eclipse.pde.prefs diff --git a/plugins/org.eclipse.tm.terminal.view.ui.local/META-INF/MANIFEST.MF b/plugins/org.eclipse.tm.terminal.view.ui.local/META-INF/MANIFEST.MF new file mode 100644 index 00000000000..b3c6735717d --- /dev/null +++ b/plugins/org.eclipse.tm.terminal.view.ui.local/META-INF/MANIFEST.MF @@ -0,0 +1,30 @@ +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: %pluginName +Bundle-SymbolicName: org.eclipse.tm.terminal.view.ui.local;singleton:=true +Bundle-Version: 4.0.0.qualifier +Bundle-Activator: org.eclipse.tm.terminal.view.ui.local.activator.UIPlugin +Bundle-Vendor: %providerName +Import-Package: org.eclipse.cdt.utils.pty;mandatory:=native +Require-Bundle: org.eclipse.cdt.core;bundle-version="5.6";resolution:=optional, + org.eclipse.core.expressions;bundle-version="3.4.400", + org.eclipse.core.resources;bundle-version="3.8.1";resolution:=optional, + org.eclipse.core.runtime;bundle-version="3.8.0", + org.eclipse.core.variables;bundle-version="3.2.600", + org.eclipse.debug.ui;bundle-version="3.8.1";resolution:=optional, + 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.view.ui.process;bundle-version="4.0.0", + org.eclipse.tm.terminal;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.local.activator;x-internal:=true, + org.eclipse.tm.terminal.view.ui.local.controls, + org.eclipse.tm.terminal.view.ui.local.help, + org.eclipse.tm.terminal.view.ui.local.launcher, + org.eclipse.tm.terminal.view.ui.local.nls;x-internal:=true, + org.eclipse.tm.terminal.view.ui.local.showin, + org.eclipse.tm.terminal.view.ui.local.showin.interfaces, + org.eclipse.tm.terminal.view.ui.local.showin.preferences diff --git a/plugins/org.eclipse.tcf.te.ui.terminals.local/META-INF/p2.inf b/plugins/org.eclipse.tm.terminal.view.ui.local/META-INF/p2.inf similarity index 100% rename from plugins/org.eclipse.tcf.te.ui.terminals.local/META-INF/p2.inf rename to plugins/org.eclipse.tm.terminal.view.ui.local/META-INF/p2.inf diff --git a/plugins/org.eclipse.tcf.te.ui.terminals.local/about.html b/plugins/org.eclipse.tm.terminal.view.ui.local/about.html similarity index 100% rename from plugins/org.eclipse.tcf.te.ui.terminals.local/about.html rename to plugins/org.eclipse.tm.terminal.view.ui.local/about.html diff --git a/plugins/org.eclipse.tcf.te.ui.terminals.local/build.properties b/plugins/org.eclipse.tm.terminal.view.ui.local/build.properties similarity index 100% rename from plugins/org.eclipse.tcf.te.ui.terminals.local/build.properties rename to plugins/org.eclipse.tm.terminal.view.ui.local/build.properties diff --git a/plugins/org.eclipse.tcf.te.ui.terminals.local/contexts.xml b/plugins/org.eclipse.tm.terminal.view.ui.local/contexts.xml similarity index 100% rename from plugins/org.eclipse.tcf.te.ui.terminals.local/contexts.xml rename to plugins/org.eclipse.tm.terminal.view.ui.local/contexts.xml diff --git a/plugins/org.eclipse.tcf.te.ui.terminals.local/icons/eview16/terminal_view.gif b/plugins/org.eclipse.tm.terminal.view.ui.local/icons/eview16/terminal_view.gif similarity index 100% rename from plugins/org.eclipse.tcf.te.ui.terminals.local/icons/eview16/terminal_view.gif rename to plugins/org.eclipse.tm.terminal.view.ui.local/icons/eview16/terminal_view.gif diff --git a/plugins/org.eclipse.tcf.te.ui.terminals.local/plugin.properties b/plugins/org.eclipse.tm.terminal.view.ui.local/plugin.properties similarity index 100% rename from plugins/org.eclipse.tcf.te.ui.terminals.local/plugin.properties rename to plugins/org.eclipse.tm.terminal.view.ui.local/plugin.properties diff --git a/plugins/org.eclipse.tcf.te.ui.terminals.local/plugin.xml b/plugins/org.eclipse.tm.terminal.view.ui.local/plugin.xml similarity index 74% rename from plugins/org.eclipse.tcf.te.ui.terminals.local/plugin.xml rename to plugins/org.eclipse.tm.terminal.view.ui.local/plugin.xml index 45808813c7c..41b308b9c99 100644 --- a/plugins/org.eclipse.tcf.te.ui.terminals.local/plugin.xml +++ b/plugins/org.eclipse.tm.terminal.view.ui.local/plugin.xml @@ -6,17 +6,17 @@ - + @@ -24,10 +24,10 @@ - + @@ -45,8 +45,8 @@ + class="org.eclipse.tm.terminal.view.ui.local.showin.DynamicContributionItems" + id="org.eclipse.tm.terminal.view.ui.local.LocalLauncherDynamicContributionItems"> @@ -67,16 +67,16 @@ @@ -84,7 +84,7 @@ @@ -93,8 +93,8 @@ + class="org.eclipse.tm.terminal.view.ui.local.launcher.LocalLauncherHandler" + commandId="org.eclipse.tm.terminal.view.ui.local.command.launch"> @@ -102,8 +102,8 @@ @@ -111,13 +111,13 @@ + class="org.eclipse.tm.terminal.view.ui.local.showin.preferences.PreferencesInitializer"> - + diff --git a/plugins/org.eclipse.tm.terminal.view.ui.local/pom.xml b/plugins/org.eclipse.tm.terminal.view.ui.local/pom.xml new file mode 100644 index 00000000000..7f7dc4fa7fc --- /dev/null +++ b/plugins/org.eclipse.tm.terminal.view.ui.local/pom.xml @@ -0,0 +1,17 @@ + + + 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.view.ui.local + eclipse-plugin + diff --git a/plugins/org.eclipse.tcf.te.ui.terminals.local/src/org/eclipse/tcf/te/ui/terminals/local/activator/UIPlugin.java b/plugins/org.eclipse.tm.terminal.view.ui.local/src/org/eclipse/tm/terminal/view/ui/local/activator/UIPlugin.java similarity index 93% rename from plugins/org.eclipse.tcf.te.ui.terminals.local/src/org/eclipse/tcf/te/ui/terminals/local/activator/UIPlugin.java rename to plugins/org.eclipse.tm.terminal.view.ui.local/src/org/eclipse/tm/terminal/view/ui/local/activator/UIPlugin.java index 80de64f1c4c..9d02abc7189 100644 --- a/plugins/org.eclipse.tcf.te.ui.terminals.local/src/org/eclipse/tcf/te/ui/terminals/local/activator/UIPlugin.java +++ b/plugins/org.eclipse.tm.terminal.view.ui.local/src/org/eclipse/tm/terminal/view/ui/local/activator/UIPlugin.java @@ -7,13 +7,13 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tcf.te.ui.terminals.local.activator; +package org.eclipse.tm.terminal.view.ui.local.activator; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.resource.ImageRegistry; import org.eclipse.swt.graphics.Image; -import org.eclipse.tcf.te.core.terminals.preferences.ScopedEclipsePreferences; -import org.eclipse.tcf.te.core.terminals.tracing.TraceHandler; +import org.eclipse.tm.terminal.view.core.preferences.ScopedEclipsePreferences; +import org.eclipse.tm.terminal.view.core.tracing.TraceHandler; import org.eclipse.ui.plugin.AbstractUIPlugin; import org.osgi.framework.BundleContext; @@ -50,7 +50,7 @@ public class UIPlugin extends AbstractUIPlugin { if (getDefault() != null && getDefault().getBundle() != null) { return getDefault().getBundle().getSymbolicName(); } - return "org.eclipse.tcf.te.ui.terminals.local"; //$NON-NLS-1$ + return "org.eclipse.tm.terminal.view.ui.local"; //$NON-NLS-1$ } /** diff --git a/plugins/org.eclipse.tcf.te.ui.terminals.local/src/org/eclipse/tcf/te/ui/terminals/local/controls/LocalWizardConfigurationPanel.java b/plugins/org.eclipse.tm.terminal.view.ui.local/src/org/eclipse/tm/terminal/view/ui/local/controls/LocalWizardConfigurationPanel.java similarity index 85% rename from plugins/org.eclipse.tcf.te.ui.terminals.local/src/org/eclipse/tcf/te/ui/terminals/local/controls/LocalWizardConfigurationPanel.java rename to plugins/org.eclipse.tm.terminal.view.ui.local/src/org/eclipse/tm/terminal/view/ui/local/controls/LocalWizardConfigurationPanel.java index 63f452e9c77..6270248694d 100644 --- a/plugins/org.eclipse.tcf.te.ui.terminals.local/src/org/eclipse/tcf/te/ui/terminals/local/controls/LocalWizardConfigurationPanel.java +++ b/plugins/org.eclipse.tm.terminal.view.ui.local/src/org/eclipse/tm/terminal/view/ui/local/controls/LocalWizardConfigurationPanel.java @@ -7,7 +7,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tcf.te.ui.terminals.local.controls; +package org.eclipse.tm.terminal.view.ui.local.controls; import java.util.Map; @@ -22,9 +22,9 @@ import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Label; -import org.eclipse.tcf.te.core.terminals.interfaces.constants.ITerminalsConnectorConstants; -import org.eclipse.tcf.te.ui.terminals.interfaces.IConfigurationPanelContainer; -import org.eclipse.tcf.te.ui.terminals.panels.AbstractExtendedConfigurationPanel; +import org.eclipse.tm.terminal.view.core.interfaces.constants.ITerminalsConnectorConstants; +import org.eclipse.tm.terminal.view.ui.interfaces.IConfigurationPanelContainer; +import org.eclipse.tm.terminal.view.ui.panels.AbstractExtendedConfigurationPanel; import org.eclipse.ui.ISelectionService; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.WorkbenchEncoding; @@ -46,9 +46,9 @@ public class LocalWizardConfigurationPanel extends AbstractExtendedConfiguration super(container); } - /* (non-Javadoc) - * @see org.eclipse.tcf.te.ui.controls.interfaces.IWizardConfigurationPanel#setupPanel(org.eclipse.swt.widgets.Composite) - */ + /* (non-Javadoc) + * @see org.eclipse.tm.terminal.view.ui.interfaces.IConfigurationPanel#setupPanel(org.eclipse.swt.widgets.Composite) + */ @Override public void setupPanel(Composite parent) { Composite panel = new Composite(parent, SWT.NONE); @@ -84,7 +84,7 @@ public class LocalWizardConfigurationPanel extends AbstractExtendedConfiguration } /* (non-Javadoc) - * @see org.eclipse.tcf.te.ui.terminals.panels.AbstractConfigurationPanel#setupData(java.util.Map) + * @see org.eclipse.tm.terminal.view.ui.panels.AbstractConfigurationPanel#setupData(java.util.Map) */ @Override public void setupData(Map data) { @@ -95,12 +95,12 @@ public class LocalWizardConfigurationPanel extends AbstractExtendedConfiguration } /* (non-Javadoc) - * @see org.eclipse.tcf.te.ui.terminals.panels.AbstractConfigurationPanel#extractData(java.util.Map) + * @see org.eclipse.tm.terminal.view.ui.panels.AbstractConfigurationPanel#extractData(java.util.Map) */ @Override public void extractData(Map data) { // set the terminal connector id for local terminal - data.put(ITerminalsConnectorConstants.PROP_TERMINAL_CONNECTOR_ID, "org.eclipse.tcf.te.ui.terminals.local.LocalConnector"); //$NON-NLS-1$ + data.put(ITerminalsConnectorConstants.PROP_TERMINAL_CONNECTOR_ID, "org.eclipse.tm.terminal.view.ui.local.LocalConnector"); //$NON-NLS-1$ // Store the encoding data.put(ITerminalsConnectorConstants.PROP_ENCODING, getEncoding()); @@ -116,21 +116,21 @@ public class LocalWizardConfigurationPanel extends AbstractExtendedConfiguration } /* (non-Javadoc) - * @see org.eclipse.tcf.te.ui.terminals.panels.AbstractConfigurationPanel#fillSettingsForHost(java.lang.String) + * @see org.eclipse.tm.terminal.view.ui.panels.AbstractConfigurationPanel#fillSettingsForHost(java.lang.String) */ @Override protected void fillSettingsForHost(String host){ } /* (non-Javadoc) - * @see org.eclipse.tcf.te.ui.terminals.panels.AbstractConfigurationPanel#saveSettingsForHost(boolean) + * @see org.eclipse.tm.terminal.view.ui.panels.AbstractConfigurationPanel#saveSettingsForHost(boolean) */ @Override protected void saveSettingsForHost(boolean add){ } /* (non-Javadoc) - * @see org.eclipse.tcf.te.ui.controls.panels.AbstractWizardConfigurationPanel#isValid() + * @see org.eclipse.tm.terminal.view.ui.panels.AbstractConfigurationPanel#isValid() */ @Override public boolean isValid(){ @@ -138,7 +138,7 @@ public class LocalWizardConfigurationPanel extends AbstractExtendedConfiguration } /* (non-Javadoc) - * @see org.eclipse.tcf.te.ui.terminals.panels.AbstractConfigurationPanel#doSaveWidgetValues(org.eclipse.jface.dialogs.IDialogSettings, java.lang.String) + * @see org.eclipse.tm.terminal.view.ui.panels.AbstractConfigurationPanel#doSaveWidgetValues(org.eclipse.jface.dialogs.IDialogSettings, java.lang.String) */ @Override public void doSaveWidgetValues(IDialogSettings settings, String idPrefix) { @@ -147,7 +147,7 @@ public class LocalWizardConfigurationPanel extends AbstractExtendedConfiguration } /* (non-Javadoc) - * @see org.eclipse.tcf.te.ui.terminals.panels.AbstractConfigurationPanel#doRestoreWidgetValues(org.eclipse.jface.dialogs.IDialogSettings, java.lang.String) + * @see org.eclipse.tm.terminal.view.ui.panels.AbstractConfigurationPanel#doRestoreWidgetValues(org.eclipse.jface.dialogs.IDialogSettings, java.lang.String) */ @Override public void doRestoreWidgetValues(IDialogSettings settings, String idPrefix) { @@ -156,7 +156,7 @@ public class LocalWizardConfigurationPanel extends AbstractExtendedConfiguration } /* (non-Javadoc) - * @see org.eclipse.tcf.te.ui.terminals.panels.AbstractConfigurationPanel#getHostFromSettings() + * @see org.eclipse.tm.terminal.view.ui.panels.AbstractConfigurationPanel#getHostFromSettings() */ @Override protected String getHostFromSettings() { @@ -164,7 +164,7 @@ public class LocalWizardConfigurationPanel extends AbstractExtendedConfiguration } /* (non-Javadoc) - * @see org.eclipse.tcf.te.ui.terminals.panels.AbstractConfigurationPanel#isWithHostList() + * @see org.eclipse.tm.terminal.view.ui.panels.AbstractConfigurationPanel#isWithHostList() */ @Override public boolean isWithHostList() { diff --git a/plugins/org.eclipse.tcf.te.ui.terminals.local/src/org/eclipse/tcf/te/ui/terminals/local/help/IContextHelpIds.java b/plugins/org.eclipse.tm.terminal.view.ui.local/src/org/eclipse/tm/terminal/view/ui/local/help/IContextHelpIds.java similarity index 88% rename from plugins/org.eclipse.tcf.te.ui.terminals.local/src/org/eclipse/tcf/te/ui/terminals/local/help/IContextHelpIds.java rename to plugins/org.eclipse.tm.terminal.view.ui.local/src/org/eclipse/tm/terminal/view/ui/local/help/IContextHelpIds.java index 5f7b4108173..8f3c4b92431 100644 --- a/plugins/org.eclipse.tcf.te.ui.terminals.local/src/org/eclipse/tcf/te/ui/terminals/local/help/IContextHelpIds.java +++ b/plugins/org.eclipse.tm.terminal.view.ui.local/src/org/eclipse/tm/terminal/view/ui/local/help/IContextHelpIds.java @@ -7,9 +7,9 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tcf.te.ui.terminals.local.help; +package org.eclipse.tm.terminal.view.ui.local.help; -import org.eclipse.tcf.te.ui.terminals.local.activator.UIPlugin; +import org.eclipse.tm.terminal.view.ui.local.activator.UIPlugin; /** diff --git a/plugins/org.eclipse.tcf.te.ui.terminals.local/src/org/eclipse/tcf/te/ui/terminals/local/launcher/LocalLauncherDelegate.java b/plugins/org.eclipse.tm.terminal.view.ui.local/src/org/eclipse/tm/terminal/view/ui/local/launcher/LocalLauncherDelegate.java similarity index 91% rename from plugins/org.eclipse.tcf.te.ui.terminals.local/src/org/eclipse/tcf/te/ui/terminals/local/launcher/LocalLauncherDelegate.java rename to plugins/org.eclipse.tm.terminal.view.ui.local/src/org/eclipse/tm/terminal/view/ui/local/launcher/LocalLauncherDelegate.java index 1baa6bf4e31..2220e60d4d0 100644 --- a/plugins/org.eclipse.tcf.te.ui.terminals.local/src/org/eclipse/tcf/te/ui/terminals/local/launcher/LocalLauncherDelegate.java +++ b/plugins/org.eclipse.tm.terminal.view.ui.local/src/org/eclipse/tm/terminal/view/ui/local/launcher/LocalLauncherDelegate.java @@ -7,7 +7,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tcf.te.ui.terminals.local.launcher; +package org.eclipse.tm.terminal.view.ui.local.launcher; import java.io.File; import java.net.InetAddress; @@ -32,24 +32,23 @@ import org.eclipse.core.variables.IStringVariableManager; import org.eclipse.core.variables.VariablesPlugin; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.tcf.te.core.terminals.TerminalServiceFactory; -import org.eclipse.tcf.te.core.terminals.interfaces.ITerminalService; -import org.eclipse.tcf.te.core.terminals.interfaces.ITerminalService.Done; -import org.eclipse.tcf.te.core.terminals.interfaces.ITerminalServiceOutputStreamMonitorListener; -import org.eclipse.tcf.te.core.terminals.interfaces.constants.ILineSeparatorConstants; -import org.eclipse.tcf.te.core.terminals.interfaces.constants.ITerminalsConnectorConstants; -import org.eclipse.tcf.te.ui.terminals.interfaces.IConfigurationPanel; -import org.eclipse.tcf.te.ui.terminals.interfaces.IConfigurationPanelContainer; -import org.eclipse.tcf.te.ui.terminals.interfaces.IMementoHandler; -import org.eclipse.tcf.te.ui.terminals.internal.SettingsStore; -import org.eclipse.tcf.te.ui.terminals.launcher.AbstractLauncherDelegate; -import org.eclipse.tcf.te.ui.terminals.local.activator.UIPlugin; -import org.eclipse.tcf.te.ui.terminals.local.controls.LocalWizardConfigurationPanel; -import org.eclipse.tcf.te.ui.terminals.local.showin.interfaces.IPreferenceKeys; -import org.eclipse.tcf.te.ui.terminals.process.ProcessSettings; 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.terminal.view.core.TerminalServiceFactory; +import org.eclipse.tm.terminal.view.core.interfaces.ITerminalService; +import org.eclipse.tm.terminal.view.core.interfaces.ITerminalServiceOutputStreamMonitorListener; +import org.eclipse.tm.terminal.view.core.interfaces.constants.ILineSeparatorConstants; +import org.eclipse.tm.terminal.view.core.interfaces.constants.ITerminalsConnectorConstants; +import org.eclipse.tm.terminal.view.ui.interfaces.IConfigurationPanel; +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.local.activator.UIPlugin; +import org.eclipse.tm.terminal.view.ui.local.controls.LocalWizardConfigurationPanel; +import org.eclipse.tm.terminal.view.ui.local.showin.interfaces.IPreferenceKeys; +import org.eclipse.tm.terminal.view.ui.process.ProcessSettings; import org.eclipse.ui.ISelectionService; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.WorkbenchEncoding; @@ -64,7 +63,7 @@ public class LocalLauncherDelegate extends AbstractLauncherDelegate { private final IMementoHandler mementoHandler = new LocalMementoHandler(); /* (non-Javadoc) - * @see org.eclipse.tcf.te.ui.terminals.interfaces.ILauncherDelegate#needsUserConfiguration() + * @see org.eclipse.tm.terminal.view.ui.interfaces.ILauncherDelegate#needsUserConfiguration() */ @Override public boolean needsUserConfiguration() { @@ -72,7 +71,7 @@ public class LocalLauncherDelegate extends AbstractLauncherDelegate { } /* (non-Javadoc) - * @see org.eclipse.tcf.te.ui.terminals.interfaces.ILauncherDelegate#getPanel(org.eclipse.tcf.te.ui.terminals.interfaces.IConfigurationPanelContainer) + * @see org.eclipse.tm.terminal.view.ui.interfaces.ILauncherDelegate#getPanel(org.eclipse.tm.terminal.view.ui.interfaces.IConfigurationPanelContainer) */ @Override public IConfigurationPanel getPanel(IConfigurationPanelContainer container) { @@ -80,10 +79,10 @@ public class LocalLauncherDelegate extends AbstractLauncherDelegate { } /* (non-Javadoc) - * @see org.eclipse.tcf.te.ui.terminals.interfaces.ILauncherDelegate#execute(java.util.Map, org.eclipse.tcf.te.core.terminals.interfaces.ITerminalService.Done) + * @see org.eclipse.tm.terminal.view.ui.interfaces.ILauncherDelegate#execute(java.util.Map, org.eclipse.tm.terminal.view.core.interfaces.ITerminalService.Done) */ @Override - public void execute(Map properties, Done done) { + public void execute(Map properties, ITerminalService.Done done) { Assert.isNotNull(properties); // Set the terminal tab title @@ -271,7 +270,7 @@ public class LocalLauncherDelegate extends AbstractLauncherDelegate { } /* (non-Javadoc) - * @see org.eclipse.tcf.te.ui.terminals.interfaces.ILauncherDelegate#createTerminalConnector(java.util.Map) + * @see org.eclipse.tm.terminal.view.ui.interfaces.ILauncherDelegate#createTerminalConnector(java.util.Map) */ @Override public ITerminalConnector createTerminalConnector(Map properties) { @@ -279,7 +278,7 @@ public class LocalLauncherDelegate extends AbstractLauncherDelegate { // Check for the terminal connector id String connectorId = (String)properties.get(ITerminalsConnectorConstants.PROP_TERMINAL_CONNECTOR_ID); - if (connectorId == null) connectorId = "org.eclipse.tcf.te.ui.terminals.local.LocalConnector"; //$NON-NLS-1$ + if (connectorId == null) connectorId = "org.eclipse.tm.terminal.view.ui.local.LocalConnector"; //$NON-NLS-1$ // Extract the process properties using defaults String image; diff --git a/plugins/org.eclipse.tcf.te.ui.terminals.local/src/org/eclipse/tcf/te/ui/terminals/local/launcher/LocalLauncherHandler.java b/plugins/org.eclipse.tm.terminal.view.ui.local/src/org/eclipse/tm/terminal/view/ui/local/launcher/LocalLauncherHandler.java similarity index 90% rename from plugins/org.eclipse.tcf.te.ui.terminals.local/src/org/eclipse/tcf/te/ui/terminals/local/launcher/LocalLauncherHandler.java rename to plugins/org.eclipse.tm.terminal.view.ui.local/src/org/eclipse/tm/terminal/view/ui/local/launcher/LocalLauncherHandler.java index aa51e164605..a0230185921 100644 --- a/plugins/org.eclipse.tcf.te.ui.terminals.local/src/org/eclipse/tcf/te/ui/terminals/local/launcher/LocalLauncherHandler.java +++ b/plugins/org.eclipse.tm.terminal.view.ui.local/src/org/eclipse/tm/terminal/view/ui/local/launcher/LocalLauncherHandler.java @@ -7,7 +7,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tcf.te.ui.terminals.local.launcher; +package org.eclipse.tm.terminal.view.ui.local.launcher; import java.util.HashMap; import java.util.Map; @@ -19,9 +19,9 @@ import org.eclipse.core.runtime.IPath; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.StructuredSelection; -import org.eclipse.tcf.te.core.terminals.interfaces.constants.ITerminalsConnectorConstants; -import org.eclipse.tcf.te.ui.terminals.interfaces.ILauncherDelegate; -import org.eclipse.tcf.te.ui.terminals.launcher.LauncherDelegateManager; +import org.eclipse.tm.terminal.view.core.interfaces.constants.ITerminalsConnectorConstants; +import org.eclipse.tm.terminal.view.ui.interfaces.ILauncherDelegate; +import org.eclipse.tm.terminal.view.ui.launcher.LauncherDelegateManager; import org.eclipse.ui.IEditorInput; import org.eclipse.ui.IPathEditorInput; import org.eclipse.ui.handlers.HandlerUtil; @@ -57,7 +57,7 @@ public class LocalLauncherHandler extends AbstractHandler { // Find the local terminal launcher delegate ILauncherDelegate delegate = null; for (ILauncherDelegate candidate : delegates) { - if ("org.eclipse.tcf.te.ui.terminals.local.launcher.local".equals(candidate.getId())) { //$NON-NLS-1$ + if ("org.eclipse.tm.terminal.view.ui.local.launcher.local".equals(candidate.getId())) { //$NON-NLS-1$ delegate = candidate; break; } diff --git a/plugins/org.eclipse.tcf.te.ui.terminals.local/src/org/eclipse/tcf/te/ui/terminals/local/launcher/LocalMementoHandler.java b/plugins/org.eclipse.tm.terminal.view.ui.local/src/org/eclipse/tm/terminal/view/ui/local/launcher/LocalMementoHandler.java similarity index 83% rename from plugins/org.eclipse.tcf.te.ui.terminals.local/src/org/eclipse/tcf/te/ui/terminals/local/launcher/LocalMementoHandler.java rename to plugins/org.eclipse.tm.terminal.view.ui.local/src/org/eclipse/tm/terminal/view/ui/local/launcher/LocalMementoHandler.java index 67f5ac618a0..819bd05e119 100644 --- a/plugins/org.eclipse.tcf.te.ui.terminals.local/src/org/eclipse/tcf/te/ui/terminals/local/launcher/LocalMementoHandler.java +++ b/plugins/org.eclipse.tm.terminal.view.ui.local/src/org/eclipse/tm/terminal/view/ui/local/launcher/LocalMementoHandler.java @@ -7,12 +7,12 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tcf.te.ui.terminals.local.launcher; +package org.eclipse.tm.terminal.view.ui.local.launcher; import java.util.Map; import org.eclipse.core.runtime.Assert; -import org.eclipse.tcf.te.ui.terminals.interfaces.IMementoHandler; +import org.eclipse.tm.terminal.view.ui.interfaces.IMementoHandler; import org.eclipse.ui.IMemento; /** @@ -21,7 +21,7 @@ import org.eclipse.ui.IMemento; public class LocalMementoHandler implements IMementoHandler { /* (non-Javadoc) - * @see org.eclipse.tcf.te.ui.terminals.interfaces.IMementoHandler#saveState(org.eclipse.ui.IMemento, java.util.Map) + * @see org.eclipse.tm.terminal.view.ui.interfaces.IMementoHandler#saveState(org.eclipse.ui.IMemento, java.util.Map) */ @Override public void saveState(IMemento memento, Map properties) { @@ -30,7 +30,7 @@ public class LocalMementoHandler implements IMementoHandler { } /* (non-Javadoc) - * @see org.eclipse.tcf.te.ui.terminals.interfaces.IMementoHandler#restoreState(org.eclipse.ui.IMemento, java.util.Map) + * @see org.eclipse.tm.terminal.view.ui.interfaces.IMementoHandler#restoreState(org.eclipse.ui.IMemento, java.util.Map) */ @Override public void restoreState(IMemento memento, Map properties) { diff --git a/plugins/org.eclipse.tcf.te.ui.terminals.local/src/org/eclipse/tcf/te/ui/terminals/local/nls/Messages.java b/plugins/org.eclipse.tm.terminal.view.ui.local/src/org/eclipse/tm/terminal/view/ui/local/nls/Messages.java similarity index 94% rename from plugins/org.eclipse.tcf.te.ui.terminals.local/src/org/eclipse/tcf/te/ui/terminals/local/nls/Messages.java rename to plugins/org.eclipse.tm.terminal.view.ui.local/src/org/eclipse/tm/terminal/view/ui/local/nls/Messages.java index aff56bf5b6a..2082b8ec5d5 100644 --- a/plugins/org.eclipse.tcf.te.ui.terminals.local/src/org/eclipse/tcf/te/ui/terminals/local/nls/Messages.java +++ b/plugins/org.eclipse.tm.terminal.view.ui.local/src/org/eclipse/tm/terminal/view/ui/local/nls/Messages.java @@ -7,7 +7,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tcf.te.ui.terminals.local.nls; +package org.eclipse.tm.terminal.view.ui.local.nls; import org.eclipse.osgi.util.NLS; @@ -17,7 +17,7 @@ import org.eclipse.osgi.util.NLS; public class Messages extends NLS { // The plug-in resource bundle name - private static final String BUNDLE_NAME = "org.eclipse.tcf.te.ui.terminals.local.nls.Messages"; //$NON-NLS-1$ + private static final String BUNDLE_NAME = "org.eclipse.tm.terminal.view.ui.local.nls.Messages"; //$NON-NLS-1$ /** * Static constructor. diff --git a/plugins/org.eclipse.tcf.te.ui.terminals.local/src/org/eclipse/tcf/te/ui/terminals/local/nls/Messages.properties b/plugins/org.eclipse.tm.terminal.view.ui.local/src/org/eclipse/tm/terminal/view/ui/local/nls/Messages.properties similarity index 100% rename from plugins/org.eclipse.tcf.te.ui.terminals.local/src/org/eclipse/tcf/te/ui/terminals/local/nls/Messages.properties rename to plugins/org.eclipse.tm.terminal.view.ui.local/src/org/eclipse/tm/terminal/view/ui/local/nls/Messages.properties diff --git a/plugins/org.eclipse.tcf.te.ui.terminals.local/src/org/eclipse/tcf/te/ui/terminals/local/showin/DynamicContributionItems.java b/plugins/org.eclipse.tm.terminal.view.ui.local/src/org/eclipse/tm/terminal/view/ui/local/showin/DynamicContributionItems.java similarity index 93% rename from plugins/org.eclipse.tcf.te.ui.terminals.local/src/org/eclipse/tcf/te/ui/terminals/local/showin/DynamicContributionItems.java rename to plugins/org.eclipse.tm.terminal.view.ui.local/src/org/eclipse/tm/terminal/view/ui/local/showin/DynamicContributionItems.java index 6be5842e924..9679602c553 100644 --- a/plugins/org.eclipse.tcf.te.ui.terminals.local/src/org/eclipse/tcf/te/ui/terminals/local/showin/DynamicContributionItems.java +++ b/plugins/org.eclipse.tm.terminal.view.ui.local/src/org/eclipse/tm/terminal/view/ui/local/showin/DynamicContributionItems.java @@ -7,7 +7,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tcf.te.ui.terminals.local.showin; +package org.eclipse.tm.terminal.view.ui.local.showin; import java.util.ArrayList; import java.util.HashMap; @@ -22,10 +22,10 @@ import org.eclipse.jface.action.IContributionItem; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.viewers.ISelection; import org.eclipse.swt.graphics.ImageData; -import org.eclipse.tcf.te.core.terminals.interfaces.constants.ITerminalsConnectorConstants; -import org.eclipse.tcf.te.ui.terminals.interfaces.ILauncherDelegate; -import org.eclipse.tcf.te.ui.terminals.launcher.LauncherDelegateManager; -import org.eclipse.tcf.te.ui.terminals.local.showin.interfaces.IExternalExecutablesProperties; +import org.eclipse.tm.terminal.view.core.interfaces.constants.ITerminalsConnectorConstants; +import org.eclipse.tm.terminal.view.ui.interfaces.ILauncherDelegate; +import org.eclipse.tm.terminal.view.ui.launcher.LauncherDelegateManager; +import org.eclipse.tm.terminal.view.ui.local.showin.interfaces.IExternalExecutablesProperties; import org.eclipse.ui.ISelectionService; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.actions.CompoundContributionItem; @@ -49,7 +49,7 @@ public class DynamicContributionItems extends CompoundContributionItem implement this.serviceLocator = serviceLocator; // Get the local terminal launcher delegate - delegate = LauncherDelegateManager.getInstance().getLauncherDelegate("org.eclipse.tcf.te.ui.terminals.local.launcher.local", false); //$NON-NLS-1$ + delegate = LauncherDelegateManager.getInstance().getLauncherDelegate("org.eclipse.tm.terminal.view.ui.local.launcher.local", false); //$NON-NLS-1$ } /* (non-Javadoc) diff --git a/plugins/org.eclipse.tcf.te.ui.terminals.local/src/org/eclipse/tcf/te/ui/terminals/local/showin/ExternalExecutablesDialog.java b/plugins/org.eclipse.tm.terminal.view.ui.local/src/org/eclipse/tm/terminal/view/ui/local/showin/ExternalExecutablesDialog.java similarity index 98% rename from plugins/org.eclipse.tcf.te.ui.terminals.local/src/org/eclipse/tcf/te/ui/terminals/local/showin/ExternalExecutablesDialog.java rename to plugins/org.eclipse.tm.terminal.view.ui.local/src/org/eclipse/tm/terminal/view/ui/local/showin/ExternalExecutablesDialog.java index 44e57c5625b..75896f2968c 100644 --- a/plugins/org.eclipse.tcf.te.ui.terminals.local/src/org/eclipse/tcf/te/ui/terminals/local/showin/ExternalExecutablesDialog.java +++ b/plugins/org.eclipse.tm.terminal.view.ui.local/src/org/eclipse/tm/terminal/view/ui/local/showin/ExternalExecutablesDialog.java @@ -7,7 +7,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tcf.te.ui.terminals.local.showin; +package org.eclipse.tm.terminal.view.ui.local.showin; import java.io.File; import java.util.HashMap; @@ -34,9 +34,9 @@ import org.eclipse.swt.widgets.FileDialog; import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.Text; -import org.eclipse.tcf.te.ui.terminals.local.help.IContextHelpIds; -import org.eclipse.tcf.te.ui.terminals.local.nls.Messages; -import org.eclipse.tcf.te.ui.terminals.local.showin.interfaces.IExternalExecutablesProperties; +import org.eclipse.tm.terminal.view.ui.local.help.IContextHelpIds; +import org.eclipse.tm.terminal.view.ui.local.nls.Messages; +import org.eclipse.tm.terminal.view.ui.local.showin.interfaces.IExternalExecutablesProperties; import org.eclipse.ui.PlatformUI; import org.osgi.framework.Bundle; @@ -338,7 +338,7 @@ public class ExternalExecutablesDialog extends TrayDialog { } /* (non-Javadoc) - * @see org.eclipse.tcf.te.ui.jface.dialogs.CustomTrayDialog#okPressed() + * @see org.eclipse.jface.dialogs.Dialog#okPressed() */ @Override protected void okPressed() { diff --git a/plugins/org.eclipse.tcf.te.ui.terminals.local/src/org/eclipse/tcf/te/ui/terminals/local/showin/ExternalExecutablesInitializer.java b/plugins/org.eclipse.tm.terminal.view.ui.local/src/org/eclipse/tm/terminal/view/ui/local/showin/ExternalExecutablesInitializer.java similarity index 96% rename from plugins/org.eclipse.tcf.te.ui.terminals.local/src/org/eclipse/tcf/te/ui/terminals/local/showin/ExternalExecutablesInitializer.java rename to plugins/org.eclipse.tm.terminal.view.ui.local/src/org/eclipse/tm/terminal/view/ui/local/showin/ExternalExecutablesInitializer.java index 1bcca4a52c1..758f522398a 100644 --- a/plugins/org.eclipse.tcf.te.ui.terminals.local/src/org/eclipse/tcf/te/ui/terminals/local/showin/ExternalExecutablesInitializer.java +++ b/plugins/org.eclipse.tm.terminal.view.ui.local/src/org/eclipse/tm/terminal/view/ui/local/showin/ExternalExecutablesInitializer.java @@ -7,7 +7,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tcf.te.ui.terminals.local.showin; +package org.eclipse.tm.terminal.view.ui.local.showin; import java.io.File; import java.util.ArrayList; @@ -17,7 +17,7 @@ import java.util.Map; import java.util.StringTokenizer; import org.eclipse.core.runtime.Platform; -import org.eclipse.tcf.te.ui.terminals.local.showin.interfaces.IExternalExecutablesProperties; +import org.eclipse.tm.terminal.view.ui.local.showin.interfaces.IExternalExecutablesProperties; import org.eclipse.ui.IStartup; /** diff --git a/plugins/org.eclipse.tcf.te.ui.terminals.local/src/org/eclipse/tcf/te/ui/terminals/local/showin/ExternalExecutablesManager.java b/plugins/org.eclipse.tm.terminal.view.ui.local/src/org/eclipse/tm/terminal/view/ui/local/showin/ExternalExecutablesManager.java similarity index 97% rename from plugins/org.eclipse.tcf.te.ui.terminals.local/src/org/eclipse/tcf/te/ui/terminals/local/showin/ExternalExecutablesManager.java rename to plugins/org.eclipse.tm.terminal.view.ui.local/src/org/eclipse/tm/terminal/view/ui/local/showin/ExternalExecutablesManager.java index 1e797d92f08..5df1edf7d7c 100644 --- a/plugins/org.eclipse.tcf.te.ui.terminals.local/src/org/eclipse/tcf/te/ui/terminals/local/showin/ExternalExecutablesManager.java +++ b/plugins/org.eclipse.tm.terminal.view.ui.local/src/org/eclipse/tm/terminal/view/ui/local/showin/ExternalExecutablesManager.java @@ -7,7 +7,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tcf.te.ui.terminals.local.showin; +package org.eclipse.tm.terminal.view.ui.local.showin; import java.io.File; import java.io.FileReader; @@ -26,7 +26,7 @@ import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.Platform; import org.eclipse.swt.graphics.ImageData; import org.eclipse.swt.graphics.ImageLoader; -import org.eclipse.tcf.te.ui.terminals.local.activator.UIPlugin; +import org.eclipse.tm.terminal.view.ui.local.activator.UIPlugin; /** * External executables manager implementation. diff --git a/plugins/org.eclipse.tcf.te.ui.terminals.local/src/org/eclipse/tcf/te/ui/terminals/local/showin/interfaces/IExternalExecutablesProperties.java b/plugins/org.eclipse.tm.terminal.view.ui.local/src/org/eclipse/tm/terminal/view/ui/local/showin/interfaces/IExternalExecutablesProperties.java similarity index 95% rename from plugins/org.eclipse.tcf.te.ui.terminals.local/src/org/eclipse/tcf/te/ui/terminals/local/showin/interfaces/IExternalExecutablesProperties.java rename to plugins/org.eclipse.tm.terminal.view.ui.local/src/org/eclipse/tm/terminal/view/ui/local/showin/interfaces/IExternalExecutablesProperties.java index daf625d045c..30c91514b4d 100644 --- a/plugins/org.eclipse.tcf.te.ui.terminals.local/src/org/eclipse/tcf/te/ui/terminals/local/showin/interfaces/IExternalExecutablesProperties.java +++ b/plugins/org.eclipse.tm.terminal.view.ui.local/src/org/eclipse/tm/terminal/view/ui/local/showin/interfaces/IExternalExecutablesProperties.java @@ -7,7 +7,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tcf.te.ui.terminals.local.showin.interfaces; +package org.eclipse.tm.terminal.view.ui.local.showin.interfaces; /** * External executables data property names. diff --git a/plugins/org.eclipse.tcf.te.ui.terminals.local/src/org/eclipse/tcf/te/ui/terminals/local/showin/interfaces/IPreferenceKeys.java b/plugins/org.eclipse.tm.terminal.view.ui.local/src/org/eclipse/tm/terminal/view/ui/local/showin/interfaces/IPreferenceKeys.java similarity index 96% rename from plugins/org.eclipse.tcf.te.ui.terminals.local/src/org/eclipse/tcf/te/ui/terminals/local/showin/interfaces/IPreferenceKeys.java rename to plugins/org.eclipse.tm.terminal.view.ui.local/src/org/eclipse/tm/terminal/view/ui/local/showin/interfaces/IPreferenceKeys.java index 631ac16c159..ba508ef04a6 100644 --- a/plugins/org.eclipse.tcf.te.ui.terminals.local/src/org/eclipse/tcf/te/ui/terminals/local/showin/interfaces/IPreferenceKeys.java +++ b/plugins/org.eclipse.tm.terminal.view.ui.local/src/org/eclipse/tm/terminal/view/ui/local/showin/interfaces/IPreferenceKeys.java @@ -7,7 +7,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tcf.te.ui.terminals.local.showin.interfaces; +package org.eclipse.tm.terminal.view.ui.local.showin.interfaces; /** * Terminals plug-in preference key definitions. diff --git a/plugins/org.eclipse.tcf.te.ui.terminals.local/src/org/eclipse/tcf/te/ui/terminals/local/showin/preferences/PreferencePage.java b/plugins/org.eclipse.tm.terminal.view.ui.local/src/org/eclipse/tm/terminal/view/ui/local/showin/preferences/PreferencePage.java similarity index 98% rename from plugins/org.eclipse.tcf.te.ui.terminals.local/src/org/eclipse/tcf/te/ui/terminals/local/showin/preferences/PreferencePage.java rename to plugins/org.eclipse.tm.terminal.view.ui.local/src/org/eclipse/tm/terminal/view/ui/local/showin/preferences/PreferencePage.java index c47135dd48f..0ec6d83c0bc 100644 --- a/plugins/org.eclipse.tcf.te.ui.terminals.local/src/org/eclipse/tcf/te/ui/terminals/local/showin/preferences/PreferencePage.java +++ b/plugins/org.eclipse.tm.terminal.view.ui.local/src/org/eclipse/tm/terminal/view/ui/local/showin/preferences/PreferencePage.java @@ -7,7 +7,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tcf.te.ui.terminals.local.showin.preferences; +package org.eclipse.tm.terminal.view.ui.local.showin.preferences; import java.io.File; import java.net.URI; @@ -62,13 +62,13 @@ import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Table; import org.eclipse.swt.widgets.TableColumn; import org.eclipse.swt.widgets.Text; -import org.eclipse.tcf.te.ui.terminals.controls.NoteCompositeHelper; -import org.eclipse.tcf.te.ui.terminals.local.activator.UIPlugin; -import org.eclipse.tcf.te.ui.terminals.local.nls.Messages; -import org.eclipse.tcf.te.ui.terminals.local.showin.ExternalExecutablesDialog; -import org.eclipse.tcf.te.ui.terminals.local.showin.ExternalExecutablesManager; -import org.eclipse.tcf.te.ui.terminals.local.showin.interfaces.IExternalExecutablesProperties; -import org.eclipse.tcf.te.ui.terminals.local.showin.interfaces.IPreferenceKeys; +import org.eclipse.tm.terminal.view.ui.controls.NoteCompositeHelper; +import org.eclipse.tm.terminal.view.ui.local.activator.UIPlugin; +import org.eclipse.tm.terminal.view.ui.local.nls.Messages; +import org.eclipse.tm.terminal.view.ui.local.showin.ExternalExecutablesDialog; +import org.eclipse.tm.terminal.view.ui.local.showin.ExternalExecutablesManager; +import org.eclipse.tm.terminal.view.ui.local.showin.interfaces.IExternalExecutablesProperties; +import org.eclipse.tm.terminal.view.ui.local.showin.interfaces.IPreferenceKeys; import org.eclipse.ui.IWorkbench; import org.eclipse.ui.IWorkbenchPreferencePage; import org.osgi.framework.Bundle; diff --git a/plugins/org.eclipse.tcf.te.ui.terminals.local/src/org/eclipse/tcf/te/ui/terminals/local/showin/preferences/PreferencesInitializer.java b/plugins/org.eclipse.tm.terminal.view.ui.local/src/org/eclipse/tm/terminal/view/ui/local/showin/preferences/PreferencesInitializer.java similarity index 83% rename from plugins/org.eclipse.tcf.te.ui.terminals.local/src/org/eclipse/tcf/te/ui/terminals/local/showin/preferences/PreferencesInitializer.java rename to plugins/org.eclipse.tm.terminal.view.ui.local/src/org/eclipse/tm/terminal/view/ui/local/showin/preferences/PreferencesInitializer.java index 036e3e34e31..2922ee644b8 100644 --- a/plugins/org.eclipse.tcf.te.ui.terminals.local/src/org/eclipse/tcf/te/ui/terminals/local/showin/preferences/PreferencesInitializer.java +++ b/plugins/org.eclipse.tm.terminal.view.ui.local/src/org/eclipse/tm/terminal/view/ui/local/showin/preferences/PreferencesInitializer.java @@ -7,12 +7,12 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tcf.te.ui.terminals.local.showin.preferences; +package org.eclipse.tm.terminal.view.ui.local.showin.preferences; import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer; -import org.eclipse.tcf.te.core.terminals.preferences.ScopedEclipsePreferences; -import org.eclipse.tcf.te.ui.terminals.local.activator.UIPlugin; -import org.eclipse.tcf.te.ui.terminals.local.showin.interfaces.IPreferenceKeys; +import org.eclipse.tm.terminal.view.core.preferences.ScopedEclipsePreferences; +import org.eclipse.tm.terminal.view.ui.local.activator.UIPlugin; +import org.eclipse.tm.terminal.view.ui.local.showin.interfaces.IPreferenceKeys; /** * Terminals default preferences initializer. diff --git a/plugins/org.eclipse.tcf.te.ui.terminals.process/.classpath b/plugins/org.eclipse.tm.terminal.view.ui.process/.classpath similarity index 100% rename from plugins/org.eclipse.tcf.te.ui.terminals.process/.classpath rename to plugins/org.eclipse.tm.terminal.view.ui.process/.classpath diff --git a/plugins/org.eclipse.tm.terminal.view.ui.process/.gitignore b/plugins/org.eclipse.tm.terminal.view.ui.process/.gitignore new file mode 100644 index 00000000000..ae3c1726048 --- /dev/null +++ b/plugins/org.eclipse.tm.terminal.view.ui.process/.gitignore @@ -0,0 +1 @@ +/bin/ diff --git a/plugins/org.eclipse.tcf.te.ui.terminals.process/.options b/plugins/org.eclipse.tm.terminal.view.ui.process/.options similarity index 100% rename from plugins/org.eclipse.tcf.te.ui.terminals.process/.options rename to plugins/org.eclipse.tm.terminal.view.ui.process/.options diff --git a/plugins/org.eclipse.tcf.te.ui.terminals.process/.project b/plugins/org.eclipse.tm.terminal.view.ui.process/.project similarity index 94% rename from plugins/org.eclipse.tcf.te.ui.terminals.process/.project rename to plugins/org.eclipse.tm.terminal.view.ui.process/.project index 65fc5f297b3..388cdcc2270 100644 --- a/plugins/org.eclipse.tcf.te.ui.terminals.process/.project +++ b/plugins/org.eclipse.tm.terminal.view.ui.process/.project @@ -1,6 +1,6 @@ - org.eclipse.tcf.te.ui.terminals.process + org.eclipse.tm.terminal.view.ui.process diff --git a/plugins/org.eclipse.tcf.te.ui.terminals.process/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.tm.terminal.view.ui.process/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from plugins/org.eclipse.tcf.te.ui.terminals.process/.settings/org.eclipse.jdt.core.prefs rename to plugins/org.eclipse.tm.terminal.view.ui.process/.settings/org.eclipse.jdt.core.prefs diff --git a/plugins/org.eclipse.tcf.te.ui.terminals.process/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.tm.terminal.view.ui.process/.settings/org.eclipse.jdt.ui.prefs similarity index 100% rename from plugins/org.eclipse.tcf.te.ui.terminals.process/.settings/org.eclipse.jdt.ui.prefs rename to plugins/org.eclipse.tm.terminal.view.ui.process/.settings/org.eclipse.jdt.ui.prefs diff --git a/plugins/org.eclipse.tcf.te.ui.terminals.process/.settings/org.eclipse.pde.prefs b/plugins/org.eclipse.tm.terminal.view.ui.process/.settings/org.eclipse.pde.prefs similarity index 100% rename from plugins/org.eclipse.tcf.te.ui.terminals.process/.settings/org.eclipse.pde.prefs rename to plugins/org.eclipse.tm.terminal.view.ui.process/.settings/org.eclipse.pde.prefs diff --git a/plugins/org.eclipse.tcf.te.ui.terminals.process/META-INF/MANIFEST.MF b/plugins/org.eclipse.tm.terminal.view.ui.process/META-INF/MANIFEST.MF similarity index 53% rename from plugins/org.eclipse.tcf.te.ui.terminals.process/META-INF/MANIFEST.MF rename to plugins/org.eclipse.tm.terminal.view.ui.process/META-INF/MANIFEST.MF index db4041309cd..8f22aa287e4 100644 --- a/plugins/org.eclipse.tcf.te.ui.terminals.process/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.tm.terminal.view.ui.process/META-INF/MANIFEST.MF @@ -1,9 +1,9 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName -Bundle-SymbolicName: org.eclipse.tcf.te.ui.terminals.process;singleton:=true -Bundle-Version: 1.3.0.qualifier -Bundle-Activator: org.eclipse.tcf.te.ui.terminals.process.activator.UIPlugin +Bundle-SymbolicName: org.eclipse.tm.terminal.view.ui.process;singleton:=true +Bundle-Version: 4.0.0.qualifier +Bundle-Activator: org.eclipse.tm.terminal.view.ui.process.activator.UIPlugin Bundle-Vendor: %providerName Import-Package: org.eclipse.cdt.utils.pty;mandatory:=native, org.eclipse.cdt.utils.spawner;mandatory:=native @@ -11,14 +11,14 @@ Require-Bundle: org.eclipse.cdt.core;bundle-version="5.6";resolution:=optional, org.eclipse.core.expressions;bundle-version="3.4.400", org.eclipse.core.resources;bundle-version="3.8.1";resolution:=optional, org.eclipse.core.runtime;bundle-version="3.8.0", - org.eclipse.tcf.te.core.terminals;bundle-version="1.3.0", - org.eclipse.tcf.te.ui.terminals;bundle-version="1.3.0", - org.eclipse.tm.terminal;bundle-version="3.3.1", + 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.ui;bundle-version="3.8.0" Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-ActivationPolicy: lazy Bundle-Localization: plugin -Export-Package: org.eclipse.tcf.te.ui.terminals.process, - org.eclipse.tcf.te.ui.terminals.process.activator;x-internal:=true, - org.eclipse.tcf.te.ui.terminals.process.help, - org.eclipse.tcf.te.ui.terminals.process.nls;x-internal:=true +Export-Package: org.eclipse.tm.terminal.view.ui.process, + org.eclipse.tm.terminal.view.ui.process.activator;x-internal:=true, + org.eclipse.tm.terminal.view.ui.process.help, + org.eclipse.tm.terminal.view.ui.process.nls;x-internal:=true diff --git a/plugins/org.eclipse.tcf.te.ui.terminals.process/META-INF/p2.inf b/plugins/org.eclipse.tm.terminal.view.ui.process/META-INF/p2.inf similarity index 100% rename from plugins/org.eclipse.tcf.te.ui.terminals.process/META-INF/p2.inf rename to plugins/org.eclipse.tm.terminal.view.ui.process/META-INF/p2.inf diff --git a/plugins/org.eclipse.tcf.te.ui.terminals.process/about.html b/plugins/org.eclipse.tm.terminal.view.ui.process/about.html similarity index 100% rename from plugins/org.eclipse.tcf.te.ui.terminals.process/about.html rename to plugins/org.eclipse.tm.terminal.view.ui.process/about.html diff --git a/plugins/org.eclipse.tcf.te.ui.terminals.process/build.properties b/plugins/org.eclipse.tm.terminal.view.ui.process/build.properties similarity index 100% rename from plugins/org.eclipse.tcf.te.ui.terminals.process/build.properties rename to plugins/org.eclipse.tm.terminal.view.ui.process/build.properties diff --git a/plugins/org.eclipse.tcf.te.ui.terminals.process/plugin.properties b/plugins/org.eclipse.tm.terminal.view.ui.process/plugin.properties similarity index 100% rename from plugins/org.eclipse.tcf.te.ui.terminals.process/plugin.properties rename to plugins/org.eclipse.tm.terminal.view.ui.process/plugin.properties diff --git a/plugins/org.eclipse.tcf.te.ui.terminals.process/plugin.xml b/plugins/org.eclipse.tm.terminal.view.ui.process/plugin.xml similarity index 62% rename from plugins/org.eclipse.tcf.te.ui.terminals.process/plugin.xml rename to plugins/org.eclipse.tm.terminal.view.ui.process/plugin.xml index 068e51399a7..58e91247124 100644 --- a/plugins/org.eclipse.tcf.te.ui.terminals.process/plugin.xml +++ b/plugins/org.eclipse.tm.terminal.view.ui.process/plugin.xml @@ -5,18 +5,18 @@ - + diff --git a/plugins/org.eclipse.tcf.te.ui.terminals.process/pom.xml b/plugins/org.eclipse.tm.terminal.view.ui.process/pom.xml similarity index 54% rename from plugins/org.eclipse.tcf.te.ui.terminals.process/pom.xml rename to plugins/org.eclipse.tm.terminal.view.ui.process/pom.xml index 859eb193202..0cd2c346929 100644 --- a/plugins/org.eclipse.tcf.te.ui.terminals.process/pom.xml +++ b/plugins/org.eclipse.tm.terminal.view.ui.process/pom.xml @@ -5,13 +5,13 @@ 4.0.0 - org.eclipse.tcf - org.eclipse.tcf.maven-build - 1.3.0-SNAPSHOT - ../../../admin/pom-build.xml + org.eclipse.tm.terminal + org.eclipse.tm.terminal.maven-build + 4.0.0-SNAPSHOT + ../../admin/pom-build.xml - 1.3.0.qualifier - org.eclipse.tcf.te.ui.terminals.process + 4.0.0.qualifier + org.eclipse.tm.terminal.view.ui.process eclipse-plugin diff --git a/plugins/org.eclipse.tcf.te.ui.terminals.process/src/org/eclipse/tcf/te/ui/terminals/process/ProcessConnector.java b/plugins/org.eclipse.tm.terminal.view.ui.process/src/org/eclipse/tm/terminal/view/ui/process/ProcessConnector.java similarity index 85% rename from plugins/org.eclipse.tcf.te.ui.terminals.process/src/org/eclipse/tcf/te/ui/terminals/process/ProcessConnector.java rename to plugins/org.eclipse.tm.terminal.view.ui.process/src/org/eclipse/tm/terminal/view/ui/process/ProcessConnector.java index 98400b7384f..26e3675eeef 100644 --- a/plugins/org.eclipse.tcf.te.ui.terminals.process/src/org/eclipse/tcf/te/ui/terminals/process/ProcessConnector.java +++ b/plugins/org.eclipse.tm.terminal.view.ui.process/src/org/eclipse/tm/terminal/view/ui/process/ProcessConnector.java @@ -7,7 +7,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tcf.te.ui.terminals.process; +package org.eclipse.tm.terminal.view.ui.process; import java.io.File; import java.io.IOException; @@ -23,17 +23,17 @@ import org.eclipse.core.runtime.Platform; import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.osgi.util.NLS; import org.eclipse.swt.custom.CTabItem; -import org.eclipse.tcf.te.core.terminals.interfaces.constants.ILineSeparatorConstants; -import org.eclipse.tcf.te.core.terminals.utils.Env; -import org.eclipse.tcf.te.ui.terminals.manager.ConsoleManager; -import org.eclipse.tcf.te.ui.terminals.process.nls.Messages; -import org.eclipse.tcf.te.ui.terminals.streams.AbstractStreamsConnector; import org.eclipse.tm.internal.terminal.emulator.VT100Emulator; import org.eclipse.tm.internal.terminal.emulator.VT100TerminalControl; import org.eclipse.tm.internal.terminal.provisional.api.ISettingsPage; import org.eclipse.tm.internal.terminal.provisional.api.ISettingsStore; import org.eclipse.tm.internal.terminal.provisional.api.ITerminalControl; import org.eclipse.tm.internal.terminal.provisional.api.TerminalState; +import org.eclipse.tm.terminal.view.core.interfaces.constants.ILineSeparatorConstants; +import org.eclipse.tm.terminal.view.core.utils.Env; +import org.eclipse.tm.terminal.view.ui.manager.ConsoleManager; +import org.eclipse.tm.terminal.view.ui.process.nls.Messages; +import org.eclipse.tm.terminal.view.ui.streams.AbstractStreamsConnector; /** * Process connector implementation. @@ -84,7 +84,7 @@ public class ProcessConnector extends AbstractStreamsConnector { } /* (non-Javadoc) - * @see org.eclipse.tcf.internal.terminal.provisional.api.provider.TerminalConnectorImpl#connect(org.eclipse.tcf.internal.terminal.provisional.api.ITerminalControl) + * @see org.eclipse.tm.internal.terminal.provisional.api.provider.TerminalConnectorImpl#connect(org.eclipse.tm.internal.terminal.provisional.api.ITerminalControl) */ @Override public void connect(ITerminalControl control) { @@ -228,7 +228,7 @@ public class ProcessConnector extends AbstractStreamsConnector { } /* (non-Javadoc) - * @see org.eclipse.tcf.internal.terminal.provisional.api.provider.TerminalConnectorImpl#isLocalEcho() + * @see org.eclipse.tm.internal.terminal.provisional.api.provider.TerminalConnectorImpl#isLocalEcho() */ @Override public boolean isLocalEcho() { @@ -236,7 +236,7 @@ public class ProcessConnector extends AbstractStreamsConnector { } /* (non-Javadoc) - * @see org.eclipse.tcf.internal.terminal.provisional.api.provider.TerminalConnectorImpl#doDisconnect() + * @see org.eclipse.tm.terminal.view.ui.streams.AbstractStreamsConnector#doDisconnect() */ @Override public void doDisconnect() { @@ -256,7 +256,7 @@ public class ProcessConnector extends AbstractStreamsConnector { // ***** Process Connector settings handling ***** /* (non-Javadoc) - * @see org.eclipse.tcf.internal.terminal.provisional.api.provider.TerminalConnectorImpl#makeSettingsPage() + * @see org.eclipse.tm.internal.terminal.provisional.api.provider.TerminalConnectorImpl#makeSettingsPage() */ @Override public ISettingsPage makeSettingsPage() { @@ -264,7 +264,7 @@ public class ProcessConnector extends AbstractStreamsConnector { } /* (non-Javadoc) - * @see org.eclipse.tcf.internal.terminal.provisional.api.provider.TerminalConnectorImpl#getSettingsSummary() + * @see org.eclipse.tm.internal.terminal.provisional.api.provider.TerminalConnectorImpl#getSettingsSummary() */ @Override public String getSettingsSummary() { @@ -272,7 +272,7 @@ public class ProcessConnector extends AbstractStreamsConnector { } /* (non-Javadoc) - * @see org.eclipse.tcf.internal.terminal.provisional.api.provider.TerminalConnectorImpl#load(org.eclipse.tcf.internal.terminal.provisional.api.ISettingsStore) + * @see org.eclipse.tm.internal.terminal.provisional.api.provider.TerminalConnectorImpl#load(org.eclipse.tm.internal.terminal.provisional.api.ISettingsStore) */ @Override public void load(ISettingsStore store) { @@ -280,7 +280,7 @@ public class ProcessConnector extends AbstractStreamsConnector { } /* (non-Javadoc) - * @see org.eclipse.tcf.internal.terminal.provisional.api.provider.TerminalConnectorImpl#save(org.eclipse.tcf.internal.terminal.provisional.api.ISettingsStore) + * @see org.eclipse.tm.internal.terminal.provisional.api.provider.TerminalConnectorImpl#save(org.eclipse.tm.internal.terminal.provisional.api.ISettingsStore) */ @Override public void save(ISettingsStore store) { @@ -288,7 +288,7 @@ public class ProcessConnector extends AbstractStreamsConnector { } /* (non-Javadoc) - * @see org.eclipse.tcf.internal.terminal.provisional.api.provider.TerminalConnectorImpl#setTerminalSize(int, int) + * @see org.eclipse.tm.internal.terminal.provisional.api.provider.TerminalConnectorImpl#setTerminalSize(int, int) */ @Override public void setTerminalSize(int newWidth, int newHeight) { diff --git a/plugins/org.eclipse.tcf.te.ui.terminals.process/src/org/eclipse/tcf/te/ui/terminals/process/ProcessLauncherDelegate.java b/plugins/org.eclipse.tm.terminal.view.ui.process/src/org/eclipse/tm/terminal/view/ui/process/ProcessLauncherDelegate.java similarity index 80% rename from plugins/org.eclipse.tcf.te.ui.terminals.process/src/org/eclipse/tcf/te/ui/terminals/process/ProcessLauncherDelegate.java rename to plugins/org.eclipse.tm.terminal.view.ui.process/src/org/eclipse/tm/terminal/view/ui/process/ProcessLauncherDelegate.java index fc78d60dee1..60726066f8d 100644 --- a/plugins/org.eclipse.tcf.te.ui.terminals.process/src/org/eclipse/tcf/te/ui/terminals/process/ProcessLauncherDelegate.java +++ b/plugins/org.eclipse.tm.terminal.view.ui.process/src/org/eclipse/tm/terminal/view/ui/process/ProcessLauncherDelegate.java @@ -7,24 +7,23 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tcf.te.ui.terminals.process; +package org.eclipse.tm.terminal.view.ui.process; import java.util.Map; import org.eclipse.cdt.utils.pty.PTY; import org.eclipse.core.runtime.Assert; -import org.eclipse.tcf.te.core.terminals.TerminalServiceFactory; -import org.eclipse.tcf.te.core.terminals.interfaces.ITerminalService; -import org.eclipse.tcf.te.core.terminals.interfaces.ITerminalService.Done; -import org.eclipse.tcf.te.core.terminals.interfaces.ITerminalServiceOutputStreamMonitorListener; -import org.eclipse.tcf.te.core.terminals.interfaces.constants.ITerminalsConnectorConstants; -import org.eclipse.tcf.te.ui.terminals.interfaces.IConfigurationPanel; -import org.eclipse.tcf.te.ui.terminals.interfaces.IConfigurationPanelContainer; -import org.eclipse.tcf.te.ui.terminals.internal.SettingsStore; -import org.eclipse.tcf.te.ui.terminals.launcher.AbstractLauncherDelegate; 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.terminal.view.core.TerminalServiceFactory; +import org.eclipse.tm.terminal.view.core.interfaces.ITerminalService; +import org.eclipse.tm.terminal.view.core.interfaces.ITerminalServiceOutputStreamMonitorListener; +import org.eclipse.tm.terminal.view.core.interfaces.constants.ITerminalsConnectorConstants; +import org.eclipse.tm.terminal.view.ui.interfaces.IConfigurationPanel; +import org.eclipse.tm.terminal.view.ui.interfaces.IConfigurationPanelContainer; +import org.eclipse.tm.terminal.view.ui.internal.SettingsStore; +import org.eclipse.tm.terminal.view.ui.launcher.AbstractLauncherDelegate; /** * Process launcher delegate implementation. @@ -33,7 +32,7 @@ import org.eclipse.tm.internal.terminal.provisional.api.TerminalConnectorExtensi public class ProcessLauncherDelegate extends AbstractLauncherDelegate { /* (non-Javadoc) - * @see org.eclipse.tcf.te.ui.terminals.interfaces.ILauncherDelegate#needsUserConfiguration() + * @see org.eclipse.tm.terminal.view.ui.interfaces.ILauncherDelegate#needsUserConfiguration() */ @Override public boolean needsUserConfiguration() { @@ -41,7 +40,7 @@ public class ProcessLauncherDelegate extends AbstractLauncherDelegate { } /* (non-Javadoc) - * @see org.eclipse.tcf.te.ui.terminals.interfaces.ILauncherDelegate#getPanel(org.eclipse.tcf.te.ui.terminals.interfaces.IConfigurationPanelContainer) + * @see org.eclipse.tm.terminal.view.ui.interfaces.ILauncherDelegate#getPanel(org.eclipse.tm.terminal.view.ui.interfaces.IConfigurationPanelContainer) */ @Override public IConfigurationPanel getPanel(IConfigurationPanelContainer container) { @@ -49,10 +48,10 @@ public class ProcessLauncherDelegate extends AbstractLauncherDelegate { } /* (non-Javadoc) - * @see org.eclipse.tcf.te.ui.terminals.interfaces.ILauncherDelegate#execute(java.util.Map, org.eclipse.tcf.te.core.terminals.interfaces.ITerminalService.Done) + * @see org.eclipse.tm.terminal.view.ui.interfaces.ILauncherDelegate#execute(java.util.Map, org.eclipse.tm.terminal.view.core.interfaces.ITerminalService.Done) */ @Override - public void execute(Map properties, Done done) { + public void execute(Map properties, ITerminalService.Done done) { Assert.isNotNull(properties); // Get the terminal service @@ -64,7 +63,7 @@ public class ProcessLauncherDelegate extends AbstractLauncherDelegate { } /* (non-Javadoc) - * @see org.eclipse.tcf.te.ui.terminals.interfaces.ILauncherDelegate#createTerminalConnector(java.util.Map) + * @see org.eclipse.tm.terminal.view.ui.interfaces.ILauncherDelegate#createTerminalConnector(java.util.Map) */ @Override public ITerminalConnector createTerminalConnector(Map properties) { @@ -72,7 +71,7 @@ public class ProcessLauncherDelegate extends AbstractLauncherDelegate { // Check for the terminal connector id String connectorId = (String)properties.get(ITerminalsConnectorConstants.PROP_TERMINAL_CONNECTOR_ID); - if (connectorId == null) connectorId = "org.eclipse.tcf.te.ui.terminals.ProcessConnector"; //$NON-NLS-1$ + if (connectorId == null) connectorId = "org.eclipse.tm.terminal.view.ui.ProcessConnector"; //$NON-NLS-1$ // Extract the process properties String image = (String)properties.get(ITerminalsConnectorConstants.PROP_PROCESS_PATH); diff --git a/plugins/org.eclipse.tcf.te.ui.terminals.process/src/org/eclipse/tcf/te/ui/terminals/process/ProcessMonitor.java b/plugins/org.eclipse.tm.terminal.view.ui.process/src/org/eclipse/tm/terminal/view/ui/process/ProcessMonitor.java similarity index 98% rename from plugins/org.eclipse.tcf.te.ui.terminals.process/src/org/eclipse/tcf/te/ui/terminals/process/ProcessMonitor.java rename to plugins/org.eclipse.tm.terminal.view.ui.process/src/org/eclipse/tm/terminal/view/ui/process/ProcessMonitor.java index f9cce8b650f..c94ff6b7eeb 100644 --- a/plugins/org.eclipse.tcf.te.ui.terminals.process/src/org/eclipse/tcf/te/ui/terminals/process/ProcessMonitor.java +++ b/plugins/org.eclipse.tm.terminal.view.ui.process/src/org/eclipse/tm/terminal/view/ui/process/ProcessMonitor.java @@ -7,7 +7,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tcf.te.ui.terminals.process; +package org.eclipse.tm.terminal.view.ui.process; import org.eclipse.core.runtime.Assert; diff --git a/plugins/org.eclipse.tcf.te.ui.terminals.process/src/org/eclipse/tcf/te/ui/terminals/process/ProcessSettings.java b/plugins/org.eclipse.tm.terminal.view.ui.process/src/org/eclipse/tm/terminal/view/ui/process/ProcessSettings.java similarity index 98% rename from plugins/org.eclipse.tcf.te.ui.terminals.process/src/org/eclipse/tcf/te/ui/terminals/process/ProcessSettings.java rename to plugins/org.eclipse.tm.terminal.view.ui.process/src/org/eclipse/tm/terminal/view/ui/process/ProcessSettings.java index 4a306ddfbc3..20b0593c332 100644 --- a/plugins/org.eclipse.tcf.te.ui.terminals.process/src/org/eclipse/tcf/te/ui/terminals/process/ProcessSettings.java +++ b/plugins/org.eclipse.tm.terminal.view.ui.process/src/org/eclipse/tm/terminal/view/ui/process/ProcessSettings.java @@ -7,13 +7,13 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tcf.te.ui.terminals.process; +package org.eclipse.tm.terminal.view.ui.process; import org.eclipse.cdt.utils.pty.PTY; import org.eclipse.core.runtime.Assert; -import org.eclipse.tcf.te.core.terminals.interfaces.ITerminalServiceOutputStreamMonitorListener; -import org.eclipse.tcf.te.ui.terminals.internal.SettingsStore; import org.eclipse.tm.internal.terminal.provisional.api.ISettingsStore; +import org.eclipse.tm.terminal.view.core.interfaces.ITerminalServiceOutputStreamMonitorListener; +import org.eclipse.tm.terminal.view.ui.internal.SettingsStore; /** * Process connector settings implementation. diff --git a/plugins/org.eclipse.tcf.te.ui.terminals.process/src/org/eclipse/tcf/te/ui/terminals/process/ProcessSettingsPage.java b/plugins/org.eclipse.tm.terminal.view.ui.process/src/org/eclipse/tm/terminal/view/ui/process/ProcessSettingsPage.java similarity index 93% rename from plugins/org.eclipse.tcf.te.ui.terminals.process/src/org/eclipse/tcf/te/ui/terminals/process/ProcessSettingsPage.java rename to plugins/org.eclipse.tm.terminal.view.ui.process/src/org/eclipse/tm/terminal/view/ui/process/ProcessSettingsPage.java index ab4d292ee4e..2465b2d9bf4 100644 --- a/plugins/org.eclipse.tcf.te.ui.terminals.process/src/org/eclipse/tcf/te/ui/terminals/process/ProcessSettingsPage.java +++ b/plugins/org.eclipse.tm.terminal.view.ui.process/src/org/eclipse/tm/terminal/view/ui/process/ProcessSettingsPage.java @@ -7,7 +7,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tcf.te.ui.terminals.process; +package org.eclipse.tm.terminal.view.ui.process; import org.eclipse.cdt.utils.pty.PTY; import org.eclipse.core.runtime.Assert; @@ -25,8 +25,8 @@ import org.eclipse.swt.widgets.FileDialog; import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.Text; -import org.eclipse.tcf.te.ui.terminals.nls.Messages; import org.eclipse.tm.internal.terminal.provisional.api.AbstractSettingsPage; +import org.eclipse.tm.terminal.view.ui.nls.Messages; import org.eclipse.ui.PlatformUI; import org.osgi.framework.Bundle; @@ -56,7 +56,7 @@ public class ProcessSettingsPage extends AbstractSettingsPage { } /* (non-Javadoc) - * @see org.eclipse.tcf.internal.terminal.provisional.api.ISettingsPage#createControl(org.eclipse.swt.widgets.Composite) + * @see org.eclipse.tm.internal.terminal.provisional.api.ISettingsPage#createControl(org.eclipse.swt.widgets.Composite) */ @Override public void createControl(Composite parent) { @@ -162,7 +162,7 @@ public class ProcessSettingsPage extends AbstractSettingsPage { } /* (non-Javadoc) - * @see org.eclipse.tcf.internal.terminal.provisional.api.ISettingsPage#saveSettings() + * @see org.eclipse.tm.internal.terminal.provisional.api.ISettingsPage#saveSettings() */ @Override public void saveSettings() { @@ -174,7 +174,7 @@ public class ProcessSettingsPage extends AbstractSettingsPage { } /* (non-Javadoc) - * @see org.eclipse.tcf.internal.terminal.provisional.api.ISettingsPage#loadSettings() + * @see org.eclipse.tm.internal.terminal.provisional.api.ISettingsPage#loadSettings() */ @Override public void loadSettings() { @@ -185,7 +185,7 @@ public class ProcessSettingsPage extends AbstractSettingsPage { } /* (non-Javadoc) - * @see org.eclipse.tcf.internal.terminal.provisional.api.ISettingsPage#validateSettings() + * @see org.eclipse.tm.internal.terminal.provisional.api.ISettingsPage#validateSettings() */ @Override public boolean validateSettings() { diff --git a/plugins/org.eclipse.tcf.te.ui.terminals.process/src/org/eclipse/tcf/te/ui/terminals/process/activator/UIPlugin.java b/plugins/org.eclipse.tm.terminal.view.ui.process/src/org/eclipse/tm/terminal/view/ui/process/activator/UIPlugin.java similarity index 94% rename from plugins/org.eclipse.tcf.te.ui.terminals.process/src/org/eclipse/tcf/te/ui/terminals/process/activator/UIPlugin.java rename to plugins/org.eclipse.tm.terminal.view.ui.process/src/org/eclipse/tm/terminal/view/ui/process/activator/UIPlugin.java index 87d195c745c..9bd8acf5346 100644 --- a/plugins/org.eclipse.tcf.te.ui.terminals.process/src/org/eclipse/tcf/te/ui/terminals/process/activator/UIPlugin.java +++ b/plugins/org.eclipse.tm.terminal.view.ui.process/src/org/eclipse/tm/terminal/view/ui/process/activator/UIPlugin.java @@ -7,12 +7,12 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tcf.te.ui.terminals.process.activator; +package org.eclipse.tm.terminal.view.ui.process.activator; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.resource.ImageRegistry; import org.eclipse.swt.graphics.Image; -import org.eclipse.tcf.te.core.terminals.tracing.TraceHandler; +import org.eclipse.tm.terminal.view.core.tracing.TraceHandler; import org.eclipse.ui.plugin.AbstractUIPlugin; import org.osgi.framework.BundleContext; @@ -48,7 +48,7 @@ public class UIPlugin extends AbstractUIPlugin { if (getDefault() != null && getDefault().getBundle() != null) { return getDefault().getBundle().getSymbolicName(); } - return "org.eclipse.tcf.te.ui.terminals.process"; //$NON-NLS-1$ + return "org.eclipse.tm.terminal.view.ui.process"; //$NON-NLS-1$ } /** diff --git a/plugins/org.eclipse.tcf.te.ui.terminals.process/src/org/eclipse/tcf/te/ui/terminals/process/help/IContextHelpIds.java b/plugins/org.eclipse.tm.terminal.view.ui.process/src/org/eclipse/tm/terminal/view/ui/process/help/IContextHelpIds.java similarity index 89% rename from plugins/org.eclipse.tcf.te.ui.terminals.process/src/org/eclipse/tcf/te/ui/terminals/process/help/IContextHelpIds.java rename to plugins/org.eclipse.tm.terminal.view.ui.process/src/org/eclipse/tm/terminal/view/ui/process/help/IContextHelpIds.java index 3fb81c57ff0..9514c022044 100644 --- a/plugins/org.eclipse.tcf.te.ui.terminals.process/src/org/eclipse/tcf/te/ui/terminals/process/help/IContextHelpIds.java +++ b/plugins/org.eclipse.tm.terminal.view.ui.process/src/org/eclipse/tm/terminal/view/ui/process/help/IContextHelpIds.java @@ -7,9 +7,9 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tcf.te.ui.terminals.process.help; +package org.eclipse.tm.terminal.view.ui.process.help; -import org.eclipse.tcf.te.ui.terminals.process.activator.UIPlugin; +import org.eclipse.tm.terminal.view.ui.process.activator.UIPlugin; /** diff --git a/plugins/org.eclipse.tcf.te.ui.terminals.process/src/org/eclipse/tcf/te/ui/terminals/process/nls/Messages.java b/plugins/org.eclipse.tm.terminal.view.ui.process/src/org/eclipse/tm/terminal/view/ui/process/nls/Messages.java similarity index 79% rename from plugins/org.eclipse.tcf.te.ui.terminals.process/src/org/eclipse/tcf/te/ui/terminals/process/nls/Messages.java rename to plugins/org.eclipse.tm.terminal.view.ui.process/src/org/eclipse/tm/terminal/view/ui/process/nls/Messages.java index 60656fa69e0..1b9b2702a65 100644 --- a/plugins/org.eclipse.tcf.te.ui.terminals.process/src/org/eclipse/tcf/te/ui/terminals/process/nls/Messages.java +++ b/plugins/org.eclipse.tm.terminal.view.ui.process/src/org/eclipse/tm/terminal/view/ui/process/nls/Messages.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011, 2014 Wind River Systems, Inc. and others. All rights reserved. + * Copyright (c) 2011 - 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 @@ -7,7 +7,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tcf.te.ui.terminals.process.nls; +package org.eclipse.tm.terminal.view.ui.process.nls; import org.eclipse.osgi.util.NLS; @@ -17,7 +17,7 @@ import org.eclipse.osgi.util.NLS; public class Messages extends NLS { // The plug-in resource bundle name - private static final String BUNDLE_NAME = "org.eclipse.tcf.te.ui.terminals.process.nls.Messages"; //$NON-NLS-1$ + private static final String BUNDLE_NAME = "org.eclipse.tm.terminal.view.ui.process.nls.Messages"; //$NON-NLS-1$ /** * Static constructor. diff --git a/plugins/org.eclipse.tcf.te.ui.terminals.process/src/org/eclipse/tcf/te/ui/terminals/process/nls/Messages.properties b/plugins/org.eclipse.tm.terminal.view.ui.process/src/org/eclipse/tm/terminal/view/ui/process/nls/Messages.properties similarity index 100% rename from plugins/org.eclipse.tcf.te.ui.terminals.process/src/org/eclipse/tcf/te/ui/terminals/process/nls/Messages.properties rename to plugins/org.eclipse.tm.terminal.view.ui.process/src/org/eclipse/tm/terminal/view/ui/process/nls/Messages.properties diff --git a/plugins/org.eclipse.tcf.te.ui.terminals.rse/.classpath b/plugins/org.eclipse.tm.terminal.view.ui.rse/.classpath similarity index 100% rename from plugins/org.eclipse.tcf.te.ui.terminals.rse/.classpath rename to plugins/org.eclipse.tm.terminal.view.ui.rse/.classpath diff --git a/plugins/org.eclipse.tm.terminal.view.ui.rse/.gitignore b/plugins/org.eclipse.tm.terminal.view.ui.rse/.gitignore new file mode 100644 index 00000000000..ae3c1726048 --- /dev/null +++ b/plugins/org.eclipse.tm.terminal.view.ui.rse/.gitignore @@ -0,0 +1 @@ +/bin/ diff --git a/plugins/org.eclipse.tcf.te.ui.terminals.rse/.options b/plugins/org.eclipse.tm.terminal.view.ui.rse/.options similarity index 100% rename from plugins/org.eclipse.tcf.te.ui.terminals.rse/.options rename to plugins/org.eclipse.tm.terminal.view.ui.rse/.options diff --git a/plugins/org.eclipse.tcf.te.ui.terminals.rse/.project b/plugins/org.eclipse.tm.terminal.view.ui.rse/.project similarity index 94% rename from plugins/org.eclipse.tcf.te.ui.terminals.rse/.project rename to plugins/org.eclipse.tm.terminal.view.ui.rse/.project index 6dbc964fb5e..c0a42945343 100644 --- a/plugins/org.eclipse.tcf.te.ui.terminals.rse/.project +++ b/plugins/org.eclipse.tm.terminal.view.ui.rse/.project @@ -1,6 +1,6 @@ - org.eclipse.tcf.te.ui.terminals.rse + org.eclipse.tm.terminal.view.ui.rse diff --git a/plugins/org.eclipse.tcf.te.ui.terminals.rse/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.tm.terminal.view.ui.rse/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from plugins/org.eclipse.tcf.te.ui.terminals.rse/.settings/org.eclipse.jdt.core.prefs rename to plugins/org.eclipse.tm.terminal.view.ui.rse/.settings/org.eclipse.jdt.core.prefs diff --git a/plugins/org.eclipse.tcf.te.ui.terminals.rse/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.tm.terminal.view.ui.rse/.settings/org.eclipse.jdt.ui.prefs similarity index 100% rename from plugins/org.eclipse.tcf.te.ui.terminals.rse/.settings/org.eclipse.jdt.ui.prefs rename to plugins/org.eclipse.tm.terminal.view.ui.rse/.settings/org.eclipse.jdt.ui.prefs diff --git a/plugins/org.eclipse.tcf.te.ui.terminals.rse/.settings/org.eclipse.pde.prefs b/plugins/org.eclipse.tm.terminal.view.ui.rse/.settings/org.eclipse.pde.prefs similarity index 100% rename from plugins/org.eclipse.tcf.te.ui.terminals.rse/.settings/org.eclipse.pde.prefs rename to plugins/org.eclipse.tm.terminal.view.ui.rse/.settings/org.eclipse.pde.prefs diff --git a/plugins/org.eclipse.tcf.te.ui.terminals.rse/META-INF/MANIFEST.MF b/plugins/org.eclipse.tm.terminal.view.ui.rse/META-INF/MANIFEST.MF similarity index 52% rename from plugins/org.eclipse.tcf.te.ui.terminals.rse/META-INF/MANIFEST.MF rename to plugins/org.eclipse.tm.terminal.view.ui.rse/META-INF/MANIFEST.MF index 906a5890c77..3acc32cf9e8 100644 --- a/plugins/org.eclipse.tcf.te.ui.terminals.rse/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.tm.terminal.view.ui.rse/META-INF/MANIFEST.MF @@ -1,22 +1,22 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName -Bundle-SymbolicName: org.eclipse.tcf.te.ui.terminals.rse;singleton:=true -Bundle-Version: 1.3.0.qualifier -Bundle-Activator: org.eclipse.tcf.te.ui.terminals.rse.activator.UIPlugin +Bundle-SymbolicName: org.eclipse.tm.terminal.view.ui.rse;singleton:=true +Bundle-Version: 4.0.0.qualifier +Bundle-Activator: org.eclipse.tm.terminal.view.ui.rse.activator.UIPlugin Bundle-Vendor: %providerName Require-Bundle: org.eclipse.core.expressions;bundle-version="3.4.400", org.eclipse.core.runtime;bundle-version="3.8.0", org.eclipse.rse.core;bundle-version="3.3.100", org.eclipse.rse.subsystems.files.core;bundle-version="3.3.1", org.eclipse.rse.ui;bundle-version="3.3.100", - org.eclipse.tcf.te.core.terminals;bundle-version="1.3.0", - org.eclipse.tcf.te.ui.terminals;bundle-version="1.3.0", - org.eclipse.tm.terminal;bundle-version="3.3.1", + 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.ui;bundle-version="3.8.0" Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-ActivationPolicy: lazy Bundle-Localization: plugin -Export-Package: org.eclipse.tcf.te.ui.terminals.rse.activator;x-internal:=true, - org.eclipse.tcf.te.ui.terminals.rse.internal;x-internal:=true, - org.eclipse.tcf.te.ui.terminals.rse.nls;x-internal:=true +Export-Package: org.eclipse.tm.terminal.view.ui.rse.activator;x-internal:=true, + org.eclipse.tm.terminal.view.ui.rse.internal;x-internal:=true, + org.eclipse.tm.terminal.view.ui.rse.nls;x-internal:=true diff --git a/plugins/org.eclipse.tcf.te.ui.terminals.rse/about.html b/plugins/org.eclipse.tm.terminal.view.ui.rse/about.html similarity index 100% rename from plugins/org.eclipse.tcf.te.ui.terminals.rse/about.html rename to plugins/org.eclipse.tm.terminal.view.ui.rse/about.html diff --git a/plugins/org.eclipse.tcf.te.ui.terminals.rse/build.properties b/plugins/org.eclipse.tm.terminal.view.ui.rse/build.properties similarity index 100% rename from plugins/org.eclipse.tcf.te.ui.terminals.rse/build.properties rename to plugins/org.eclipse.tm.terminal.view.ui.rse/build.properties diff --git a/plugins/org.eclipse.tcf.te.ui.terminals.rse/icons/eview16/terminal_view.gif b/plugins/org.eclipse.tm.terminal.view.ui.rse/icons/eview16/terminal_view.gif similarity index 100% rename from plugins/org.eclipse.tcf.te.ui.terminals.rse/icons/eview16/terminal_view.gif rename to plugins/org.eclipse.tm.terminal.view.ui.rse/icons/eview16/terminal_view.gif diff --git a/plugins/org.eclipse.tcf.te.ui.terminals.rse/plugin.properties b/plugins/org.eclipse.tm.terminal.view.ui.rse/plugin.properties similarity index 100% rename from plugins/org.eclipse.tcf.te.ui.terminals.rse/plugin.properties rename to plugins/org.eclipse.tm.terminal.view.ui.rse/plugin.properties diff --git a/plugins/org.eclipse.tcf.te.ui.terminals.rse/plugin.xml b/plugins/org.eclipse.tm.terminal.view.ui.rse/plugin.xml similarity index 71% rename from plugins/org.eclipse.tcf.te.ui.terminals.rse/plugin.xml rename to plugins/org.eclipse.tm.terminal.view.ui.rse/plugin.xml index 25a58712bc0..c07bfae014c 100644 --- a/plugins/org.eclipse.tcf.te.ui.terminals.rse/plugin.xml +++ b/plugins/org.eclipse.tm.terminal.view.ui.rse/plugin.xml @@ -3,9 +3,9 @@ - + + class="org.eclipse.tm.terminal.view.ui.rse.internal.TerminalContextPropertiesProvider"> @@ -16,10 +16,10 @@ - + @@ -51,9 +51,9 @@ @@ -61,10 +61,10 @@ - + - + @@ -77,9 +77,9 @@ @@ -87,8 +87,8 @@ + class="org.eclipse.tm.terminal.view.ui.rse.internal.LaunchTerminalHandler" + commandId="org.eclipse.tm.terminal.view.ui.rse.command.launch"> diff --git a/plugins/org.eclipse.tcf.te.ui.terminals.rse/pom.xml b/plugins/org.eclipse.tm.terminal.view.ui.rse/pom.xml similarity index 54% rename from plugins/org.eclipse.tcf.te.ui.terminals.rse/pom.xml rename to plugins/org.eclipse.tm.terminal.view.ui.rse/pom.xml index 70a8617810d..9a28c053d29 100644 --- a/plugins/org.eclipse.tcf.te.ui.terminals.rse/pom.xml +++ b/plugins/org.eclipse.tm.terminal.view.ui.rse/pom.xml @@ -5,13 +5,13 @@ 4.0.0 - org.eclipse.tcf - org.eclipse.tcf.maven-build - 1.3.0-SNAPSHOT - ../../../admin/pom-build.xml + org.eclipse.tm.terminal + org.eclipse.tm.terminal.maven-build + 4.0.0-SNAPSHOT + ../../admin/pom-build.xml - 1.3.0.qualifier - org.eclipse.tcf.te.ui.terminals.rse + 4.0.0.qualifier + org.eclipse.tm.terminal.view.ui.rse eclipse-plugin diff --git a/plugins/org.eclipse.tcf.te.ui.terminals.rse/src/org/eclipse/tcf/te/ui/terminals/rse/activator/UIPlugin.java b/plugins/org.eclipse.tm.terminal.view.ui.rse/src/org/eclipse/tm/terminal/view/ui/rse/activator/UIPlugin.java similarity index 94% rename from plugins/org.eclipse.tcf.te.ui.terminals.rse/src/org/eclipse/tcf/te/ui/terminals/rse/activator/UIPlugin.java rename to plugins/org.eclipse.tm.terminal.view.ui.rse/src/org/eclipse/tm/terminal/view/ui/rse/activator/UIPlugin.java index 614dbaaf896..15821b29f92 100644 --- a/plugins/org.eclipse.tcf.te.ui.terminals.rse/src/org/eclipse/tcf/te/ui/terminals/rse/activator/UIPlugin.java +++ b/plugins/org.eclipse.tm.terminal.view.ui.rse/src/org/eclipse/tm/terminal/view/ui/rse/activator/UIPlugin.java @@ -7,12 +7,12 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tcf.te.ui.terminals.rse.activator; +package org.eclipse.tm.terminal.view.ui.rse.activator; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.resource.ImageRegistry; import org.eclipse.swt.graphics.Image; -import org.eclipse.tcf.te.core.terminals.tracing.TraceHandler; +import org.eclipse.tm.terminal.view.core.tracing.TraceHandler; import org.eclipse.ui.plugin.AbstractUIPlugin; import org.osgi.framework.BundleContext; @@ -48,7 +48,7 @@ public class UIPlugin extends AbstractUIPlugin { if (getDefault() != null && getDefault().getBundle() != null) { return getDefault().getBundle().getSymbolicName(); } - return "org.eclipse.tcf.te.ui.terminals.rse"; //$NON-NLS-1$ + return "org.eclipse.tm.terminal.view.ui.rse"; //$NON-NLS-1$ } /** diff --git a/plugins/org.eclipse.tcf.te.ui.terminals.rse/src/org/eclipse/tcf/te/ui/terminals/rse/internal/LaunchTerminalHandler.java b/plugins/org.eclipse.tm.terminal.view.ui.rse/src/org/eclipse/tm/terminal/view/ui/rse/internal/LaunchTerminalHandler.java similarity index 90% rename from plugins/org.eclipse.tcf.te.ui.terminals.rse/src/org/eclipse/tcf/te/ui/terminals/rse/internal/LaunchTerminalHandler.java rename to plugins/org.eclipse.tm.terminal.view.ui.rse/src/org/eclipse/tm/terminal/view/ui/rse/internal/LaunchTerminalHandler.java index c70f8299367..361d74629e4 100644 --- a/plugins/org.eclipse.tcf.te.ui.terminals.rse/src/org/eclipse/tcf/te/ui/terminals/rse/internal/LaunchTerminalHandler.java +++ b/plugins/org.eclipse.tm.terminal.view.ui.rse/src/org/eclipse/tm/terminal/view/ui/rse/internal/LaunchTerminalHandler.java @@ -7,7 +7,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tcf.te.ui.terminals.rse.internal; +package org.eclipse.tm.terminal.view.ui.rse.internal; import java.util.Map; @@ -25,10 +25,10 @@ import org.eclipse.rse.core.model.IRSEModelObject; import org.eclipse.rse.core.subsystems.ISubSystem; import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile; import org.eclipse.swt.widgets.Shell; -import org.eclipse.tcf.te.core.terminals.interfaces.constants.ITerminalsConnectorConstants; -import org.eclipse.tcf.te.ui.terminals.interfaces.ILauncherDelegate; -import org.eclipse.tcf.te.ui.terminals.internal.dialogs.LaunchTerminalSettingsDialog; -import org.eclipse.tcf.te.ui.terminals.launcher.LauncherDelegateManager; +import org.eclipse.tm.terminal.view.core.interfaces.constants.ITerminalsConnectorConstants; +import org.eclipse.tm.terminal.view.ui.interfaces.ILauncherDelegate; +import org.eclipse.tm.terminal.view.ui.internal.dialogs.LaunchTerminalSettingsDialog; +import org.eclipse.tm.terminal.view.ui.launcher.LauncherDelegateManager; import org.eclipse.ui.handlers.HandlerUtil; /** @@ -64,7 +64,7 @@ public class LaunchTerminalHandler extends AbstractHandler { @Override protected boolean isFiltered(ISelection selection, ILauncherDelegate delegate) { Assert.isNotNull(delegate); - return !"org.eclipse.tcf.te.ui.terminals.ssh.launcher.ssh".equals(delegate.getId()); //$NON-NLS-1$ + return !"org.eclipse.tm.terminal.view.ui.ssh.launcher.ssh".equals(delegate.getId()); //$NON-NLS-1$ } }; dialog.setSelection(new StructuredSelection(host)); diff --git a/plugins/org.eclipse.tcf.te.ui.terminals.rse/src/org/eclipse/tcf/te/ui/terminals/rse/internal/PropertyTester.java b/plugins/org.eclipse.tm.terminal.view.ui.rse/src/org/eclipse/tm/terminal/view/ui/rse/internal/PropertyTester.java similarity index 97% rename from plugins/org.eclipse.tcf.te.ui.terminals.rse/src/org/eclipse/tcf/te/ui/terminals/rse/internal/PropertyTester.java rename to plugins/org.eclipse.tm.terminal.view.ui.rse/src/org/eclipse/tm/terminal/view/ui/rse/internal/PropertyTester.java index 5aa6ea07990..2d8a799cd48 100644 --- a/plugins/org.eclipse.tcf.te.ui.terminals.rse/src/org/eclipse/tcf/te/ui/terminals/rse/internal/PropertyTester.java +++ b/plugins/org.eclipse.tm.terminal.view.ui.rse/src/org/eclipse/tm/terminal/view/ui/rse/internal/PropertyTester.java @@ -7,7 +7,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tcf.te.ui.terminals.rse.internal; +package org.eclipse.tm.terminal.view.ui.rse.internal; import java.util.Arrays; import java.util.List; diff --git a/plugins/org.eclipse.tcf.te.ui.terminals.rse/src/org/eclipse/tcf/te/ui/terminals/rse/internal/TerminalContextPropertiesProvider.java b/plugins/org.eclipse.tm.terminal.view.ui.rse/src/org/eclipse/tm/terminal/view/ui/rse/internal/TerminalContextPropertiesProvider.java similarity index 86% rename from plugins/org.eclipse.tcf.te.ui.terminals.rse/src/org/eclipse/tcf/te/ui/terminals/rse/internal/TerminalContextPropertiesProvider.java rename to plugins/org.eclipse.tm.terminal.view.ui.rse/src/org/eclipse/tm/terminal/view/ui/rse/internal/TerminalContextPropertiesProvider.java index 706379f6a88..3bae85c3e2e 100644 --- a/plugins/org.eclipse.tcf.te.ui.terminals.rse/src/org/eclipse/tcf/te/ui/terminals/rse/internal/TerminalContextPropertiesProvider.java +++ b/plugins/org.eclipse.tm.terminal.view.ui.rse/src/org/eclipse/tm/terminal/view/ui/rse/internal/TerminalContextPropertiesProvider.java @@ -7,14 +7,14 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tcf.te.ui.terminals.rse.internal; +package org.eclipse.tm.terminal.view.ui.rse.internal; import java.util.HashMap; import java.util.Map; import org.eclipse.rse.core.model.IHost; -import org.eclipse.tcf.te.core.terminals.interfaces.ITerminalContextPropertiesProvider; -import org.eclipse.tcf.te.core.terminals.interfaces.constants.IContextPropertiesConstants; +import org.eclipse.tm.terminal.view.core.interfaces.ITerminalContextPropertiesProvider; +import org.eclipse.tm.terminal.view.core.interfaces.constants.IContextPropertiesConstants; /** * Terminal context properties provider implementation. @@ -22,7 +22,7 @@ import org.eclipse.tcf.te.core.terminals.interfaces.constants.IContextProperties public class TerminalContextPropertiesProvider implements ITerminalContextPropertiesProvider { /* (non-Javadoc) - * @see org.eclipse.tcf.te.core.terminals.interfaces.ITerminalContextPropertiesProvider#getTargetAddress(java.lang.Object) + * @see org.eclipse.tm.terminal.view.core.interfaces.ITerminalContextPropertiesProvider#getTargetAddress(java.lang.Object) */ @Override public Map getTargetAddress(Object context) { @@ -40,7 +40,7 @@ public class TerminalContextPropertiesProvider implements ITerminalContextProper } /* (non-Javadoc) - * @see org.eclipse.tcf.te.core.terminals.interfaces.ITerminalContextPropertiesProvider#getProperty(java.lang.Object, java.lang.String) + * @see org.eclipse.tm.terminal.view.core.interfaces.ITerminalContextPropertiesProvider#getProperty(java.lang.Object, java.lang.String) */ @Override public Object getProperty(Object context, String key) { diff --git a/plugins/org.eclipse.tcf.te.ui.terminals.rse/src/org/eclipse/tcf/te/ui/terminals/rse/nls/Messages.java b/plugins/org.eclipse.tm.terminal.view.ui.rse/src/org/eclipse/tm/terminal/view/ui/rse/nls/Messages.java similarity index 85% rename from plugins/org.eclipse.tcf.te.ui.terminals.rse/src/org/eclipse/tcf/te/ui/terminals/rse/nls/Messages.java rename to plugins/org.eclipse.tm.terminal.view.ui.rse/src/org/eclipse/tm/terminal/view/ui/rse/nls/Messages.java index 7732c2e7178..ff0949eb340 100644 --- a/plugins/org.eclipse.tcf.te.ui.terminals.rse/src/org/eclipse/tcf/te/ui/terminals/rse/nls/Messages.java +++ b/plugins/org.eclipse.tm.terminal.view.ui.rse/src/org/eclipse/tm/terminal/view/ui/rse/nls/Messages.java @@ -7,7 +7,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tcf.te.ui.terminals.rse.nls; +package org.eclipse.tm.terminal.view.ui.rse.nls; import org.eclipse.osgi.util.NLS; @@ -17,7 +17,7 @@ import org.eclipse.osgi.util.NLS; public class Messages extends NLS { // The plug-in resource bundle name - private static final String BUNDLE_NAME = "org.eclipse.tcf.te.ui.terminals.rse.nls.Messages"; //$NON-NLS-1$ + private static final String BUNDLE_NAME = "org.eclipse.tm.terminal.view.ui.rse.nls.Messages"; //$NON-NLS-1$ /** * Static constructor. diff --git a/plugins/org.eclipse.tcf.te.ui.terminals.rse/src/org/eclipse/tcf/te/ui/terminals/rse/nls/Messages.properties b/plugins/org.eclipse.tm.terminal.view.ui.rse/src/org/eclipse/tm/terminal/view/ui/rse/nls/Messages.properties similarity index 100% rename from plugins/org.eclipse.tcf.te.ui.terminals.rse/src/org/eclipse/tcf/te/ui/terminals/rse/nls/Messages.properties rename to plugins/org.eclipse.tm.terminal.view.ui.rse/src/org/eclipse/tm/terminal/view/ui/rse/nls/Messages.properties diff --git a/plugins/org.eclipse.tcf.te.ui.terminals.serial/.classpath b/plugins/org.eclipse.tm.terminal.view.ui.serial/.classpath similarity index 100% rename from plugins/org.eclipse.tcf.te.ui.terminals.serial/.classpath rename to plugins/org.eclipse.tm.terminal.view.ui.serial/.classpath diff --git a/plugins/org.eclipse.tm.terminal.view.ui.serial/.gitignore b/plugins/org.eclipse.tm.terminal.view.ui.serial/.gitignore new file mode 100644 index 00000000000..ae3c1726048 --- /dev/null +++ b/plugins/org.eclipse.tm.terminal.view.ui.serial/.gitignore @@ -0,0 +1 @@ +/bin/ diff --git a/plugins/org.eclipse.tcf.te.ui.terminals.serial/.options b/plugins/org.eclipse.tm.terminal.view.ui.serial/.options similarity index 100% rename from plugins/org.eclipse.tcf.te.ui.terminals.serial/.options rename to plugins/org.eclipse.tm.terminal.view.ui.serial/.options diff --git a/plugins/org.eclipse.tcf.te.ui.terminals.serial/.project b/plugins/org.eclipse.tm.terminal.view.ui.serial/.project similarity index 92% rename from plugins/org.eclipse.tcf.te.ui.terminals.serial/.project rename to plugins/org.eclipse.tm.terminal.view.ui.serial/.project index e4317e21b12..2d7948ad029 100644 --- a/plugins/org.eclipse.tcf.te.ui.terminals.serial/.project +++ b/plugins/org.eclipse.tm.terminal.view.ui.serial/.project @@ -1,6 +1,6 @@ - org.eclipse.tcf.te.ui.terminals.serial + org.eclipse.tm.terminal.view.ui.serial diff --git a/plugins/org.eclipse.tcf.te.ui.terminals.serial/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.tm.terminal.view.ui.serial/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from plugins/org.eclipse.tcf.te.ui.terminals.serial/.settings/org.eclipse.jdt.core.prefs rename to plugins/org.eclipse.tm.terminal.view.ui.serial/.settings/org.eclipse.jdt.core.prefs diff --git a/plugins/org.eclipse.tcf.te.ui.terminals.serial/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.tm.terminal.view.ui.serial/.settings/org.eclipse.jdt.ui.prefs similarity index 100% rename from plugins/org.eclipse.tcf.te.ui.terminals.serial/.settings/org.eclipse.jdt.ui.prefs rename to plugins/org.eclipse.tm.terminal.view.ui.serial/.settings/org.eclipse.jdt.ui.prefs diff --git a/plugins/org.eclipse.tcf.te.ui.terminals.serial/.settings/org.eclipse.pde.prefs b/plugins/org.eclipse.tm.terminal.view.ui.serial/.settings/org.eclipse.pde.prefs similarity index 100% rename from plugins/org.eclipse.tcf.te.ui.terminals.serial/.settings/org.eclipse.pde.prefs rename to plugins/org.eclipse.tm.terminal.view.ui.serial/.settings/org.eclipse.pde.prefs 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 new file mode 100644 index 00000000000..4e6a2bdd8cb --- /dev/null +++ b/plugins/org.eclipse.tm.terminal.view.ui.serial/META-INF/MANIFEST.MF @@ -0,0 +1,24 @@ +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: %pluginName +Bundle-SymbolicName: org.eclipse.tm.terminal.view.ui.serial;singleton:=true +Bundle-Version: 4.0.0.qualifier +Bundle-Activator: org.eclipse.tm.terminal.view.ui.serial.activator.UIPlugin +Bundle-Vendor: %providerName +Require-Bundle: org.eclipse.core.expressions;bundle-version="3.4.400", + org.eclipse.core.runtime;bundle-version="3.8.0", + org.eclipse.equinox.security;bundle-version="1.1.100", + 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.controls, + org.eclipse.tm.terminal.view.ui.serial.interfaces, + org.eclipse.tm.terminal.view.ui.serial.launcher, + org.eclipse.tm.terminal.view.ui.serial.nls;x-internal:=true +Import-Package: gnu.io;resolution:=optional diff --git a/plugins/org.eclipse.tcf.te.ui.terminals.serial/about.html b/plugins/org.eclipse.tm.terminal.view.ui.serial/about.html similarity index 100% rename from plugins/org.eclipse.tcf.te.ui.terminals.serial/about.html rename to plugins/org.eclipse.tm.terminal.view.ui.serial/about.html diff --git a/plugins/org.eclipse.tcf.te.ui.terminals.serial/build.properties b/plugins/org.eclipse.tm.terminal.view.ui.serial/build.properties similarity index 100% rename from plugins/org.eclipse.tcf.te.ui.terminals.serial/build.properties rename to plugins/org.eclipse.tm.terminal.view.ui.serial/build.properties diff --git a/plugins/org.eclipse.tcf.te.ui.terminals.serial/plugin.properties b/plugins/org.eclipse.tm.terminal.view.ui.serial/plugin.properties similarity index 100% rename from plugins/org.eclipse.tcf.te.ui.terminals.serial/plugin.properties rename to plugins/org.eclipse.tm.terminal.view.ui.serial/plugin.properties diff --git a/plugins/org.eclipse.tcf.te.ui.terminals.serial/plugin.xml b/plugins/org.eclipse.tm.terminal.view.ui.serial/plugin.xml similarity index 68% rename from plugins/org.eclipse.tcf.te.ui.terminals.serial/plugin.xml rename to plugins/org.eclipse.tm.terminal.view.ui.serial/plugin.xml index ebb08e2cf35..e68182694a2 100644 --- a/plugins/org.eclipse.tcf.te.ui.terminals.serial/plugin.xml +++ b/plugins/org.eclipse.tm.terminal.view.ui.serial/plugin.xml @@ -3,10 +3,10 @@ - + @@ -14,7 +14,7 @@ diff --git a/plugins/org.eclipse.tcf.te.ui.terminals.serial/pom.xml b/plugins/org.eclipse.tm.terminal.view.ui.serial/pom.xml similarity index 54% rename from plugins/org.eclipse.tcf.te.ui.terminals.serial/pom.xml rename to plugins/org.eclipse.tm.terminal.view.ui.serial/pom.xml index 5014b6d9f1a..efc134e74f4 100644 --- a/plugins/org.eclipse.tcf.te.ui.terminals.serial/pom.xml +++ b/plugins/org.eclipse.tm.terminal.view.ui.serial/pom.xml @@ -5,13 +5,13 @@ 4.0.0 - org.eclipse.tcf - org.eclipse.tcf.maven-build - 1.3.0-SNAPSHOT - ../../../admin/pom-build.xml + org.eclipse.tm.terminal + org.eclipse.tm.terminal.maven-build + 4.0.0-SNAPSHOT + ../../admin/pom-build.xml - 1.3.0.qualifier - org.eclipse.tcf.te.ui.terminals.serial + 4.0.0.qualifier + org.eclipse.tm.terminal.view.ui.serial eclipse-plugin diff --git a/plugins/org.eclipse.tcf.te.ui.terminals.serial/src/org/eclipse/tcf/te/ui/terminals/serial/activator/UIPlugin.java b/plugins/org.eclipse.tm.terminal.view.ui.serial/src/org/eclipse/tm/terminal/view/ui/serial/activator/UIPlugin.java similarity index 94% rename from plugins/org.eclipse.tcf.te.ui.terminals.serial/src/org/eclipse/tcf/te/ui/terminals/serial/activator/UIPlugin.java rename to plugins/org.eclipse.tm.terminal.view.ui.serial/src/org/eclipse/tm/terminal/view/ui/serial/activator/UIPlugin.java index 19ac52a269b..6fe86258e9e 100644 --- a/plugins/org.eclipse.tcf.te.ui.terminals.serial/src/org/eclipse/tcf/te/ui/terminals/serial/activator/UIPlugin.java +++ b/plugins/org.eclipse.tm.terminal.view.ui.serial/src/org/eclipse/tm/terminal/view/ui/serial/activator/UIPlugin.java @@ -7,12 +7,12 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tcf.te.ui.terminals.serial.activator; +package org.eclipse.tm.terminal.view.ui.serial.activator; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.resource.ImageRegistry; import org.eclipse.swt.graphics.Image; -import org.eclipse.tcf.te.core.terminals.tracing.TraceHandler; +import org.eclipse.tm.terminal.view.core.tracing.TraceHandler; import org.eclipse.ui.plugin.AbstractUIPlugin; import org.osgi.framework.BundleContext; @@ -47,7 +47,7 @@ public class UIPlugin extends AbstractUIPlugin { if (getDefault() != null && getDefault().getBundle() != null) { return getDefault().getBundle().getSymbolicName(); } - return "org.eclipse.tcf.te.ui.terminals.serial"; //$NON-NLS-1$ + return "org.eclipse.tm.terminal.view.ui.serial"; //$NON-NLS-1$ } /** diff --git a/plugins/org.eclipse.tcf.te.ui.terminals.serial/src/org/eclipse/tcf/te/ui/terminals/serial/controls/SerialConfigurationPanel.java b/plugins/org.eclipse.tm.terminal.view.ui.serial/src/org/eclipse/tm/terminal/view/ui/serial/controls/SerialConfigurationPanel.java similarity index 82% rename from plugins/org.eclipse.tcf.te.ui.terminals.serial/src/org/eclipse/tcf/te/ui/terminals/serial/controls/SerialConfigurationPanel.java rename to plugins/org.eclipse.tm.terminal.view.ui.serial/src/org/eclipse/tm/terminal/view/ui/serial/controls/SerialConfigurationPanel.java index 8459fcf8911..53d33f8678c 100644 --- a/plugins/org.eclipse.tcf.te.ui.terminals.serial/src/org/eclipse/tcf/te/ui/terminals/serial/controls/SerialConfigurationPanel.java +++ b/plugins/org.eclipse.tm.terminal.view.ui.serial/src/org/eclipse/tm/terminal/view/ui/serial/controls/SerialConfigurationPanel.java @@ -7,7 +7,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tcf.te.ui.terminals.serial.controls; +package org.eclipse.tm.terminal.view.ui.serial.controls; import java.util.Map; @@ -17,9 +17,9 @@ import org.eclipse.swt.SWT; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Composite; -import org.eclipse.tcf.te.core.terminals.interfaces.constants.ITerminalsConnectorConstants; -import org.eclipse.tcf.te.ui.terminals.interfaces.IConfigurationPanelContainer; -import org.eclipse.tcf.te.ui.terminals.panels.AbstractExtendedConfigurationPanel; +import org.eclipse.tm.terminal.view.core.interfaces.constants.ITerminalsConnectorConstants; +import org.eclipse.tm.terminal.view.ui.interfaces.IConfigurationPanelContainer; +import org.eclipse.tm.terminal.view.ui.panels.AbstractExtendedConfigurationPanel; /** * Serial wizard configuration panel implementation. @@ -38,7 +38,7 @@ public class SerialConfigurationPanel extends AbstractExtendedConfigurationPanel } /* (non-Javadoc) - * @see org.eclipse.tcf.te.ui.terminals.interfaces.IConfigurationPanel#setupPanel(org.eclipse.swt.widgets.Composite) + * @see org.eclipse.tm.terminal.view.ui.interfaces.IConfigurationPanel#setupPanel(org.eclipse.swt.widgets.Composite) */ @Override public void setupPanel(Composite parent) { @@ -60,7 +60,7 @@ public class SerialConfigurationPanel extends AbstractExtendedConfigurationPanel } /* (non-Javadoc) - * @see org.eclipse.tcf.te.ui.terminals.panels.AbstractConfigurationPanel#extractData(java.util.Map) + * @see org.eclipse.tm.terminal.view.ui.panels.AbstractConfigurationPanel#extractData(java.util.Map) */ @Override public void extractData(Map data) { @@ -72,21 +72,21 @@ public class SerialConfigurationPanel extends AbstractExtendedConfigurationPanel } /* (non-Javadoc) - * @see org.eclipse.tcf.te.ui.terminals.panels.AbstractExtendedConfigurationPanel#fillSettingsForHost(java.lang.String) + * @see org.eclipse.tm.terminal.view.ui.panels.AbstractExtendedConfigurationPanel#fillSettingsForHost(java.lang.String) */ @Override protected void fillSettingsForHost(String host){ } /* (non-Javadoc) - * @see org.eclipse.tcf.te.ui.terminals.panels.AbstractExtendedConfigurationPanel#saveSettingsForHost(boolean) + * @see org.eclipse.tm.terminal.view.ui.panels.AbstractExtendedConfigurationPanel#saveSettingsForHost(boolean) */ @Override protected void saveSettingsForHost(boolean add){ } /* (non-Javadoc) - * @see org.eclipse.tcf.te.ui.terminals.panels.AbstractConfigurationPanel#isValid() + * @see org.eclipse.tm.terminal.view.ui.panels.AbstractConfigurationPanel#isValid() */ @Override public boolean isValid(){ @@ -94,7 +94,7 @@ public class SerialConfigurationPanel extends AbstractExtendedConfigurationPanel } /* (non-Javadoc) - * @see org.eclipse.tcf.te.ui.terminals.panels.AbstractExtendedConfigurationPanel#doSaveWidgetValues(org.eclipse.jface.dialogs.IDialogSettings, java.lang.String) + * @see org.eclipse.tm.terminal.view.ui.panels.AbstractExtendedConfigurationPanel#doSaveWidgetValues(org.eclipse.jface.dialogs.IDialogSettings, java.lang.String) */ @Override public void doSaveWidgetValues(IDialogSettings settings, String idPrefix) { @@ -105,7 +105,7 @@ public class SerialConfigurationPanel extends AbstractExtendedConfigurationPanel } /* (non-Javadoc) - * @see org.eclipse.tcf.te.ui.terminals.panels.AbstractExtendedConfigurationPanel#doRestoreWidgetValues(org.eclipse.jface.dialogs.IDialogSettings, java.lang.String) + * @see org.eclipse.tm.terminal.view.ui.panels.AbstractExtendedConfigurationPanel#doRestoreWidgetValues(org.eclipse.jface.dialogs.IDialogSettings, java.lang.String) */ @Override public void doRestoreWidgetValues(IDialogSettings settings, String idPrefix) { @@ -116,7 +116,7 @@ public class SerialConfigurationPanel extends AbstractExtendedConfigurationPanel } /* (non-Javadoc) - * @see org.eclipse.tcf.te.ui.terminals.panels.AbstractExtendedConfigurationPanel#getHostFromSettings() + * @see org.eclipse.tm.terminal.view.ui.panels.AbstractExtendedConfigurationPanel#getHostFromSettings() */ @Override protected String getHostFromSettings() { @@ -124,7 +124,7 @@ public class SerialConfigurationPanel extends AbstractExtendedConfigurationPanel } /* (non-Javadoc) - * @see org.eclipse.tcf.te.ui.terminals.panels.AbstractExtendedConfigurationPanel#isWithHostList() + * @see org.eclipse.tm.terminal.view.ui.panels.AbstractExtendedConfigurationPanel#isWithHostList() */ @Override public boolean isWithHostList() { diff --git a/plugins/org.eclipse.tcf.te.ui.terminals.serial/src/org/eclipse/tcf/te/ui/terminals/serial/controls/SerialLinePanel.java b/plugins/org.eclipse.tm.terminal.view.ui.serial/src/org/eclipse/tm/terminal/view/ui/serial/controls/SerialLinePanel.java similarity index 96% rename from plugins/org.eclipse.tcf.te.ui.terminals.serial/src/org/eclipse/tcf/te/ui/terminals/serial/controls/SerialLinePanel.java rename to plugins/org.eclipse.tm.terminal.view.ui.serial/src/org/eclipse/tm/terminal/view/ui/serial/controls/SerialLinePanel.java index 0e8feb62ddc..d71df6c6e7f 100644 --- a/plugins/org.eclipse.tcf.te.ui.terminals.serial/src/org/eclipse/tcf/te/ui/terminals/serial/controls/SerialLinePanel.java +++ b/plugins/org.eclipse.tm.terminal.view.ui.serial/src/org/eclipse/tm/terminal/view/ui/serial/controls/SerialLinePanel.java @@ -7,7 +7,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tcf.te.ui.terminals.serial.controls; +package org.eclipse.tm.terminal.view.ui.serial.controls; import gnu.io.CommPortIdentifier; @@ -38,12 +38,12 @@ 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.tcf.te.core.terminals.interfaces.constants.ITerminalsConnectorConstants; -import org.eclipse.tcf.te.ui.terminals.interfaces.IConfigurationPanelContainer; -import org.eclipse.tcf.te.ui.terminals.panels.AbstractConfigurationPanel; -import org.eclipse.tcf.te.ui.terminals.serial.activator.UIPlugin; -import org.eclipse.tcf.te.ui.terminals.serial.interfaces.ITraceIds; -import org.eclipse.tcf.te.ui.terminals.serial.nls.Messages; +import org.eclipse.tm.terminal.view.core.interfaces.constants.ITerminalsConnectorConstants; +import org.eclipse.tm.terminal.view.ui.interfaces.IConfigurationPanelContainer; +import org.eclipse.tm.terminal.view.ui.panels.AbstractConfigurationPanel; +import org.eclipse.tm.terminal.view.ui.serial.activator.UIPlugin; +import org.eclipse.tm.terminal.view.ui.serial.interfaces.ITraceIds; +import org.eclipse.tm.terminal.view.ui.serial.nls.Messages; import org.eclipse.ui.PlatformUI; /** @@ -150,7 +150,7 @@ public class SerialLinePanel extends AbstractConfigurationPanel { } /* (non-Javadoc) - * @see org.eclipse.tcf.te.ui.controls.interfaces.IWizardConfigurationPanel#setupPanel(org.eclipse.swt.widgets.Composite) + * @see org.eclipse.tm.terminal.view.ui.interfaces.IConfigurationPanel#setupPanel(org.eclipse.swt.widgets.Composite) */ @Override public void setupPanel(Composite parent) { @@ -608,7 +608,7 @@ public class SerialLinePanel extends AbstractConfigurationPanel { } /* (non-Javadoc) - * @see org.eclipse.tcf.te.ui.controls.panels.AbstractWizardConfigurationPanel#isValid() + * @see org.eclipse.tm.terminal.view.ui.panels.AbstractConfigurationPanel#isValid() */ @Override public boolean isValid() { @@ -676,7 +676,7 @@ public class SerialLinePanel extends AbstractConfigurationPanel { private final String fcSelectedTTYTimeoutSlotId = "SerialLinePanel.selectedTTYTimeout." + System.getProperty("os.name"); //$NON-NLS-1$ //$NON-NLS-2$ /* (non-Javadoc) - * @see org.eclipse.tcf.te.ui.controls.panels.AbstractWizardConfigurationPanel#doRestoreWidgetValues(org.eclipse.jface.dialogs.IDialogSettings, java.lang.String) + * @see org.eclipse.tm.terminal.view.ui.panels.AbstractConfigurationPanel#doRestoreWidgetValues(org.eclipse.jface.dialogs.IDialogSettings, java.lang.String) */ @Override public void doRestoreWidgetValues(IDialogSettings settings, String idPrefix) { @@ -723,7 +723,7 @@ public class SerialLinePanel extends AbstractConfigurationPanel { } /* (non-Javadoc) - * @see org.eclipse.tcf.te.ui.controls.panels.AbstractWizardConfigurationPanel#doSaveWidgetValues(org.eclipse.jface.dialogs.IDialogSettings, java.lang.String) + * @see org.eclipse.tm.terminal.view.ui.panels.AbstractConfigurationPanel#doSaveWidgetValues(org.eclipse.jface.dialogs.IDialogSettings, java.lang.String) */ @Override public void doSaveWidgetValues(IDialogSettings settings, String idPrefix) { @@ -740,7 +740,7 @@ public class SerialLinePanel extends AbstractConfigurationPanel { } /* (non-Javadoc) - * @see org.eclipse.tcf.te.ui.terminals.panels.AbstractConfigurationPanel#setupData(java.util.Map) + * @see org.eclipse.tm.terminal.view.ui.panels.AbstractConfigurationPanel#setupData(java.util.Map) */ @Override public void setupData(Map data) { @@ -761,7 +761,7 @@ public class SerialLinePanel extends AbstractConfigurationPanel { } /* (non-Javadoc) - * @see org.eclipse.tcf.te.ui.terminals.panels.AbstractConfigurationPanel#extractData(java.util.Map) + * @see org.eclipse.tm.terminal.view.ui.panels.AbstractConfigurationPanel#extractData(java.util.Map) */ @Override public void extractData(Map data) { diff --git a/plugins/org.eclipse.tcf.te.ui.terminals.serial/src/org/eclipse/tcf/te/ui/terminals/serial/controls/SerialPortAddressDialog.java b/plugins/org.eclipse.tm.terminal.view.ui.serial/src/org/eclipse/tm/terminal/view/ui/serial/controls/SerialPortAddressDialog.java similarity index 98% rename from plugins/org.eclipse.tcf.te.ui.terminals.serial/src/org/eclipse/tcf/te/ui/terminals/serial/controls/SerialPortAddressDialog.java rename to plugins/org.eclipse.tm.terminal.view.ui.serial/src/org/eclipse/tm/terminal/view/ui/serial/controls/SerialPortAddressDialog.java index 1e5632c420c..c067e531e43 100644 --- a/plugins/org.eclipse.tcf.te.ui.terminals.serial/src/org/eclipse/tcf/te/ui/terminals/serial/controls/SerialPortAddressDialog.java +++ b/plugins/org.eclipse.tm.terminal.view.ui.serial/src/org/eclipse/tm/terminal/view/ui/serial/controls/SerialPortAddressDialog.java @@ -7,7 +7,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tcf.te.ui.terminals.serial.controls; +package org.eclipse.tm.terminal.view.ui.serial.controls; import java.util.List; import java.util.regex.Matcher; @@ -33,8 +33,8 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Shell; -import org.eclipse.tcf.te.ui.terminals.serial.activator.UIPlugin; -import org.eclipse.tcf.te.ui.terminals.serial.nls.Messages; +import org.eclipse.tm.terminal.view.ui.serial.activator.UIPlugin; +import org.eclipse.tm.terminal.view.ui.serial.nls.Messages; import org.eclipse.ui.PlatformUI; /** @@ -401,7 +401,7 @@ public class SerialPortAddressDialog extends TitleAreaDialog implements IMessage } /* (non-Javadoc) - * @see org.eclipse.tcf.te.ui.dialogs.CustomTitleAreaDialog#okPressed() + * @see org.eclipse.jface.dialogs.Dialog#okPressed() */ @Override protected void okPressed() { diff --git a/plugins/org.eclipse.tcf.te.ui.terminals.serial/src/org/eclipse/tcf/te/ui/terminals/serial/interfaces/ITraceIds.java b/plugins/org.eclipse.tm.terminal.view.ui.serial/src/org/eclipse/tm/terminal/view/ui/serial/interfaces/ITraceIds.java similarity index 93% rename from plugins/org.eclipse.tcf.te.ui.terminals.serial/src/org/eclipse/tcf/te/ui/terminals/serial/interfaces/ITraceIds.java rename to plugins/org.eclipse.tm.terminal.view.ui.serial/src/org/eclipse/tm/terminal/view/ui/serial/interfaces/ITraceIds.java index 9f0df469edc..74efd38ce79 100644 --- a/plugins/org.eclipse.tcf.te.ui.terminals.serial/src/org/eclipse/tcf/te/ui/terminals/serial/interfaces/ITraceIds.java +++ b/plugins/org.eclipse.tm.terminal.view.ui.serial/src/org/eclipse/tm/terminal/view/ui/serial/interfaces/ITraceIds.java @@ -7,7 +7,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tcf.te.ui.terminals.serial.interfaces; +package org.eclipse.tm.terminal.view.ui.serial.interfaces; /** * Trace slot identifiers. diff --git a/plugins/org.eclipse.tcf.te.ui.terminals.serial/src/org/eclipse/tcf/te/ui/terminals/serial/interfaces/IWireTypeSerial.java b/plugins/org.eclipse.tm.terminal.view.ui.serial/src/org/eclipse/tm/terminal/view/ui/serial/interfaces/IWireTypeSerial.java similarity index 96% rename from plugins/org.eclipse.tcf.te.ui.terminals.serial/src/org/eclipse/tcf/te/ui/terminals/serial/interfaces/IWireTypeSerial.java rename to plugins/org.eclipse.tm.terminal.view.ui.serial/src/org/eclipse/tm/terminal/view/ui/serial/interfaces/IWireTypeSerial.java index a8da2a84fc5..5c60c77e265 100644 --- a/plugins/org.eclipse.tcf.te.ui.terminals.serial/src/org/eclipse/tcf/te/ui/terminals/serial/interfaces/IWireTypeSerial.java +++ b/plugins/org.eclipse.tm.terminal.view.ui.serial/src/org/eclipse/tm/terminal/view/ui/serial/interfaces/IWireTypeSerial.java @@ -7,7 +7,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tcf.te.ui.terminals.serial.interfaces; +package org.eclipse.tm.terminal.view.ui.serial.interfaces; /** * The properties specific to the wire type "serial". diff --git a/plugins/org.eclipse.tcf.te.ui.terminals.serial/src/org/eclipse/tcf/te/ui/terminals/serial/launcher/SerialLauncherDelegate.java b/plugins/org.eclipse.tm.terminal.view.ui.serial/src/org/eclipse/tm/terminal/view/ui/serial/launcher/SerialLauncherDelegate.java similarity index 81% rename from plugins/org.eclipse.tcf.te.ui.terminals.serial/src/org/eclipse/tcf/te/ui/terminals/serial/launcher/SerialLauncherDelegate.java rename to plugins/org.eclipse.tm.terminal.view.ui.serial/src/org/eclipse/tm/terminal/view/ui/serial/launcher/SerialLauncherDelegate.java index 1ad192c300c..b385c78c382 100644 --- a/plugins/org.eclipse.tcf.te.ui.terminals.serial/src/org/eclipse/tcf/te/ui/terminals/serial/launcher/SerialLauncherDelegate.java +++ b/plugins/org.eclipse.tm.terminal.view.ui.serial/src/org/eclipse/tm/terminal/view/ui/serial/launcher/SerialLauncherDelegate.java @@ -7,7 +7,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tcf.te.ui.terminals.serial.launcher; +package org.eclipse.tm.terminal.view.ui.serial.launcher; import java.text.DateFormat; import java.util.Date; @@ -15,21 +15,20 @@ import java.util.Map; import org.eclipse.core.runtime.Assert; import org.eclipse.osgi.util.NLS; -import org.eclipse.tcf.te.core.terminals.TerminalServiceFactory; -import org.eclipse.tcf.te.core.terminals.interfaces.ITerminalService; -import org.eclipse.tcf.te.core.terminals.interfaces.ITerminalService.Done; -import org.eclipse.tcf.te.core.terminals.interfaces.constants.ITerminalsConnectorConstants; -import org.eclipse.tcf.te.ui.terminals.interfaces.IConfigurationPanel; -import org.eclipse.tcf.te.ui.terminals.interfaces.IConfigurationPanelContainer; -import org.eclipse.tcf.te.ui.terminals.interfaces.IMementoHandler; -import org.eclipse.tcf.te.ui.terminals.internal.SettingsStore; -import org.eclipse.tcf.te.ui.terminals.launcher.AbstractLauncherDelegate; -import org.eclipse.tcf.te.ui.terminals.serial.controls.SerialConfigurationPanel; -import org.eclipse.tcf.te.ui.terminals.serial.nls.Messages; 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; +import org.eclipse.tm.terminal.view.ui.interfaces.IConfigurationPanel; +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.controls.SerialConfigurationPanel; +import org.eclipse.tm.terminal.view.ui.serial.nls.Messages; /** * Serial launcher delegate implementation. @@ -40,7 +39,7 @@ public class SerialLauncherDelegate extends AbstractLauncherDelegate { private final IMementoHandler mementoHandler = new SerialMementoHandler(); /* (non-Javadoc) - * @see org.eclipse.tcf.te.ui.terminals.interfaces.ILauncherDelegate#needsUserConfiguration() + * @see org.eclipse.tm.terminal.view.ui.interfaces.ILauncherDelegate#needsUserConfiguration() */ @Override public boolean needsUserConfiguration() { @@ -48,7 +47,7 @@ public class SerialLauncherDelegate extends AbstractLauncherDelegate { } /* (non-Javadoc) - * @see org.eclipse.tcf.te.ui.terminals.interfaces.ILauncherDelegate#getPanel(org.eclipse.tcf.te.ui.terminals.interfaces.IConfigurationPanelContainer) + * @see org.eclipse.tm.terminal.view.ui.interfaces.ILauncherDelegate#getPanel(org.eclipse.tm.terminal.view.ui.interfaces.IConfigurationPanelContainer) */ @Override public IConfigurationPanel getPanel(IConfigurationPanelContainer container) { @@ -56,10 +55,10 @@ public class SerialLauncherDelegate extends AbstractLauncherDelegate { } /* (non-Javadoc) - * @see org.eclipse.tcf.te.ui.terminals.interfaces.ILauncherDelegate#execute(java.util.Map, org.eclipse.tcf.te.core.terminals.interfaces.ITerminalService.Done) + * @see org.eclipse.tm.terminal.view.ui.interfaces.ILauncherDelegate#execute(java.util.Map, org.eclipse.tm.terminal.view.core.interfaces.ITerminalService.Done) */ @Override - public void execute(Map properties, Done done) { + public void execute(Map properties, ITerminalService.Done done) { Assert.isNotNull(properties); // Set the terminal tab title @@ -106,7 +105,7 @@ public class SerialLauncherDelegate extends AbstractLauncherDelegate { } /* (non-Javadoc) - * @see org.eclipse.tcf.te.ui.terminals.interfaces.ILauncherDelegate#createTerminalConnector(java.util.Map) + * @see org.eclipse.tm.terminal.view.ui.interfaces.ILauncherDelegate#createTerminalConnector(java.util.Map) */ @Override public ITerminalConnector createTerminalConnector(Map properties) { diff --git a/plugins/org.eclipse.tcf.te.ui.terminals.serial/src/org/eclipse/tcf/te/ui/terminals/serial/launcher/SerialMementoHandler.java b/plugins/org.eclipse.tm.terminal.view.ui.serial/src/org/eclipse/tm/terminal/view/ui/serial/launcher/SerialMementoHandler.java similarity index 92% rename from plugins/org.eclipse.tcf.te.ui.terminals.serial/src/org/eclipse/tcf/te/ui/terminals/serial/launcher/SerialMementoHandler.java rename to plugins/org.eclipse.tm.terminal.view.ui.serial/src/org/eclipse/tm/terminal/view/ui/serial/launcher/SerialMementoHandler.java index 47615d28886..747611311dd 100644 --- a/plugins/org.eclipse.tcf.te.ui.terminals.serial/src/org/eclipse/tcf/te/ui/terminals/serial/launcher/SerialMementoHandler.java +++ b/plugins/org.eclipse.tm.terminal.view.ui.serial/src/org/eclipse/tm/terminal/view/ui/serial/launcher/SerialMementoHandler.java @@ -7,13 +7,13 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tcf.te.ui.terminals.serial.launcher; +package org.eclipse.tm.terminal.view.ui.serial.launcher; import java.util.Map; import org.eclipse.core.runtime.Assert; -import org.eclipse.tcf.te.core.terminals.interfaces.constants.ITerminalsConnectorConstants; -import org.eclipse.tcf.te.ui.terminals.interfaces.IMementoHandler; +import org.eclipse.tm.terminal.view.core.interfaces.constants.ITerminalsConnectorConstants; +import org.eclipse.tm.terminal.view.ui.interfaces.IMementoHandler; import org.eclipse.ui.IMemento; /** @@ -22,7 +22,7 @@ import org.eclipse.ui.IMemento; public class SerialMementoHandler implements IMementoHandler { /* (non-Javadoc) - * @see org.eclipse.tcf.te.ui.terminals.interfaces.IMementoHandler#saveState(org.eclipse.ui.IMemento, java.util.Map) + * @see org.eclipse.tm.terminal.view.ui.interfaces.IMementoHandler#saveState(org.eclipse.ui.IMemento, java.util.Map) */ @Override public void saveState(IMemento memento, Map properties) { @@ -43,7 +43,7 @@ public class SerialMementoHandler implements IMementoHandler { } /* (non-Javadoc) - * @see org.eclipse.tcf.te.ui.terminals.interfaces.IMementoHandler#restoreState(org.eclipse.ui.IMemento, java.util.Map) + * @see org.eclipse.tm.terminal.view.ui.interfaces.IMementoHandler#restoreState(org.eclipse.ui.IMemento, java.util.Map) */ @Override public void restoreState(IMemento memento, Map properties) { diff --git a/plugins/org.eclipse.tcf.te.ui.terminals.serial/src/org/eclipse/tcf/te/ui/terminals/serial/nls/Messages.java b/plugins/org.eclipse.tm.terminal.view.ui.serial/src/org/eclipse/tm/terminal/view/ui/serial/nls/Messages.java similarity index 95% rename from plugins/org.eclipse.tcf.te.ui.terminals.serial/src/org/eclipse/tcf/te/ui/terminals/serial/nls/Messages.java rename to plugins/org.eclipse.tm.terminal.view.ui.serial/src/org/eclipse/tm/terminal/view/ui/serial/nls/Messages.java index 530171509bf..8d78203c7c8 100644 --- a/plugins/org.eclipse.tcf.te.ui.terminals.serial/src/org/eclipse/tcf/te/ui/terminals/serial/nls/Messages.java +++ b/plugins/org.eclipse.tm.terminal.view.ui.serial/src/org/eclipse/tm/terminal/view/ui/serial/nls/Messages.java @@ -7,7 +7,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tcf.te.ui.terminals.serial.nls; +package org.eclipse.tm.terminal.view.ui.serial.nls; import org.eclipse.osgi.util.NLS; @@ -17,7 +17,7 @@ import org.eclipse.osgi.util.NLS; public class Messages extends NLS { // The plug-in resource bundle name - private static final String BUNDLE_NAME = "org.eclipse.tcf.te.ui.terminals.serial.nls.Messages"; //$NON-NLS-1$ + private static final String BUNDLE_NAME = "org.eclipse.tm.terminal.view.ui.serial.nls.Messages"; //$NON-NLS-1$ /** * Static constructor. diff --git a/plugins/org.eclipse.tcf.te.ui.terminals.serial/src/org/eclipse/tcf/te/ui/terminals/serial/nls/Messages.properties b/plugins/org.eclipse.tm.terminal.view.ui.serial/src/org/eclipse/tm/terminal/view/ui/serial/nls/Messages.properties similarity index 100% rename from plugins/org.eclipse.tcf.te.ui.terminals.serial/src/org/eclipse/tcf/te/ui/terminals/serial/nls/Messages.properties rename to plugins/org.eclipse.tm.terminal.view.ui.serial/src/org/eclipse/tm/terminal/view/ui/serial/nls/Messages.properties diff --git a/plugins/org.eclipse.tcf.te.ui.terminals.ssh/.classpath b/plugins/org.eclipse.tm.terminal.view.ui.ssh/.classpath similarity index 100% rename from plugins/org.eclipse.tcf.te.ui.terminals.ssh/.classpath rename to plugins/org.eclipse.tm.terminal.view.ui.ssh/.classpath diff --git a/plugins/org.eclipse.tm.terminal.view.ui.ssh/.gitignore b/plugins/org.eclipse.tm.terminal.view.ui.ssh/.gitignore new file mode 100644 index 00000000000..ae3c1726048 --- /dev/null +++ b/plugins/org.eclipse.tm.terminal.view.ui.ssh/.gitignore @@ -0,0 +1 @@ +/bin/ diff --git a/plugins/org.eclipse.tcf.te.ui.terminals.ssh/.options b/plugins/org.eclipse.tm.terminal.view.ui.ssh/.options similarity index 100% rename from plugins/org.eclipse.tcf.te.ui.terminals.ssh/.options rename to plugins/org.eclipse.tm.terminal.view.ui.ssh/.options diff --git a/plugins/org.eclipse.tcf.te.ui.terminals.ssh/.project b/plugins/org.eclipse.tm.terminal.view.ui.ssh/.project similarity index 94% rename from plugins/org.eclipse.tcf.te.ui.terminals.ssh/.project rename to plugins/org.eclipse.tm.terminal.view.ui.ssh/.project index af2dbffa88e..569a6aff988 100644 --- a/plugins/org.eclipse.tcf.te.ui.terminals.ssh/.project +++ b/plugins/org.eclipse.tm.terminal.view.ui.ssh/.project @@ -1,6 +1,6 @@ - org.eclipse.tcf.te.ui.terminals.ssh + org.eclipse.tm.terminal.view.ui.ssh diff --git a/plugins/org.eclipse.tcf.te.ui.terminals.ssh/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.tm.terminal.view.ui.ssh/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from plugins/org.eclipse.tcf.te.ui.terminals.ssh/.settings/org.eclipse.jdt.core.prefs rename to plugins/org.eclipse.tm.terminal.view.ui.ssh/.settings/org.eclipse.jdt.core.prefs diff --git a/plugins/org.eclipse.tcf.te.ui.terminals.ssh/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.tm.terminal.view.ui.ssh/.settings/org.eclipse.jdt.ui.prefs similarity index 100% rename from plugins/org.eclipse.tcf.te.ui.terminals.ssh/.settings/org.eclipse.jdt.ui.prefs rename to plugins/org.eclipse.tm.terminal.view.ui.ssh/.settings/org.eclipse.jdt.ui.prefs diff --git a/plugins/org.eclipse.tcf.te.ui.terminals.ssh/.settings/org.eclipse.pde.prefs b/plugins/org.eclipse.tm.terminal.view.ui.ssh/.settings/org.eclipse.pde.prefs similarity index 100% rename from plugins/org.eclipse.tcf.te.ui.terminals.ssh/.settings/org.eclipse.pde.prefs rename to plugins/org.eclipse.tm.terminal.view.ui.ssh/.settings/org.eclipse.pde.prefs diff --git a/plugins/org.eclipse.tm.terminal.view.ui.ssh/META-INF/MANIFEST.MF b/plugins/org.eclipse.tm.terminal.view.ui.ssh/META-INF/MANIFEST.MF new file mode 100644 index 00000000000..6e3c716c2af --- /dev/null +++ b/plugins/org.eclipse.tm.terminal.view.ui.ssh/META-INF/MANIFEST.MF @@ -0,0 +1,22 @@ +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: %pluginName +Bundle-SymbolicName: org.eclipse.tm.terminal.view.ui.ssh;singleton:=true +Bundle-Version: 4.0.0.qualifier +Bundle-Activator: org.eclipse.tm.terminal.view.ui.ssh.activator.UIPlugin +Bundle-Vendor: %providerName +Require-Bundle: org.eclipse.core.expressions;bundle-version="3.4.400", + org.eclipse.core.runtime;bundle-version="3.8.0", + org.eclipse.equinox.security;bundle-version="1.1.100", + 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.ssh;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.ssh.activator;x-internal:=true, + org.eclipse.tm.terminal.view.ui.ssh.controls, + org.eclipse.tm.terminal.view.ui.ssh.launcher, + org.eclipse.tm.terminal.view.ui.ssh.nls;x-internal:=true diff --git a/plugins/org.eclipse.tcf.te.ui.terminals.ssh/about.html b/plugins/org.eclipse.tm.terminal.view.ui.ssh/about.html similarity index 100% rename from plugins/org.eclipse.tcf.te.ui.terminals.ssh/about.html rename to plugins/org.eclipse.tm.terminal.view.ui.ssh/about.html diff --git a/plugins/org.eclipse.tcf.te.ui.terminals.ssh/build.properties b/plugins/org.eclipse.tm.terminal.view.ui.ssh/build.properties similarity index 100% rename from plugins/org.eclipse.tcf.te.ui.terminals.ssh/build.properties rename to plugins/org.eclipse.tm.terminal.view.ui.ssh/build.properties diff --git a/plugins/org.eclipse.tcf.te.ui.terminals.ssh/plugin.properties b/plugins/org.eclipse.tm.terminal.view.ui.ssh/plugin.properties similarity index 100% rename from plugins/org.eclipse.tcf.te.ui.terminals.ssh/plugin.properties rename to plugins/org.eclipse.tm.terminal.view.ui.ssh/plugin.properties diff --git a/plugins/org.eclipse.tcf.te.ui.terminals.ssh/plugin.xml b/plugins/org.eclipse.tm.terminal.view.ui.ssh/plugin.xml similarity index 68% rename from plugins/org.eclipse.tcf.te.ui.terminals.ssh/plugin.xml rename to plugins/org.eclipse.tm.terminal.view.ui.ssh/plugin.xml index 3af1ce7e8b4..9ace7597f0f 100644 --- a/plugins/org.eclipse.tcf.te.ui.terminals.ssh/plugin.xml +++ b/plugins/org.eclipse.tm.terminal.view.ui.ssh/plugin.xml @@ -3,10 +3,10 @@ - + @@ -14,7 +14,7 @@ diff --git a/plugins/org.eclipse.tm.terminal.view.ui.ssh/pom.xml b/plugins/org.eclipse.tm.terminal.view.ui.ssh/pom.xml new file mode 100644 index 00000000000..2bd950bfac3 --- /dev/null +++ b/plugins/org.eclipse.tm.terminal.view.ui.ssh/pom.xml @@ -0,0 +1,17 @@ + + + 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.view.ui.ssh + eclipse-plugin + diff --git a/plugins/org.eclipse.tcf.te.ui.terminals.ssh/src/org/eclipse/tcf/te/ui/terminals/ssh/activator/UIPlugin.java b/plugins/org.eclipse.tm.terminal.view.ui.ssh/src/org/eclipse/tm/terminal/view/ui/ssh/activator/UIPlugin.java similarity index 94% rename from plugins/org.eclipse.tcf.te.ui.terminals.ssh/src/org/eclipse/tcf/te/ui/terminals/ssh/activator/UIPlugin.java rename to plugins/org.eclipse.tm.terminal.view.ui.ssh/src/org/eclipse/tm/terminal/view/ui/ssh/activator/UIPlugin.java index 8349dae57a3..c43b2634015 100644 --- a/plugins/org.eclipse.tcf.te.ui.terminals.ssh/src/org/eclipse/tcf/te/ui/terminals/ssh/activator/UIPlugin.java +++ b/plugins/org.eclipse.tm.terminal.view.ui.ssh/src/org/eclipse/tm/terminal/view/ui/ssh/activator/UIPlugin.java @@ -7,12 +7,12 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tcf.te.ui.terminals.ssh.activator; +package org.eclipse.tm.terminal.view.ui.ssh.activator; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.resource.ImageRegistry; import org.eclipse.swt.graphics.Image; -import org.eclipse.tcf.te.core.terminals.tracing.TraceHandler; +import org.eclipse.tm.terminal.view.core.tracing.TraceHandler; import org.eclipse.ui.plugin.AbstractUIPlugin; import org.osgi.framework.BundleContext; @@ -47,7 +47,7 @@ public class UIPlugin extends AbstractUIPlugin { if (getDefault() != null && getDefault().getBundle() != null) { return getDefault().getBundle().getSymbolicName(); } - return "org.eclipse.tcf.te.ui.terminals.ssh"; //$NON-NLS-1$ + return "org.eclipse.tm.terminal.view.ui.ssh"; //$NON-NLS-1$ } /** diff --git a/plugins/org.eclipse.tcf.te.ui.terminals.ssh/src/org/eclipse/tcf/te/ui/terminals/ssh/controls/SshWizardConfigurationPanel.java b/plugins/org.eclipse.tm.terminal.view.ui.ssh/src/org/eclipse/tm/terminal/view/ui/ssh/controls/SshWizardConfigurationPanel.java similarity index 92% rename from plugins/org.eclipse.tcf.te.ui.terminals.ssh/src/org/eclipse/tcf/te/ui/terminals/ssh/controls/SshWizardConfigurationPanel.java rename to plugins/org.eclipse.tm.terminal.view.ui.ssh/src/org/eclipse/tm/terminal/view/ui/ssh/controls/SshWizardConfigurationPanel.java index 04d525860f1..581fa582cda 100644 --- a/plugins/org.eclipse.tcf.te.ui.terminals.ssh/src/org/eclipse/tcf/te/ui/terminals/ssh/controls/SshWizardConfigurationPanel.java +++ b/plugins/org.eclipse.tm.terminal.view.ui.ssh/src/org/eclipse/tm/terminal/view/ui/ssh/controls/SshWizardConfigurationPanel.java @@ -8,7 +8,7 @@ * Wind River Systems - initial API and implementation * Max Weninger (Wind River) - [361352] [TERMINALS][SSH] Add SSH terminal support *******************************************************************************/ -package org.eclipse.tcf.te.ui.terminals.ssh.controls; +package org.eclipse.tm.terminal.view.ui.ssh.controls; import java.util.HashMap; import java.util.Map; @@ -27,17 +27,17 @@ import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Label; -import org.eclipse.tcf.te.core.terminals.TerminalContextPropertiesProviderFactory; -import org.eclipse.tcf.te.core.terminals.interfaces.ITerminalContextPropertiesProvider; -import org.eclipse.tcf.te.core.terminals.interfaces.constants.IContextPropertiesConstants; -import org.eclipse.tcf.te.core.terminals.interfaces.constants.ITerminalsConnectorConstants; -import org.eclipse.tcf.te.ui.terminals.interfaces.IConfigurationPanelContainer; -import org.eclipse.tcf.te.ui.terminals.panels.AbstractExtendedConfigurationPanel; -import org.eclipse.tcf.te.ui.terminals.ssh.nls.Messages; import org.eclipse.tm.internal.terminal.provisional.api.AbstractSettingsPage; import org.eclipse.tm.internal.terminal.provisional.api.ISettingsPage; import org.eclipse.tm.internal.terminal.ssh.SshConnector; import org.eclipse.tm.internal.terminal.ssh.SshSettings; +import org.eclipse.tm.terminal.view.core.TerminalContextPropertiesProviderFactory; +import org.eclipse.tm.terminal.view.core.interfaces.ITerminalContextPropertiesProvider; +import org.eclipse.tm.terminal.view.core.interfaces.constants.IContextPropertiesConstants; +import org.eclipse.tm.terminal.view.core.interfaces.constants.ITerminalsConnectorConstants; +import org.eclipse.tm.terminal.view.ui.interfaces.IConfigurationPanelContainer; +import org.eclipse.tm.terminal.view.ui.panels.AbstractExtendedConfigurationPanel; +import org.eclipse.tm.terminal.view.ui.ssh.nls.Messages; /** * SSH wizard configuration panel implementation. @@ -63,7 +63,7 @@ public class SshWizardConfigurationPanel extends AbstractExtendedConfigurationPa } /* (non-Javadoc) - * @see org.eclipse.tcf.te.ui.controls.interfaces.IWizardConfigurationPanel#setupPanel(org.eclipse.swt.widgets.Composite) + * @see org.eclipse.tm.terminal.view.ui.interfaces.IConfigurationPanel#setupPanel(org.eclipse.swt.widgets.Composite) */ @Override public void setupPanel(Composite parent) { @@ -104,7 +104,7 @@ public class SshWizardConfigurationPanel extends AbstractExtendedConfigurationPa } /* (non-Javadoc) - * @see org.eclipse.tcf.te.ui.terminals.panels.AbstractConfigurationPanel#setupData(java.util.Map) + * @see org.eclipse.tm.terminal.view.ui.panels.AbstractConfigurationPanel#setupData(java.util.Map) */ @Override public void setupData(Map data) { @@ -157,7 +157,7 @@ public class SshWizardConfigurationPanel extends AbstractExtendedConfigurationPa } /* (non-Javadoc) - * @see org.eclipse.tcf.te.ui.terminals.panels.AbstractConfigurationPanel#extractData(java.util.Map) + * @see org.eclipse.tm.terminal.view.ui.panels.AbstractConfigurationPanel#extractData(java.util.Map) */ @Override public void extractData(Map data) { @@ -177,7 +177,7 @@ public class SshWizardConfigurationPanel extends AbstractExtendedConfigurationPa } /* (non-Javadoc) - * @see org.eclipse.tcf.te.ui.terminals.panels.AbstractConfigurationPanel#fillSettingsForHost(java.lang.String) + * @see org.eclipse.tm.terminal.view.ui.panels.AbstractConfigurationPanel#fillSettingsForHost(java.lang.String) */ @Override protected void fillSettingsForHost(String host) { @@ -233,7 +233,7 @@ public class SshWizardConfigurationPanel extends AbstractExtendedConfigurationPa } /* (non-Javadoc) - * @see org.eclipse.tcf.te.ui.controls.interfaces.IWizardConfigurationPanel#doSaveWidgetValues(org.eclipse.jface.dialogs.IDialogSettings, java.lang.String) + * @see org.eclipse.tm.terminal.view.ui.panels.AbstractExtendedConfigurationPanel#doSaveWidgetValues(org.eclipse.jface.dialogs.IDialogSettings, java.lang.String) */ @Override public void doSaveWidgetValues(IDialogSettings settings, String idPrefix) { @@ -242,7 +242,7 @@ public class SshWizardConfigurationPanel extends AbstractExtendedConfigurationPa } /* (non-Javadoc) - * @see org.eclipse.tcf.te.ui.terminals.panels.AbstractConfigurationPanel#saveSettingsForHost(boolean) + * @see org.eclipse.tm.terminal.view.ui.panels.AbstractConfigurationPanel#saveSettingsForHost(boolean) */ @Override protected void saveSettingsForHost(boolean add) { @@ -363,7 +363,7 @@ public class SshWizardConfigurationPanel extends AbstractExtendedConfigurationPa } /* (non-Javadoc) - * @see org.eclipse.tcf.te.ui.terminals.panels.AbstractConfigurationPanel#removeSecurePassword(java.lang.String) + * @see org.eclipse.tm.terminal.view.ui.panels.AbstractConfigurationPanel#removeSecurePassword(java.lang.String) */ @Override protected void removeSecurePassword(String host) { @@ -382,7 +382,7 @@ public class SshWizardConfigurationPanel extends AbstractExtendedConfigurationPa } /* (non-Javadoc) - * @see org.eclipse.tcf.te.ui.controls.panels.AbstractWizardConfigurationPanel#isValid() + * @see org.eclipse.tm.terminal.view.ui.panels.AbstractConfigurationPanel#isValid() */ @Override public boolean isValid(){ @@ -390,7 +390,7 @@ public class SshWizardConfigurationPanel extends AbstractExtendedConfigurationPa } /* (non-Javadoc) - * @see org.eclipse.tcf.te.ui.terminals.panels.AbstractConfigurationPanel#getHostFromSettings() + * @see org.eclipse.tm.terminal.view.ui.panels.AbstractConfigurationPanel#getHostFromSettings() */ @Override protected String getHostFromSettings() { diff --git a/plugins/org.eclipse.tcf.te.ui.terminals.ssh/src/org/eclipse/tcf/te/ui/terminals/ssh/launcher/SshLauncherDelegate.java b/plugins/org.eclipse.tm.terminal.view.ui.ssh/src/org/eclipse/tm/terminal/view/ui/ssh/launcher/SshLauncherDelegate.java similarity index 83% rename from plugins/org.eclipse.tcf.te.ui.terminals.ssh/src/org/eclipse/tcf/te/ui/terminals/ssh/launcher/SshLauncherDelegate.java rename to plugins/org.eclipse.tm.terminal.view.ui.ssh/src/org/eclipse/tm/terminal/view/ui/ssh/launcher/SshLauncherDelegate.java index 2faeb435c12..9d5b9687f08 100644 --- a/plugins/org.eclipse.tcf.te.ui.terminals.ssh/src/org/eclipse/tcf/te/ui/terminals/ssh/launcher/SshLauncherDelegate.java +++ b/plugins/org.eclipse.tm.terminal.view.ui.ssh/src/org/eclipse/tm/terminal/view/ui/ssh/launcher/SshLauncherDelegate.java @@ -8,7 +8,7 @@ * Wind River Systems - initial API and implementation * Max Weninger (Wind River) - [361352] [TERMINALS][SSH] Add SSH terminal support *******************************************************************************/ -package org.eclipse.tcf.te.ui.terminals.ssh.launcher; +package org.eclipse.tm.terminal.view.ui.ssh.launcher; import java.text.DateFormat; import java.util.Date; @@ -16,21 +16,20 @@ import java.util.Map; import org.eclipse.core.runtime.Assert; import org.eclipse.osgi.util.NLS; -import org.eclipse.tcf.te.core.terminals.TerminalServiceFactory; -import org.eclipse.tcf.te.core.terminals.interfaces.ITerminalService; -import org.eclipse.tcf.te.core.terminals.interfaces.ITerminalService.Done; -import org.eclipse.tcf.te.core.terminals.interfaces.constants.ITerminalsConnectorConstants; -import org.eclipse.tcf.te.ui.terminals.interfaces.IConfigurationPanel; -import org.eclipse.tcf.te.ui.terminals.interfaces.IConfigurationPanelContainer; -import org.eclipse.tcf.te.ui.terminals.interfaces.IMementoHandler; -import org.eclipse.tcf.te.ui.terminals.internal.SettingsStore; -import org.eclipse.tcf.te.ui.terminals.launcher.AbstractLauncherDelegate; -import org.eclipse.tcf.te.ui.terminals.ssh.controls.SshWizardConfigurationPanel; -import org.eclipse.tcf.te.ui.terminals.ssh.nls.Messages; 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.ssh.SshSettings; +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; +import org.eclipse.tm.terminal.view.ui.interfaces.IConfigurationPanel; +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.ssh.controls.SshWizardConfigurationPanel; +import org.eclipse.tm.terminal.view.ui.ssh.nls.Messages; /** * SSH launcher delegate implementation. @@ -41,7 +40,7 @@ public class SshLauncherDelegate extends AbstractLauncherDelegate { private final IMementoHandler mementoHandler = new SshMementoHandler(); /* (non-Javadoc) - * @see org.eclipse.tcf.te.ui.terminals.interfaces.ILauncherDelegate#needsUserConfiguration() + * @see org.eclipse.tm.terminal.view.ui.interfaces.ILauncherDelegate#needsUserConfiguration() */ @Override public boolean needsUserConfiguration() { @@ -49,7 +48,7 @@ public class SshLauncherDelegate extends AbstractLauncherDelegate { } /* (non-Javadoc) - * @see org.eclipse.tcf.te.ui.terminals.interfaces.ILauncherDelegate#getPanel(org.eclipse.tcf.te.ui.terminals.interfaces.IConfigurationPanelContainer) + * @see org.eclipse.tm.terminal.view.ui.interfaces.ILauncherDelegate#getPanel(org.eclipse.tm.terminal.view.ui.interfaces.IConfigurationPanelContainer) */ @Override public IConfigurationPanel getPanel(IConfigurationPanelContainer container) { @@ -57,10 +56,10 @@ public class SshLauncherDelegate extends AbstractLauncherDelegate { } /* (non-Javadoc) - * @see org.eclipse.tcf.te.ui.terminals.interfaces.ILauncherDelegate#execute(java.util.Map, org.eclipse.tcf.te.core.terminals.interfaces.ITerminalService.Done) + * @see org.eclipse.tm.terminal.view.ui.interfaces.ILauncherDelegate#execute(java.util.Map, org.eclipse.tm.terminal.view.core.interfaces.ITerminalService.Done) */ @Override - public void execute(Map properties, Done done) { + public void execute(Map properties, ITerminalService.Done done) { Assert.isNotNull(properties); // Set the terminal tab title @@ -114,7 +113,7 @@ public class SshLauncherDelegate extends AbstractLauncherDelegate { } /* (non-Javadoc) - * @see org.eclipse.tcf.te.ui.terminals.interfaces.ILauncherDelegate#createTerminalConnector(java.util.Map) + * @see org.eclipse.tm.terminal.view.ui.interfaces.ILauncherDelegate#createTerminalConnector(java.util.Map) */ @Override public ITerminalConnector createTerminalConnector(Map properties) { diff --git a/plugins/org.eclipse.tcf.te.ui.terminals.ssh/src/org/eclipse/tcf/te/ui/terminals/ssh/launcher/SshMementoHandler.java b/plugins/org.eclipse.tm.terminal.view.ui.ssh/src/org/eclipse/tm/terminal/view/ui/ssh/launcher/SshMementoHandler.java similarity index 95% rename from plugins/org.eclipse.tcf.te.ui.terminals.ssh/src/org/eclipse/tcf/te/ui/terminals/ssh/launcher/SshMementoHandler.java rename to plugins/org.eclipse.tm.terminal.view.ui.ssh/src/org/eclipse/tm/terminal/view/ui/ssh/launcher/SshMementoHandler.java index f0ce4c2c045..61e3d273ff1 100644 --- a/plugins/org.eclipse.tcf.te.ui.terminals.ssh/src/org/eclipse/tcf/te/ui/terminals/ssh/launcher/SshMementoHandler.java +++ b/plugins/org.eclipse.tm.terminal.view.ui.ssh/src/org/eclipse/tm/terminal/view/ui/ssh/launcher/SshMementoHandler.java @@ -7,7 +7,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tcf.te.ui.terminals.ssh.launcher; +package org.eclipse.tm.terminal.view.ui.ssh.launcher; import java.util.Map; @@ -15,8 +15,8 @@ import org.eclipse.core.runtime.Assert; import org.eclipse.equinox.security.storage.ISecurePreferences; import org.eclipse.equinox.security.storage.SecurePreferencesFactory; import org.eclipse.equinox.security.storage.StorageException; -import org.eclipse.tcf.te.core.terminals.interfaces.constants.ITerminalsConnectorConstants; -import org.eclipse.tcf.te.ui.terminals.interfaces.IMementoHandler; +import org.eclipse.tm.terminal.view.core.interfaces.constants.ITerminalsConnectorConstants; +import org.eclipse.tm.terminal.view.ui.interfaces.IMementoHandler; import org.eclipse.ui.IMemento; /** @@ -26,7 +26,7 @@ public class SshMementoHandler implements IMementoHandler { /* (non-Javadoc) - * @see org.eclipse.tcf.te.ui.terminals.interfaces.IMementoHandler#saveState(org.eclipse.ui.IMemento, java.util.Map) + * @see org.eclipse.tm.terminal.view.ui.interfaces.IMementoHandler#saveState(org.eclipse.ui.IMemento, java.util.Map) */ @Override public void saveState(IMemento memento, Map properties) { @@ -74,7 +74,7 @@ public class SshMementoHandler implements IMementoHandler { } /* (non-Javadoc) - * @see org.eclipse.tcf.te.ui.terminals.interfaces.IMementoHandler#restoreState(org.eclipse.ui.IMemento, java.util.Map) + * @see org.eclipse.tm.terminal.view.ui.interfaces.IMementoHandler#restoreState(org.eclipse.ui.IMemento, java.util.Map) */ @Override public void restoreState(IMemento memento, Map properties) { diff --git a/plugins/org.eclipse.tcf.te.ui.terminals.ssh/src/org/eclipse/tcf/te/ui/terminals/ssh/nls/Messages.java b/plugins/org.eclipse.tm.terminal.view.ui.ssh/src/org/eclipse/tm/terminal/view/ui/ssh/nls/Messages.java similarity index 77% rename from plugins/org.eclipse.tcf.te.ui.terminals.ssh/src/org/eclipse/tcf/te/ui/terminals/ssh/nls/Messages.java rename to plugins/org.eclipse.tm.terminal.view.ui.ssh/src/org/eclipse/tm/terminal/view/ui/ssh/nls/Messages.java index 265c2e0d0bb..d5cee145798 100644 --- a/plugins/org.eclipse.tcf.te.ui.terminals.ssh/src/org/eclipse/tcf/te/ui/terminals/ssh/nls/Messages.java +++ b/plugins/org.eclipse.tm.terminal.view.ui.ssh/src/org/eclipse/tm/terminal/view/ui/ssh/nls/Messages.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011, 2014 Wind River Systems, Inc. and others. All rights reserved. + * Copyright (c) 2011 - 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 @@ -8,17 +8,17 @@ * Wind River Systems - initial API and implementation * Max Weninger (Wind River) - [361352] [TERMINALS][SSH] Add SSH terminal support *******************************************************************************/ -package org.eclipse.tcf.te.ui.terminals.ssh.nls; +package org.eclipse.tm.terminal.view.ui.ssh.nls; import org.eclipse.osgi.util.NLS; /** - * Target Explorer TCF terminals extensions UI plug-in externalized strings management. + * Terminals extensions UI plug-in externalized strings management. */ public class Messages extends NLS { // The plug-in resource bundle name - private static final String BUNDLE_NAME = "org.eclipse.tcf.te.ui.terminals.ssh.nls.Messages"; //$NON-NLS-1$ + private static final String BUNDLE_NAME = "org.eclipse.tm.terminal.view.ui.ssh.nls.Messages"; //$NON-NLS-1$ /** * Static constructor. diff --git a/plugins/org.eclipse.tcf.te.ui.terminals.ssh/src/org/eclipse/tcf/te/ui/terminals/ssh/nls/Messages.properties b/plugins/org.eclipse.tm.terminal.view.ui.ssh/src/org/eclipse/tm/terminal/view/ui/ssh/nls/Messages.properties similarity index 100% rename from plugins/org.eclipse.tcf.te.ui.terminals.ssh/src/org/eclipse/tcf/te/ui/terminals/ssh/nls/Messages.properties rename to plugins/org.eclipse.tm.terminal.view.ui.ssh/src/org/eclipse/tm/terminal/view/ui/ssh/nls/Messages.properties diff --git a/plugins/org.eclipse.tcf.te.ui.terminals.telnet/.classpath b/plugins/org.eclipse.tm.terminal.view.ui.telnet/.classpath similarity index 100% rename from plugins/org.eclipse.tcf.te.ui.terminals.telnet/.classpath rename to plugins/org.eclipse.tm.terminal.view.ui.telnet/.classpath diff --git a/plugins/org.eclipse.tm.terminal.view.ui.telnet/.gitignore b/plugins/org.eclipse.tm.terminal.view.ui.telnet/.gitignore new file mode 100644 index 00000000000..ae3c1726048 --- /dev/null +++ b/plugins/org.eclipse.tm.terminal.view.ui.telnet/.gitignore @@ -0,0 +1 @@ +/bin/ diff --git a/plugins/org.eclipse.tcf.te.ui.terminals.telnet/.options b/plugins/org.eclipse.tm.terminal.view.ui.telnet/.options similarity index 100% rename from plugins/org.eclipse.tcf.te.ui.terminals.telnet/.options rename to plugins/org.eclipse.tm.terminal.view.ui.telnet/.options diff --git a/plugins/org.eclipse.tcf.te.ui.terminals.telnet/.project b/plugins/org.eclipse.tm.terminal.view.ui.telnet/.project similarity index 94% rename from plugins/org.eclipse.tcf.te.ui.terminals.telnet/.project rename to plugins/org.eclipse.tm.terminal.view.ui.telnet/.project index 13db50347ae..384bfc77b07 100644 --- a/plugins/org.eclipse.tcf.te.ui.terminals.telnet/.project +++ b/plugins/org.eclipse.tm.terminal.view.ui.telnet/.project @@ -1,6 +1,6 @@ - org.eclipse.tcf.te.ui.terminals.telnet + org.eclipse.tm.terminal.view.ui.telnet diff --git a/plugins/org.eclipse.tcf.te.ui.terminals.telnet/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.tm.terminal.view.ui.telnet/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from plugins/org.eclipse.tcf.te.ui.terminals.telnet/.settings/org.eclipse.jdt.core.prefs rename to plugins/org.eclipse.tm.terminal.view.ui.telnet/.settings/org.eclipse.jdt.core.prefs diff --git a/plugins/org.eclipse.tcf.te.ui.terminals.telnet/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.tm.terminal.view.ui.telnet/.settings/org.eclipse.jdt.ui.prefs similarity index 100% rename from plugins/org.eclipse.tcf.te.ui.terminals.telnet/.settings/org.eclipse.jdt.ui.prefs rename to plugins/org.eclipse.tm.terminal.view.ui.telnet/.settings/org.eclipse.jdt.ui.prefs diff --git a/plugins/org.eclipse.tcf.te.ui.terminals.telnet/.settings/org.eclipse.pde.prefs b/plugins/org.eclipse.tm.terminal.view.ui.telnet/.settings/org.eclipse.pde.prefs similarity index 100% rename from plugins/org.eclipse.tcf.te.ui.terminals.telnet/.settings/org.eclipse.pde.prefs rename to plugins/org.eclipse.tm.terminal.view.ui.telnet/.settings/org.eclipse.pde.prefs diff --git a/plugins/org.eclipse.tm.terminal.view.ui.telnet/META-INF/MANIFEST.MF b/plugins/org.eclipse.tm.terminal.view.ui.telnet/META-INF/MANIFEST.MF new file mode 100644 index 00000000000..a59348e7df4 --- /dev/null +++ b/plugins/org.eclipse.tm.terminal.view.ui.telnet/META-INF/MANIFEST.MF @@ -0,0 +1,22 @@ +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: %pluginName +Bundle-SymbolicName: org.eclipse.tm.terminal.view.ui.telnet;singleton:=true +Bundle-Version: 4.0.0.qualifier +Bundle-Activator: org.eclipse.tm.terminal.view.ui.telnet.activator.UIPlugin +Bundle-Vendor: %providerName +Require-Bundle: org.eclipse.core.expressions;bundle-version="3.4.400", + org.eclipse.core.runtime;bundle-version="3.8.0", + org.eclipse.equinox.security;bundle-version="1.1.100", + 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.telnet;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.telnet.activator;x-internal:=true, + org.eclipse.tm.terminal.view.ui.telnet.controls, + org.eclipse.tm.terminal.view.ui.telnet.launcher, + org.eclipse.tm.terminal.view.ui.telnet.nls;x-internal:=true diff --git a/plugins/org.eclipse.tcf.te.ui.terminals.telnet/about.html b/plugins/org.eclipse.tm.terminal.view.ui.telnet/about.html similarity index 100% rename from plugins/org.eclipse.tcf.te.ui.terminals.telnet/about.html rename to plugins/org.eclipse.tm.terminal.view.ui.telnet/about.html diff --git a/plugins/org.eclipse.tcf.te.ui.terminals.telnet/build.properties b/plugins/org.eclipse.tm.terminal.view.ui.telnet/build.properties similarity index 100% rename from plugins/org.eclipse.tcf.te.ui.terminals.telnet/build.properties rename to plugins/org.eclipse.tm.terminal.view.ui.telnet/build.properties diff --git a/plugins/org.eclipse.tcf.te.ui.terminals.telnet/plugin.properties b/plugins/org.eclipse.tm.terminal.view.ui.telnet/plugin.properties similarity index 100% rename from plugins/org.eclipse.tcf.te.ui.terminals.telnet/plugin.properties rename to plugins/org.eclipse.tm.terminal.view.ui.telnet/plugin.properties diff --git a/plugins/org.eclipse.tcf.te.ui.terminals.telnet/plugin.xml b/plugins/org.eclipse.tm.terminal.view.ui.telnet/plugin.xml similarity index 68% rename from plugins/org.eclipse.tcf.te.ui.terminals.telnet/plugin.xml rename to plugins/org.eclipse.tm.terminal.view.ui.telnet/plugin.xml index a2a34d7ea23..d7bd55bb02d 100644 --- a/plugins/org.eclipse.tcf.te.ui.terminals.telnet/plugin.xml +++ b/plugins/org.eclipse.tm.terminal.view.ui.telnet/plugin.xml @@ -3,10 +3,10 @@ - + @@ -14,7 +14,7 @@ diff --git a/plugins/org.eclipse.tcf.te.ui.terminals.telnet/pom.xml b/plugins/org.eclipse.tm.terminal.view.ui.telnet/pom.xml similarity index 54% rename from plugins/org.eclipse.tcf.te.ui.terminals.telnet/pom.xml rename to plugins/org.eclipse.tm.terminal.view.ui.telnet/pom.xml index f3694ee3653..048ecb27aad 100644 --- a/plugins/org.eclipse.tcf.te.ui.terminals.telnet/pom.xml +++ b/plugins/org.eclipse.tm.terminal.view.ui.telnet/pom.xml @@ -5,13 +5,13 @@ 4.0.0 - org.eclipse.tcf - org.eclipse.tcf.maven-build - 1.3.0-SNAPSHOT - ../../../admin/pom-build.xml + org.eclipse.tm.terminal + org.eclipse.tm.terminal.maven-build + 4.0.0-SNAPSHOT + ../../admin/pom-build.xml - 1.3.0.qualifier - org.eclipse.tcf.te.ui.terminals.telnet + 4.0.0.qualifier + org.eclipse.tm.terminal.view.ui.telnet eclipse-plugin diff --git a/plugins/org.eclipse.tcf.te.ui.terminals.telnet/src/org/eclipse/tcf/te/ui/terminals/telnet/activator/UIPlugin.java b/plugins/org.eclipse.tm.terminal.view.ui.telnet/src/org/eclipse/tm/terminal/view/ui/telnet/activator/UIPlugin.java similarity index 94% rename from plugins/org.eclipse.tcf.te.ui.terminals.telnet/src/org/eclipse/tcf/te/ui/terminals/telnet/activator/UIPlugin.java rename to plugins/org.eclipse.tm.terminal.view.ui.telnet/src/org/eclipse/tm/terminal/view/ui/telnet/activator/UIPlugin.java index a6ce8753cea..69549b85412 100644 --- a/plugins/org.eclipse.tcf.te.ui.terminals.telnet/src/org/eclipse/tcf/te/ui/terminals/telnet/activator/UIPlugin.java +++ b/plugins/org.eclipse.tm.terminal.view.ui.telnet/src/org/eclipse/tm/terminal/view/ui/telnet/activator/UIPlugin.java @@ -8,12 +8,12 @@ * Wind River Systems - initial API and implementation * Max Weninger (Wind River) - [366374] [TERMINALS][TELNET] Add Telnet terminal support *******************************************************************************/ -package org.eclipse.tcf.te.ui.terminals.telnet.activator; +package org.eclipse.tm.terminal.view.ui.telnet.activator; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.resource.ImageRegistry; import org.eclipse.swt.graphics.Image; -import org.eclipse.tcf.te.core.terminals.tracing.TraceHandler; +import org.eclipse.tm.terminal.view.core.tracing.TraceHandler; import org.eclipse.ui.plugin.AbstractUIPlugin; import org.osgi.framework.BundleContext; @@ -48,7 +48,7 @@ public class UIPlugin extends AbstractUIPlugin { if (getDefault() != null && getDefault().getBundle() != null) { return getDefault().getBundle().getSymbolicName(); } - return "org.eclipse.tcf.te.ui.terminals.telnet"; //$NON-NLS-1$ + return "org.eclipse.tm.terminal.view.ui.telnet"; //$NON-NLS-1$ } /** diff --git a/plugins/org.eclipse.tcf.te.ui.terminals.telnet/src/org/eclipse/tcf/te/ui/terminals/telnet/controls/TelnetWizardConfigurationPanel.java b/plugins/org.eclipse.tm.terminal.view.ui.telnet/src/org/eclipse/tm/terminal/view/ui/telnet/controls/TelnetWizardConfigurationPanel.java similarity index 90% rename from plugins/org.eclipse.tcf.te.ui.terminals.telnet/src/org/eclipse/tcf/te/ui/terminals/telnet/controls/TelnetWizardConfigurationPanel.java rename to plugins/org.eclipse.tm.terminal.view.ui.telnet/src/org/eclipse/tm/terminal/view/ui/telnet/controls/TelnetWizardConfigurationPanel.java index 6d011eae71c..b106182366f 100644 --- a/plugins/org.eclipse.tcf.te.ui.terminals.telnet/src/org/eclipse/tcf/te/ui/terminals/telnet/controls/TelnetWizardConfigurationPanel.java +++ b/plugins/org.eclipse.tm.terminal.view.ui.telnet/src/org/eclipse/tm/terminal/view/ui/telnet/controls/TelnetWizardConfigurationPanel.java @@ -8,7 +8,7 @@ * Wind River Systems - initial API and implementation * Max Weninger (Wind River) - [366374] [TERMINALS][TELNET] Add Telnet terminal support *******************************************************************************/ -package org.eclipse.tcf.te.ui.terminals.telnet.controls; +package org.eclipse.tm.terminal.view.ui.telnet.controls; import java.util.HashMap; import java.util.Map; @@ -19,14 +19,14 @@ import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; -import org.eclipse.tcf.te.core.terminals.interfaces.constants.ITerminalsConnectorConstants; -import org.eclipse.tcf.te.ui.terminals.interfaces.IConfigurationPanelContainer; -import org.eclipse.tcf.te.ui.terminals.panels.AbstractExtendedConfigurationPanel; import org.eclipse.tm.internal.terminal.provisional.api.AbstractSettingsPage; import org.eclipse.tm.internal.terminal.provisional.api.ISettingsPage; import org.eclipse.tm.internal.terminal.telnet.NetworkPortMap; import org.eclipse.tm.internal.terminal.telnet.TelnetConnector; import org.eclipse.tm.internal.terminal.telnet.TelnetSettings; +import org.eclipse.tm.terminal.view.core.interfaces.constants.ITerminalsConnectorConstants; +import org.eclipse.tm.terminal.view.ui.interfaces.IConfigurationPanelContainer; +import org.eclipse.tm.terminal.view.ui.panels.AbstractExtendedConfigurationPanel; /** * telnet wizard configuration panel implementation. @@ -47,7 +47,7 @@ public class TelnetWizardConfigurationPanel extends AbstractExtendedConfiguratio } /* (non-Javadoc) - * @see org.eclipse.tcf.te.ui.controls.interfaces.IWizardConfigurationPanel#setupPanel(org.eclipse.swt.widgets.Composite) + * @see org.eclipse.tm.terminal.view.ui.interfaces.IConfigurationPanel#setupPanel(org.eclipse.swt.widgets.Composite) */ @Override public void setupPanel(Composite parent) { @@ -87,7 +87,7 @@ public class TelnetWizardConfigurationPanel extends AbstractExtendedConfiguratio } /* (non-Javadoc) - * @see org.eclipse.tcf.te.ui.terminals.panels.AbstractConfigurationPanel#setupData(java.util.Map) + * @see org.eclipse.tm.terminal.view.ui.panels.AbstractConfigurationPanel#setupData(java.util.Map) */ @Override public void setupData(Map data) { @@ -111,7 +111,7 @@ public class TelnetWizardConfigurationPanel extends AbstractExtendedConfiguratio } /* (non-Javadoc) - * @see org.eclipse.tcf.te.ui.terminals.panels.AbstractConfigurationPanel#extractData(java.util.Map) + * @see org.eclipse.tm.terminal.view.ui.panels.AbstractConfigurationPanel#extractData(java.util.Map) */ @Override public void extractData(Map data) { @@ -128,7 +128,7 @@ public class TelnetWizardConfigurationPanel extends AbstractExtendedConfiguratio } /* (non-Javadoc) - * @see org.eclipse.tcf.te.ui.terminals.panels.AbstractConfigurationPanel#fillSettingsForHost(java.lang.String) + * @see org.eclipse.tm.terminal.view.ui.panels.AbstractConfigurationPanel#fillSettingsForHost(java.lang.String) */ @Override protected void fillSettingsForHost(String host){ @@ -158,7 +158,7 @@ public class TelnetWizardConfigurationPanel extends AbstractExtendedConfiguratio } /* (non-Javadoc) - * @see org.eclipse.tcf.te.ui.terminals.panels.AbstractConfigurationPanel#saveSettingsForHost(boolean) + * @see org.eclipse.tm.terminal.view.ui.panels.AbstractConfigurationPanel#saveSettingsForHost(boolean) */ @Override protected void saveSettingsForHost(boolean add){ @@ -186,7 +186,7 @@ public class TelnetWizardConfigurationPanel extends AbstractExtendedConfiguratio } /* (non-Javadoc) - * @see org.eclipse.tcf.te.ui.controls.panels.AbstractWizardConfigurationPanel#isValid() + * @see org.eclipse.tm.terminal.view.ui.panels.AbstractConfigurationPanel#isValid() */ @Override public boolean isValid(){ @@ -194,7 +194,7 @@ public class TelnetWizardConfigurationPanel extends AbstractExtendedConfiguratio } /* (non-Javadoc) - * @see org.eclipse.tcf.te.ui.terminals.panels.AbstractConfigurationPanel#doSaveWidgetValues(org.eclipse.jface.dialogs.IDialogSettings, java.lang.String) + * @see org.eclipse.tm.terminal.view.ui.panels.AbstractConfigurationPanel#doSaveWidgetValues(org.eclipse.jface.dialogs.IDialogSettings, java.lang.String) */ @Override public void doSaveWidgetValues(IDialogSettings settings, String idPrefix) { @@ -203,7 +203,7 @@ public class TelnetWizardConfigurationPanel extends AbstractExtendedConfiguratio } /* (non-Javadoc) - * @see org.eclipse.tcf.te.ui.terminals.panels.AbstractConfigurationPanel#getHostFromSettings() + * @see org.eclipse.tm.terminal.view.ui.panels.AbstractConfigurationPanel#getHostFromSettings() */ @Override protected String getHostFromSettings() { diff --git a/plugins/org.eclipse.tcf.te.ui.terminals.telnet/src/org/eclipse/tcf/te/ui/terminals/telnet/launcher/TelnetLauncherDelegate.java b/plugins/org.eclipse.tm.terminal.view.ui.telnet/src/org/eclipse/tm/terminal/view/ui/telnet/launcher/TelnetLauncherDelegate.java similarity index 81% rename from plugins/org.eclipse.tcf.te.ui.terminals.telnet/src/org/eclipse/tcf/te/ui/terminals/telnet/launcher/TelnetLauncherDelegate.java rename to plugins/org.eclipse.tm.terminal.view.ui.telnet/src/org/eclipse/tm/terminal/view/ui/telnet/launcher/TelnetLauncherDelegate.java index 2f3c78e281a..56bcf06e715 100644 --- a/plugins/org.eclipse.tcf.te.ui.terminals.telnet/src/org/eclipse/tcf/te/ui/terminals/telnet/launcher/TelnetLauncherDelegate.java +++ b/plugins/org.eclipse.tm.terminal.view.ui.telnet/src/org/eclipse/tm/terminal/view/ui/telnet/launcher/TelnetLauncherDelegate.java @@ -8,7 +8,7 @@ * Wind River Systems - initial API and implementation * Max Weninger (Wind River) - [366374] [TERMINALS][TELNET] Add Telnet terminal support *******************************************************************************/ -package org.eclipse.tcf.te.ui.terminals.telnet.launcher; +package org.eclipse.tm.terminal.view.ui.telnet.launcher; import java.text.DateFormat; import java.util.Date; @@ -16,21 +16,20 @@ import java.util.Map; import org.eclipse.core.runtime.Assert; import org.eclipse.osgi.util.NLS; -import org.eclipse.tcf.te.core.terminals.TerminalServiceFactory; -import org.eclipse.tcf.te.core.terminals.interfaces.ITerminalService; -import org.eclipse.tcf.te.core.terminals.interfaces.ITerminalService.Done; -import org.eclipse.tcf.te.core.terminals.interfaces.constants.ITerminalsConnectorConstants; -import org.eclipse.tcf.te.ui.terminals.interfaces.IConfigurationPanel; -import org.eclipse.tcf.te.ui.terminals.interfaces.IConfigurationPanelContainer; -import org.eclipse.tcf.te.ui.terminals.interfaces.IMementoHandler; -import org.eclipse.tcf.te.ui.terminals.internal.SettingsStore; -import org.eclipse.tcf.te.ui.terminals.launcher.AbstractLauncherDelegate; -import org.eclipse.tcf.te.ui.terminals.telnet.controls.TelnetWizardConfigurationPanel; -import org.eclipse.tcf.te.ui.terminals.telnet.nls.Messages; 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.telnet.TelnetSettings; +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; +import org.eclipse.tm.terminal.view.ui.interfaces.IConfigurationPanel; +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.telnet.controls.TelnetWizardConfigurationPanel; +import org.eclipse.tm.terminal.view.ui.telnet.nls.Messages; /** * Telnet launcher delegate implementation. @@ -41,7 +40,7 @@ public class TelnetLauncherDelegate extends AbstractLauncherDelegate { private final IMementoHandler mementoHandler = new TelnetMementoHandler(); /* (non-Javadoc) - * @see org.eclipse.tcf.te.ui.terminals.interfaces.ILauncherDelegate#needsUserConfiguration() + * @see org.eclipse.tm.terminal.view.ui.interfaces.ILauncherDelegate#needsUserConfiguration() */ @Override public boolean needsUserConfiguration() { @@ -49,7 +48,7 @@ public class TelnetLauncherDelegate extends AbstractLauncherDelegate { } /* (non-Javadoc) - * @see org.eclipse.tcf.te.ui.terminals.interfaces.ILauncherDelegate#getPanel(org.eclipse.tcf.te.ui.terminals.interfaces.IConfigurationPanelContainer) + * @see org.eclipse.tm.terminal.view.ui.interfaces.ILauncherDelegate#getPanel(org.eclipse.tm.terminal.view.ui.interfaces.IConfigurationPanelContainer) */ @Override public IConfigurationPanel getPanel(IConfigurationPanelContainer container) { @@ -57,10 +56,10 @@ public class TelnetLauncherDelegate extends AbstractLauncherDelegate { } /* (non-Javadoc) - * @see org.eclipse.tcf.te.ui.terminals.interfaces.ILauncherDelegate#execute(java.util.Map, org.eclipse.tcf.te.core.terminals.interfaces.ITerminalService.Done) + * @see org.eclipse.tm.terminal.view.ui.interfaces.ILauncherDelegate#execute(java.util.Map, org.eclipse.tm.terminal.view.core.interfaces.ITerminalService.Done) */ @Override - public void execute(Map properties, Done done) { + public void execute(Map properties, ITerminalService.Done done) { Assert.isNotNull(properties); // Set the terminal tab title @@ -113,7 +112,7 @@ public class TelnetLauncherDelegate extends AbstractLauncherDelegate { } /* (non-Javadoc) - * @see org.eclipse.tcf.te.ui.terminals.interfaces.ILauncherDelegate#createTerminalConnector(java.util.Map) + * @see org.eclipse.tm.terminal.view.ui.interfaces.ILauncherDelegate#createTerminalConnector(java.util.Map) */ @Override public ITerminalConnector createTerminalConnector(Map properties) { diff --git a/plugins/org.eclipse.tcf.te.ui.terminals.telnet/src/org/eclipse/tcf/te/ui/terminals/telnet/launcher/TelnetMementoHandler.java b/plugins/org.eclipse.tm.terminal.view.ui.telnet/src/org/eclipse/tm/terminal/view/ui/telnet/launcher/TelnetMementoHandler.java similarity index 89% rename from plugins/org.eclipse.tcf.te.ui.terminals.telnet/src/org/eclipse/tcf/te/ui/terminals/telnet/launcher/TelnetMementoHandler.java rename to plugins/org.eclipse.tm.terminal.view.ui.telnet/src/org/eclipse/tm/terminal/view/ui/telnet/launcher/TelnetMementoHandler.java index eaa0c6bdefe..05d2d95e8aa 100644 --- a/plugins/org.eclipse.tcf.te.ui.terminals.telnet/src/org/eclipse/tcf/te/ui/terminals/telnet/launcher/TelnetMementoHandler.java +++ b/plugins/org.eclipse.tm.terminal.view.ui.telnet/src/org/eclipse/tm/terminal/view/ui/telnet/launcher/TelnetMementoHandler.java @@ -7,13 +7,13 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tcf.te.ui.terminals.telnet.launcher; +package org.eclipse.tm.terminal.view.ui.telnet.launcher; import java.util.Map; import org.eclipse.core.runtime.Assert; -import org.eclipse.tcf.te.core.terminals.interfaces.constants.ITerminalsConnectorConstants; -import org.eclipse.tcf.te.ui.terminals.interfaces.IMementoHandler; +import org.eclipse.tm.terminal.view.core.interfaces.constants.ITerminalsConnectorConstants; +import org.eclipse.tm.terminal.view.ui.interfaces.IMementoHandler; import org.eclipse.ui.IMemento; /** @@ -22,7 +22,7 @@ import org.eclipse.ui.IMemento; public class TelnetMementoHandler implements IMementoHandler { /* (non-Javadoc) - * @see org.eclipse.tcf.te.ui.terminals.interfaces.IMementoHandler#saveState(org.eclipse.ui.IMemento, java.util.Map) + * @see org.eclipse.tm.terminal.view.ui.interfaces.IMementoHandler#saveState(org.eclipse.ui.IMemento, java.util.Map) */ @Override public void saveState(IMemento memento, Map properties) { @@ -40,7 +40,7 @@ public class TelnetMementoHandler implements IMementoHandler { } /* (non-Javadoc) - * @see org.eclipse.tcf.te.ui.terminals.interfaces.IMementoHandler#restoreState(org.eclipse.ui.IMemento, java.util.Map) + * @see org.eclipse.tm.terminal.view.ui.interfaces.IMementoHandler#restoreState(org.eclipse.ui.IMemento, java.util.Map) */ @Override public void restoreState(IMemento memento, Map properties) { diff --git a/plugins/org.eclipse.tcf.te.ui.terminals.telnet/src/org/eclipse/tcf/te/ui/terminals/telnet/nls/Messages.java b/plugins/org.eclipse.tm.terminal.view.ui.telnet/src/org/eclipse/tm/terminal/view/ui/telnet/nls/Messages.java similarity index 75% rename from plugins/org.eclipse.tcf.te.ui.terminals.telnet/src/org/eclipse/tcf/te/ui/terminals/telnet/nls/Messages.java rename to plugins/org.eclipse.tm.terminal.view.ui.telnet/src/org/eclipse/tm/terminal/view/ui/telnet/nls/Messages.java index b1f817b8691..4119e2cc99b 100644 --- a/plugins/org.eclipse.tcf.te.ui.terminals.telnet/src/org/eclipse/tcf/te/ui/terminals/telnet/nls/Messages.java +++ b/plugins/org.eclipse.tm.terminal.view.ui.telnet/src/org/eclipse/tm/terminal/view/ui/telnet/nls/Messages.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011 Wind River Systems, Inc. and others. All rights reserved. + * Copyright (c) 2011, 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 @@ -8,17 +8,17 @@ * Wind River Systems - initial API and implementation * Max Weninger (Wind River) - [366374] [TERMINALS][TELNET] Add Telnet terminal support *******************************************************************************/ -package org.eclipse.tcf.te.ui.terminals.telnet.nls; +package org.eclipse.tm.terminal.view.ui.telnet.nls; import org.eclipse.osgi.util.NLS; /** - * Target Explorer TCF terminals extensions UI plug-in externalized strings management. + * Terminals extensions UI plug-in externalized strings management. */ public class Messages extends NLS { // The plug-in resource bundle name - private static final String BUNDLE_NAME = "org.eclipse.tcf.te.ui.terminals.telnet.nls.Messages"; //$NON-NLS-1$ + private static final String BUNDLE_NAME = "org.eclipse.tm.terminal.view.ui.telnet.nls.Messages"; //$NON-NLS-1$ /** * Static constructor. diff --git a/plugins/org.eclipse.tcf.te.ui.terminals.telnet/src/org/eclipse/tcf/te/ui/terminals/telnet/nls/Messages.properties b/plugins/org.eclipse.tm.terminal.view.ui.telnet/src/org/eclipse/tm/terminal/view/ui/telnet/nls/Messages.properties similarity index 100% rename from plugins/org.eclipse.tcf.te.ui.terminals.telnet/src/org/eclipse/tcf/te/ui/terminals/telnet/nls/Messages.properties rename to plugins/org.eclipse.tm.terminal.view.ui.telnet/src/org/eclipse/tm/terminal/view/ui/telnet/nls/Messages.properties diff --git a/plugins/org.eclipse.tcf.te.ui.terminals/.classpath b/plugins/org.eclipse.tm.terminal.view.ui/.classpath similarity index 100% rename from plugins/org.eclipse.tcf.te.ui.terminals/.classpath rename to plugins/org.eclipse.tm.terminal.view.ui/.classpath diff --git a/plugins/org.eclipse.tm.terminal.view.ui/.gitignore b/plugins/org.eclipse.tm.terminal.view.ui/.gitignore new file mode 100644 index 00000000000..ae3c1726048 --- /dev/null +++ b/plugins/org.eclipse.tm.terminal.view.ui/.gitignore @@ -0,0 +1 @@ +/bin/ diff --git a/plugins/org.eclipse.tcf.te.ui.terminals/.options b/plugins/org.eclipse.tm.terminal.view.ui/.options similarity index 100% rename from plugins/org.eclipse.tcf.te.ui.terminals/.options rename to plugins/org.eclipse.tm.terminal.view.ui/.options diff --git a/plugins/org.eclipse.tcf.te.ui.terminals/.project b/plugins/org.eclipse.tm.terminal.view.ui/.project similarity index 95% rename from plugins/org.eclipse.tcf.te.ui.terminals/.project rename to plugins/org.eclipse.tm.terminal.view.ui/.project index 94502bab4d6..a663c982f5c 100644 --- a/plugins/org.eclipse.tcf.te.ui.terminals/.project +++ b/plugins/org.eclipse.tm.terminal.view.ui/.project @@ -1,6 +1,6 @@ - org.eclipse.tcf.te.ui.terminals + org.eclipse.tm.terminal.view.ui diff --git a/plugins/org.eclipse.tcf.te.ui.terminals/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.tm.terminal.view.ui/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from plugins/org.eclipse.tcf.te.ui.terminals/.settings/org.eclipse.jdt.core.prefs rename to plugins/org.eclipse.tm.terminal.view.ui/.settings/org.eclipse.jdt.core.prefs diff --git a/plugins/org.eclipse.tcf.te.ui.terminals/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.tm.terminal.view.ui/.settings/org.eclipse.jdt.ui.prefs similarity index 100% rename from plugins/org.eclipse.tcf.te.ui.terminals/.settings/org.eclipse.jdt.ui.prefs rename to plugins/org.eclipse.tm.terminal.view.ui/.settings/org.eclipse.jdt.ui.prefs diff --git a/plugins/org.eclipse.tcf.te.ui.terminals/.settings/org.eclipse.pde.prefs b/plugins/org.eclipse.tm.terminal.view.ui/.settings/org.eclipse.pde.prefs similarity index 100% rename from plugins/org.eclipse.tcf.te.ui.terminals/.settings/org.eclipse.pde.prefs rename to plugins/org.eclipse.tm.terminal.view.ui/.settings/org.eclipse.pde.prefs diff --git a/plugins/org.eclipse.tm.terminal.view.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.tm.terminal.view.ui/META-INF/MANIFEST.MF new file mode 100644 index 00000000000..0b688d3f7af --- /dev/null +++ b/plugins/org.eclipse.tm.terminal.view.ui/META-INF/MANIFEST.MF @@ -0,0 +1,34 @@ +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: %pluginName +Bundle-SymbolicName: org.eclipse.tm.terminal.view.ui;singleton:=true +Bundle-Version: 4.0.0.qualifier +Bundle-Activator: org.eclipse.tm.terminal.view.ui.activator.UIPlugin +Bundle-Vendor: %providerName +Require-Bundle: org.eclipse.core.expressions;bundle-version="3.4.400", + org.eclipse.core.runtime;bundle-version="3.8.0", + org.eclipse.core.resources;bundle-version="3.8.1";resolution:=optional, + org.eclipse.tm.terminal.view.core;bundle-version="4.0.0", + org.eclipse.tm.terminal;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.actions, + org.eclipse.tm.terminal.view.ui.activator;x-internal:=true, + org.eclipse.tm.terminal.view.ui.controls, + org.eclipse.tm.terminal.view.ui.help, + org.eclipse.tm.terminal.view.ui.interfaces, + org.eclipse.tm.terminal.view.ui.interfaces.tracing;x-internal:=true, + org.eclipse.tm.terminal.view.ui.internal;x-internal:=true, + org.eclipse.tm.terminal.view.ui.internal.dialogs;x-internal:=true, + org.eclipse.tm.terminal.view.ui.internal.handler;x-internal:=true, + org.eclipse.tm.terminal.view.ui.launcher, + org.eclipse.tm.terminal.view.ui.listeners, + org.eclipse.tm.terminal.view.ui.manager, + org.eclipse.tm.terminal.view.ui.nls;x-internal:=true, + org.eclipse.tm.terminal.view.ui.panels, + org.eclipse.tm.terminal.view.ui.services, + org.eclipse.tm.terminal.view.ui.streams, + org.eclipse.tm.terminal.view.ui.tabs, + org.eclipse.tm.terminal.view.ui.view diff --git a/plugins/org.eclipse.tcf.te.ui.terminals/about.html b/plugins/org.eclipse.tm.terminal.view.ui/about.html similarity index 100% rename from plugins/org.eclipse.tcf.te.ui.terminals/about.html rename to plugins/org.eclipse.tm.terminal.view.ui/about.html diff --git a/plugins/org.eclipse.tcf.te.ui.terminals/build.properties b/plugins/org.eclipse.tm.terminal.view.ui/build.properties similarity index 100% rename from plugins/org.eclipse.tcf.te.ui.terminals/build.properties rename to plugins/org.eclipse.tm.terminal.view.ui/build.properties diff --git a/plugins/org.eclipse.tcf.te.ui.terminals/contexts.xml b/plugins/org.eclipse.tm.terminal.view.ui/contexts.xml similarity index 100% rename from plugins/org.eclipse.tcf.te.ui.terminals/contexts.xml rename to plugins/org.eclipse.tm.terminal.view.ui/contexts.xml diff --git a/plugins/org.eclipse.tcf.te.ui.terminals/icons/clcl16/command_input_field.gif b/plugins/org.eclipse.tm.terminal.view.ui/icons/clcl16/command_input_field.gif similarity index 100% rename from plugins/org.eclipse.tcf.te.ui.terminals/icons/clcl16/command_input_field.gif rename to plugins/org.eclipse.tm.terminal.view.ui/icons/clcl16/command_input_field.gif diff --git a/plugins/org.eclipse.tcf.te.ui.terminals/icons/dlcl16/command_input_field.gif b/plugins/org.eclipse.tm.terminal.view.ui/icons/dlcl16/command_input_field.gif similarity index 100% rename from plugins/org.eclipse.tcf.te.ui.terminals/icons/dlcl16/command_input_field.gif rename to plugins/org.eclipse.tm.terminal.view.ui/icons/dlcl16/command_input_field.gif diff --git a/plugins/org.eclipse.tcf.te.ui.terminals/icons/dlcl16/disconnect.gif b/plugins/org.eclipse.tm.terminal.view.ui/icons/dlcl16/disconnect.gif similarity index 100% rename from plugins/org.eclipse.tcf.te.ui.terminals/icons/dlcl16/disconnect.gif rename to plugins/org.eclipse.tm.terminal.view.ui/icons/dlcl16/disconnect.gif diff --git a/plugins/org.eclipse.tcf.te.ui.terminals/icons/elcl16/command_input_field.gif b/plugins/org.eclipse.tm.terminal.view.ui/icons/elcl16/command_input_field.gif similarity index 100% rename from plugins/org.eclipse.tcf.te.ui.terminals/icons/elcl16/command_input_field.gif rename to plugins/org.eclipse.tm.terminal.view.ui/icons/elcl16/command_input_field.gif diff --git a/plugins/org.eclipse.tcf.te.ui.terminals/icons/elcl16/disconnect.gif b/plugins/org.eclipse.tm.terminal.view.ui/icons/elcl16/disconnect.gif similarity index 100% rename from plugins/org.eclipse.tcf.te.ui.terminals/icons/elcl16/disconnect.gif rename to plugins/org.eclipse.tm.terminal.view.ui/icons/elcl16/disconnect.gif diff --git a/plugins/org.eclipse.tcf.te.ui.terminals/icons/eview16/terminal_view.gif b/plugins/org.eclipse.tm.terminal.view.ui/icons/eview16/terminal_view.gif similarity index 100% rename from plugins/org.eclipse.tcf.te.ui.terminals/icons/eview16/terminal_view.gif rename to plugins/org.eclipse.tm.terminal.view.ui/icons/eview16/terminal_view.gif diff --git a/plugins/org.eclipse.tcf.te.ui.terminals/plugin.properties b/plugins/org.eclipse.tm.terminal.view.ui/plugin.properties similarity index 100% rename from plugins/org.eclipse.tcf.te.ui.terminals/plugin.properties rename to plugins/org.eclipse.tm.terminal.view.ui/plugin.properties diff --git a/plugins/org.eclipse.tcf.te.ui.terminals/plugin.xml b/plugins/org.eclipse.tm.terminal.view.ui/plugin.xml similarity index 64% rename from plugins/org.eclipse.tcf.te.ui.terminals/plugin.xml rename to plugins/org.eclipse.tm.terminal.view.ui/plugin.xml index 17b90285ea1..211f6eebe2b 100644 --- a/plugins/org.eclipse.tcf.te.ui.terminals/plugin.xml +++ b/plugins/org.eclipse.tm.terminal.view.ui/plugin.xml @@ -8,16 +8,16 @@ @@ -26,10 +26,10 @@ - + - + - + - + - + - + - + @@ -112,33 +112,33 @@ - + - + @@ -147,46 +147,46 @@ - + - + @@ -195,7 +195,7 @@

@@ -207,26 +207,26 @@ @@ -234,7 +234,7 @@ @@ -243,40 +243,40 @@ + class="org.eclipse.tm.terminal.view.ui.internal.handler.LaunchTerminalCommandHandler" + commandId="org.eclipse.tm.terminal.view.ui.command.launch"> + class="org.eclipse.tm.terminal.view.ui.internal.handler.LaunchTerminalCommandHandler" + commandId="org.eclipse.tm.terminal.view.ui.command.launchToolbar"> + class="org.eclipse.tm.terminal.view.ui.internal.handler.DisconnectTerminalCommandHandler" + commandId="org.eclipse.tm.terminal.view.ui.command.disconnect"> - - + + - + - + @@ -294,42 +294,42 @@ + activityId="org.eclipse.tm.terminal.view.ui.activity.views" + pattern="org\.eclipse\.tm\.terminal\.view\.ui/org\.eclipse\.tm\.terminal\.view\.ui\.TerminalsView"> + activityId="org.eclipse.tm.terminal.view.ui.activity.views" + pattern="org\.eclipse\.tm\.terminal\.view\.ui/org\.eclipse\.tm\.terminal\.view\.ui\.toolbar"> + activityId="org.eclipse.tm.terminal.view.ui.activity.views" + pattern="org\.eclipse\.tm\.terminal\.view\.ui/org\.eclipse\.tm\.terminal\.view\.ui\.commands\..*"> + activityId="org.eclipse.tm.terminal.view.ui.activity.views" + categoryId="org.eclipse.tm.terminal.view.ui.category"> + id="org.eclipse.tm.terminal.view.ui.activity.views"> diff --git a/plugins/org.eclipse.tcf.te.ui.terminals.local/pom.xml b/plugins/org.eclipse.tm.terminal.view.ui/pom.xml similarity index 54% rename from plugins/org.eclipse.tcf.te.ui.terminals.local/pom.xml rename to plugins/org.eclipse.tm.terminal.view.ui/pom.xml index 144c83e1fc1..1f8cb85a45d 100644 --- a/plugins/org.eclipse.tcf.te.ui.terminals.local/pom.xml +++ b/plugins/org.eclipse.tm.terminal.view.ui/pom.xml @@ -5,13 +5,13 @@ 4.0.0 - org.eclipse.tcf - org.eclipse.tcf.maven-build - 1.3.0-SNAPSHOT - ../../../admin/pom-build.xml + org.eclipse.tm.terminal + org.eclipse.tm.terminal.maven-build + 4.0.0-SNAPSHOT + ../../admin/pom-build.xml - 1.3.0.qualifier - org.eclipse.tcf.te.ui.terminals.local + 4.0.0.qualifier + org.eclipse.tm.terminal.view.ui eclipse-plugin diff --git a/plugins/org.eclipse.tcf.te.ui.terminals/schema/launcherDelegates.exsd b/plugins/org.eclipse.tm.terminal.view.ui/schema/launcherDelegates.exsd similarity index 100% rename from plugins/org.eclipse.tcf.te.ui.terminals/schema/launcherDelegates.exsd rename to plugins/org.eclipse.tm.terminal.view.ui/schema/launcherDelegates.exsd diff --git a/plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/actions/AbstractAction.java b/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/actions/AbstractAction.java similarity index 91% rename from plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/actions/AbstractAction.java rename to plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/actions/AbstractAction.java index 3ab4f8cef66..0816f1769ff 100644 --- a/plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/actions/AbstractAction.java +++ b/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/actions/AbstractAction.java @@ -7,7 +7,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tcf.te.ui.terminals.actions; +package org.eclipse.tm.terminal.view.ui.actions; import org.eclipse.core.commands.Command; import org.eclipse.core.commands.ParameterizedCommand; @@ -19,12 +19,12 @@ import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.StructuredSelection; import org.eclipse.osgi.util.NLS; import org.eclipse.swt.custom.CTabItem; -import org.eclipse.tcf.te.ui.terminals.activator.UIPlugin; -import org.eclipse.tcf.te.ui.terminals.nls.Messages; -import org.eclipse.tcf.te.ui.terminals.tabs.TabFolderManager; -import org.eclipse.tcf.te.ui.terminals.tabs.TabFolderToolbarHandler; import org.eclipse.tm.internal.terminal.control.ITerminalViewControl; import org.eclipse.tm.internal.terminal.control.actions.AbstractTerminalAction; +import org.eclipse.tm.terminal.view.ui.activator.UIPlugin; +import org.eclipse.tm.terminal.view.ui.nls.Messages; +import org.eclipse.tm.terminal.view.ui.tabs.TabFolderManager; +import org.eclipse.tm.terminal.view.ui.tabs.TabFolderToolbarHandler; import org.eclipse.ui.ISources; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.commands.ICommandService; @@ -33,7 +33,6 @@ import org.eclipse.ui.handlers.IHandlerService; /** * Abstract terminal action wrapper implementation. */ -@SuppressWarnings("restriction") public abstract class AbstractAction extends AbstractTerminalAction { // Reference to the parent toolbar handler private final TabFolderToolbarHandler parent; @@ -64,7 +63,7 @@ public abstract class AbstractAction extends AbstractTerminalAction { } /* (non-Javadoc) - * @see org.eclipse.tcf.internal.terminal.control.actions.AbstractTerminalAction#getTarget() + * @see org.eclipse.tm.internal.terminal.control.actions.AbstractTerminalAction#getTarget() */ @Override protected ITerminalViewControl getTarget() { @@ -72,7 +71,7 @@ public abstract class AbstractAction extends AbstractTerminalAction { } /* (non-Javadoc) - * @see org.eclipse.tcf.internal.terminal.control.actions.AbstractTerminalAction#run() + * @see org.eclipse.tm.internal.terminal.control.actions.AbstractTerminalAction#run() */ @Override public void run() { @@ -139,7 +138,7 @@ public abstract class AbstractAction extends AbstractTerminalAction { protected abstract String getCommandId(); /* (non-Javadoc) - * @see org.eclipse.tcf.internal.terminal.control.actions.AbstractTerminalAction#updateAction(boolean) + * @see org.eclipse.tm.internal.terminal.control.actions.AbstractTerminalAction#updateAction(boolean) */ @Override public void updateAction(boolean aboutToShow) { diff --git a/plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/actions/PinTerminalAction.java b/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/actions/PinTerminalAction.java similarity index 82% rename from plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/actions/PinTerminalAction.java rename to plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/actions/PinTerminalAction.java index f152023c581..4e8d5215256 100644 --- a/plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/actions/PinTerminalAction.java +++ b/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/actions/PinTerminalAction.java @@ -7,19 +7,18 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tcf.te.ui.terminals.actions; +package org.eclipse.tm.terminal.view.ui.actions; import org.eclipse.jface.action.IAction; -import org.eclipse.tcf.te.ui.terminals.activator.UIPlugin; -import org.eclipse.tcf.te.ui.terminals.interfaces.ITerminalsView; -import org.eclipse.tcf.te.ui.terminals.interfaces.ImageConsts; -import org.eclipse.tcf.te.ui.terminals.nls.Messages; import org.eclipse.tm.internal.terminal.control.actions.AbstractTerminalAction; +import org.eclipse.tm.terminal.view.ui.activator.UIPlugin; +import org.eclipse.tm.terminal.view.ui.interfaces.ITerminalsView; +import org.eclipse.tm.terminal.view.ui.interfaces.ImageConsts; +import org.eclipse.tm.terminal.view.ui.nls.Messages; /** * Pins the currently visible terminal view. */ -@SuppressWarnings("restriction") public class PinTerminalAction extends AbstractTerminalAction { private ITerminalsView view = null; diff --git a/plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/actions/SelectEncodingAction.java b/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/actions/SelectEncodingAction.java similarity index 92% rename from plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/actions/SelectEncodingAction.java rename to plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/actions/SelectEncodingAction.java index d1d5672119f..4a697c16f35 100644 --- a/plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/actions/SelectEncodingAction.java +++ b/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/actions/SelectEncodingAction.java @@ -7,7 +7,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tcf.te.ui.terminals.actions; +package org.eclipse.tm.terminal.view.ui.actions; import java.io.UnsupportedEncodingException; @@ -15,12 +15,12 @@ import org.eclipse.core.runtime.Assert; import org.eclipse.jface.action.IAction; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.window.Window; -import org.eclipse.tcf.te.ui.terminals.internal.dialogs.EncodingSelectionDialog; -import org.eclipse.tcf.te.ui.terminals.nls.Messages; -import org.eclipse.tcf.te.ui.terminals.tabs.TabFolderManager; import org.eclipse.tm.internal.terminal.control.ITerminalViewControl; import org.eclipse.tm.internal.terminal.control.actions.AbstractTerminalAction; import org.eclipse.tm.internal.terminal.provisional.api.TerminalState; +import org.eclipse.tm.terminal.view.ui.internal.dialogs.EncodingSelectionDialog; +import org.eclipse.tm.terminal.view.ui.nls.Messages; +import org.eclipse.tm.terminal.view.ui.tabs.TabFolderManager; /** * Terminal control select encoding action implementation. diff --git a/plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/actions/TabScrollLockAction.java b/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/actions/TabScrollLockAction.java similarity index 82% rename from plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/actions/TabScrollLockAction.java rename to plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/actions/TabScrollLockAction.java index 571eb8da35c..64bcdda7847 100644 --- a/plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/actions/TabScrollLockAction.java +++ b/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/actions/TabScrollLockAction.java @@ -7,15 +7,15 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tcf.te.ui.terminals.actions; +package org.eclipse.tm.terminal.view.ui.actions; import org.eclipse.jface.action.IAction; -import org.eclipse.tcf.te.ui.terminals.activator.UIPlugin; -import org.eclipse.tcf.te.ui.terminals.interfaces.ImageConsts; -import org.eclipse.tcf.te.ui.terminals.nls.Messages; import org.eclipse.tm.internal.terminal.control.ITerminalViewControl; import org.eclipse.tm.internal.terminal.control.actions.AbstractTerminalAction; import org.eclipse.tm.internal.terminal.provisional.api.TerminalState; +import org.eclipse.tm.terminal.view.ui.activator.UIPlugin; +import org.eclipse.tm.terminal.view.ui.interfaces.ImageConsts; +import org.eclipse.tm.terminal.view.ui.nls.Messages; /** * Terminal console tab scroll lock action. @@ -38,7 +38,7 @@ public class TabScrollLockAction extends AbstractTerminalAction { } /* (non-Javadoc) - * @see org.eclipse.tcf.internal.terminal.control.actions.AbstractTerminalAction#run() + * @see org.eclipse.tm.internal.terminal.control.actions.AbstractTerminalAction#run() */ @Override public void run() { @@ -50,7 +50,7 @@ public class TabScrollLockAction extends AbstractTerminalAction { } /* (non-Javadoc) - * @see org.eclipse.tcf.internal.terminal.control.actions.AbstractTerminalAction#updateAction(boolean) + * @see org.eclipse.tm.internal.terminal.control.actions.AbstractTerminalAction#updateAction(boolean) */ @Override public void updateAction(boolean aboutToShow) { diff --git a/plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/actions/ToggleCommandFieldAction.java b/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/actions/ToggleCommandFieldAction.java similarity index 87% rename from plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/actions/ToggleCommandFieldAction.java rename to plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/actions/ToggleCommandFieldAction.java index d2eb36b2cfb..7622cc525d2 100644 --- a/plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/actions/ToggleCommandFieldAction.java +++ b/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/actions/ToggleCommandFieldAction.java @@ -7,18 +7,18 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tcf.te.ui.terminals.actions; +package org.eclipse.tm.terminal.view.ui.actions; import org.eclipse.jface.action.IAction; import org.eclipse.swt.custom.CTabItem; -import org.eclipse.tcf.te.ui.terminals.activator.UIPlugin; -import org.eclipse.tcf.te.ui.terminals.interfaces.ITerminalsView; -import org.eclipse.tcf.te.ui.terminals.interfaces.ImageConsts; -import org.eclipse.tcf.te.ui.terminals.nls.Messages; -import org.eclipse.tcf.te.ui.terminals.tabs.TabCommandFieldHandler; -import org.eclipse.tcf.te.ui.terminals.tabs.TabFolderManager; import org.eclipse.tm.internal.terminal.control.actions.AbstractTerminalAction; import org.eclipse.tm.internal.terminal.provisional.api.TerminalState; +import org.eclipse.tm.terminal.view.ui.activator.UIPlugin; +import org.eclipse.tm.terminal.view.ui.interfaces.ITerminalsView; +import org.eclipse.tm.terminal.view.ui.interfaces.ImageConsts; +import org.eclipse.tm.terminal.view.ui.nls.Messages; +import org.eclipse.tm.terminal.view.ui.tabs.TabCommandFieldHandler; +import org.eclipse.tm.terminal.view.ui.tabs.TabFolderManager; /** * Toggle command input field. diff --git a/plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/activator/UIPlugin.java b/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/activator/UIPlugin.java similarity index 95% rename from plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/activator/UIPlugin.java rename to plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/activator/UIPlugin.java index f12b8ee35be..be20bfc735d 100644 --- a/plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/activator/UIPlugin.java +++ b/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/activator/UIPlugin.java @@ -8,7 +8,7 @@ * Wind River Systems - initial API and implementation * Max Weninger (Wind River) - [361363] [TERMINALS] Implement "Pin&Clone" for the "Terminals" view *******************************************************************************/ -package org.eclipse.tcf.te.ui.terminals.activator; +package org.eclipse.tm.terminal.view.ui.activator; import java.net.URL; import java.util.ArrayList; @@ -21,14 +21,14 @@ import org.eclipse.swt.custom.CTabFolder; import org.eclipse.swt.custom.CTabItem; import org.eclipse.swt.graphics.Image; import org.eclipse.swt.widgets.Display; -import org.eclipse.tcf.te.core.terminals.preferences.ScopedEclipsePreferences; -import org.eclipse.tcf.te.core.terminals.tracing.TraceHandler; -import org.eclipse.tcf.te.ui.terminals.interfaces.ImageConsts; -import org.eclipse.tcf.te.ui.terminals.listeners.WorkbenchWindowListener; -import org.eclipse.tcf.te.ui.terminals.view.TerminalsView; -import org.eclipse.tcf.te.ui.terminals.view.TerminalsViewMementoHandler; import org.eclipse.tm.internal.terminal.control.ITerminalViewControl; import org.eclipse.tm.internal.terminal.provisional.api.TerminalState; +import org.eclipse.tm.terminal.view.core.preferences.ScopedEclipsePreferences; +import org.eclipse.tm.terminal.view.core.tracing.TraceHandler; +import org.eclipse.tm.terminal.view.ui.interfaces.ImageConsts; +import org.eclipse.tm.terminal.view.ui.listeners.WorkbenchWindowListener; +import org.eclipse.tm.terminal.view.ui.view.TerminalsView; +import org.eclipse.tm.terminal.view.ui.view.TerminalsViewMementoHandler; import org.eclipse.ui.IViewPart; import org.eclipse.ui.IViewReference; import org.eclipse.ui.IWindowListener; @@ -78,7 +78,7 @@ public class UIPlugin extends AbstractUIPlugin { if (getDefault() != null && getDefault().getBundle() != null) { return getDefault().getBundle().getSymbolicName(); } - return "org.eclipse.tcf.te.ui.terminals"; //$NON-NLS-1$ + return "org.eclipse.tm.terminal.view.ui"; //$NON-NLS-1$ } /** diff --git a/plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/controls/ConfigurationPanelControl.java b/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/controls/ConfigurationPanelControl.java similarity index 97% rename from plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/controls/ConfigurationPanelControl.java rename to plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/controls/ConfigurationPanelControl.java index 75de4de716c..1a3e70ddabf 100644 --- a/plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/controls/ConfigurationPanelControl.java +++ b/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/controls/ConfigurationPanelControl.java @@ -7,7 +7,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tcf.te.ui.terminals.controls; +package org.eclipse.tm.terminal.view.ui.controls; import java.util.HashMap; import java.util.Hashtable; @@ -22,9 +22,9 @@ import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Group; -import org.eclipse.tcf.te.ui.terminals.interfaces.IConfigurationPanel; -import org.eclipse.tcf.te.ui.terminals.interfaces.IConfigurationPanelContainer; -import org.eclipse.tcf.te.ui.terminals.panels.AbstractConfigurationPanel; +import org.eclipse.tm.terminal.view.ui.interfaces.IConfigurationPanel; +import org.eclipse.tm.terminal.view.ui.interfaces.IConfigurationPanelContainer; +import org.eclipse.tm.terminal.view.ui.panels.AbstractConfigurationPanel; /** * Base control to deal with wizard or property page controls @@ -61,7 +61,7 @@ public class ConfigurationPanelControl implements IConfigurationPanelContainer, } /* (non-Javadoc) - * @see org.eclipse.tcf.te.ui.terminals.interfaces.IConfigurationPanel#setupPanel(org.eclipse.swt.widgets.Composite) + * @see org.eclipse.tm.terminal.view.ui.interfaces.IConfigurationPanel#setupPanel(org.eclipse.swt.widgets.Composite) */ @Override public void setupPanel(Composite parent) { @@ -75,7 +75,7 @@ public class ConfigurationPanelControl implements IConfigurationPanelContainer, } /* (non-Javadoc) - * @see org.eclipse.tcf.te.ui.terminals.panels.AbstractConfigurationPanel#isValid() + * @see org.eclipse.tm.terminal.view.ui.panels.AbstractConfigurationPanel#isValid() */ @Override public boolean isValid() { @@ -136,7 +136,7 @@ public class ConfigurationPanelControl implements IConfigurationPanelContainer, } /* (non-Javadoc) - * @see org.eclipse.tcf.te.ui.terminals.interfaces.IConfigurationPanelContainer#validate() + * @see org.eclipse.tm.terminal.view.ui.interfaces.IConfigurationPanelContainer#validate() */ @Override public void validate() { diff --git a/plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/controls/NoteCompositeHelper.java b/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/controls/NoteCompositeHelper.java similarity index 98% rename from plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/controls/NoteCompositeHelper.java rename to plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/controls/NoteCompositeHelper.java index eb998da2797..a861234c4d6 100644 --- a/plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/controls/NoteCompositeHelper.java +++ b/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/controls/NoteCompositeHelper.java @@ -7,7 +7,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tcf.te.ui.terminals.controls; +package org.eclipse.tm.terminal.view.ui.controls; import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.resource.JFaceResources; @@ -23,7 +23,7 @@ import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Label; -import org.eclipse.tcf.te.ui.terminals.nls.Messages; +import org.eclipse.tm.terminal.view.ui.nls.Messages; /** * A helper class to create a composite with a highlighted note diff --git a/plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/help/IContextHelpIds.java b/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/help/IContextHelpIds.java similarity index 91% rename from plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/help/IContextHelpIds.java rename to plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/help/IContextHelpIds.java index 650f8306566..a1cf1271f13 100644 --- a/plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/help/IContextHelpIds.java +++ b/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/help/IContextHelpIds.java @@ -7,9 +7,9 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tcf.te.ui.terminals.help; +package org.eclipse.tm.terminal.view.ui.help; -import org.eclipse.tcf.te.ui.terminals.activator.UIPlugin; +import org.eclipse.tm.terminal.view.ui.activator.UIPlugin; /** diff --git a/plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/interfaces/IConfigurationPanel.java b/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/interfaces/IConfigurationPanel.java similarity index 98% rename from plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/interfaces/IConfigurationPanel.java rename to plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/interfaces/IConfigurationPanel.java index a39ad7ade42..325028ce12a 100644 --- a/plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/interfaces/IConfigurationPanel.java +++ b/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/interfaces/IConfigurationPanel.java @@ -7,7 +7,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tcf.te.ui.terminals.interfaces; +package org.eclipse.tm.terminal.view.ui.interfaces; import java.util.Map; diff --git a/plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/interfaces/IConfigurationPanelContainer.java b/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/interfaces/IConfigurationPanelContainer.java similarity index 95% rename from plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/interfaces/IConfigurationPanelContainer.java rename to plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/interfaces/IConfigurationPanelContainer.java index 03d3f41eec2..4ff7cc2e53d 100644 --- a/plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/interfaces/IConfigurationPanelContainer.java +++ b/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/interfaces/IConfigurationPanelContainer.java @@ -7,7 +7,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tcf.te.ui.terminals.interfaces; +package org.eclipse.tm.terminal.view.ui.interfaces; diff --git a/plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/interfaces/ILauncherDelegate.java b/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/interfaces/ILauncherDelegate.java similarity index 96% rename from plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/interfaces/ILauncherDelegate.java rename to plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/interfaces/ILauncherDelegate.java index bf3f717ef35..5989ce02ec9 100644 --- a/plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/interfaces/ILauncherDelegate.java +++ b/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/interfaces/ILauncherDelegate.java @@ -7,15 +7,15 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tcf.te.ui.terminals.interfaces; +package org.eclipse.tm.terminal.view.ui.interfaces; import java.util.Map; import org.eclipse.core.expressions.Expression; import org.eclipse.core.runtime.IAdaptable; import org.eclipse.core.runtime.IExecutableExtension; -import org.eclipse.tcf.te.core.terminals.interfaces.ITerminalService; import org.eclipse.tm.internal.terminal.provisional.api.ITerminalConnector; +import org.eclipse.tm.terminal.view.core.interfaces.ITerminalService; /** * Terminal launcher delegate. diff --git a/plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/interfaces/IMementoHandler.java b/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/interfaces/IMementoHandler.java similarity index 96% rename from plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/interfaces/IMementoHandler.java rename to plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/interfaces/IMementoHandler.java index d6ae8e6d9d7..5afbf66fbbf 100644 --- a/plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/interfaces/IMementoHandler.java +++ b/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/interfaces/IMementoHandler.java @@ -7,7 +7,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tcf.te.ui.terminals.interfaces; +package org.eclipse.tm.terminal.view.ui.interfaces; import java.util.Map; diff --git a/plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/interfaces/IPreferenceKeys.java b/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/interfaces/IPreferenceKeys.java similarity index 94% rename from plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/interfaces/IPreferenceKeys.java rename to plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/interfaces/IPreferenceKeys.java index 905b568aa25..3fb50a92142 100644 --- a/plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/interfaces/IPreferenceKeys.java +++ b/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/interfaces/IPreferenceKeys.java @@ -7,7 +7,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tcf.te.ui.terminals.interfaces; +package org.eclipse.tm.terminal.view.ui.interfaces; /** * Terminals plug-in preference key definitions. diff --git a/plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/interfaces/ITerminalsView.java b/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/interfaces/ITerminalsView.java similarity index 96% rename from plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/interfaces/ITerminalsView.java rename to plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/interfaces/ITerminalsView.java index fcad401755e..b5821efe2aa 100644 --- a/plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/interfaces/ITerminalsView.java +++ b/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/interfaces/ITerminalsView.java @@ -8,7 +8,7 @@ * Wind River Systems - initial API and implementation * Max Weninger (Wind River) - [361363] [TERMINALS] Implement "Pin&Clone" for the "Terminals" view *******************************************************************************/ -package org.eclipse.tcf.te.ui.terminals.interfaces; +package org.eclipse.tm.terminal.view.ui.interfaces; import org.eclipse.ui.IViewPart; diff --git a/plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/interfaces/IUIConstants.java b/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/interfaces/IUIConstants.java similarity index 81% rename from plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/interfaces/IUIConstants.java rename to plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/interfaces/IUIConstants.java index 7c733a0e6bd..3ce443c9166 100644 --- a/plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/interfaces/IUIConstants.java +++ b/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/interfaces/IUIConstants.java @@ -7,7 +7,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tcf.te.ui.terminals.interfaces; +package org.eclipse.tm.terminal.view.ui.interfaces; /** * Terminals common UI constants. @@ -16,6 +16,6 @@ public interface IUIConstants { /** * The view id of the terminals view. */ - public static final String ID = "org.eclipse.tcf.te.ui.terminals.TerminalsView"; //$NON-NLS-1$ + public static final String ID = "org.eclipse.tm.terminal.view.ui.TerminalsView"; //$NON-NLS-1$ } diff --git a/plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/interfaces/ImageConsts.java b/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/interfaces/ImageConsts.java similarity index 98% rename from plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/interfaces/ImageConsts.java rename to plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/interfaces/ImageConsts.java index ec47afc8642..990909997d5 100644 --- a/plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/interfaces/ImageConsts.java +++ b/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/interfaces/ImageConsts.java @@ -8,7 +8,7 @@ * Wind River Systems - initial API and implementation * Max Weninger (Wind River) - [361363] [TERMINALS] Implement "Pin&Clone" for the "Terminals" view *******************************************************************************/ -package org.eclipse.tcf.te.ui.terminals.interfaces; +package org.eclipse.tm.terminal.view.ui.interfaces; /** * Image registry constants. diff --git a/plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/interfaces/tracing/ITraceIds.java b/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/interfaces/tracing/ITraceIds.java similarity index 94% rename from plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/interfaces/tracing/ITraceIds.java rename to plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/interfaces/tracing/ITraceIds.java index 1ed32c06c75..f07bca3ec37 100644 --- a/plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/interfaces/tracing/ITraceIds.java +++ b/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/interfaces/tracing/ITraceIds.java @@ -7,7 +7,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tcf.te.ui.terminals.interfaces.tracing; +package org.eclipse.tm.terminal.view.ui.interfaces.tracing; /** * Core plug-in trace slot identifiers. diff --git a/plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/internal/PreferencesInitializer.java b/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/internal/PreferencesInitializer.java similarity index 83% rename from plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/internal/PreferencesInitializer.java rename to plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/internal/PreferencesInitializer.java index b6b6a6fa434..59dc8d180e8 100644 --- a/plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/internal/PreferencesInitializer.java +++ b/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/internal/PreferencesInitializer.java @@ -7,12 +7,12 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tcf.te.ui.terminals.internal; +package org.eclipse.tm.terminal.view.ui.internal; import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer; -import org.eclipse.tcf.te.core.terminals.preferences.ScopedEclipsePreferences; -import org.eclipse.tcf.te.ui.terminals.activator.UIPlugin; -import org.eclipse.tcf.te.ui.terminals.interfaces.IPreferenceKeys; +import org.eclipse.tm.terminal.view.core.preferences.ScopedEclipsePreferences; +import org.eclipse.tm.terminal.view.ui.activator.UIPlugin; +import org.eclipse.tm.terminal.view.ui.interfaces.IPreferenceKeys; /** * Terminals default preferences initializer. diff --git a/plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/internal/PropertyTester.java b/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/internal/PropertyTester.java similarity index 90% rename from plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/internal/PropertyTester.java rename to plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/internal/PropertyTester.java index 1a98d00b8b6..8ce61bbbe58 100644 --- a/plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/internal/PropertyTester.java +++ b/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/internal/PropertyTester.java @@ -7,16 +7,16 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tcf.te.ui.terminals.internal; +package org.eclipse.tm.terminal.view.ui.internal; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.StructuredSelection; import org.eclipse.swt.custom.CTabItem; -import org.eclipse.tcf.te.ui.terminals.interfaces.ITerminalsView; -import org.eclipse.tcf.te.ui.terminals.launcher.LauncherDelegateManager; -import org.eclipse.tcf.te.ui.terminals.tabs.TabFolderManager; import org.eclipse.tm.internal.terminal.control.ITerminalViewControl; import org.eclipse.tm.internal.terminal.provisional.api.TerminalState; +import org.eclipse.tm.terminal.view.ui.interfaces.ITerminalsView; +import org.eclipse.tm.terminal.view.ui.launcher.LauncherDelegateManager; +import org.eclipse.tm.terminal.view.ui.tabs.TabFolderManager; /** diff --git a/plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/internal/SettingsStore.java b/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/internal/SettingsStore.java similarity index 83% rename from plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/internal/SettingsStore.java rename to plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/internal/SettingsStore.java index 31635db6d95..5a11c168899 100644 --- a/plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/internal/SettingsStore.java +++ b/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/internal/SettingsStore.java @@ -7,7 +7,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tcf.te.ui.terminals.internal; +package org.eclipse.tm.terminal.view.ui.internal; import java.util.HashMap; import java.util.Map; @@ -39,7 +39,7 @@ public class SettingsStore implements ISettingsStore { } /* (non-Javadoc) - * @see org.eclipse.tcf.internal.terminal.provisional.api.ISettingsStore#get(java.lang.String, java.lang.String) + * @see org.eclipse.tm.internal.terminal.provisional.api.ISettingsStore#get(java.lang.String, java.lang.String) */ @Override public final String get(String key, String defaultValue) { @@ -49,7 +49,7 @@ public class SettingsStore implements ISettingsStore { } /* (non-Javadoc) - * @see org.eclipse.tcf.internal.terminal.provisional.api.ISettingsStore#get(java.lang.String) + * @see org.eclipse.tm.internal.terminal.provisional.api.ISettingsStore#get(java.lang.String) */ @Override public final String get(String key) { @@ -58,7 +58,7 @@ public class SettingsStore implements ISettingsStore { } /* (non-Javadoc) - * @see org.eclipse.tcf.internal.terminal.provisional.api.ISettingsStore#put(java.lang.String, java.lang.String) + * @see org.eclipse.tm.internal.terminal.provisional.api.ISettingsStore#put(java.lang.String, java.lang.String) */ @Override public final void put(String key, String value) { diff --git a/plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/internal/dialogs/EncodingSelectionDialog.java b/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/internal/dialogs/EncodingSelectionDialog.java similarity index 87% rename from plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/internal/dialogs/EncodingSelectionDialog.java rename to plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/internal/dialogs/EncodingSelectionDialog.java index dc49648bd26..b129b5a047d 100644 --- a/plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/internal/dialogs/EncodingSelectionDialog.java +++ b/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/internal/dialogs/EncodingSelectionDialog.java @@ -7,7 +7,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tcf.te.ui.terminals.internal.dialogs; +package org.eclipse.tm.terminal.view.ui.internal.dialogs; import org.eclipse.core.runtime.Assert; import org.eclipse.jface.dialogs.TrayDialog; @@ -18,10 +18,10 @@ import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Shell; -import org.eclipse.tcf.te.ui.terminals.help.IContextHelpIds; -import org.eclipse.tcf.te.ui.terminals.interfaces.IConfigurationPanelContainer; -import org.eclipse.tcf.te.ui.terminals.nls.Messages; -import org.eclipse.tcf.te.ui.terminals.panels.AbstractExtendedConfigurationPanel; +import org.eclipse.tm.terminal.view.ui.help.IContextHelpIds; +import org.eclipse.tm.terminal.view.ui.interfaces.IConfigurationPanelContainer; +import org.eclipse.tm.terminal.view.ui.nls.Messages; +import org.eclipse.tm.terminal.view.ui.panels.AbstractExtendedConfigurationPanel; import org.eclipse.ui.PlatformUI; /** @@ -50,9 +50,9 @@ public class EncodingSelectionDialog extends TrayDialog { super(container); } - /* (non-Javadoc) - * @see org.eclipse.tcf.te.ui.controls.interfaces.IWizardConfigurationPanel#setupPanel(org.eclipse.swt.widgets.Composite) - */ + /* (non-Javadoc) + * @see org.eclipse.tm.terminal.view.ui.interfaces.IConfigurationPanel#setupPanel(org.eclipse.swt.widgets.Composite) + */ @Override public void setupPanel(Composite parent) { Composite panel = new Composite(parent, SWT.NONE); @@ -70,21 +70,21 @@ public class EncodingSelectionDialog extends TrayDialog { } /* (non-Javadoc) - * @see org.eclipse.tcf.te.ui.terminals.panels.AbstractConfigurationPanel#saveSettingsForHost(boolean) + * @see org.eclipse.tm.terminal.view.ui.panels.AbstractConfigurationPanel#saveSettingsForHost(boolean) */ @Override protected void saveSettingsForHost(boolean add) { } /* (non-Javadoc) - * @see org.eclipse.tcf.te.ui.terminals.panels.AbstractConfigurationPanel#fillSettingsForHost(java.lang.String) + * @see org.eclipse.tm.terminal.view.ui.panels.AbstractConfigurationPanel#fillSettingsForHost(java.lang.String) */ @Override protected void fillSettingsForHost(String host) { } /* (non-Javadoc) - * @see org.eclipse.tcf.te.ui.terminals.panels.AbstractConfigurationPanel#getHostFromSettings() + * @see org.eclipse.tm.terminal.view.ui.panels.AbstractConfigurationPanel#getHostFromSettings() */ @Override protected String getHostFromSettings() { @@ -92,7 +92,7 @@ public class EncodingSelectionDialog extends TrayDialog { } /* (non-Javadoc) - * @see org.eclipse.tcf.te.ui.terminals.panels.AbstractConfigurationPanel#getEncoding() + * @see org.eclipse.tm.terminal.view.ui.panels.AbstractConfigurationPanel#getEncoding() */ @Override public String getEncoding() { @@ -100,7 +100,7 @@ public class EncodingSelectionDialog extends TrayDialog { } /* (non-Javadoc) - * @see org.eclipse.tcf.te.ui.terminals.panels.AbstractConfigurationPanel#setEncoding(java.lang.String) + * @see org.eclipse.tm.terminal.view.ui.panels.AbstractConfigurationPanel#setEncoding(java.lang.String) */ @Override public void setEncoding(String encoding) { @@ -194,9 +194,9 @@ public class EncodingSelectionDialog extends TrayDialog { } } - /* (non-Javadoc) - * @see org.eclipse.tcf.te.ui.jface.dialogs.CustomTrayDialog#okPressed() - */ + /* (non-Javadoc) + * @see org.eclipse.jface.dialogs.Dialog#okPressed() + */ @Override protected void okPressed() { // Save the selected encoding diff --git a/plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/internal/dialogs/LaunchTerminalSettingsDialog.java b/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/internal/dialogs/LaunchTerminalSettingsDialog.java similarity index 96% rename from plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/internal/dialogs/LaunchTerminalSettingsDialog.java rename to plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/internal/dialogs/LaunchTerminalSettingsDialog.java index cc9ae1b8fb2..c65206b87ba 100644 --- a/plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/internal/dialogs/LaunchTerminalSettingsDialog.java +++ b/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/internal/dialogs/LaunchTerminalSettingsDialog.java @@ -8,7 +8,7 @@ * Wind River Systems - initial API and implementation * Max Weninger (Wind River) - [361352] [TERMINALS][SSH] Add SSH terminal support *******************************************************************************/ -package org.eclipse.tcf.te.ui.terminals.internal.dialogs; +package org.eclipse.tm.terminal.view.ui.internal.dialogs; import java.util.ArrayList; import java.util.Arrays; @@ -36,15 +36,15 @@ import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.MessageBox; import org.eclipse.swt.widgets.Shell; -import org.eclipse.tcf.te.core.terminals.interfaces.constants.ITerminalsConnectorConstants; -import org.eclipse.tcf.te.ui.terminals.activator.UIPlugin; -import org.eclipse.tcf.te.ui.terminals.controls.ConfigurationPanelControl; -import org.eclipse.tcf.te.ui.terminals.help.IContextHelpIds; -import org.eclipse.tcf.te.ui.terminals.interfaces.IConfigurationPanel; -import org.eclipse.tcf.te.ui.terminals.interfaces.ILauncherDelegate; -import org.eclipse.tcf.te.ui.terminals.interfaces.tracing.ITraceIds; -import org.eclipse.tcf.te.ui.terminals.launcher.LauncherDelegateManager; -import org.eclipse.tcf.te.ui.terminals.nls.Messages; +import org.eclipse.tm.terminal.view.core.interfaces.constants.ITerminalsConnectorConstants; +import org.eclipse.tm.terminal.view.ui.activator.UIPlugin; +import org.eclipse.tm.terminal.view.ui.controls.ConfigurationPanelControl; +import org.eclipse.tm.terminal.view.ui.help.IContextHelpIds; +import org.eclipse.tm.terminal.view.ui.interfaces.IConfigurationPanel; +import org.eclipse.tm.terminal.view.ui.interfaces.ILauncherDelegate; +import org.eclipse.tm.terminal.view.ui.interfaces.tracing.ITraceIds; +import org.eclipse.tm.terminal.view.ui.launcher.LauncherDelegateManager; +import org.eclipse.tm.terminal.view.ui.nls.Messages; import org.eclipse.ui.PlatformUI; /** @@ -82,7 +82,7 @@ public class LaunchTerminalSettingsDialog extends TrayDialog { } /* (non-Javadoc) - * @see org.eclipse.tcf.te.ui.controls.BaseWizardConfigurationPanelControl#getGroupLabel() + * @see org.eclipse.tm.terminal.view.ui.controls.ConfigurationPanelControl#getGroupLabel() */ @Override public String getGroupLabel() { @@ -90,7 +90,7 @@ public class LaunchTerminalSettingsDialog extends TrayDialog { } /* (non-Javadoc) - * @see org.eclipse.tcf.te.ui.controls.BaseWizardConfigurationPanelControl#showConfigurationPanel(java.lang.String) + * @see org.eclipse.tm.terminal.view.ui.controls.ConfigurationPanelControl#showConfigurationPanel(java.lang.String) */ @Override public void showConfigurationPanel(String key) { @@ -120,7 +120,7 @@ public class LaunchTerminalSettingsDialog extends TrayDialog { } /* (non-Javadoc) - * @see org.eclipse.tcf.te.ui.terminals.interfaces.IConfigurationPanelContainer#validate() + * @see org.eclipse.tm.terminal.view.ui.interfaces.IConfigurationPanelContainer#validate() */ @Override public void validate() { diff --git a/plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/internal/handler/AbstractTriggerCommandHandler.java b/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/internal/handler/AbstractTriggerCommandHandler.java similarity index 94% rename from plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/internal/handler/AbstractTriggerCommandHandler.java rename to plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/internal/handler/AbstractTriggerCommandHandler.java index da9dde56e48..03b5e7a93f9 100644 --- a/plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/internal/handler/AbstractTriggerCommandHandler.java +++ b/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/internal/handler/AbstractTriggerCommandHandler.java @@ -7,7 +7,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tcf.te.ui.terminals.internal.handler; +package org.eclipse.tm.terminal.view.ui.internal.handler; import org.eclipse.core.commands.AbstractHandler; import org.eclipse.core.commands.Command; @@ -19,8 +19,8 @@ import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Platform; import org.eclipse.core.runtime.Status; import org.eclipse.jface.viewers.ISelection; -import org.eclipse.tcf.te.ui.terminals.activator.UIPlugin; -import org.eclipse.tcf.te.ui.terminals.nls.Messages; +import org.eclipse.tm.terminal.view.ui.activator.UIPlugin; +import org.eclipse.tm.terminal.view.ui.nls.Messages; import org.eclipse.ui.ISources; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.commands.ICommandService; diff --git a/plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/internal/handler/DisconnectTerminalCommandHandler.java b/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/internal/handler/DisconnectTerminalCommandHandler.java similarity index 91% rename from plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/internal/handler/DisconnectTerminalCommandHandler.java rename to plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/internal/handler/DisconnectTerminalCommandHandler.java index 7858bf9a7bf..33aa6f9a3c2 100644 --- a/plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/internal/handler/DisconnectTerminalCommandHandler.java +++ b/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/internal/handler/DisconnectTerminalCommandHandler.java @@ -7,7 +7,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tcf.te.ui.terminals.internal.handler; +package org.eclipse.tm.terminal.view.ui.internal.handler; import org.eclipse.core.commands.AbstractHandler; import org.eclipse.core.commands.ExecutionEvent; @@ -15,15 +15,14 @@ import org.eclipse.core.commands.ExecutionException; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.swt.custom.CTabItem; -import org.eclipse.tcf.te.ui.terminals.interfaces.ITerminalsView; -import org.eclipse.tcf.te.ui.terminals.tabs.TabFolderManager; import org.eclipse.tm.internal.terminal.control.ITerminalViewControl; +import org.eclipse.tm.terminal.view.ui.interfaces.ITerminalsView; +import org.eclipse.tm.terminal.view.ui.tabs.TabFolderManager; import org.eclipse.ui.handlers.HandlerUtil; /** * Disconnect terminal connection command handler implementation. */ -@SuppressWarnings("restriction") public class DisconnectTerminalCommandHandler extends AbstractHandler { /* (non-Javadoc) diff --git a/plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/internal/handler/LaunchTerminalCommandHandler.java b/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/internal/handler/LaunchTerminalCommandHandler.java similarity index 88% rename from plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/internal/handler/LaunchTerminalCommandHandler.java rename to plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/internal/handler/LaunchTerminalCommandHandler.java index e87f96ce0d8..46c34b668ec 100644 --- a/plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/internal/handler/LaunchTerminalCommandHandler.java +++ b/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/internal/handler/LaunchTerminalCommandHandler.java @@ -7,7 +7,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tcf.te.ui.terminals.internal.handler; +package org.eclipse.tm.terminal.view.ui.internal.handler; import java.text.DateFormat; import java.util.Date; @@ -22,15 +22,15 @@ import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.window.Window; import org.eclipse.swt.widgets.Shell; -import org.eclipse.tcf.te.core.terminals.TerminalContextPropertiesProviderFactory; -import org.eclipse.tcf.te.core.terminals.interfaces.ITerminalContextPropertiesProvider; -import org.eclipse.tcf.te.core.terminals.interfaces.constants.IContextPropertiesConstants; -import org.eclipse.tcf.te.core.terminals.interfaces.constants.ITerminalsConnectorConstants; -import org.eclipse.tcf.te.ui.terminals.activator.UIPlugin; -import org.eclipse.tcf.te.ui.terminals.interfaces.ILauncherDelegate; -import org.eclipse.tcf.te.ui.terminals.interfaces.tracing.ITraceIds; -import org.eclipse.tcf.te.ui.terminals.internal.dialogs.LaunchTerminalSettingsDialog; -import org.eclipse.tcf.te.ui.terminals.launcher.LauncherDelegateManager; +import org.eclipse.tm.terminal.view.core.TerminalContextPropertiesProviderFactory; +import org.eclipse.tm.terminal.view.core.interfaces.ITerminalContextPropertiesProvider; +import org.eclipse.tm.terminal.view.core.interfaces.constants.IContextPropertiesConstants; +import org.eclipse.tm.terminal.view.core.interfaces.constants.ITerminalsConnectorConstants; +import org.eclipse.tm.terminal.view.ui.activator.UIPlugin; +import org.eclipse.tm.terminal.view.ui.interfaces.ILauncherDelegate; +import org.eclipse.tm.terminal.view.ui.interfaces.tracing.ITraceIds; +import org.eclipse.tm.terminal.view.ui.internal.dialogs.LaunchTerminalSettingsDialog; +import org.eclipse.tm.terminal.view.ui.launcher.LauncherDelegateManager; import org.eclipse.ui.handlers.HandlerUtil; /** @@ -45,8 +45,8 @@ public class LaunchTerminalCommandHandler extends AbstractHandler { @Override public Object execute(ExecutionEvent event) throws ExecutionException { String commandId = event.getCommand().getId(); - // "org.eclipse.tcf.te.ui.terminals.command.launchToolbar" - // "org.eclipse.tcf.te.ui.terminals.command.launch" + // "org.eclipse.tm.terminal.view.ui.command.launchToolbar" + // "org.eclipse.tm.terminal.view.ui.command.launch" long start = System.currentTimeMillis(); @@ -63,7 +63,7 @@ public class LaunchTerminalCommandHandler extends AbstractHandler { // Get the current selection ISelection selection = HandlerUtil.getCurrentSelection(event); - if (commandId.equals("org.eclipse.tcf.te.ui.terminals.command.launchToolbar")) { //$NON-NLS-1$ + if (commandId.equals("org.eclipse.tm.terminal.view.ui.command.launchToolbar")) { //$NON-NLS-1$ if (UIPlugin.getTraceHandler().isSlotEnabled(0, ITraceIds.TRACE_LAUNCH_TERMINAL_COMMAND_HANDLER)) { UIPlugin.getTraceHandler().trace("(a) Attempt to open launch terminal settings dialog after " + (System.currentTimeMillis() - start) + " ms.", //$NON-NLS-1$ //$NON-NLS-2$ ITraceIds.TRACE_LAUNCH_TERMINAL_COMMAND_HANDLER, LaunchTerminalCommandHandler.this); diff --git a/plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/internal/handler/MaximizeViewHandler.java b/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/internal/handler/MaximizeViewHandler.java similarity index 94% rename from plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/internal/handler/MaximizeViewHandler.java rename to plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/internal/handler/MaximizeViewHandler.java index a95424d3728..5803e005e07 100644 --- a/plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/internal/handler/MaximizeViewHandler.java +++ b/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/internal/handler/MaximizeViewHandler.java @@ -7,7 +7,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tcf.te.ui.terminals.internal.handler; +package org.eclipse.tm.terminal.view.ui.internal.handler; import org.eclipse.core.commands.ExecutionEvent; import org.eclipse.core.commands.ExecutionException; diff --git a/plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/internal/handler/QuickAccessHandler.java b/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/internal/handler/QuickAccessHandler.java similarity index 94% rename from plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/internal/handler/QuickAccessHandler.java rename to plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/internal/handler/QuickAccessHandler.java index 24401827b8c..ac63da8a95d 100644 --- a/plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/internal/handler/QuickAccessHandler.java +++ b/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/internal/handler/QuickAccessHandler.java @@ -7,7 +7,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tcf.te.ui.terminals.internal.handler; +package org.eclipse.tm.terminal.view.ui.internal.handler; import org.eclipse.core.commands.ExecutionEvent; import org.eclipse.core.commands.ExecutionException; diff --git a/plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/launcher/AbstractLauncherDelegate.java b/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/launcher/AbstractLauncherDelegate.java similarity index 90% rename from plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/launcher/AbstractLauncherDelegate.java rename to plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/launcher/AbstractLauncherDelegate.java index 1b868c4385d..1970d0765c8 100644 --- a/plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/launcher/AbstractLauncherDelegate.java +++ b/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/launcher/AbstractLauncherDelegate.java @@ -7,7 +7,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tcf.te.ui.terminals.launcher; +package org.eclipse.tm.terminal.view.ui.launcher; import org.eclipse.core.expressions.Expression; import org.eclipse.core.expressions.ExpressionConverter; @@ -18,9 +18,9 @@ import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.PlatformObject; import org.eclipse.core.runtime.Status; import org.eclipse.osgi.util.NLS; -import org.eclipse.tcf.te.ui.terminals.activator.UIPlugin; -import org.eclipse.tcf.te.ui.terminals.interfaces.ILauncherDelegate; -import org.eclipse.tcf.te.ui.terminals.nls.Messages; +import org.eclipse.tm.terminal.view.ui.activator.UIPlugin; +import org.eclipse.tm.terminal.view.ui.interfaces.ILauncherDelegate; +import org.eclipse.tm.terminal.view.ui.nls.Messages; /** * Abstract launcher delegate implementation. @@ -91,7 +91,7 @@ public abstract class AbstractLauncherDelegate extends PlatformObject implements } /* (non-Javadoc) - * @see org.eclipse.tcf.te.ui.terminals.interfaces.ILauncherDelegate#getId() + * @see org.eclipse.tm.terminal.view.ui.interfaces.ILauncherDelegate#getId() */ @Override public String getId() { @@ -99,7 +99,7 @@ public abstract class AbstractLauncherDelegate extends PlatformObject implements } /* (non-Javadoc) - * @see org.eclipse.tcf.te.ui.terminals.interfaces.ILauncherDelegate#getLabel() + * @see org.eclipse.tm.terminal.view.ui.interfaces.ILauncherDelegate#getLabel() */ @Override public String getLabel() { @@ -107,7 +107,7 @@ public abstract class AbstractLauncherDelegate extends PlatformObject implements } /* (non-Javadoc) - * @see org.eclipse.tcf.te.ui.terminals.interfaces.ILauncherDelegate#getEnablement() + * @see org.eclipse.tm.terminal.view.ui.interfaces.ILauncherDelegate#getEnablement() */ @Override public Expression getEnablement() { @@ -115,7 +115,7 @@ public abstract class AbstractLauncherDelegate extends PlatformObject implements } /* (non-Javadoc) - * @see org.eclipse.tcf.te.ui.terminals.interfaces.ILauncherDelegate#isHidden() + * @see org.eclipse.tm.terminal.view.ui.interfaces.ILauncherDelegate#isHidden() */ @Override public boolean isHidden() { diff --git a/plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/launcher/LauncherDelegateManager.java b/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/launcher/LauncherDelegateManager.java similarity index 97% rename from plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/launcher/LauncherDelegateManager.java rename to plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/launcher/LauncherDelegateManager.java index 1b99f4389a2..0e9d1886feb 100644 --- a/plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/launcher/LauncherDelegateManager.java +++ b/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/launcher/LauncherDelegateManager.java @@ -7,7 +7,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tcf.te.ui.terminals.launcher; +package org.eclipse.tm.terminal.view.ui.launcher; import java.util.ArrayList; import java.util.Arrays; @@ -32,9 +32,9 @@ import org.eclipse.core.runtime.Platform; import org.eclipse.core.runtime.Status; import org.eclipse.jface.viewers.ISelection; import org.eclipse.osgi.util.NLS; -import org.eclipse.tcf.te.ui.terminals.activator.UIPlugin; -import org.eclipse.tcf.te.ui.terminals.interfaces.ILauncherDelegate; -import org.eclipse.tcf.te.ui.terminals.nls.Messages; +import org.eclipse.tm.terminal.view.ui.activator.UIPlugin; +import org.eclipse.tm.terminal.view.ui.interfaces.ILauncherDelegate; +import org.eclipse.tm.terminal.view.ui.nls.Messages; import org.eclipse.ui.ISources; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.handlers.IHandlerService; @@ -168,14 +168,14 @@ public class LauncherDelegateManager { * The comparator assure that extension are read in a predictable order. *

* The order of the extensions is defined as following:
- *

  • Extensions contributed by our own plug-ins (org.eclipse.tcf.te.*) + *
    • Extensions contributed by our own plug-ins (org.eclipse.tm.terminal.*) * in ascending alphabetic order and
      • *
    • Extensions contributed by any other plug-in in ascending alphabetic order.
      • *
    • Extensions contributed by the same plug-in in ascending alphabetic order by the * extensions unique id
      • */ /* default */ static class ExtensionPointComparator implements Comparator { - private final static String OWN_PLUGINS_PATTERN = "org.eclipse.tcf.te."; //$NON-NLS-1$ + private final static String OWN_PLUGINS_PATTERN = "org.eclipse.tm.terminal."; //$NON-NLS-1$ /* (non-Javadoc) * @see java.util.Comparator#compare(java.lang.Object, java.lang.Object) @@ -379,7 +379,7 @@ public class LauncherDelegateManager { if (initialized) return; IExtensionRegistry registry = Platform.getExtensionRegistry(); - IExtensionPoint point = registry.getExtensionPoint("org.eclipse.tcf.te.ui.terminals.launcherDelegates"); //$NON-NLS-1$ + IExtensionPoint point = registry.getExtensionPoint("org.eclipse.tm.terminal.view.ui.launcherDelegates"); //$NON-NLS-1$ if (point != null) { IExtension[] extensions = getExtensionsSorted(point); for (IExtension extension : extensions) { diff --git a/plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/listeners/AbstractWindowListener.java b/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/listeners/AbstractWindowListener.java similarity index 98% rename from plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/listeners/AbstractWindowListener.java rename to plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/listeners/AbstractWindowListener.java index d5752bf4e3a..7627ae4924a 100644 --- a/plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/listeners/AbstractWindowListener.java +++ b/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/listeners/AbstractWindowListener.java @@ -7,7 +7,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tcf.te.ui.terminals.listeners; +package org.eclipse.tm.terminal.view.ui.listeners; import org.eclipse.ui.IPartListener2; import org.eclipse.ui.IPartService; diff --git a/plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/listeners/WorkbenchPartListener.java b/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/listeners/WorkbenchPartListener.java similarity index 95% rename from plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/listeners/WorkbenchPartListener.java rename to plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/listeners/WorkbenchPartListener.java index 017b19271f2..e49178a0ba7 100644 --- a/plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/listeners/WorkbenchPartListener.java +++ b/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/listeners/WorkbenchPartListener.java @@ -7,7 +7,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tcf.te.ui.terminals.listeners; +package org.eclipse.tm.terminal.view.ui.listeners; import java.util.HashMap; import java.util.Map; @@ -67,7 +67,7 @@ public class WorkbenchPartListener implements IPartListener2 { */ @Override public void partActivated(IWorkbenchPartReference partRef) { - if ("org.eclipse.tcf.te.ui.terminals.TerminalsView".equals(partRef.getId())) { //$NON-NLS-1$ + if ("org.eclipse.tm.terminal.view.ui.TerminalsView".equals(partRef.getId())) { //$NON-NLS-1$ IWorkbenchPart part = partRef.getPart(false); if (part != null && part.getSite() != null) { IContextService service = (IContextService)part.getSite().getService(IContextService.class); @@ -88,7 +88,7 @@ public class WorkbenchPartListener implements IPartListener2 { */ @Override public void partDeactivated(IWorkbenchPartReference partRef) { - if ("org.eclipse.tcf.te.ui.terminals.TerminalsView".equals(partRef.getId())) { //$NON-NLS-1$ + if ("org.eclipse.tm.terminal.view.ui.TerminalsView".equals(partRef.getId())) { //$NON-NLS-1$ IWorkbenchPart part = partRef.getPart(false); if (part != null && part.getSite() != null) { IContextService service = (IContextService)part.getSite().getService(IContextService.class); diff --git a/plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/listeners/WorkbenchWindowListener.java b/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/listeners/WorkbenchWindowListener.java similarity index 86% rename from plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/listeners/WorkbenchWindowListener.java rename to plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/listeners/WorkbenchWindowListener.java index 21349a95494..f96a9796ecc 100644 --- a/plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/listeners/WorkbenchWindowListener.java +++ b/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/listeners/WorkbenchWindowListener.java @@ -7,7 +7,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tcf.te.ui.terminals.listeners; +package org.eclipse.tm.terminal.view.ui.listeners; import org.eclipse.ui.IPartListener2; @@ -18,7 +18,7 @@ import org.eclipse.ui.IPartListener2; public class WorkbenchWindowListener extends AbstractWindowListener { /* (non-Javadoc) - * @see org.eclipse.tcf.te.ui.views.listeners.AbstractWindowListener#createPartListener() + * @see org.eclipse.tm.terminal.view.ui.listeners.AbstractWindowListener#createPartListener() */ @Override protected IPartListener2 createPartListener() { diff --git a/plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/manager/ConsoleManager.java b/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/manager/ConsoleManager.java similarity index 97% rename from plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/manager/ConsoleManager.java rename to plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/manager/ConsoleManager.java index e716c623756..20998332f42 100644 --- a/plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/manager/ConsoleManager.java +++ b/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/manager/ConsoleManager.java @@ -8,7 +8,7 @@ * Wind River Systems - initial API and implementation * Max Weninger (Wind River) - [361363] [TERMINALS] Implement "Pin&Clone" for the "Terminals" view *******************************************************************************/ -package org.eclipse.tcf.te.ui.terminals.manager; +package org.eclipse.tm.terminal.view.ui.manager; import java.util.ArrayList; import java.util.Arrays; @@ -22,16 +22,16 @@ import org.eclipse.core.runtime.Status; import org.eclipse.swt.custom.CTabFolder; import org.eclipse.swt.custom.CTabItem; import org.eclipse.swt.widgets.Display; -import org.eclipse.tcf.te.core.terminals.interfaces.constants.ITerminalsConnectorConstants; -import org.eclipse.tcf.te.ui.terminals.activator.UIPlugin; -import org.eclipse.tcf.te.ui.terminals.interfaces.IPreferenceKeys; -import org.eclipse.tcf.te.ui.terminals.interfaces.ITerminalsView; -import org.eclipse.tcf.te.ui.terminals.interfaces.IUIConstants; -import org.eclipse.tcf.te.ui.terminals.tabs.TabFolderManager; -import org.eclipse.tcf.te.ui.terminals.view.TerminalsView; import org.eclipse.tm.internal.terminal.control.ITerminalViewControl; import org.eclipse.tm.internal.terminal.provisional.api.ITerminalConnector; import org.eclipse.tm.internal.terminal.provisional.api.ITerminalControl; +import org.eclipse.tm.terminal.view.core.interfaces.constants.ITerminalsConnectorConstants; +import org.eclipse.tm.terminal.view.ui.activator.UIPlugin; +import org.eclipse.tm.terminal.view.ui.interfaces.IPreferenceKeys; +import org.eclipse.tm.terminal.view.ui.interfaces.ITerminalsView; +import org.eclipse.tm.terminal.view.ui.interfaces.IUIConstants; +import org.eclipse.tm.terminal.view.ui.tabs.TabFolderManager; +import org.eclipse.tm.terminal.view.ui.view.TerminalsView; import org.eclipse.ui.IPerspectiveDescriptor; import org.eclipse.ui.IPerspectiveListener; import org.eclipse.ui.IViewPart; diff --git a/plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/nls/Messages.java b/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/nls/Messages.java similarity index 96% rename from plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/nls/Messages.java rename to plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/nls/Messages.java index 0d47192ebb7..55867c90dc3 100644 --- a/plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/nls/Messages.java +++ b/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/nls/Messages.java @@ -8,7 +8,7 @@ * Wind River Systems - initial API and implementation * Max Weninger (Wind River) - [361363] [TERMINALS] Implement "Pin&Clone" for the "Terminals" view *******************************************************************************/ -package org.eclipse.tcf.te.ui.terminals.nls; +package org.eclipse.tm.terminal.view.ui.nls; import java.lang.reflect.Field; @@ -20,7 +20,7 @@ import org.eclipse.osgi.util.NLS; public class Messages extends NLS { // The plug-in resource bundle name - private static final String BUNDLE_NAME = "org.eclipse.tcf.te.ui.terminals.nls.Messages"; //$NON-NLS-1$ + private static final String BUNDLE_NAME = "org.eclipse.tm.terminal.view.ui.nls.Messages"; //$NON-NLS-1$ /** * Static constructor. diff --git a/plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/nls/Messages.properties b/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/nls/Messages.properties similarity index 100% rename from plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/nls/Messages.properties rename to plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/nls/Messages.properties diff --git a/plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/panels/AbstractConfigurationPanel.java b/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/panels/AbstractConfigurationPanel.java similarity index 82% rename from plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/panels/AbstractConfigurationPanel.java rename to plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/panels/AbstractConfigurationPanel.java index 8ee9b25067d..da3cd494310 100644 --- a/plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/panels/AbstractConfigurationPanel.java +++ b/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/panels/AbstractConfigurationPanel.java @@ -7,7 +7,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tcf.te.ui.terminals.panels; +package org.eclipse.tm.terminal.view.ui.panels; import java.util.Map; @@ -15,8 +15,8 @@ import org.eclipse.jface.dialogs.IDialogSettings; import org.eclipse.jface.dialogs.IMessageProvider; import org.eclipse.jface.viewers.ISelection; import org.eclipse.swt.widgets.Composite; -import org.eclipse.tcf.te.ui.terminals.interfaces.IConfigurationPanel; -import org.eclipse.tcf.te.ui.terminals.interfaces.IConfigurationPanelContainer; +import org.eclipse.tm.terminal.view.ui.interfaces.IConfigurationPanel; +import org.eclipse.tm.terminal.view.ui.interfaces.IConfigurationPanelContainer; /** * Abstract terminal launcher configuration panel implementation. @@ -45,7 +45,7 @@ public abstract class AbstractConfigurationPanel implements IConfigurationPanel } /* (non-Javadoc) - * @see org.eclipse.tcf.te.ui.terminals.interfaces.IConfigurationPanel#getContainer() + * @see org.eclipse.tm.terminal.view.ui.interfaces.IConfigurationPanel#getContainer() */ @Override public IConfigurationPanelContainer getContainer() { @@ -80,7 +80,7 @@ public abstract class AbstractConfigurationPanel implements IConfigurationPanel } /* (non-Javadoc) - * @see org.eclipse.tcf.te.ui.terminals.interfaces.IConfigurationPanel#dispose() + * @see org.eclipse.tm.terminal.view.ui.interfaces.IConfigurationPanel#dispose() */ @Override public void dispose() { @@ -96,7 +96,7 @@ public abstract class AbstractConfigurationPanel implements IConfigurationPanel } /* (non-Javadoc) - * @see org.eclipse.tcf.te.ui.terminals.interfaces.IConfigurationPanel#getControl() + * @see org.eclipse.tm.terminal.view.ui.interfaces.IConfigurationPanel#getControl() */ @Override public Composite getControl() { @@ -104,7 +104,7 @@ public abstract class AbstractConfigurationPanel implements IConfigurationPanel } /* (non-Javadoc) - * @see org.eclipse.tcf.te.ui.terminals.interfaces.IConfigurationPanel#setSelection(org.eclipse.jface.viewers.ISelection) + * @see org.eclipse.tm.terminal.view.ui.interfaces.IConfigurationPanel#setSelection(org.eclipse.jface.viewers.ISelection) */ @Override public void setSelection(ISelection selection) { @@ -112,7 +112,7 @@ public abstract class AbstractConfigurationPanel implements IConfigurationPanel } /* (non-Javadoc) - * @see org.eclipse.tcf.te.ui.terminals.interfaces.IConfigurationPanel#getSelection() + * @see org.eclipse.tm.terminal.view.ui.interfaces.IConfigurationPanel#getSelection() */ @Override public ISelection getSelection() { @@ -120,14 +120,14 @@ public abstract class AbstractConfigurationPanel implements IConfigurationPanel } /* (non-Javadoc) - * @see org.eclipse.tcf.te.ui.terminals.interfaces.IConfigurationPanel#doRestoreWidgetValues(org.eclipse.jface.dialogs.IDialogSettings, java.lang.String) + * @see org.eclipse.tm.terminal.view.ui.interfaces.IConfigurationPanel#doRestoreWidgetValues(org.eclipse.jface.dialogs.IDialogSettings, java.lang.String) */ @Override public void doRestoreWidgetValues(IDialogSettings settings, String idPrefix) { } /* (non-Javadoc) - * @see org.eclipse.tcf.te.ui.terminals.interfaces.IConfigurationPanel#doSaveWidgetValues(org.eclipse.jface.dialogs.IDialogSettings, java.lang.String) + * @see org.eclipse.tm.terminal.view.ui.interfaces.IConfigurationPanel#doSaveWidgetValues(org.eclipse.jface.dialogs.IDialogSettings, java.lang.String) */ @Override public void doSaveWidgetValues(IDialogSettings settings, String idPrefix) { @@ -149,7 +149,7 @@ public abstract class AbstractConfigurationPanel implements IConfigurationPanel } /* (non-Javadoc) - * @see org.eclipse.tcf.te.ui.terminals.interfaces.IConfigurationPanel#setEnabled(boolean) + * @see org.eclipse.tm.terminal.view.ui.interfaces.IConfigurationPanel#setEnabled(boolean) */ @Override public void setEnabled(boolean enabled) { @@ -164,7 +164,7 @@ public abstract class AbstractConfigurationPanel implements IConfigurationPanel } /* (non-Javadoc) - * @see org.eclipse.tcf.te.ui.terminals.interfaces.IConfigurationPanel#isValid() + * @see org.eclipse.tm.terminal.view.ui.interfaces.IConfigurationPanel#isValid() */ @Override public boolean isValid() { @@ -173,28 +173,28 @@ public abstract class AbstractConfigurationPanel implements IConfigurationPanel } /* (non-Javadoc) - * @see org.eclipse.tcf.te.ui.terminals.interfaces.IConfigurationPanel#activate() + * @see org.eclipse.tm.terminal.view.ui.interfaces.IConfigurationPanel#activate() */ @Override public void activate() { } /* (non-Javadoc) - * @see org.eclipse.tcf.te.ui.terminals.interfaces.IConfigurationPanel#extractData(java.util.Map) + * @see org.eclipse.tm.terminal.view.ui.interfaces.IConfigurationPanel#extractData(java.util.Map) */ @Override public void extractData(Map data) { } /* (non-Javadoc) - * @see org.eclipse.tcf.te.ui.terminals.interfaces.IConfigurationPanel#setupData(java.util.Map) + * @see org.eclipse.tm.terminal.view.ui.interfaces.IConfigurationPanel#setupData(java.util.Map) */ @Override public void setupData(Map data) { } /* (non-Javadoc) - * @see org.eclipse.tcf.te.ui.terminals.interfaces.IConfigurationPanel#updateData(java.util.Map) + * @see org.eclipse.tm.terminal.view.ui.interfaces.IConfigurationPanel#updateData(java.util.Map) */ @Override public void updateData(Map data) { diff --git a/plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/panels/AbstractExtendedConfigurationPanel.java b/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/panels/AbstractExtendedConfigurationPanel.java similarity index 96% rename from plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/panels/AbstractExtendedConfigurationPanel.java rename to plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/panels/AbstractExtendedConfigurationPanel.java index 6277dc6c3d8..656aa77331f 100644 --- a/plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/panels/AbstractExtendedConfigurationPanel.java +++ b/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/panels/AbstractExtendedConfigurationPanel.java @@ -7,7 +7,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tcf.te.ui.terminals.panels; +package org.eclipse.tm.terminal.view.ui.panels; import java.nio.charset.Charset; import java.nio.charset.IllegalCharsetNameException; @@ -38,13 +38,13 @@ import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Combo; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Label; -import org.eclipse.tcf.te.core.terminals.TerminalContextPropertiesProviderFactory; -import org.eclipse.tcf.te.core.terminals.interfaces.ITerminalContextPropertiesProvider; -import org.eclipse.tcf.te.core.terminals.interfaces.constants.IContextPropertiesConstants; -import org.eclipse.tcf.te.core.terminals.interfaces.constants.ITerminalsConnectorConstants; -import org.eclipse.tcf.te.ui.terminals.activator.UIPlugin; -import org.eclipse.tcf.te.ui.terminals.interfaces.IConfigurationPanelContainer; -import org.eclipse.tcf.te.ui.terminals.nls.Messages; +import org.eclipse.tm.terminal.view.core.TerminalContextPropertiesProviderFactory; +import org.eclipse.tm.terminal.view.core.interfaces.ITerminalContextPropertiesProvider; +import org.eclipse.tm.terminal.view.core.interfaces.constants.IContextPropertiesConstants; +import org.eclipse.tm.terminal.view.core.interfaces.constants.ITerminalsConnectorConstants; +import org.eclipse.tm.terminal.view.ui.activator.UIPlugin; +import org.eclipse.tm.terminal.view.ui.interfaces.IConfigurationPanelContainer; +import org.eclipse.tm.terminal.view.ui.nls.Messages; import org.eclipse.ui.ISharedImages; import org.eclipse.ui.WorkbenchEncoding; import org.osgi.framework.Bundle; @@ -120,7 +120,7 @@ public abstract class AbstractExtendedConfigurationPanel extends AbstractConfigu } /* (non-Javadoc) - * @see org.eclipse.tcf.te.ui.controls.panels.AbstractWizardConfigurationPanel#doRestoreWidgetValues(org.eclipse.jface.dialogs.IDialogSettings, java.lang.String) + * @see org.eclipse.tm.terminal.view.ui.panels.AbstractConfigurationPanel#doRestoreWidgetValues(org.eclipse.jface.dialogs.IDialogSettings, java.lang.String) */ @Override public void doRestoreWidgetValues(IDialogSettings settings, String idPrefix) { @@ -237,7 +237,7 @@ public abstract class AbstractExtendedConfigurationPanel extends AbstractConfigu } /* (non-Javadoc) - * @see org.eclipse.tcf.te.ui.controls.panels.AbstractWizardConfigurationPanel#doSaveWidgetValues(org.eclipse.jface.dialogs.IDialogSettings, java.lang.String) + * @see org.eclipse.tm.terminal.view.ui.panels.AbstractConfigurationPanel#doSaveWidgetValues(org.eclipse.jface.dialogs.IDialogSettings, java.lang.String) */ @Override public void doSaveWidgetValues(IDialogSettings settings, String idPrefix) { diff --git a/plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/services/TerminalService.java b/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/services/TerminalService.java similarity index 89% rename from plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/services/TerminalService.java rename to plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/services/TerminalService.java index e06206e2a20..c69bdda01c8 100644 --- a/plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/services/TerminalService.java +++ b/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/services/TerminalService.java @@ -7,7 +7,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tcf.te.ui.terminals.services; +package org.eclipse.tm.terminal.view.ui.services; import java.util.HashMap; import java.util.Map; @@ -20,16 +20,16 @@ import org.eclipse.core.runtime.SafeRunner; import org.eclipse.core.runtime.Status; import org.eclipse.swt.custom.CTabItem; import org.eclipse.swt.widgets.Display; -import org.eclipse.tcf.te.core.terminals.activator.CoreBundleActivator; -import org.eclipse.tcf.te.core.terminals.interfaces.ITerminalService; -import org.eclipse.tcf.te.core.terminals.interfaces.ITerminalTabListener; -import org.eclipse.tcf.te.core.terminals.interfaces.constants.ITerminalsConnectorConstants; -import org.eclipse.tcf.te.ui.terminals.interfaces.ILauncherDelegate; -import org.eclipse.tcf.te.ui.terminals.interfaces.IUIConstants; -import org.eclipse.tcf.te.ui.terminals.launcher.LauncherDelegateManager; -import org.eclipse.tcf.te.ui.terminals.manager.ConsoleManager; -import org.eclipse.tcf.te.ui.terminals.nls.Messages; import org.eclipse.tm.internal.terminal.provisional.api.ITerminalConnector; +import org.eclipse.tm.terminal.view.core.activator.CoreBundleActivator; +import org.eclipse.tm.terminal.view.core.interfaces.ITerminalService; +import org.eclipse.tm.terminal.view.core.interfaces.ITerminalTabListener; +import org.eclipse.tm.terminal.view.core.interfaces.constants.ITerminalsConnectorConstants; +import org.eclipse.tm.terminal.view.ui.interfaces.ILauncherDelegate; +import org.eclipse.tm.terminal.view.ui.interfaces.IUIConstants; +import org.eclipse.tm.terminal.view.ui.launcher.LauncherDelegateManager; +import org.eclipse.tm.terminal.view.ui.manager.ConsoleManager; +import org.eclipse.tm.terminal.view.ui.nls.Messages; import org.eclipse.ui.PlatformUI; /** @@ -87,7 +87,7 @@ public class TerminalService implements ITerminalService { } /* (non-Javadoc) - * @see org.eclipse.tcf.te.core.terminals.interfaces.ITerminalService#addTerminalTabListener(org.eclipse.tcf.te.core.terminals.interfaces.ITerminalTabListener) + * @see org.eclipse.tm.terminal.view.core.interfaces.ITerminalService#addTerminalTabListener(org.eclipse.tm.terminal.view.core.interfaces.ITerminalTabListener) */ @Override public final void addTerminalTabListener(ITerminalTabListener listener) { @@ -96,7 +96,7 @@ public class TerminalService implements ITerminalService { } /* (non-Javadoc) - * @see org.eclipse.tcf.te.core.terminals.interfaces.ITerminalService#removeTerminalTabListener(org.eclipse.tcf.te.core.terminals.interfaces.ITerminalTabListener) + * @see org.eclipse.tm.terminal.view.core.interfaces.ITerminalService#removeTerminalTabListener(org.eclipse.tm.terminal.view.core.interfaces.ITerminalTabListener) */ @Override public final void removeTerminalTabListener(ITerminalTabListener listener) { @@ -257,7 +257,7 @@ public class TerminalService implements ITerminalService { } /* (non-Javadoc) - * @see org.eclipse.tcf.te.core.terminals.interfaces.ITerminalService#openConsole(java.util.Map, org.eclipse.tcf.te.core.terminals.interfaces.ITerminalService.Done) + * @see org.eclipse.tm.terminal.view.core.interfaces.ITerminalService#openConsole(java.util.Map, org.eclipse.tm.terminal.view.core.interfaces.ITerminalService.Done) */ @Override public void openConsole(final Map properties, final Done done) { @@ -322,7 +322,7 @@ public class TerminalService implements ITerminalService { } /* (non-Javadoc) - * @see org.eclipse.tcf.te.core.terminals.interfaces.ITerminalService#closeConsole(java.util.Map, org.eclipse.tcf.te.core.terminals.interfaces.ITerminalService.Done) + * @see org.eclipse.tm.terminal.view.core.interfaces.ITerminalService#closeConsole(java.util.Map, org.eclipse.tm.terminal.view.core.interfaces.ITerminalService.Done) */ @Override public void closeConsole(final Map properties, final Done done) { @@ -340,7 +340,7 @@ public class TerminalService implements ITerminalService { } /* (non-Javadoc) - * @see org.eclipse.tcf.te.core.terminals.interfaces.ITerminalService#terminateConsole(java.util.Map, org.eclipse.tcf.te.core.terminals.interfaces.ITerminalService.Done) + * @see org.eclipse.tm.terminal.view.core.interfaces.ITerminalService#terminateConsole(java.util.Map, org.eclipse.tm.terminal.view.core.interfaces.ITerminalService.Done) */ @Override public void terminateConsole(Map properties, Done done) { diff --git a/plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/streams/AbstractStreamsConnector.java b/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/streams/AbstractStreamsConnector.java similarity index 95% rename from plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/streams/AbstractStreamsConnector.java rename to plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/streams/AbstractStreamsConnector.java index 51496bcbf2a..89fdfbcf67d 100644 --- a/plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/streams/AbstractStreamsConnector.java +++ b/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/streams/AbstractStreamsConnector.java @@ -7,15 +7,15 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tcf.te.ui.terminals.streams; +package org.eclipse.tm.terminal.view.ui.streams; import java.io.InputStream; import java.io.OutputStream; import org.eclipse.core.runtime.Assert; -import org.eclipse.tcf.te.core.terminals.interfaces.ITerminalServiceOutputStreamMonitorListener; import org.eclipse.tm.internal.terminal.provisional.api.ITerminalControl; import org.eclipse.tm.internal.terminal.provisional.api.provider.TerminalConnectorImpl; +import org.eclipse.tm.terminal.view.core.interfaces.ITerminalServiceOutputStreamMonitorListener; import org.eclipse.ui.services.IDisposable; /** @@ -151,7 +151,7 @@ public abstract class AbstractStreamsConnector extends TerminalConnectorImpl { } /* (non-Javadoc) - * @see org.eclipse.tcf.internal.terminal.provisional.api.provider.TerminalConnectorImpl#doDisconnect() + * @see org.eclipse.tm.internal.terminal.provisional.api.provider.TerminalConnectorImpl#doDisconnect() */ @Override protected void doDisconnect() { @@ -163,9 +163,9 @@ public abstract class AbstractStreamsConnector extends TerminalConnectorImpl { super.doDisconnect(); } - /* (non-Javadoc) - * @see org.eclipse.tcf.internal.terminal.provisional.api.provider.TerminalConnectorImpl#getTerminalToRemoteStream() - */ + /* (non-Javadoc) + * @see org.eclipse.tm.internal.terminal.provisional.api.provider.TerminalConnectorImpl#getTerminalToRemoteStream() + */ @Override public OutputStream getTerminalToRemoteStream() { return stdInMonitor; diff --git a/plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/streams/InputStreamMonitor.java b/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/streams/InputStreamMonitor.java similarity index 97% rename from plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/streams/InputStreamMonitor.java rename to plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/streams/InputStreamMonitor.java index 486c7dfede1..5a18a691b2b 100644 --- a/plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/streams/InputStreamMonitor.java +++ b/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/streams/InputStreamMonitor.java @@ -7,7 +7,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tcf.te.ui.terminals.streams; +package org.eclipse.tm.terminal.view.ui.streams; import java.io.IOException; import java.io.OutputStream; @@ -20,10 +20,10 @@ import org.eclipse.core.runtime.Assert; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.osgi.util.NLS; -import org.eclipse.tcf.te.core.terminals.interfaces.constants.ILineSeparatorConstants; -import org.eclipse.tcf.te.ui.terminals.activator.UIPlugin; -import org.eclipse.tcf.te.ui.terminals.nls.Messages; import org.eclipse.tm.internal.terminal.provisional.api.ITerminalControl; +import org.eclipse.tm.terminal.view.core.interfaces.constants.ILineSeparatorConstants; +import org.eclipse.tm.terminal.view.ui.activator.UIPlugin; +import org.eclipse.tm.terminal.view.ui.nls.Messages; import org.eclipse.ui.services.IDisposable; /** @@ -54,7 +54,6 @@ public class InputStreamMonitor extends OutputStream implements IDisposable { private final Queue queue = new LinkedList(); // ***** Line separator replacement logic ***** - // ***** Adapted from org.eclipse.tcf.internal.terminal.local.LocalTerminalOutputStream ***** private final static int TERMINAL_SENDS_CR = 0; private final static int TERMINAL_SENDS_CRLF = 1; diff --git a/plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/streams/OutputStreamMonitor.java b/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/streams/OutputStreamMonitor.java similarity index 96% rename from plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/streams/OutputStreamMonitor.java rename to plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/streams/OutputStreamMonitor.java index ddfbba64424..07983df66ca 100644 --- a/plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/streams/OutputStreamMonitor.java +++ b/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/streams/OutputStreamMonitor.java @@ -7,7 +7,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tcf.te.ui.terminals.streams; +package org.eclipse.tm.terminal.view.ui.streams; import java.io.BufferedInputStream; import java.io.IOException; @@ -20,12 +20,12 @@ import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.ListenerList; import org.eclipse.core.runtime.Status; import org.eclipse.osgi.util.NLS; -import org.eclipse.tcf.te.core.terminals.interfaces.ITerminalServiceOutputStreamMonitorListener; -import org.eclipse.tcf.te.core.terminals.interfaces.constants.ILineSeparatorConstants; -import org.eclipse.tcf.te.ui.terminals.activator.UIPlugin; -import org.eclipse.tcf.te.ui.terminals.interfaces.tracing.ITraceIds; -import org.eclipse.tcf.te.ui.terminals.nls.Messages; import org.eclipse.tm.internal.terminal.provisional.api.ITerminalControl; +import org.eclipse.tm.terminal.view.core.interfaces.ITerminalServiceOutputStreamMonitorListener; +import org.eclipse.tm.terminal.view.core.interfaces.constants.ILineSeparatorConstants; +import org.eclipse.tm.terminal.view.ui.activator.UIPlugin; +import org.eclipse.tm.terminal.view.ui.interfaces.tracing.ITraceIds; +import org.eclipse.tm.terminal.view.ui.nls.Messages; import org.eclipse.ui.services.IDisposable; /** diff --git a/plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/streams/StreamsConnector.java b/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/streams/StreamsConnector.java similarity index 76% rename from plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/streams/StreamsConnector.java rename to plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/streams/StreamsConnector.java index e9bddcba853..d297a0ba364 100644 --- a/plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/streams/StreamsConnector.java +++ b/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/streams/StreamsConnector.java @@ -7,7 +7,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tcf.te.ui.terminals.streams; +package org.eclipse.tm.terminal.view.ui.streams; import org.eclipse.core.runtime.Assert; import org.eclipse.tm.internal.terminal.provisional.api.ISettingsStore; @@ -43,7 +43,7 @@ public class StreamsConnector extends AbstractStreamsConnector implements IDispo } /* (non-Javadoc) - * @see org.eclipse.tcf.internal.terminal.provisional.api.provider.TerminalConnectorImpl#connect(org.eclipse.tcf.internal.terminal.provisional.api.ITerminalControl) + * @see org.eclipse.tm.internal.terminal.provisional.api.provider.TerminalConnectorImpl#connect(org.eclipse.tm.internal.terminal.provisional.api.ITerminalControl) */ @Override public void connect(ITerminalControl control) { @@ -62,7 +62,7 @@ public class StreamsConnector extends AbstractStreamsConnector implements IDispo } /* (non-Javadoc) - * @see org.eclipse.tcf.internal.terminal.provisional.api.provider.TerminalConnectorImpl#isLocalEcho() + * @see org.eclipse.tm.internal.terminal.provisional.api.provider.TerminalConnectorImpl#isLocalEcho() */ @Override public boolean isLocalEcho() { @@ -78,7 +78,7 @@ public class StreamsConnector extends AbstractStreamsConnector implements IDispo } /* (non-Javadoc) - * @see org.eclipse.tcf.internal.terminal.provisional.api.provider.TerminalConnectorImpl#doDisconnect() + * @see org.eclipse.tm.terminal.view.ui.streams.AbstractStreamsConnector#doDisconnect() */ @Override public void doDisconnect() { @@ -92,7 +92,7 @@ public class StreamsConnector extends AbstractStreamsConnector implements IDispo // ***** Process Connector settings handling ***** /* (non-Javadoc) - * @see org.eclipse.tcf.internal.terminal.provisional.api.provider.TerminalConnectorImpl#getSettingsSummary() + * @see org.eclipse.tm.internal.terminal.provisional.api.provider.TerminalConnectorImpl#getSettingsSummary() */ @Override public String getSettingsSummary() { @@ -100,7 +100,7 @@ public class StreamsConnector extends AbstractStreamsConnector implements IDispo } /* (non-Javadoc) - * @see org.eclipse.tcf.internal.terminal.provisional.api.provider.TerminalConnectorImpl#load(org.eclipse.tcf.internal.terminal.provisional.api.ISettingsStore) + * @see org.eclipse.tm.internal.terminal.provisional.api.provider.TerminalConnectorImpl#load(org.eclipse.tm.internal.terminal.provisional.api.ISettingsStore) */ @Override public void load(ISettingsStore store) { @@ -108,7 +108,7 @@ public class StreamsConnector extends AbstractStreamsConnector implements IDispo } /* (non-Javadoc) - * @see org.eclipse.tcf.internal.terminal.provisional.api.provider.TerminalConnectorImpl#save(org.eclipse.tcf.internal.terminal.provisional.api.ISettingsStore) + * @see org.eclipse.tm.internal.terminal.provisional.api.provider.TerminalConnectorImpl#save(org.eclipse.tm.internal.terminal.provisional.api.ISettingsStore) */ @Override public void save(ISettingsStore store) { diff --git a/plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/streams/StreamsLauncherDelegate.java b/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/streams/StreamsLauncherDelegate.java similarity index 77% rename from plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/streams/StreamsLauncherDelegate.java rename to plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/streams/StreamsLauncherDelegate.java index 6d492e7ba86..ce82381db48 100644 --- a/plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/streams/StreamsLauncherDelegate.java +++ b/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/streams/StreamsLauncherDelegate.java @@ -7,25 +7,24 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tcf.te.ui.terminals.streams; +package org.eclipse.tm.terminal.view.ui.streams; import java.io.InputStream; import java.io.OutputStream; import java.util.Map; import org.eclipse.core.runtime.Assert; -import org.eclipse.tcf.te.core.terminals.TerminalServiceFactory; -import org.eclipse.tcf.te.core.terminals.interfaces.ITerminalService; -import org.eclipse.tcf.te.core.terminals.interfaces.ITerminalService.Done; -import org.eclipse.tcf.te.core.terminals.interfaces.ITerminalServiceOutputStreamMonitorListener; -import org.eclipse.tcf.te.core.terminals.interfaces.constants.ITerminalsConnectorConstants; -import org.eclipse.tcf.te.ui.terminals.interfaces.IConfigurationPanel; -import org.eclipse.tcf.te.ui.terminals.interfaces.IConfigurationPanelContainer; -import org.eclipse.tcf.te.ui.terminals.internal.SettingsStore; -import org.eclipse.tcf.te.ui.terminals.launcher.AbstractLauncherDelegate; 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.terminal.view.core.TerminalServiceFactory; +import org.eclipse.tm.terminal.view.core.interfaces.ITerminalService; +import org.eclipse.tm.terminal.view.core.interfaces.ITerminalServiceOutputStreamMonitorListener; +import org.eclipse.tm.terminal.view.core.interfaces.constants.ITerminalsConnectorConstants; +import org.eclipse.tm.terminal.view.ui.interfaces.IConfigurationPanel; +import org.eclipse.tm.terminal.view.ui.interfaces.IConfigurationPanelContainer; +import org.eclipse.tm.terminal.view.ui.internal.SettingsStore; +import org.eclipse.tm.terminal.view.ui.launcher.AbstractLauncherDelegate; /** * Streams launcher delegate implementation. @@ -34,7 +33,7 @@ import org.eclipse.tm.internal.terminal.provisional.api.TerminalConnectorExtensi public class StreamsLauncherDelegate extends AbstractLauncherDelegate { /* (non-Javadoc) - * @see org.eclipse.tcf.te.ui.terminals.interfaces.ILauncherDelegate#needsUserConfiguration() + * @see org.eclipse.tm.terminal.view.ui.interfaces.ILauncherDelegate#needsUserConfiguration() */ @Override public boolean needsUserConfiguration() { @@ -42,7 +41,7 @@ public class StreamsLauncherDelegate extends AbstractLauncherDelegate { } /* (non-Javadoc) - * @see org.eclipse.tcf.te.ui.terminals.interfaces.ILauncherDelegate#getPanel(org.eclipse.tcf.te.ui.terminals.interfaces.IConfigurationPanelContainer) + * @see org.eclipse.tm.terminal.view.ui.interfaces.ILauncherDelegate#getPanel(org.eclipse.tm.terminal.view.ui.interfaces.IConfigurationPanelContainer) */ @Override public IConfigurationPanel getPanel(IConfigurationPanelContainer container) { @@ -50,10 +49,10 @@ public class StreamsLauncherDelegate extends AbstractLauncherDelegate { } /* (non-Javadoc) - * @see org.eclipse.tcf.te.ui.terminals.interfaces.ILauncherDelegate#execute(java.util.Map, org.eclipse.tcf.te.core.terminals.interfaces.ITerminalService.Done) + * @see org.eclipse.tm.terminal.view.ui.interfaces.ILauncherDelegate#execute(java.util.Map, org.eclipse.tm.terminal.view.core.interfaces.ITerminalService.Done) */ @Override - public void execute(Map properties, Done done) { + public void execute(Map properties, ITerminalService.Done done) { Assert.isNotNull(properties); // Get the terminal service @@ -65,7 +64,7 @@ public class StreamsLauncherDelegate extends AbstractLauncherDelegate { } /* (non-Javadoc) - * @see org.eclipse.tcf.te.ui.terminals.interfaces.ILauncherDelegate#createTerminalConnector(java.util.Map) + * @see org.eclipse.tm.terminal.view.ui.interfaces.ILauncherDelegate#createTerminalConnector(java.util.Map) */ @Override public ITerminalConnector createTerminalConnector(Map properties) { @@ -73,7 +72,7 @@ public class StreamsLauncherDelegate extends AbstractLauncherDelegate { // Check for the terminal connector id String connectorId = (String)properties.get(ITerminalsConnectorConstants.PROP_TERMINAL_CONNECTOR_ID); - if (connectorId == null) connectorId = "org.eclipse.tcf.te.ui.terminals.StreamsConnector"; //$NON-NLS-1$ + if (connectorId == null) connectorId = "org.eclipse.tm.terminal.view.ui.StreamsConnector"; //$NON-NLS-1$ // Extract the streams properties OutputStream stdin = (OutputStream)properties.get(ITerminalsConnectorConstants.PROP_STREAMS_STDIN); diff --git a/plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/streams/StreamsSettings.java b/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/streams/StreamsSettings.java similarity index 97% rename from plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/streams/StreamsSettings.java rename to plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/streams/StreamsSettings.java index dcaaac457ed..5ad03d888ad 100644 --- a/plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/streams/StreamsSettings.java +++ b/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/streams/StreamsSettings.java @@ -7,15 +7,15 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tcf.te.ui.terminals.streams; +package org.eclipse.tm.terminal.view.ui.streams; import java.io.InputStream; import java.io.OutputStream; import org.eclipse.core.runtime.Assert; -import org.eclipse.tcf.te.core.terminals.interfaces.ITerminalServiceOutputStreamMonitorListener; -import org.eclipse.tcf.te.ui.terminals.internal.SettingsStore; import org.eclipse.tm.internal.terminal.provisional.api.ISettingsStore; +import org.eclipse.tm.terminal.view.core.interfaces.ITerminalServiceOutputStreamMonitorListener; +import org.eclipse.tm.terminal.view.ui.internal.SettingsStore; /** * Streams connector settings implementation. diff --git a/plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/tabs/TabCommandFieldHandler.java b/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/tabs/TabCommandFieldHandler.java similarity index 97% rename from plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/tabs/TabCommandFieldHandler.java rename to plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/tabs/TabCommandFieldHandler.java index c6f5e814da7..9a85fee1112 100644 --- a/plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/tabs/TabCommandFieldHandler.java +++ b/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/tabs/TabCommandFieldHandler.java @@ -7,7 +7,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tcf.te.ui.terminals.tabs; +package org.eclipse.tm.terminal.view.ui.tabs; import org.eclipse.core.runtime.Assert; import org.eclipse.core.runtime.IAdaptable; @@ -19,7 +19,6 @@ import org.eclipse.ui.services.IDisposable; /** * Tab command input field handler implementation. */ -@SuppressWarnings("restriction") public class TabCommandFieldHandler implements IDisposable, IAdaptable { // Reference to the parent tab folder manager private final TabFolderManager tabFolderManager; diff --git a/plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/tabs/TabDisposeListener.java b/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/tabs/TabDisposeListener.java similarity index 92% rename from plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/tabs/TabDisposeListener.java rename to plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/tabs/TabDisposeListener.java index c4f08d92b96..2a61fa1116e 100644 --- a/plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/tabs/TabDisposeListener.java +++ b/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/tabs/TabDisposeListener.java @@ -7,22 +7,21 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tcf.te.ui.terminals.tabs; +package org.eclipse.tm.terminal.view.ui.tabs; import org.eclipse.core.runtime.Assert; import org.eclipse.swt.custom.CTabItem; import org.eclipse.swt.events.DisposeEvent; import org.eclipse.swt.events.DisposeListener; import org.eclipse.swt.widgets.Control; -import org.eclipse.tcf.te.core.terminals.TerminalServiceFactory; -import org.eclipse.tcf.te.core.terminals.interfaces.ITerminalService; -import org.eclipse.tcf.te.ui.terminals.services.TerminalService; import org.eclipse.tm.internal.terminal.control.ITerminalViewControl; +import org.eclipse.tm.terminal.view.core.TerminalServiceFactory; +import org.eclipse.tm.terminal.view.core.interfaces.ITerminalService; +import org.eclipse.tm.terminal.view.ui.services.TerminalService; /** * Terminals tab default dispose listener implementation. */ -@SuppressWarnings("restriction") public class TabDisposeListener implements DisposeListener { private final TabFolderManager parentTabFolderManager; diff --git a/plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/tabs/TabFolderManager.java b/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/tabs/TabFolderManager.java similarity index 98% rename from plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/tabs/TabFolderManager.java rename to plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/tabs/TabFolderManager.java index 9e4c96a0c86..78de833f116 100644 --- a/plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/tabs/TabFolderManager.java +++ b/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/tabs/TabFolderManager.java @@ -7,7 +7,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tcf.te.ui.terminals.tabs; +package org.eclipse.tm.terminal.view.ui.tabs; import java.io.UnsupportedEncodingException; import java.util.ArrayList; @@ -43,17 +43,17 @@ import org.eclipse.swt.layout.FillLayout; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Menu; -import org.eclipse.tcf.te.core.terminals.interfaces.constants.ITerminalsConnectorConstants; -import org.eclipse.tcf.te.ui.terminals.activator.UIPlugin; -import org.eclipse.tcf.te.ui.terminals.interfaces.ITerminalsView; -import org.eclipse.tcf.te.ui.terminals.interfaces.ImageConsts; -import org.eclipse.tcf.te.ui.terminals.nls.Messages; import org.eclipse.tm.internal.terminal.control.ITerminalListener; import org.eclipse.tm.internal.terminal.control.ITerminalViewControl; import org.eclipse.tm.internal.terminal.control.TerminalViewControlFactory; import org.eclipse.tm.internal.terminal.provisional.api.ITerminalConnector; import org.eclipse.tm.internal.terminal.provisional.api.ITerminalControl; import org.eclipse.tm.internal.terminal.provisional.api.TerminalState; +import org.eclipse.tm.terminal.view.core.interfaces.constants.ITerminalsConnectorConstants; +import org.eclipse.tm.terminal.view.ui.activator.UIPlugin; +import org.eclipse.tm.terminal.view.ui.interfaces.ITerminalsView; +import org.eclipse.tm.terminal.view.ui.interfaces.ImageConsts; +import org.eclipse.tm.terminal.view.ui.nls.Messages; import org.eclipse.ui.PlatformUI; /** diff --git a/plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/tabs/TabFolderMenuHandler.java b/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/tabs/TabFolderMenuHandler.java similarity index 94% rename from plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/tabs/TabFolderMenuHandler.java rename to plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/tabs/TabFolderMenuHandler.java index f04d9a3d1b5..11af9b37906 100644 --- a/plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/tabs/TabFolderMenuHandler.java +++ b/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/tabs/TabFolderMenuHandler.java @@ -7,7 +7,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tcf.te.ui.terminals.tabs; +package org.eclipse.tm.terminal.view.ui.tabs; import java.util.ArrayList; import java.util.List; @@ -26,9 +26,6 @@ import org.eclipse.swt.dnd.DND; import org.eclipse.swt.dnd.TextTransfer; import org.eclipse.swt.dnd.Transfer; import org.eclipse.swt.widgets.Menu; -import org.eclipse.tcf.te.core.terminals.interfaces.constants.ITerminalsConnectorConstants; -import org.eclipse.tcf.te.ui.terminals.actions.SelectEncodingAction; -import org.eclipse.tcf.te.ui.terminals.interfaces.ITerminalsView; import org.eclipse.tm.internal.terminal.control.ITerminalViewControl; import org.eclipse.tm.internal.terminal.control.actions.AbstractTerminalAction; import org.eclipse.tm.internal.terminal.control.actions.TerminalActionClearAll; @@ -36,6 +33,9 @@ import org.eclipse.tm.internal.terminal.control.actions.TerminalActionCopy; import org.eclipse.tm.internal.terminal.control.actions.TerminalActionPaste; import org.eclipse.tm.internal.terminal.control.actions.TerminalActionSelectAll; import org.eclipse.tm.internal.terminal.provisional.api.TerminalState; +import org.eclipse.tm.terminal.view.core.interfaces.constants.ITerminalsConnectorConstants; +import org.eclipse.tm.terminal.view.ui.actions.SelectEncodingAction; +import org.eclipse.tm.terminal.view.ui.interfaces.ITerminalsView; import org.eclipse.ui.IWorkbenchActionConstants; /** @@ -205,7 +205,7 @@ public class TabFolderMenuHandler extends PlatformObject { // Create and add the copy action add(new TerminalActionCopy() { /* (non-Javadoc) - * @see org.eclipse.tcf.internal.terminal.control.actions.AbstractTerminalAction#getTarget() + * @see org.eclipse.tm.internal.terminal.control.actions.AbstractTerminalAction#getTarget() */ @Override protected ITerminalViewControl getTarget() { @@ -251,7 +251,7 @@ public class TabFolderMenuHandler extends PlatformObject { super.run(); } /* (non-Javadoc) - * @see org.eclipse.tcf.internal.terminal.control.actions.AbstractTerminalAction#getTarget() + * @see org.eclipse.tm.internal.terminal.control.actions.AbstractTerminalAction#getTarget() */ @Override protected ITerminalViewControl getTarget() { @@ -262,7 +262,7 @@ public class TabFolderMenuHandler extends PlatformObject { // Create and add the clear all action add(new TerminalActionClearAll() { /* (non-Javadoc) - * @see org.eclipse.tcf.internal.terminal.control.actions.AbstractTerminalAction#getTarget() + * @see org.eclipse.tm.internal.terminal.control.actions.AbstractTerminalAction#getTarget() */ @Override protected ITerminalViewControl getTarget() { @@ -284,7 +284,7 @@ public class TabFolderMenuHandler extends PlatformObject { // Create and add the select all action add(new TerminalActionSelectAll() { /* (non-Javadoc) - * @see org.eclipse.tcf.internal.terminal.control.actions.AbstractTerminalAction#getTarget() + * @see org.eclipse.tm.internal.terminal.control.actions.AbstractTerminalAction#getTarget() */ @Override protected ITerminalViewControl getTarget() { @@ -295,7 +295,7 @@ public class TabFolderMenuHandler extends PlatformObject { // Create and add the select encoding action add (new SelectEncodingAction((TabFolderManager)getParentView().getAdapter(TabFolderManager.class)) { /* (non-Javadoc) - * @see org.eclipse.tcf.internal.terminal.control.actions.AbstractTerminalAction#getTarget() + * @see org.eclipse.tm.internal.terminal.control.actions.AbstractTerminalAction#getTarget() */ @Override protected ITerminalViewControl getTarget() { diff --git a/plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/tabs/TabFolderSelectionListener.java b/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/tabs/TabFolderSelectionListener.java similarity index 97% rename from plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/tabs/TabFolderSelectionListener.java rename to plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/tabs/TabFolderSelectionListener.java index 37e4110cba7..9912f743dca 100644 --- a/plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/tabs/TabFolderSelectionListener.java +++ b/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/tabs/TabFolderSelectionListener.java @@ -7,7 +7,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tcf.te.ui.terminals.tabs; +package org.eclipse.tm.terminal.view.ui.tabs; import org.eclipse.core.runtime.Assert; import org.eclipse.swt.events.SelectionEvent; diff --git a/plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/tabs/TabFolderToolbarHandler.java b/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/tabs/TabFolderToolbarHandler.java similarity index 93% rename from plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/tabs/TabFolderToolbarHandler.java rename to plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/tabs/TabFolderToolbarHandler.java index 07d1a78684f..33733e7e567 100644 --- a/plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/tabs/TabFolderToolbarHandler.java +++ b/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/tabs/TabFolderToolbarHandler.java @@ -8,7 +8,7 @@ * Wind River Systems - initial API and implementation * Max Weninger (Wind River) - [361363] [TERMINALS] Implement "Pin&Clone" for the "Terminals" view *******************************************************************************/ -package org.eclipse.tcf.te.ui.terminals.tabs; +package org.eclipse.tm.terminal.view.ui.tabs; import java.util.ArrayList; import java.util.List; @@ -22,17 +22,17 @@ import org.eclipse.jface.viewers.SelectionChangedEvent; import org.eclipse.jface.viewers.StructuredSelection; import org.eclipse.swt.custom.CTabFolder; import org.eclipse.swt.custom.CTabItem; -import org.eclipse.tcf.te.ui.terminals.actions.AbstractAction; -import org.eclipse.tcf.te.ui.terminals.actions.PinTerminalAction; -import org.eclipse.tcf.te.ui.terminals.actions.TabScrollLockAction; -import org.eclipse.tcf.te.ui.terminals.actions.ToggleCommandFieldAction; -import org.eclipse.tcf.te.ui.terminals.interfaces.ITerminalsView; import org.eclipse.tm.internal.terminal.control.ITerminalViewControl; import org.eclipse.tm.internal.terminal.control.actions.AbstractTerminalAction; import org.eclipse.tm.internal.terminal.control.actions.TerminalActionClearAll; import org.eclipse.tm.internal.terminal.control.actions.TerminalActionCopy; import org.eclipse.tm.internal.terminal.control.actions.TerminalActionPaste; import org.eclipse.tm.internal.terminal.provisional.api.TerminalState; +import org.eclipse.tm.terminal.view.ui.actions.AbstractAction; +import org.eclipse.tm.terminal.view.ui.actions.PinTerminalAction; +import org.eclipse.tm.terminal.view.ui.actions.TabScrollLockAction; +import org.eclipse.tm.terminal.view.ui.actions.ToggleCommandFieldAction; +import org.eclipse.tm.terminal.view.ui.interfaces.ITerminalsView; import org.eclipse.ui.IActionBars; import org.eclipse.ui.IWorkbenchActionConstants; @@ -209,7 +209,7 @@ public class TabFolderToolbarHandler extends PlatformObject { // Create and add the paste action add(new TerminalActionPaste() { /* (non-Javadoc) - * @see org.eclipse.tcf.internal.terminal.control.actions.AbstractTerminalAction#getTarget() + * @see org.eclipse.tm.internal.terminal.control.actions.AbstractTerminalAction#getTarget() */ @Override protected ITerminalViewControl getTarget() { @@ -220,7 +220,7 @@ public class TabFolderToolbarHandler extends PlatformObject { // Create and add the copy action add(new TerminalActionCopy() { /* (non-Javadoc) - * @see org.eclipse.tcf.internal.terminal.control.actions.AbstractTerminalAction#getTarget() + * @see org.eclipse.tm.internal.terminal.control.actions.AbstractTerminalAction#getTarget() */ @Override protected ITerminalViewControl getTarget() { @@ -231,7 +231,7 @@ public class TabFolderToolbarHandler extends PlatformObject { // Create and add the scroll lock action add (new TabScrollLockAction() { /* (non-Javadoc) - * @see org.eclipse.tcf.internal.terminal.control.actions.AbstractTerminalAction#getTarget() + * @see org.eclipse.tm.internal.terminal.control.actions.AbstractTerminalAction#getTarget() */ @Override protected ITerminalViewControl getTarget() { @@ -242,7 +242,7 @@ public class TabFolderToolbarHandler extends PlatformObject { // Create and add the clear all action add(new TerminalActionClearAll() { /* (non-Javadoc) - * @see org.eclipse.tcf.internal.terminal.control.actions.AbstractTerminalAction#getTarget() + * @see org.eclipse.tm.internal.terminal.control.actions.AbstractTerminalAction#getTarget() */ @Override protected ITerminalViewControl getTarget() { diff --git a/plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/tabs/TabTerminalListener.java b/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/tabs/TabTerminalListener.java similarity index 93% rename from plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/tabs/TabTerminalListener.java rename to plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/tabs/TabTerminalListener.java index f482d58572b..c65f3e0fcda 100644 --- a/plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/tabs/TabTerminalListener.java +++ b/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/tabs/TabTerminalListener.java @@ -7,16 +7,16 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tcf.te.ui.terminals.tabs; +package org.eclipse.tm.terminal.view.ui.tabs; import org.eclipse.core.runtime.Assert; import org.eclipse.jface.viewers.ISelectionProvider; import org.eclipse.osgi.util.NLS; import org.eclipse.swt.custom.CTabItem; import org.eclipse.swt.widgets.Display; -import org.eclipse.tcf.te.ui.terminals.nls.Messages; import org.eclipse.tm.internal.terminal.control.ITerminalListener; import org.eclipse.tm.internal.terminal.provisional.api.TerminalState; +import org.eclipse.tm.terminal.view.ui.nls.Messages; /** * Terminals tab default terminal listener implementation. @@ -74,7 +74,7 @@ public class TabTerminalListener implements ITerminalListener { } /* (non-Javadoc) - * @see org.eclipse.tcf.internal.terminal.control.ITerminalListener#setState(org.eclipse.tcf.internal.terminal.provisional.api.TerminalState) + * @see org.eclipse.tm.internal.terminal.control.ITerminalListener#setState(org.eclipse.tm.internal.terminal.provisional.api.TerminalState) */ @Override public void setState(final TerminalState state) { @@ -144,7 +144,7 @@ public class TabTerminalListener implements ITerminalListener { } /* (non-Javadoc) - * @see org.eclipse.tcf.internal.terminal.control.ITerminalListener#setTerminalTitle(java.lang.String) + * @see org.eclipse.tm.internal.terminal.control.ITerminalListener#setTerminalTitle(java.lang.String) */ @Override public void setTerminalTitle(String title) { diff --git a/plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/view/TerminalsView.java b/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/view/TerminalsView.java similarity index 96% rename from plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/view/TerminalsView.java rename to plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/view/TerminalsView.java index cc4bbf576a9..27c1fb42804 100644 --- a/plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/view/TerminalsView.java +++ b/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/view/TerminalsView.java @@ -8,7 +8,7 @@ * Wind River Systems - initial API and implementation * Max Weninger (Wind River) - [361363] [TERMINALS] Implement "Pin&Clone" for the "Terminals" view *******************************************************************************/ -package org.eclipse.tcf.te.ui.terminals.view; +package org.eclipse.tm.terminal.view.ui.view; import java.util.Iterator; import java.util.UUID; @@ -49,12 +49,12 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Event; import org.eclipse.swt.widgets.Listener; -import org.eclipse.tcf.te.ui.terminals.activator.UIPlugin; -import org.eclipse.tcf.te.ui.terminals.interfaces.ITerminalsView; -import org.eclipse.tcf.te.ui.terminals.nls.Messages; -import org.eclipse.tcf.te.ui.terminals.tabs.TabFolderManager; -import org.eclipse.tcf.te.ui.terminals.tabs.TabFolderMenuHandler; -import org.eclipse.tcf.te.ui.terminals.tabs.TabFolderToolbarHandler; +import org.eclipse.tm.terminal.view.ui.activator.UIPlugin; +import org.eclipse.tm.terminal.view.ui.interfaces.ITerminalsView; +import org.eclipse.tm.terminal.view.ui.nls.Messages; +import org.eclipse.tm.terminal.view.ui.tabs.TabFolderManager; +import org.eclipse.tm.terminal.view.ui.tabs.TabFolderMenuHandler; +import org.eclipse.tm.terminal.view.ui.tabs.TabFolderToolbarHandler; import org.eclipse.ui.IMemento; import org.eclipse.ui.ISources; import org.eclipse.ui.IViewSite; @@ -583,7 +583,7 @@ public class TerminalsView extends ViewPart implements ITerminalsView, IShowInTa } /* (non-Javadoc) - * @see org.eclipse.tcf.te.ui.terminals.interfaces.ITerminalsView#switchToEmptyPageControl() + * @see org.eclipse.tm.terminal.view.ui.interfaces.ITerminalsView#switchToEmptyPageControl() */ @Override public void switchToEmptyPageControl() { @@ -594,7 +594,7 @@ public class TerminalsView extends ViewPart implements ITerminalsView, IShowInTa } /* (non-Javadoc) - * @see org.eclipse.tcf.te.ui.terminals.interfaces.ITerminalsView#switchToTabFolderControl() + * @see org.eclipse.tm.terminal.view.ui.interfaces.ITerminalsView#switchToTabFolderControl() */ @Override public void switchToTabFolderControl() { @@ -629,7 +629,7 @@ public class TerminalsView extends ViewPart implements ITerminalsView, IShowInTa } /* (non-Javadoc) - * @see org.eclipse.tcf.te.ui.terminals.interfaces.ITerminalsView#setPinned(boolean) + * @see org.eclipse.tm.terminal.view.ui.interfaces.ITerminalsView#setPinned(boolean) */ @Override public void setPinned(boolean pin) { @@ -637,7 +637,7 @@ public class TerminalsView extends ViewPart implements ITerminalsView, IShowInTa } /* (non-Javadoc) - * @see org.eclipse.tcf.te.ui.terminals.interfaces.ITerminalsView#isPinned() + * @see org.eclipse.tm.terminal.view.ui.interfaces.ITerminalsView#isPinned() */ @Override public boolean isPinned() { @@ -696,7 +696,7 @@ public class TerminalsView extends ViewPart implements ITerminalsView, IShowInTa // If the selection is valid, fire the command to open the local terminal if (isValid) { ICommandService service = (ICommandService)PlatformUI.getWorkbench().getService(ICommandService.class); - Command command = service != null ? service.getCommand("org.eclipse.tcf.te.ui.terminals.local.command.launch") : null; //$NON-NLS-1$ + Command command = service != null ? service.getCommand("org.eclipse.tm.terminal.view.ui.local.command.launch") : null; //$NON-NLS-1$ if (command != null && command.isDefined() && command.isEnabled()) { try { ParameterizedCommand pCmd = ParameterizedCommand.generateCommand(command, null); diff --git a/plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/view/TerminalsViewMementoHandler.java b/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/view/TerminalsViewMementoHandler.java similarity index 94% rename from plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/view/TerminalsViewMementoHandler.java rename to plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/view/TerminalsViewMementoHandler.java index c4d419fb065..b8e6486213e 100644 --- a/plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/view/TerminalsViewMementoHandler.java +++ b/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/view/TerminalsViewMementoHandler.java @@ -7,7 +7,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tcf.te.ui.terminals.view; +package org.eclipse.tm.terminal.view.ui.view; import java.util.ArrayList; import java.util.HashMap; @@ -18,24 +18,23 @@ import java.util.concurrent.atomic.AtomicBoolean; import org.eclipse.core.runtime.Assert; import org.eclipse.core.runtime.IStatus; import org.eclipse.swt.custom.CTabItem; -import org.eclipse.tcf.te.core.terminals.interfaces.ITerminalService; -import org.eclipse.tcf.te.core.terminals.interfaces.constants.ITerminalsConnectorConstants; -import org.eclipse.tcf.te.ui.terminals.actions.PinTerminalAction; -import org.eclipse.tcf.te.ui.terminals.interfaces.ILauncherDelegate; -import org.eclipse.tcf.te.ui.terminals.interfaces.IMementoHandler; -import org.eclipse.tcf.te.ui.terminals.launcher.LauncherDelegateManager; -import org.eclipse.tcf.te.ui.terminals.tabs.TabFolderToolbarHandler; import org.eclipse.tm.internal.terminal.control.ITerminalViewControl; +import org.eclipse.tm.terminal.view.core.interfaces.ITerminalService; +import org.eclipse.tm.terminal.view.core.interfaces.constants.ITerminalsConnectorConstants; +import org.eclipse.tm.terminal.view.ui.actions.PinTerminalAction; +import org.eclipse.tm.terminal.view.ui.interfaces.ILauncherDelegate; +import org.eclipse.tm.terminal.view.ui.interfaces.IMementoHandler; +import org.eclipse.tm.terminal.view.ui.launcher.LauncherDelegateManager; +import org.eclipse.tm.terminal.view.ui.tabs.TabFolderToolbarHandler; import org.eclipse.ui.IMemento; import org.eclipse.ui.PlatformUI; /** * Take care of the persisted state handling of the "Terminals" view. */ -@SuppressWarnings("restriction") public class TerminalsViewMementoHandler { // The list of items to save. See the workbench listener implementation - // in o.e.tcf.te.ui.terminals.activator.UIPlugin. + // in o.e.tm.terminal.view.ui.activator.UIPlugin. private final List saveables = new ArrayList(); /** diff --git a/plugins/org.eclipse.tm.terminal/.gitignore b/plugins/org.eclipse.tm.terminal/.gitignore new file mode 100644 index 00000000000..ae3c1726048 --- /dev/null +++ b/plugins/org.eclipse.tm.terminal/.gitignore @@ -0,0 +1 @@ +/bin/ diff --git a/plugins/org.eclipse.tm.terminal/META-INF/MANIFEST.MF b/plugins/org.eclipse.tm.terminal/META-INF/MANIFEST.MF index ccb37735d23..41852053a69 100644 --- a/plugins/org.eclipse.tm.terminal/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.tm.terminal/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.tm.terminal; singleton:=true -Bundle-Version: 3.3.100.qualifier +Bundle-Version: 4.0.0.qualifier Bundle-Activator: org.eclipse.tm.internal.terminal.control.impl.TerminalPlugin Bundle-Vendor: %providerName Bundle-Localization: plugin diff --git a/plugins/org.eclipse.tm.terminal/pom.xml b/plugins/org.eclipse.tm.terminal/pom.xml index 96ae5f6cabe..d7d270047f0 100644 --- a/plugins/org.eclipse.tm.terminal/pom.xml +++ b/plugins/org.eclipse.tm.terminal/pom.xml @@ -1,15 +1,17 @@ - + 4.0.0 + - org.eclipse.tm.maven-build - org.eclipse.tm + org.eclipse.tm.terminal + org.eclipse.tm.terminal.maven-build 4.0.0-SNAPSHOT - ../../../admin/pom-build.xml + ../../admin/pom-build.xml - org.eclipse.tm + + 4.0.0.qualifier org.eclipse.tm.terminal - 3.3.100.qualifier eclipse-plugin diff --git a/pom.xml b/pom.xml new file mode 100644 index 00000000000..0836b91f0c9 --- /dev/null +++ b/pom.xml @@ -0,0 +1,66 @@ + + + 4.0.0 + + + org.eclipse.tm.terminal + org.eclipse.tm.terminal.maven-build + 4.0.0-SNAPSHOT + admin/pom-build.xml + + + org.eclipse.tm.terminal + terminal-parent + 4.0.0-SNAPSHOT + pom + TM Terminal, Maven Master + + + + 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 + features/org.eclipse.tm.terminal.telnet.sdk.feature + features/org.eclipse.tm.terminal.remote.feature + features/org.eclipse.tm.terminal.remote.sdk.feature + + + plugins/org.eclipse.tm.terminal.view.core + plugins/org.eclipse.tm.terminal.view.ui + plugins/org.eclipse.tm.terminal.view.ui.local + plugins/org.eclipse.tm.terminal.view.ui.process + plugins/org.eclipse.tm.terminal.view.ui.rse + plugins/org.eclipse.tm.terminal.view.ui.serial + plugins/org.eclipse.tm.terminal.view.ui.ssh + plugins/org.eclipse.tm.terminal.view.ui.telnet + + features/org.eclipse.tm.terminal.view.feature + 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 + + + repos/org.eclipse.tm.terminal.repo + + + + + tests + + plugins/org.eclipse.tm.terminal.test + + + + diff --git a/readme.txt b/readme.txt index 3f318523fc8..4b5151f88c0 100644 --- a/readme.txt +++ b/readme.txt @@ -1,4 +1,4 @@ -The "terminal" folder holds the TM Terminal Component. -Its core depends on Eclipse RCP only and can be adapted to eRCP. +This repository holds the TM Terminal Component. +Its core depends on Eclipse RCP only. All these Git modules should be named "org.eclipse.tm.terminal.*". See http://www.eclipse.org/tm/ diff --git a/repos/org.eclipse.tm.terminal.repo/.project b/repos/org.eclipse.tm.terminal.repo/.project new file mode 100644 index 00000000000..37c94f97f84 --- /dev/null +++ b/repos/org.eclipse.tm.terminal.repo/.project @@ -0,0 +1,11 @@ + + + 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 new file mode 100644 index 00000000000..803e18d281a --- /dev/null +++ b/repos/org.eclipse.tm.terminal.repo/category.xml @@ -0,0 +1,54 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + TM Terminal Main Features + + + diff --git a/repos/org.eclipse.tm.terminal.repo/pom.xml b/repos/org.eclipse.tm.terminal.repo/pom.xml new file mode 100644 index 00000000000..b80720908cb --- /dev/null +++ b/repos/org.eclipse.tm.terminal.repo/pom.xml @@ -0,0 +1,61 @@ + + + 4.0.0 + + + org.eclipse.tm.terminal + org.eclipse.tm.terminal.maven-build + 4.0.0-SNAPSHOT + ../../admin/pom-build.xml + + + 4.0.0-SNAPSHOT + org.eclipse.tm.terminal.repo + eclipse-repository + + + + deploy + + + + maven-antrun-plugin + + + deploy + install + + run + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +