fixed q7 tests
updated target
updated emfstore handler to use api
fixed controls
diff --git a/ECP2/_target/ecp.target b/ECP2/_target/ecp.target
index a60a8eb..dd491d7 100644
--- a/ECP2/_target/ecp.target
+++ b/ECP2/_target/ecp.target
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde version="3.8"?><target name="ECP RCP" sequenceNumber="180">
+<?pde version="3.8"?><target name="ECP RCP" sequenceNumber="181">
<locations>
<location includeAllPlatforms="true" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
<unit id="org.h2" version="1.1.117.v201105142352"/>
@@ -24,13 +24,13 @@
<repository location="http://download.eclipse.org/releases/juno/"/>
</location>
<location includeAllPlatforms="true" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.emf.emfstore.client.transaction.feature.feature.group" version="0.9.3.v20130301-2113"/>
-<unit id="org.eclipse.emf.emfstore.common.feature.feature.group" version="0.9.3.v20130301-2113"/>
-<unit id="org.eclipse.emf.emfstore.client.ui.feature.feature.group" version="0.9.3.v20130301-2113"/>
-<unit id="org.eclipse.emf.emfstore.example.feature.feature.group" version="0.9.3.v20130301-2113"/>
-<unit id="org.eclipse.emf.emfstore.client.feature.feature.group" version="0.9.3.v20130301-2113"/>
-<unit id="org.eclipse.emf.emfstore.server.feature.feature.group" version="0.9.3.v20130301-2113"/>
-<repository location="https://hudson.eclipse.org/hudson/job/emf-emfstore-integration-tycho/650/artifact/git/org.eclipse.emf.emfstore.releng/org.eclipse.emf.emfstore.p2repository/target/repository/"/>
+<unit id="org.eclipse.emf.emfstore.client.transaction.feature.feature.group" version="0.9.3.v20130302-0032"/>
+<unit id="org.eclipse.emf.emfstore.client.ui.feature.feature.group" version="0.9.3.v20130302-0032"/>
+<unit id="org.eclipse.emf.emfstore.client.feature.feature.group" version="0.9.3.v20130302-0032"/>
+<unit id="org.eclipse.emf.emfstore.common.feature.feature.group" version="0.9.3.v20130302-0032"/>
+<unit id="org.eclipse.emf.emfstore.example.feature.feature.group" version="0.9.3.v20130302-0032"/>
+<unit id="org.eclipse.emf.emfstore.server.feature.feature.group" version="0.9.3.v20130302-0032"/>
+<repository location="https://hudson.eclipse.org/hudson/job/emf-emfstore-integration-tycho/651/artifact/git/org.eclipse.emf.emfstore.releng/org.eclipse.emf.emfstore.p2repository/target/repository/"/>
</location>
</locations>
</target>
diff --git a/ECP2/org.eclipse.emf.ecp.core.emffilter/src/org/eclipse/emf/ecp/core/emffilter/DefaultFilter.java b/ECP2/org.eclipse.emf.ecp.core.emffilter/src/org/eclipse/emf/ecp/core/emffilter/DefaultFilter.java
index 6104302..ce4387e 100644
--- a/ECP2/org.eclipse.emf.ecp.core.emffilter/src/org/eclipse/emf/ecp/core/emffilter/DefaultFilter.java
+++ b/ECP2/org.eclipse.emf.ecp.core.emffilter/src/org/eclipse/emf/ecp/core/emffilter/DefaultFilter.java
@@ -49,7 +49,8 @@
addEMFCompareModels(packages);
addGMFModels(packages);
addGraphitiModels(packages);
-
+ addQ7Models(packages);
+
// xml
packages.add("http://www.eclipse.org/xsd/2002/XSD"); //$NON-NLS-1$
packages.add("http://www.w3.org/XML/1998/namespace"); //$NON-NLS-1$
@@ -58,16 +59,53 @@
packages.add("http://www.eclipse.org/acceleo/profiler/3.0"); //$NON-NLS-1$
packages.add("http://www.eclipse.org/acceleo/mtl/3.0"); //$NON-NLS-1$
- //TODO add Graphiti
-
+ // TODO add Graphiti
+
return packages;
}
+ private void addQ7Models(Set<String> packages) {
+ packages.add("http://www.eclipse.org/ecl/ast.ecore");
+ packages.add("http://www.eclipse.org/ecl/invoke/commands.ecore");
+ packages.add("http://www.eclipse.org/debug/runtime/commands.ecore");
+ packages.add("http://www.eclipse.org/ecl/data/commands.ecore");
+ packages.add("http://www.eclipse.org/ecl/platform.ui/commands.ecore");
+ packages.add("http:///com/xored/q7/ecl/context.ecore");
+ packages.add("http://xored.com/x5/core.ecore");
+ packages.add("http://www.eclipse.org/ecl/core.ecore");
+ packages.add("http://xored.com/q7/debug");
+ packages.add("http:///com/xored/tesla/core/diagram.ecore");
+ packages.add("http://www.eclipse.org/ecl/tesla/diagram.ecore");
+ packages.add("http:///com/xored/tesla/core/info.ecore");
+ packages.add("http://xored.com/sherlock/jobs/1.0");
+ packages.add("http://xored.com/q7/sherlock/model.ecore");
+ packages.add("http://www.eclipse.org/ecl/tesla.ecore");
+ packages.add("http://xored.com/q7/core/model.ecore");
+ packages.add("http://www.eclipse.org/ecl/data/objects.ecore");
+ packages.add("http://www.eclipse.org/ecl/platform.ui/objects.ecore");
+ packages.add("http://www.eclipse.org/ecl/operations.ecore");
+ packages.add("http://com/xored/q7/parameters.ecore");
+ packages.add("http://www.eclipse.org/ecl/perf.ecore");
+ packages.add("http://xored.com/x5/data/eclipse/platform.ecore");
+ packages.add("com.xored.q7.preferences");
+ packages.add("http:///com/xored/tesla/core/protocol.ecore");
+ packages.add("http:///com/xored/tesla/core/protocol/raw.ecore");
+ packages.add("http://xored.com/sherlock/report/1.0");
+ packages.add("http://xored.com/sherlock/report/1.0");
+ packages.add("http://com/xored/q7/reporting.ecore");
+ packages.add("http://com/xored/q7/scenario.ecore");
+ packages.add("http://xored.com/sherlock/1.0");
+ packages.add("http://xored.com/x5/dynamic/com.xored.q7.x5.startup");
+ packages.add("http://xored.com/x5/data/system.ecore");
+ packages.add("http:///com/xored/tesla/core/ui.ecore");
+ packages.add("http://xored.com/x5/data/eclipse/workspace.ecore");
+ packages.add("http:///com/xored/q7/workspace.ecore");
+ }
+
private void addGraphitiModels(Set<String> packages) {
packages.add("http://eclipse.org/graphiti/examples/chess");
packages.add("http://eclipse.org/graphiti/mm/algorithms/styles");
-
-
+
}
/**
diff --git a/ECP2/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/internal/swt/controls/MultiControl.java b/ECP2/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/internal/swt/controls/MultiControl.java
index c773005..1dc40dd 100644
--- a/ECP2/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/internal/swt/controls/MultiControl.java
+++ b/ECP2/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/internal/swt/controls/MultiControl.java
@@ -33,6 +33,7 @@
import org.eclipse.emf.ecp.edit.internal.swt.actions.ECPSWTAction;
import org.eclipse.emf.ecp.edit.internal.swt.util.ECPObservableValue;
import org.eclipse.emf.ecp.edit.internal.swt.util.SWTControl;
+import org.eclipse.emf.ecp.editor.util.ECPApplicableTester;
import org.eclipse.emf.ecp.editor.util.StaticApplicableTester;
import org.eclipse.emf.edit.command.MoveCommand;
import org.eclipse.emf.edit.command.RemoveCommand;
@@ -108,16 +109,18 @@
private void findControlDescription(IItemPropertyDescriptor itemPropertyDescriptor, EObject eObject) {
int bestPriority = -1;
for (ControlDescription description : ControlFactory.INSTANCE.getControlDescriptors()) {
- if (StaticApplicableTester.class.isInstance(description.getTester())) {
- StaticApplicableTester tester = (StaticApplicableTester) description.getTester();
- int priority = getTesterPriority(tester, itemPropertyDescriptor, eObject);
- if (bestPriority < priority) {
- bestPriority = priority;
- controlDescription = description;
- supportedClassType = tester.getSupportedClassType();
+ for(ECPApplicableTester tester:description.getTester()){
+ if (StaticApplicableTester.class.isInstance(tester)) {
+ StaticApplicableTester test = (StaticApplicableTester) tester;
+ int priority = getTesterPriority(test, itemPropertyDescriptor, eObject);
+ if (bestPriority < priority) {
+ bestPriority = priority;
+ controlDescription = description;
+ supportedClassType = test.getSupportedClassType();
+ }
+ } else {
+ continue;
}
- } else {
- continue;
}
}
}
diff --git a/ECP2/org.eclipse.emf.ecp.emfstore.ui/src/org/eclipse/emf/ecp/emfstore/internal/ui/handler/CreateBranchHandler.java b/ECP2/org.eclipse.emf.ecp.emfstore.ui/src/org/eclipse/emf/ecp/emfstore/internal/ui/handler/CreateBranchHandler.java
index f5ad364..564d2cb 100644
--- a/ECP2/org.eclipse.emf.ecp.emfstore.ui/src/org/eclipse/emf/ecp/emfstore/internal/ui/handler/CreateBranchHandler.java
+++ b/ECP2/org.eclipse.emf.ecp.emfstore.ui/src/org/eclipse/emf/ecp/emfstore/internal/ui/handler/CreateBranchHandler.java
@@ -14,7 +14,7 @@
import org.eclipse.emf.ecp.emfstore.core.internal.EMFStoreProvider;
import org.eclipse.emf.ecp.spi.core.InternalProject;
-import org.eclipse.emf.emfstore.internal.client.model.ProjectSpace;
+import org.eclipse.emf.emfstore.client.ESLocalProject;
import org.eclipse.emf.emfstore.internal.client.ui.controller.UICreateBranchController;
import org.eclipse.core.commands.AbstractHandler;
@@ -35,7 +35,7 @@
public Object execute(ExecutionEvent event) throws ExecutionException {
InternalProject project = (InternalProject) ((IStructuredSelection) HandlerUtil.getActiveMenuSelection(event))
.getFirstElement();
- ProjectSpace projectSpace = (ProjectSpace) EMFStoreProvider.INSTANCE.getProjectSpace(project);
+ ESLocalProject projectSpace = EMFStoreProvider.INSTANCE.getProjectSpace(project);
// TODO EMFStore constructor missing
new UICreateBranchController(HandlerUtil.getActiveShell(event), projectSpace).execute();
return null;
diff --git a/ECP2/org.eclipse.emf.ecp.emfstore.ui/src/org/eclipse/emf/ecp/emfstore/internal/ui/handler/ManagerUserGroupHandler.java b/ECP2/org.eclipse.emf.ecp.emfstore.ui/src/org/eclipse/emf/ecp/emfstore/internal/ui/handler/ManagerUserGroupHandler.java
index 4bc014a..b478686 100644
--- a/ECP2/org.eclipse.emf.ecp.emfstore.ui/src/org/eclipse/emf/ecp/emfstore/internal/ui/handler/ManagerUserGroupHandler.java
+++ b/ECP2/org.eclipse.emf.ecp.emfstore.ui/src/org/eclipse/emf/ecp/emfstore/internal/ui/handler/ManagerUserGroupHandler.java
@@ -15,8 +15,7 @@
import org.eclipse.emf.ecp.core.ECPRepository;
import org.eclipse.emf.ecp.emfstore.core.internal.EMFStoreProvider;
import org.eclipse.emf.ecp.spi.core.InternalRepository;
-import org.eclipse.emf.emfstore.internal.client.model.ServerInfo;
-import org.eclipse.emf.emfstore.internal.client.model.impl.api.ESServerImpl;
+import org.eclipse.emf.emfstore.client.ESServer;
import org.eclipse.emf.emfstore.internal.client.ui.controller.UIManageOrgUnitsController;
import org.eclipse.core.commands.AbstractHandler;
@@ -38,8 +37,7 @@
final ECPRepository ecpRepository = (ECPRepository) ((IStructuredSelection) HandlerUtil
.getActiveMenuSelection(event)).getFirstElement();
- final ServerInfo serverInfo = ((ESServerImpl) EMFStoreProvider.INSTANCE
- .getServerInfo((InternalRepository) ecpRepository)).getInternalAPIImpl();
+ final ESServer serverInfo = EMFStoreProvider.INSTANCE.getServerInfo((InternalRepository) ecpRepository);
// TODO EMFStore Constructor is missing
new UIManageOrgUnitsController(HandlerUtil.getActiveShell(event), serverInfo.getLastUsersession()).execute();
return null;
diff --git a/ECP2/org.eclipse.emf.ecp.emfstore.ui/src/org/eclipse/emf/ecp/emfstore/internal/ui/handler/ShareProjectHandler.java b/ECP2/org.eclipse.emf.ecp.emfstore.ui/src/org/eclipse/emf/ecp/emfstore/internal/ui/handler/ShareProjectHandler.java
index 6f6ae76..d1a1fbc 100644
--- a/ECP2/org.eclipse.emf.ecp.emfstore.ui/src/org/eclipse/emf/ecp/emfstore/internal/ui/handler/ShareProjectHandler.java
+++ b/ECP2/org.eclipse.emf.ecp.emfstore.ui/src/org/eclipse/emf/ecp/emfstore/internal/ui/handler/ShareProjectHandler.java
@@ -16,6 +16,7 @@
import org.eclipse.emf.ecp.internal.wizards.ShareWizard;
import org.eclipse.emf.ecp.spi.core.InternalProject;
import org.eclipse.emf.ecp.spi.core.InternalRepository;
+import org.eclipse.emf.emfstore.client.ESLocalProject;
import org.eclipse.emf.emfstore.internal.client.model.ServerInfo;
import org.eclipse.emf.emfstore.internal.client.model.impl.api.ESLocalProjectImpl;
import org.eclipse.emf.emfstore.internal.client.model.impl.api.ESServerImpl;
@@ -49,13 +50,14 @@
// TODO internal cast again
InternalRepository repository = (InternalRepository) rw.getSelectedRepository();
project.undispose(repository);
- ESLocalProjectImpl localProject = (ESLocalProjectImpl) EMFStoreProvider.INSTANCE.getProjectSpace(project);
+ ESLocalProject localProject = EMFStoreProvider.INSTANCE.getProjectSpace(project);
// TODO Ugly
if (localProject.getUsersession() == null) {
ESServerImpl server = (ESServerImpl) EMFStoreProvider.INSTANCE.getServerInfo(project.getRepository());
ServerInfo serverInfo = server.getInternalAPIImpl();
- localProject.getInternalAPIImpl().setUsersession(serverInfo.getLastUsersession());
+ ((ESLocalProjectImpl) localProject).getInternalAPIImpl()
+ .setUsersession(serverInfo.getLastUsersession());
}
// TODO EMFStore Constructor is missing
new UIShareProjectController(HandlerUtil.getActiveShell(event), localProject).execute();
diff --git a/ECPQ7Tests/Editor/Double.test b/ECPQ7Tests/Editor/Double.test
index a1bf359..e11a3ba 100644
--- a/ECPQ7Tests/Editor/Double.test
+++ b/ECPQ7Tests/Editor/Double.test
@@ -7,7 +7,7 @@
Element-Version: 3.0
External-Reference:
Id: _k5jCAHHZEeKndsdNMEr_UQ
-Save-Time: 2/14/13 11:14 AM
+Save-Time: 3/2/13 1:17 AM
Testcase-Type: ecl
------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac
@@ -36,7 +36,7 @@
get-editor "Player Jonas" | get-editbox -after [get-label Height] | set-text hallo89
with [get-editor "Player Jonas" | get-editbox -after [get-label Height]] {
get-property "decorators.visible" -index 0 | equals true | verify-true
- get-property "decorators.description" -index 0 | equals "Invalid input" | verify-true
+ get-property "decorators.description" -index 0 | equals "Invalid input For input string: \"hallo89\"" | verify-true
}
get-editor "Player Jonas" | get-editbox -after [get-label Height] | set-text "656.89"
@@ -49,7 +49,7 @@
}
with [get-editor "Player Jonas" | get-editbox -after [get-label Height]] {
get-property "decorators.visible" -index 0 | equals false | verify-true
- get-property "decorators.description" -index 0 | equals "Invalid input" | verify-true
+ get-property "decorators.description" -index 0 | equals "Invalid input For input string: \"hallo89\""| verify-true
}
get-editor "Player Jonas" | close
get-view "Model Explorer" | get-tree | select "TestProject/League America/Player Jonas" | double-click
diff --git a/ECPQ7Tests/Editor/Int.test b/ECPQ7Tests/Editor/Int.test
index b0dc99b..08158f3 100644
--- a/ECPQ7Tests/Editor/Int.test
+++ b/ECPQ7Tests/Editor/Int.test
@@ -7,7 +7,7 @@
Element-Version: 3.0
External-Reference:
Id: _1mLz4HHYEeKndsdNMEr_UQ
-Save-Time: 2/14/13 11:20 AM
+Save-Time: 3/2/13 12:58 AM
Testcase-Type: ecl
------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac
@@ -29,7 +29,7 @@
| set-text 9987999999999999999999999999999999999999
with [get-editor "Player Jonas" | get-editbox -after [get-label "Number Of Victories"]] {
get-property "decorators.visible" -index 0 | equals true | verify-true
- get-property "decorators.description" -index 0 | equals "Invalid input" | verify-true
+ get-property "decorators.description" -index 0 | equals "Invalid input For input string: \"9987999999999999999999999999999999999999\"" | verify-true
}
get-view "Model Explorer" | get-tree | select "TestProject/League America/Player Maximilian" | double-click
get-editor "Player Jonas" | click
diff --git a/ECPQ7Tests/successfull/DirtyDecorator.test b/ECPQ7Tests/successfull/DirtyDecorator.test
index c05fcd5..f1fdf1d 100644
--- a/ECPQ7Tests/successfull/DirtyDecorator.test
+++ b/ECPQ7Tests/successfull/DirtyDecorator.test
@@ -7,7 +7,7 @@
Element-Version: 3.0
External-Reference:
Id: _z2GgIEBxEeKAxsN-kffdlw
-Save-Time: 2/15/13 6:11 PM
+Save-Time: 3/2/13 1:21 AM
Testcase-Type: ecl
------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac
@@ -89,7 +89,8 @@
get-view "Model Explorer" | get-tree | get-item TestProjectSecondCheckout
| get-property "getImage().getImageData().transparentPixel" | equals [get-by-os -macosx "0" -win "53" -linux "0"] | verify-true
get-view "Model Explorer" | get-tree | get-menu "Create new project" | click
-with [get-window "Create EMFStore Project"] {
+with [get-window "Create Project"] {
+ get-combo -after [get-label "Provider:"] | set-text EMFStore
get-editbox -after [get-label "Project Name:"] | set-text NeuesProjekt
get-button Finish | click
}
