diff --git a/admin/pom-build.xml b/admin/pom-build.xml index 9591cdf44e6..134a2acc5a3 100644 --- a/admin/pom-build.xml +++ b/admin/pom-build.xml @@ -80,6 +80,64 @@ + + org.eclipse.tycho + target-platform-configuration + + + + + + p2-installable-unit + org.eclipse.platform.ide + 0.0.0 + + + eclipse-feature + org.eclipse.sdk + 0.0.0 + + + eclipse-feature + org.eclipse.cdt.platform + 0.0.0 + + + eclipse-feature + org.eclipse.remote + 0.0.0 + + + eclipse-feature + org.eclipse.swtbot.eclipse + 0.0.0 + + + + + + + org.jacoco + jacoco-maven-plugin + + + + prepare-agent + + + + org.eclipse.tm.terminal* + + + + + + + diff --git a/admin/pom-config.xml b/admin/pom-config.xml index 2790374c6f0..2a5d9647c9a 100644 --- a/admin/pom-config.xml +++ b/admin/pom-config.xml @@ -40,18 +40,27 @@ 0.22.0 - 0.22.0 + ${tycho-version} 2.7 1.8 1.5 2.5.2 + + 0.7.4.201502262128 + + 1.1.2 ${env.WORKSPACE}/admin UTF-8 + + false + file + true + scm:git:git://git.eclipse.org/gitroot/tm/org.eclipse.tm.terminal.git development @@ -62,15 +71,15 @@ - http://download.eclipse.org/cbi/updates/license http://download.eclipse.org/eclipse/updates/4.5 http://download.eclipse.org/releases/mars - http://download.eclipse.org/tools/orbit/downloads/drops/R20170516192513/repository + http://download.eclipse.org/cbi/updates/license http://download.eclipse.org/tools/cdt/releases/8.8.1 - http://download.eclipse.org/tm/updates/4.0 - http://download.eclipse.org/tools/ptp/builds/remote/mars/milestones - http://download.eclipse.org/technology/swtbot/releases/latest/ + http://download.eclipse.org/tm/updates/4.0 + http://download.eclipse.org/tools/ptp/builds/remote/2.0.0 http://archive.eclipse.org/tm/updates/rxtx + http://download.eclipse.org/tools/orbit/downloads/drops/R20150124073747/repository + http://download.eclipse.org/technology/swtbot/releases/latest/ @@ -100,13 +109,8 @@ p2 - rse - ${rse-site} - p2 - - - remote - ${remote-site} + tm + ${tm-site} p2 @@ -114,6 +118,11 @@ ${swtbot-site} p2 + + remote + ${remote-site} + p2 + rxtx ${rxtx-site} @@ -205,7 +214,7 @@ http://download.eclipse.org/eclipse/updates/4.6 http://download.eclipse.org/releases/neon http://download.eclipse.org/tools/orbit/R-builds/R20170307180635/repository - http://download.eclipse.org/tm/updates/4.2 + http://download.eclipse.org/tm/updates/4.2 http://download.eclipse.org/tools/ptp/builds/remote/neon/milestones http://download.eclipse.org/tools/cdt/releases/9.2 @@ -220,7 +229,7 @@ http://download.eclipse.org/eclipse/updates/4.7 http://download.eclipse.org/releases/oxygen http://download.eclipse.org/tools/orbit/downloads/drops/R20170516192513/repository - http://download.eclipse.org/tm/updates/4.3milestones + http://download.eclipse.org/tm/updates/4.3milestones http://download.eclipse.org/tools/ptp/builds/remote/oxygen/milestones http://download.eclipse.org/tools/cdt/builds/oxygen/milestones diff --git a/plugins/org.eclipse.tm.terminal.control/META-INF/MANIFEST.MF b/plugins/org.eclipse.tm.terminal.control/META-INF/MANIFEST.MF index 834c287f478..cbe88525986 100644 --- a/plugins/org.eclipse.tm.terminal.control/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.tm.terminal.control/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.tm.terminal.control; singleton:=true -Bundle-Version: 4.2.0.qualifier +Bundle-Version: 4.3.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.control/about.properties b/plugins/org.eclipse.tm.terminal.control/about.properties index ad76531b251..b4986ad91ce 100644 --- a/plugins/org.eclipse.tm.terminal.control/about.properties +++ b/plugins/org.eclipse.tm.terminal.control/about.properties @@ -1,5 +1,5 @@ ################################################################################ -# Copyright (c) 2006, 2016 Wind River Systems, Inc. and others. +# Copyright (c) 2006, 2017 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 @@ -20,5 +20,5 @@ blurb=Target Management Terminal Widget\n\ \n\ Version: {featureVersion}\n\ \n\ -(c) Copyright Wind River Systems, Inc. and others 2003, 2016. All rights reserved.\n\ +(c) Copyright Wind River Systems, Inc. and others 2003, 2017. All rights reserved.\n\ Visit http://www.eclipse.org/tm diff --git a/plugins/org.eclipse.tm.terminal.control/pom.xml b/plugins/org.eclipse.tm.terminal.control/pom.xml index 85d9443b764..6823fde9ba5 100644 --- a/plugins/org.eclipse.tm.terminal.control/pom.xml +++ b/plugins/org.eclipse.tm.terminal.control/pom.xml @@ -11,7 +11,7 @@ ../../admin/pom-build.xml - 4.2.0-SNAPSHOT + 4.3.0-SNAPSHOT org.eclipse.tm.terminal.control eclipse-plugin diff --git a/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/connector/TerminalToRemoteInjectionOutputStream.java b/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/connector/TerminalToRemoteInjectionOutputStream.java index e73568d9306..7db522edc4c 100644 --- a/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/connector/TerminalToRemoteInjectionOutputStream.java +++ b/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/connector/TerminalToRemoteInjectionOutputStream.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008, 2015 Wind River Systems, Inc. and others. + * Copyright (c) 2008, 2017 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 @@ -15,7 +15,13 @@ import java.io.FilterOutputStream; import java.io.IOException; import java.io.OutputStream; -class TerminalToRemoteInjectionOutputStream extends FilterOutputStream { +/** + * @noextend This class is not intended to be subclassed by clients. + * @noreference This class is not intended to be referenced by clients. + * @noinstantiate This class is not intended to be instantiated by clients. + * This class used to be package-protected. It is public only for access by the Unit Tests. + */ +public class TerminalToRemoteInjectionOutputStream extends FilterOutputStream { /** * This class handles bytes written to the {@link TerminalToRemoteInjectionOutputStream}. */ diff --git a/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/emulator/VT100EmulatorBackend.java b/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/emulator/VT100EmulatorBackend.java index 36140d60050..a6ea4e5d23b 100644 --- a/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/emulator/VT100EmulatorBackend.java +++ b/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/emulator/VT100EmulatorBackend.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2015 Wind River Systems, Inc. and others. + * Copyright (c) 2007, 2017 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 @@ -18,6 +18,9 @@ import org.eclipse.tm.terminal.model.ITerminalTextData; import org.eclipse.tm.terminal.model.Style; /** + * @noextend This class is not intended to be subclassed by clients. + * @noreference This class not intended to be referenced by clients. + * It used to be package protected, and it is public only for Unit Tests. * */ public class VT100EmulatorBackend implements IVT100EmulatorBackend { @@ -137,8 +140,13 @@ public class VT100EmulatorBackend implements IVT100EmulatorBackend { setCursor(cl, cc); } } - - int toAbsoluteLine(int line) { + + /** + * @nooverride This method is not intended to be re-implemented or extended by clients. + * @noreference This method is not intended to be referenced by clients. + * It used to be package protected, and it is public only for Unit Tests. + */ + public int toAbsoluteLine(int line) { synchronized (fTerminal) { return fTerminal.getHeight()-fLines+line; } diff --git a/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/model/SnapshotChanges.java b/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/model/SnapshotChanges.java index 362e8cef855..222cc8858cf 100644 --- a/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/model/SnapshotChanges.java +++ b/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/model/SnapshotChanges.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2015 Wind River Systems, Inc. and others. + * Copyright (c) 2007, 2017 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 @@ -16,6 +16,10 @@ import org.eclipse.tm.terminal.model.ITerminalTextData; /** * Collects the changes of the {@link ITerminalTextData} * + * @noextend This class is not intended to be subclassed by clients. + * @noreference This class is not intended to be referenced by clients. + * @noinstantiate This class is not intended to be instantiated by clients. + * This class used to be package-protected. It is public only for access by the Unit Tests. */ public class SnapshotChanges implements ISnapshotChanges { /** @@ -71,8 +75,11 @@ public class SnapshotChanges implements ISnapshotChanges { * @param line * @param size * @return true if the range overlaps with the interest window + * @nooverride This method is not intended to be re-implemented or extended by clients. + * @noreference This method is not intended to be referenced by clients. + * It used to be package protected, and it is public only for Unit Tests. */ - boolean isInInterestWindow(int line, int size) { + public boolean isInInterestWindow(int line, int size) { if(fInterestWindowSize<=0) return true; if(line+size<=fInterestWindowStartLine || line>=fInterestWindowStartLine+fInterestWindowSize) @@ -82,8 +89,11 @@ public class SnapshotChanges implements ISnapshotChanges { /** * @param line * @return true if the line is within the interest window + * @nooverride This method is not intended to be re-implemented or extended by clients. + * @noreference This method is not intended to be referenced by clients. + * It used to be package protected, and it is public only for Unit Tests. */ - boolean isInInterestWindow(int line) { + public boolean isInInterestWindow(int line) { if(fInterestWindowSize<=0) return true; if(line=fInterestWindowStartLine+fInterestWindowSize) @@ -93,8 +103,11 @@ public class SnapshotChanges implements ISnapshotChanges { /** * @param line * @return the line within the window + * @nooverride This method is not intended to be re-implemented or extended by clients. + * @noreference This method is not intended to be referenced by clients. + * It used to be package protected, and it is public only for Unit Tests. */ - int fitLineToWindow(int line) { + public int fitLineToWindow(int line) { if(fInterestWindowSize<=0) return line; if(linebefore {@link #fitLineToWindow(int)} has been called! * @param size * @return the adjusted size. + * @nooverride This method is not intended to be re-implemented or extended by clients. + * @noreference This method is not intended to be referenced by clients. + * It used to be package protected, and it is public only for Unit Tests. + * *

Note:

{@link #fitLineToWindow(int)} has to be called on the line to * move the window correctly! */ - int fitSizeToWindow(int line, int size) { + public int fitSizeToWindow(int line, int size) { if(fInterestWindowSize<=0) return size; if(line../../admin/pom-build.xml - 4.0.100-SNAPSHOT + 4.3.0-SNAPSHOT org.eclipse.tm.terminal.test - eclipse-test-plugin + 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 - - - - + + true + -ea -Xmx512m -XX:MaxPermSize=256m -Drse.enableSecureStoreAccess=false -Dorg.eclipse.swt.browser.UseWebKitGTK=true + + + + + tests + + + + + org.eclipse.tycho + tycho-surefire-plugin + ${tycho-version} + + true + false + org.eclipse.platform.ide + + ${tycho.testArgLine} ${ui.test.vmargs} + org.eclipse.ui.ide.workbench + true + true + p2Installed + + + ${basedir}/tracing/.options + + + + + **/AutomatedPluginTests.* + **/AutomatedTests.* + + + + + + org.codehaus.gmaven + gmaven-plugin + + + validate + + execute + + + + project.properties['qualified.bundle.version'] = project.properties['unqualifiedVersion'].replace('qualifier', project.properties['buildQualifier']) + + + + + + + + org.apache.maven.plugins + maven-antrun-plugin + + + generate-report + post-integration-test + + run + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + org.jacoco + org.jacoco.ant + ${jacoco-version} + + + + + + +