Skip to content

Nat table - Do not Merge - Just for review #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 26 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
fc13a1a
Bug 462627 - Support for Nebula NatTable
andyeq May 28, 2015
8125d2f
Merge remote-tracking branch 'origin/master' into natTableSupport
haiodo Oct 2, 2015
e5d3d2d
Merge remote-tracking branch 'origin/master' into natTableSupport
haiodo Oct 5, 2015
5053c4f
Merge branch 'master' into natTableSupport
haiodo Oct 7, 2015
044f46a
* Version fixes to build Nebula support
haiodo Oct 7, 2015
6a2077b
Fix build target platform used by Runtime 3x
haiodo Oct 7, 2015
c8e847e
Build agains latest nebula release.
haiodo Oct 7, 2015
586f704
Include nebula modules to product.
haiodo Oct 12, 2015
72ed62a
Some nebula build fixes
haiodo Oct 14, 2015
161b915
Correct Nattacble build
haiodo Oct 15, 2015
8b325f1
Build update
haiodo Oct 15, 2015
1e919b1
Revert to tyco 0.22.0 since OS X bundle are invalid.
haiodo Oct 15, 2015
416cf36
Add the get-nat-table command.
Nov 3, 2015
4628e6b
Add NatTable-specific GetCell and SetSelection commands.
Nov 6, 2015
ca78d79
Make get-cell work with click and mouse commands for selecting single…
Nov 9, 2015
0f81b42
Support selecting multiple cells using the shift and ctrl keys.
Nov 9, 2015
ffeee0e
Add get-row-header and get-column-header ECL commands.
Nov 10, 2015
a62db71
Rename ...nebula.nattable... to ...nattable..., since the modules are…
Nov 10, 2015
c02ee9f
Add support for getting rows and columns by text instead of coordinate.
Nov 13, 2015
f220f77
Use only position coordinates for NatTable cells, not index coordinates.
Nov 16, 2015
44f7768
Properly clean up NatTableRecordingProcessor.mouseDownEvents after a …
Nov 16, 2015
e7b3708
Record NatTable cell selectors as get-cell commands.
Nov 16, 2015
3fc578c
Fix Maven build.
Nov 16, 2015
77fa19c
Handle cell positions specified by header text everywhere.
Nov 17, 2015
03892b7
Update antrunner plugin version
haiodo Nov 17, 2015
a23bfd6
Add NatTable plug-ins to the nebula features.
Nov 17, 2015
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ modules/nebula/plugins/org.eclipse.rcptt.module.nebula.updates/runtime/
.DS_Store
/workspace/
.settings/
m2
*.log
!*verifications.log*
/ecl/tests/org.eclipse.ecl.doc.tests/output/core.html
Expand Down
48 changes: 48 additions & 0 deletions build_local.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
#!/bin/sh
export MAVEN_OPTS="-Xms512m -Xmx756m -XX:MaxPermSize=256m"

export MAVEN_EXTRA="-Dmaven.repo.local=./m2"
OPTIONS="-Dtycho.localArtifacts=ignore $MAVEN_EXTRA $@"

echo ""
read -p "Build Core(y/n)? " -e -r
if [[ $REPLY =~ ^[Yy]$ ]]
then
mvn clean install -f releng/core/pom.xml $OPTIONS
fi

export REPLY=""

echo ""
read -p "Build Runtime 3x(y/n)? " -e -r
if [[ $REPLY =~ ^[Yy]$ ]]
then
mvn clean install -f releng/runtime/pom.xml -P runtime3x $OPTIONS
fi

export REPLY=""

echo ""
read -p "Build Runtime 4x(y/n)? " -e -r
if [[ $REPLY =~ ^[Yy]$ ]]
then
mvn clean install -f releng/runtime/pom.xml -P runtime4x $OPTIONS
fi

export REPLY=""

echo ""
read -p "Build IDE and modules(y/n)? " -e -r
if [[ $REPLY =~ ^[Yy]$ ]]
then
mvn clean install -f releng/ide/pom.xml $OPTIONS
fi

export REPLY=""

echo ""
read -p "Build Product(y/n)? " -e -r
if [[ $REPLY =~ ^[Yy]$ ]]
then
mvn clean install -f releng/rcptt/pom.xml $OPTIONS
fi
58 changes: 28 additions & 30 deletions clean-pom.xml
Original file line number Diff line number Diff line change
@@ -1,45 +1,43 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>com.xored.q7</groupId>
<artifactId>q7.clean</artifactId>
<version>2.1.0-SNAPSHOT</version>
<packaging>pom</packaging>

<properties>
<repo>${settings.localRepository}</repo>
</properties>
<build>
<plugins>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
<phase>package</phase>
<configuration>
<tasks>
<delete failonerror="false" dir="${repo}/org/eclipse/rcptt" />
<delete failonerror="false" dir="${repo}/.cache/tycho" />
<delete failonerror="false" file="${repo}/.meta/p2-local-metadata.properties" />
<delete failonerror="false" includeEmptyDirs="true">
<fileset dir="${repo}/p2/osgi/bundle">
<include name="org.eclipse.rcptt*/**" />
</fileset>
</delete>
<delete failonerror="false" includeEmptyDirs="true">
<fileset dir="${repo}/p2/org/eclipse/update/feature">
<include name="org.eclipse.rcptt*/**" />
</fileset>
</delete>
</tasks>
</configuration>
<goals>
<goal>run</goal>
</goals>
</execution>
</executions>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
<phase>package</phase>
<configuration>
<tasks>
<delete dir="${repo}/org/eclipse/rcptt" failonerror="false"/>
<delete dir="${repo}/.cache/tycho" failonerror="false"/>
<delete failonerror="false" file="${repo}/.meta/p2-local-metadata.properties"/>
<delete failonerror="false" includeEmptyDirs="true">
<fileset dir="${repo}/p2/osgi/bundle">
<include name="org.eclipse.rcptt*/**"/>
</fileset>
</delete>
<delete failonerror="false" includeEmptyDirs="true">
<fileset dir="${repo}/p2/org/eclipse/update/feature">
<include name="org.eclipse.rcptt*/**"/>
</fileset>
</delete>
</tasks>
</configuration>
<goals>
<goal>run</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
</project>
8 changes: 1 addition & 7 deletions core/org.eclipse.rcptt.core-feature/feature.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ Not used in runtime.
<import plugin="org.eclipse.emf.transaction"/>
<import plugin="org.eclipse.emf.workspace"/>
<import feature="org.eclipse.rcptt.ecl.core" version="2.1.0.qualifier"/>
<import plugin="com.google.guava"/>
</requires>

<plugin
Expand Down Expand Up @@ -264,11 +265,4 @@ Not used in runtime.
version="2.1.0.qualifier"
unpack="false"/>

<plugin
id="com.google.guava"
download-size="0"
install-size="0"
version="15.0.0"
unpack="false"/>

</feature>
2 changes: 1 addition & 1 deletion core/org.eclipse.rcptt.core.search/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Bundle-SymbolicName: org.eclipse.rcptt.core.search
Bundle-Version: 2.1.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Require-Bundle: org.antlr.runtime;bundle-version="3.2.0",
org.eclipse.rcptt.core;bundle-version="2.0.0",
org.eclipse.rcptt.core;bundle-version="2.1.0",
org.eclipse.core.runtime
Export-Package: org.eclipse.rcptt.core.search.tags
Bundle-Vendor: Eclipse RCP Testing Tool Project
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
import java.util.List;

import org.eclipse.emf.common.util.EList;

import org.eclipse.rcptt.tesla.core.protocol.raw.Element;

public class ViewerUIElement extends ControlUIElement {
Expand Down Expand Up @@ -95,6 +94,7 @@ public boolean setMultiSelectionList(List<List<String>> selection,
* @param path
* @return
*/
@Deprecated
public boolean selectItem(String... path) {
return this.selector.set_item.path(path).select();
}
Expand Down Expand Up @@ -169,6 +169,13 @@ public void activateCellEditor(int column) {
player.safeExecuteCommand(cmd);
}

public void activateCellEditor(String path) {
ActivateCellEditor cmd = factory.createActivateCellEditor();
cmd.setElement(getElement());
cmd.getPath().add(path);
player.safeExecuteCommand(cmd);
}

public void applyCellEditor() {
ApplyCellEditor cmd = factory.createApplyCellEditor();
cmd.setElement(getElement());
Expand All @@ -190,6 +197,7 @@ public void cancelCellEditor() {
* @deprecated
* @param index
*/
@Deprecated
public void cellClick(int index) {
CellClick click = factory.createCellClick();
click.setColumn(index);
Expand Down
2 changes: 1 addition & 1 deletion core/org.eclipse.rcptt.tesla.ecl/model/tesla.ecore
Original file line number Diff line number Diff line change
Expand Up @@ -1726,7 +1726,7 @@
<eClassifiers xsi:type="ecore:EClass" name="DecryptResult">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="value" lowerBound="1" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="RestartAut" eSuperTypes="../../org.eclipse.rcptt.ecl.core/model/ecl.ecore#//Command">
<eClassifiers xsi:type="ecore:EClass" name="RestartAut" eSuperTypes="../../org.eclipse.rcptt.ecl.core/model/ecl.ecore#//Command">
<eAnnotations source="http://www.eclipse.org/ecl/docs">
<details key="description" value="Restarts AUT.&#xA;Can be used if there in no File/Restart option in AUT.&#xA;&#xA;Please note that &lt;a href=&quot;#wait-until-eclipse-is-ready&quot;>wait-until-eclipse-is-ready&lt;/a> command should be used &#xA;immidiately after restart-aut command. "/>
<details key="example" value="get-view &quot;Package Explorer&quot; | get-tree | get-menu &quot;New/Java Project&quot; | click&#xA;with [get-window &quot;New Java Project&quot;] {&#xA; with [get-editbox -after [get-label &quot;Project name:&quot;]] {&#xA; set-text MyProjec&#xA; set-text MyProject&#xA; }&#xA; get-button Finish | click&#xA;}&#xA;&#xA;restart-aut&#xA;&#xA;wait-until-eclipse-is-ready&#xA;&#xA;get-view &quot;Package Explorer&quot; | get-tree | get-property itemCount | equals 1 | verify-true"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@ Require-Bundle: org.eclipse.core.runtime,
org.eclipse.rcptt.ecl.core;bundle-version="[2.1.0,3.0.0)";visibility:=reexport,
org.junit,
org.eclipse.rcptt.ecl.parser;bundle-version="[2.1.0,3.0.0)",
org.eclipse.rcptt.ecl.interop;bundle-version="2.0.0"
org.eclipse.rcptt.ecl.interop;bundle-version="2.1.0"
Bundle-ActivationPolicy: lazy
2 changes: 1 addition & 1 deletion examples/rcptt.extensions.ecl/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<repository>
<id>rcptt</id>
<layout>p2</layout>
<url>http://download.eclipse.org/rcptt/nightly/2.0.0/latest/repository/</url>
<url>http://download.eclipse.org/rcptt/nightly/2.1.0/latest/repository/</url>
</repository>
</repositories>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,6 @@
<rcptt-version>2.1.0-SNAPSHOT</rcptt-version>
<rcptt-runner-version>2.1.0-SNAPSHOT</rcptt-runner-version>
<rcptt-maven-group>org.eclipse.rcptt</rcptt-maven-group>
<rcptt-maven-version>2.0.0-SNAPSOT</rcptt-maven-version>
<rcptt-maven-version>2.1.0-SNAPSOT</rcptt-maven-version>
</properties>
</project>
Original file line number Diff line number Diff line change
Expand Up @@ -25,21 +25,21 @@
unpack="false"/>

<plugin
id="org.eclipse.rcptt.tesla.nebula.impl"
id="org.eclipse.rcptt.tesla.nebula.ecl"
download-size="0"
install-size="0"
version="2.1.0.qualifier"
unpack="false"/>

<plugin
id="org.eclipse.rcptt.tesla.nebula.ecl"
id="org.eclipse.rcptt.tesla.nebula.ecl.impl"
download-size="0"
install-size="0"
version="2.1.0.qualifier"
unpack="false"/>

<plugin
id="org.eclipse.rcptt.tesla.nebula.ecl.impl"
id="org.eclipse.rcptt.tesla.nebula.impl"
download-size="0"
install-size="0"
version="2.1.0.qualifier"
Expand All @@ -52,4 +52,53 @@
version="2.1.0.qualifier"
unpack="false"/>

<plugin
id="org.eclipse.rcptt.tesla.recording.nebula.ecl"
download-size="0"
install-size="0"
version="2.1.0.qualifier"
unpack="false"/>

<plugin
id="org.eclipse.rcptt.tesla.nattable"
download-size="0"
install-size="0"
version="2.1.0.qualifier"
unpack="false"/>

<plugin
id="org.eclipse.rcptt.tesla.nattable.ecl"
download-size="0"
install-size="0"
version="2.1.0.qualifier"
unpack="false"/>

<plugin
id="org.eclipse.rcptt.tesla.nattable.ecl.impl"
download-size="0"
install-size="0"
version="2.1.0.qualifier"
unpack="false"/>

<plugin
id="org.eclipse.rcptt.tesla.nattable.impl"
download-size="0"
install-size="0"
version="2.1.0.qualifier"
unpack="false"/>

<plugin
id="org.eclipse.rcptt.tesla.recording.nattable"
download-size="0"
install-size="0"
version="2.1.0.qualifier"
unpack="false"/>

<plugin
id="org.eclipse.rcptt.tesla.recording.nattable"
download-size="0"
install-size="0"
version="2.1.0.qualifier"
unpack="false"/>

</feature>
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,27 @@
version="2.1.0.qualifier"
unpack="false"/>

<plugin
id="org.eclipse.rcptt.tesla.nattable"
download-size="0"
install-size="0"
version="2.1.0.qualifier"
unpack="false"/>

<plugin
id="org.eclipse.rcptt.tesla.nattable.ecl"
download-size="0"
install-size="0"
version="2.1.0.qualifier"
unpack="false"/>

<plugin
id="org.eclipse.rcptt.tesla.recording.nattable.ecl"
download-size="0"
install-size="0"
version="2.1.0.qualifier"
unpack="false"/>

<plugin
id="org.eclipse.rcptt.module.nebula.updates"
download-size="0"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<q7runtime
kind="extra"
path="platform:///plugin/org.eclipse.rcptt.module.nebula.updates/runtime/"
version="[3.4,4.5]">
version="[3.4,4.6]">
</q7runtime>
</extension>
</plugin>
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>org.eclipse.rcptt.tesla.nattable.ecl.impl</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.pde.ManifestBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.pde.SchemaBuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
</projectDescription>
Loading