Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorashatalin2009-01-10 10:54:49 -0500
committerashatalin2009-01-10 10:54:49 -0500
commitd8d50358782da2e3514ad7406ccb3d46242605eb (patch)
tree624b357cbf281e4176bd9ffdcc10a0b2c3c114ae
parent5bf10b95e7a7fa13ee38cc630358a81f182c386a (diff)
downloadorg.eclipse.gmf-tooling-d8d50358782da2e3514ad7406ccb3d46242605eb.tar.gz
org.eclipse.gmf-tooling-d8d50358782da2e3514ad7406ccb3d46242605eb.tar.xz
org.eclipse.gmf-tooling-d8d50358782da2e3514ad7406ccb3d46242605eb.zip
OCL keywords are prefixed with "_" in collection expression iterator name
-rw-r--r--tests/org.eclipse.gmf.tests.xpand.migration/resources/org/eclipse/gmf/tests/xpand/migration/CollectionExpression.ext12
-rw-r--r--tests/org.eclipse.gmf.tests.xpand.migration/resources/org/eclipse/gmf/tests/xpand/migration/CollectionExpression.qvto12
2 files changed, 12 insertions, 12 deletions
diff --git a/tests/org.eclipse.gmf.tests.xpand.migration/resources/org/eclipse/gmf/tests/xpand/migration/CollectionExpression.ext b/tests/org.eclipse.gmf.tests.xpand.migration/resources/org/eclipse/gmf/tests/xpand/migration/CollectionExpression.ext
index 1150d875f..14e01a1d1 100644
--- a/tests/org.eclipse.gmf.tests.xpand.migration/resources/org/eclipse/gmf/tests/xpand/migration/CollectionExpression.ext
+++ b/tests/org.eclipse.gmf.tests.xpand.migration/resources/org/eclipse/gmf/tests/xpand/migration/CollectionExpression.ext
@@ -1,7 +1,7 @@
import "http://www.eclipse.org/emf/2002/Ecore";
List[String] collectCall(ecore::EPackage ePackage) :
- ePackage.eClassifiers.collect(cl | cl.name)
+ ePackage.eClassifiers.collect(self | self.name)
;
List[String] collectCallImplicitIterator(ecore::EPackage ePackage) :
@@ -9,7 +9,7 @@ List[String] collectCallImplicitIterator(ecore::EPackage ePackage) :
;
List[ecore::EClassifier] selectCall(ecore::EPackage ePackage, ecore::EJavaObject javaObject) :
- ePackage.eClassifiers.select(cl | cl.isInstance(javaObject))
+ ePackage.eClassifiers.select(query | query.isInstance(javaObject))
;
List[ecore::EClassifier] selectCallImplicitIterator(ecore::EPackage ePackage, ecore::EJavaObject javaObject) :
@@ -17,7 +17,7 @@ List[ecore::EClassifier] selectCallImplicitIterator(ecore::EPackage ePackage, ec
;
List[ecore::EClassifier] rejectCall(ecore::EPackage ePackage, ecore::EJavaObject javaObject) :
- ePackage.eClassifiers.reject(cl | cl.isInstance(javaObject))
+ ePackage.eClassifiers.reject(helper | helper.isInstance(javaObject))
;
List[ecore::EClassifier] rejectCallImplicitIterator(ecore::EPackage ePackage, ecore::EJavaObject javaObject) :
@@ -25,7 +25,7 @@ List[ecore::EClassifier] rejectCallImplicitIterator(ecore::EPackage ePackage, ec
;
Boolean existsCall(ecore::EPackage ePackage, ecore::EJavaObject javaObject) :
- ePackage.eClassifiers.exists(cl | cl.isInstance(javaObject))
+ ePackage.eClassifiers.exists(inout | inout.isInstance(javaObject))
;
Boolean existsCallImplicitIterator(ecore::EPackage ePackage, ecore::EJavaObject javaObject) :
@@ -33,7 +33,7 @@ Boolean existsCallImplicitIterator(ecore::EPackage ePackage, ecore::EJavaObject
;
Boolean notExistsCall(ecore::EPackage ePackage, ecore::EJavaObject javaObject) :
- ePackage.eClassifiers.notExists(cl | cl.isInstance(javaObject))
+ ePackage.eClassifiers.notExists(when | when.isInstance(javaObject))
;
Boolean notExistsCallImplicitIterator(ecore::EPackage ePackage, ecore::EJavaObject javaObject) :
@@ -41,7 +41,7 @@ Boolean notExistsCallImplicitIterator(ecore::EPackage ePackage, ecore::EJavaObje
;
Boolean forAllCall(ecore::EPackage ePackage, ecore::EJavaObject javaObject) :
- ePackage.eClassifiers.forAll(cl | cl.isInstance(javaObject))
+ ePackage.eClassifiers.forAll(var | var.isInstance(javaObject))
;
Boolean forAllCallImplicitIterator(ecore::EPackage ePackage, ecore::EJavaObject javaObject) :
diff --git a/tests/org.eclipse.gmf.tests.xpand.migration/resources/org/eclipse/gmf/tests/xpand/migration/CollectionExpression.qvto b/tests/org.eclipse.gmf.tests.xpand.migration/resources/org/eclipse/gmf/tests/xpand/migration/CollectionExpression.qvto
index 2718db174..c248a669f 100644
--- a/tests/org.eclipse.gmf.tests.xpand.migration/resources/org/eclipse/gmf/tests/xpand/migration/CollectionExpression.qvto
+++ b/tests/org.eclipse.gmf.tests.xpand.migration/resources/org/eclipse/gmf/tests/xpand/migration/CollectionExpression.qvto
@@ -3,7 +3,7 @@ modeltype ecore uses "http://www.eclipse.org/emf/2002/Ecore";
library CollectionExpression;
helper collectCall(ePackage : ecore::EPackage) : Sequence(String) {
- return ePackage.eClassifiers->collect(cl | cl.name)
+ return ePackage.eClassifiers->collect(_self | _self.name)
}
helper collectCallImplicitIterator(ePackage : ecore::EPackage) : Sequence(String) {
@@ -11,7 +11,7 @@ helper collectCallImplicitIterator(ePackage : ecore::EPackage) : Sequence(String
}
helper selectCall(ePackage : ecore::EPackage, javaObject : OclAny) : Sequence(ecore::EClassifier) {
- return ePackage.eClassifiers->select(cl | cl.isInstance(javaObject))->asSequence()
+ return ePackage.eClassifiers->select(_query | _query.isInstance(javaObject))->asSequence()
}
helper selectCallImplicitIterator(ePackage : ecore::EPackage, javaObject : OclAny) : Sequence(ecore::EClassifier) {
@@ -19,7 +19,7 @@ helper selectCallImplicitIterator(ePackage : ecore::EPackage, javaObject : OclAn
}
helper rejectCall(ePackage : ecore::EPackage, javaObject : OclAny) : Sequence(ecore::EClassifier) {
- return ePackage.eClassifiers->reject(cl | cl.isInstance(javaObject))->asSequence()
+ return ePackage.eClassifiers->reject(_helper | _helper.isInstance(javaObject))->asSequence()
}
helper rejectCallImplicitIterator(ePackage : ecore::EPackage, javaObject : OclAny) : Sequence(ecore::EClassifier) {
@@ -27,7 +27,7 @@ helper rejectCallImplicitIterator(ePackage : ecore::EPackage, javaObject : OclAn
}
helper existsCall(ePackage : ecore::EPackage, javaObject : OclAny) : Boolean {
- return ePackage.eClassifiers->exists(cl | cl.isInstance(javaObject))
+ return ePackage.eClassifiers->exists(_inout | _inout.isInstance(javaObject))
}
helper existsCallImplicitIterator(ePackage : ecore::EPackage, javaObject : OclAny) : Boolean {
@@ -35,7 +35,7 @@ helper existsCallImplicitIterator(ePackage : ecore::EPackage, javaObject : OclAn
}
helper notExistsCall(ePackage : ecore::EPackage, javaObject : OclAny) : Boolean {
- return not ePackage.eClassifiers->exists(cl | cl.isInstance(javaObject))
+ return not ePackage.eClassifiers->exists(_when | _when.isInstance(javaObject))
}
helper notExistsCallImplicitIterator(ePackage : ecore::EPackage, javaObject : OclAny) : Boolean {
@@ -43,7 +43,7 @@ helper notExistsCallImplicitIterator(ePackage : ecore::EPackage, javaObject : Oc
}
helper forAllCall(ePackage : ecore::EPackage, javaObject : OclAny) : Boolean {
- return ePackage.eClassifiers->forAll(cl | cl.isInstance(javaObject))
+ return ePackage.eClassifiers->forAll(_var | _var.isInstance(javaObject))
}
helper forAllCallImplicitIterator(ePackage : ecore::EPackage, javaObject : OclAny) : Boolean {

Back to the top