Attachment 147054 Details for Bug 259031 – Interim implementation of oclType

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] Interim implementation of oclType

OclType.patch (text/plain), 18.96 KB, created by Ed Willink

on 2009-09-13 02:34:52 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Ed Willink

Created: 2009-09-13 02:34:52 EDT

Size: 18.96 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.ocl
>Index: src/org/eclipse/ocl/util/OCLStandardLibraryUtil.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.mdt/org.eclipse.ocl/plugins/org.eclipse.ocl/src/org/eclipse/ocl/util/OCLStandardLibraryUtil.java,v
>retrieving revision 1.14
>diff -u -r1.14 OCLStandardLibraryUtil.java
>--- src/org/eclipse/ocl/util/OCLStandardLibraryUtil.java	1 Sep 2009 20:11:23 -0000	1.14
>+++ src/org/eclipse/ocl/util/OCLStandardLibraryUtil.java	13 Sep 2009 06:30:01 -0000
>@@ -121,6 +121,7 @@
> 		operationCodes.put(GREATER_THAN_EQUAL_NAME, GREATER_THAN_EQUAL);
> 		operationCodes.put(OCL_IS_NEW_NAME, OCL_IS_NEW);
> 		operationCodes.put(OCL_IS_IN_STATE_NAME, OCL_IS_IN_STATE);
>+		operationCodes.put(OCL_TYPE_NAME, OCL_TYPE);
> 		operationCodes.put(HAS_RETURNED_NAME, HAS_RETURNED);
> 		operationCodes.put(RESULT_NAME, RESULT);
> 		operationCodes.put(IS_SIGNAL_SENT_NAME, IS_SIGNAL_SENT);
>@@ -178,6 +179,7 @@
> 		oclAnyOperationCodes.put(GREATER_THAN_EQUAL_NAME, GREATER_THAN_EQUAL);
> 		oclAnyOperationCodes.put(OCL_IS_NEW_NAME, OCL_IS_NEW);
> 		oclAnyOperationCodes.put(OCL_IS_IN_STATE_NAME, OCL_IS_IN_STATE);
>+		oclAnyOperationCodes.put(OCL_TYPE_NAME, OCL_TYPE);
> 	}
> 
> 	// not instantiable by clients
>@@ -307,6 +309,8 @@
> 				return OCL_IS_NEW_NAME;
> 			case OCL_IS_IN_STATE :
> 				return OCL_IS_IN_STATE_NAME;
>+			case OCL_TYPE :
>+				return OCL_TYPE_NAME;
> 			case HAS_RETURNED :
> 				return HAS_RETURNED_NAME;
> 			case RESULT :
>@@ -1251,6 +1255,8 @@
> 			OCL_IS_NEW_NAME));
> 		result.add(createBinaryOperation(uml, stdlib.getBoolean(),
> 			OCL_IS_IN_STATE_NAME, stdlib.getState(), "statespec")); //$NON-NLS-1$
>+		result.add(createUnaryOperation(uml, stdlib.getOclType(),
>+			OCL_TYPE_NAME));
> 
> 		return result;
> 	}
>Index: src/org/eclipse/ocl/AbstractTypeChecker.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.mdt/org.eclipse.ocl/plugins/org.eclipse.ocl/src/org/eclipse/ocl/AbstractTypeChecker.java,v
>retrieving revision 1.5
>diff -u -r1.5 AbstractTypeChecker.java
>--- src/org/eclipse/ocl/AbstractTypeChecker.java	1 Sep 2009 20:11:23 -0000	1.5
>+++ src/org/eclipse/ocl/AbstractTypeChecker.java	13 Sep 2009 06:29:58 -0000
>@@ -34,7 +34,6 @@
> import org.eclipse.emf.common.util.EList;
> import org.eclipse.emf.ecore.ENamedElement;
> import org.eclipse.ocl.expressions.CollectionKind;
>-import org.eclipse.ocl.expressions.TypeExp;
> import org.eclipse.ocl.expressions.Variable;
> import org.eclipse.ocl.internal.l10n.OCLMessages;
> import org.eclipse.ocl.lpg.BasicEnvironment;
>@@ -1012,7 +1011,7 @@
> 
> 			// handle parameters of type OclType
> 			if (popType instanceof TypeType<?, ?>) {
>-				if (arg instanceof TypeExp<?>) {
>+				if (argType instanceof TypeType<?, ?>) {
> 					continue;
> 				}
> 				return false;
>Index: src/org/eclipse/ocl/EvaluationVisitorImpl.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.mdt/org.eclipse.ocl/plugins/org.eclipse.ocl/src/org/eclipse/ocl/EvaluationVisitorImpl.java,v
>retrieving revision 1.3
>diff -u -r1.3 EvaluationVisitorImpl.java
>--- src/org/eclipse/ocl/EvaluationVisitorImpl.java	1 Sep 2009 20:11:23 -0000	1.3
>+++ src/org/eclipse/ocl/EvaluationVisitorImpl.java	13 Sep 2009 06:29:59 -0000
>@@ -402,6 +402,10 @@
> 						return (sourceVal == getInvalid())?
> 								Boolean.TRUE : Boolean.FALSE;
> 
>+					case PredefinedType.OCL_TYPE:
>+						// OclAny::oclType()
>+						return sourceType;
>+
> 					case PredefinedType.SIZE:
> 						if (sourceType == getString()) {
> 							// String::size()
>@@ -1290,6 +1294,11 @@
> 				}
> 			}
> 
>+			// AnyType::oclType()
>+			else if (opCode == PredefinedType.OCL_TYPE) {
>+				return sourceType;
>+			}
>+
> 			// Handle < (lessThan)
> 			else if ((opCode == PredefinedType.LESS_THAN) && (sourceVal instanceof Comparable<?>)) {
> 				@SuppressWarnings("unchecked")
>Index: src/org/eclipse/ocl/utilities/PredefinedType.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.mdt/org.eclipse.ocl/plugins/org.eclipse.ocl/src/org/eclipse/ocl/utilities/PredefinedType.java,v
>retrieving revision 1.5
>diff -u -r1.5 PredefinedType.java
>--- src/org/eclipse/ocl/utilities/PredefinedType.java	30 Nov 2008 22:11:38 -0000	1.5
>+++ src/org/eclipse/ocl/utilities/PredefinedType.java	13 Sep 2009 06:30:02 -0000
>@@ -192,6 +192,16 @@
> 
> 	String OCL_IS_IN_STATE_NAME = "oclIsInState"; //$NON-NLS-1$
> 
>+	/**
>+	 * @since 3.0
>+	 */
>+	int OCL_TYPE = 73;
>+
>+	/**
>+	 * @since 3.0
>+	 */
>+	String OCL_TYPE_NAME = "oclType"; //$NON-NLS-1$
>+
> 	/*
> 	 * OclMessage operations
> 	 */
>Index: src/org/eclipse/ocl/internal/helper/OCLSyntaxHelper.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.mdt/org.eclipse.ocl/plugins/org.eclipse.ocl/src/org/eclipse/ocl/internal/helper/OCLSyntaxHelper.java,v
>retrieving revision 1.15
>diff -u -r1.15 OCLSyntaxHelper.java
>--- src/org/eclipse/ocl/internal/helper/OCLSyntaxHelper.java	4 Sep 2009 13:40:43 -0000	1.15
>+++ src/org/eclipse/ocl/internal/helper/OCLSyntaxHelper.java	13 Sep 2009 06:30:00 -0000
>@@ -132,6 +132,7 @@
> 		ANY_TYPE_OPERATIONS.add(PredefinedType.OCL_IS_INVALID_NAME);
> 		ANY_TYPE_OPERATIONS.add(PredefinedType.OCL_IS_NEW_NAME);
> 		ANY_TYPE_OPERATIONS.add(PredefinedType.OCL_IS_IN_STATE_NAME);
>+		ANY_TYPE_OPERATIONS.add(PredefinedType.OCL_TYPE_NAME);
> 		ANY_TYPE_OPERATIONS.add(PredefinedType.LESS_THAN_NAME);
> 		ANY_TYPE_OPERATIONS.add(PredefinedType.GREATER_THAN_NAME);
> 		ANY_TYPE_OPERATIONS.add(PredefinedType.LESS_THAN_EQUAL_NAME);
>#P org.eclipse.ocl.ecore
>Index: model/oclstdlib.ecore
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.mdt/org.eclipse.ocl/plugins/org.eclipse.ocl.ecore/model/oclstdlib.ecore,v
>retrieving revision 1.4
>diff -u -r1.4 oclstdlib.ecore
>--- model/oclstdlib.ecore	11 May 2008 05:37:13 -0000	1.4
>+++ model/oclstdlib.ecore	13 Sep 2009 06:30:04 -0000
>@@ -28,6 +28,7 @@
>       <eOperations name="oclIsInState" eType="#/0/Boolean">
>         <eParameters name="statespec" eType="#/0/State"/>
>       </eOperations>
>+      <eOperations name="oclType" eType="#/0/OclType"/>
>       <eOperations name="&lt;" eType="#/0/Boolean">
>         <eParameters name="object" eType="#/0/T"/>
>       </eOperations>
>#P org.eclipse.ocl.ecore.tests
>Index: src/org/eclipse/ocl/ecore/tests/BasicOCLTest.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.mdt/org.eclipse.ocl/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/tests/BasicOCLTest.java,v
>retrieving revision 1.9
>diff -u -r1.9 BasicOCLTest.java
>--- src/org/eclipse/ocl/ecore/tests/BasicOCLTest.java	1 Sep 2009 20:10:53 -0000	1.9
>+++ src/org/eclipse/ocl/ecore/tests/BasicOCLTest.java	13 Sep 2009 06:30:06 -0000
>@@ -681,6 +681,30 @@
>         }
>     }
>     
>+    /**
>+     * Tests that oclType returns the type.
>+     */
>+    public void test_oclType() {
>+        helper.setContext(EcorePackage.Literals.ESTRING);
>+        
>+        try {
>+            assertTrue(
>+                check(helper, EcorePackage.eNS_URI, "'a'.oclIsTypeOf('b'.oclType())")); //$NON-NLS-1$
>+            assertTrue(
>+                check(helper, EcorePackage.eNS_URI, "self.oclIsTypeOf('b'.oclType())")); //$NON-NLS-1$
>+            assertTrue(
>+                check(helper, EcorePackage.eNS_URI, "4.oclIsTypeOf(9.oclType())")); //$NON-NLS-1$
>+            assertTrue(
>+                check(helper, EcorePackage.eNS_URI, "3.14.oclIsTypeOf(2.0.oclType())")); //$NON-NLS-1$
>+            assertTrue(
>+                check(helper, EcorePackage.eNS_URI, "true.oclIsTypeOf(false.oclType())")); //$NON-NLS-1$
>+            assertFalse(
>+                check(helper, EcorePackage.eNS_URI, "'a'.oclIsTypeOf(4.oclType())")); //$NON-NLS-1$
>+        } catch (ParserException e) {
>+            fail("Failed to parse or evaluate: " + e.getLocalizedMessage()); //$NON-NLS-1$
>+        }
>+    }
>+    
> 	private void assertInvalidString(String input) {
> 		boolean isParserError = false;
> 		try {
>#P org.eclipse.ocl.uml.tests
>Index: src/org/eclipse/ocl/uml/tests/BasicOCLTest.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.mdt/org.eclipse.ocl/tests/org.eclipse.ocl.uml.tests/src/org/eclipse/ocl/uml/tests/BasicOCLTest.java,v
>retrieving revision 1.7
>diff -u -r1.7 BasicOCLTest.java
>--- src/org/eclipse/ocl/uml/tests/BasicOCLTest.java	1 Sep 2009 20:11:49 -0000	1.7
>+++ src/org/eclipse/ocl/uml/tests/BasicOCLTest.java	13 Sep 2009 06:30:08 -0000
>@@ -369,6 +369,31 @@
>     }
>     
>     /**
>+     * Tests that oclType returns the type.
>+     */
>+    public void test_oclType() {
>+        helper.setContext(getMetaclass("Stereotype")); //$NON-NLS-1$
>+        Stereotype stereo = umlf.createStereotype();
>+        
>+        try {
>+            assertTrue(
>+                check(helper, stereo, "'a'.oclIsTypeOf('b'.oclType())")); //$NON-NLS-1$
>+            assertTrue(
>+                check(helper, stereo, "self.oclIsTypeOf(let a : Stereotype = self in a.oclType())")); //$NON-NLS-1$
>+            assertTrue(
>+                check(helper, stereo, "4.oclIsTypeOf(9.oclType())")); //$NON-NLS-1$
>+            assertTrue(
>+                check(helper, stereo, "3.14.oclIsTypeOf(2.0.oclType())")); //$NON-NLS-1$
>+            assertTrue(
>+                check(helper, stereo, "true.oclIsTypeOf(false.oclType())")); //$NON-NLS-1$
>+            assertFalse(
>+                check(helper, stereo, "'a'.oclIsTypeOf(4.oclType())")); //$NON-NLS-1$
>+        } catch (ParserException e) {
>+            fail("Failed to parse or evaluate: " + e.getLocalizedMessage()); //$NON-NLS-1$
>+        }
>+    }
>+    
>+    /**
>      * Tests that the value of an enumeration literal expression is the Java
>      * enumerated type instance, not the <tt>EnumerationLiteral</tt> model element.
>      */
>#P org.eclipse.ocl.uml
>Index: src/org/eclipse/ocl/uml/UMLEvaluationEnvironment.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.mdt/org.eclipse.ocl/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/UMLEvaluationEnvironment.java,v
>retrieving revision 1.16
>diff -u -r1.16 UMLEvaluationEnvironment.java
>--- src/org/eclipse/ocl/uml/UMLEvaluationEnvironment.java	1 Sep 2009 20:11:00 -0000	1.16
>+++ src/org/eclipse/ocl/uml/UMLEvaluationEnvironment.java	13 Sep 2009 06:30:13 -0000
>@@ -1048,6 +1048,9 @@
>                     && !(eclassifier instanceof EClass)) {
>                     return object.getClass() == eclassifier.getInstanceClass();
>                 }
>+            } else {
>+                Classifier oClassifier = getType(object);
>+                return oClassifier == classifier;
>             }
>             break;
>         }
>Index: model/oclstdlib.uml
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.mdt/org.eclipse.ocl/plugins/org.eclipse.ocl.uml/model/oclstdlib.uml,v
>retrieving revision 1.7
>diff -u -r1.7 oclstdlib.uml
>--- model/oclstdlib.uml	12 Oct 2008 01:12:33 -0000	1.7
>+++ model/oclstdlib.uml	13 Sep 2009 06:30:12 -0000
>@@ -1,5 +1,5 @@
> <?xml version="1.0" encoding="UTF-8"?>
>-<xmi:XMI xmi:version="2.1" xmlns:xmi="http://schema.omg.org/spec/XMI/2.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:ocl.uml="http://www.eclipse.org/ocl/1.1.0/UML" xmlns:uml="http://www.eclipse.org/uml2/3.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/ocl/1.1.0/UML http://www.eclipse.org/OCL/1.1.0/OCL#//uml">
>+<xmi:XMI xmi:version="2.1" xmlns:xmi="http://schema.omg.org/spec/XMI/2.1" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:ocl.uml="http://www.eclipse.org/ocl/1.1.0/UML" xmlns:uml="http://www.eclipse.org/uml2/3.0.0/UML">
>   <uml:Package xmi:id="_ajR70KjQEdu4LJng8Rasow" name="oclstdlib">
>     <eAnnotations xmi:id="_awji16jQEdu4LJng8Rasow" source="http://www.eclipse.org/ocl/1.1.0/OCL">
>       <contents xmi:type="ecore:EPackage" xmi:id="_awji2KjQEdu4LJng8Rasow" name="oclstdlib" nsURI="http://www.eclipse.org/ocl/1.1.0/oclstdlib.uml" nsPrefix="oclstdlib">
>@@ -49,6 +49,9 @@
>         <ownedParameter xmi:id="_akVExqjQEdu4LJng8Rasow" type="_ak_zNKjQEdu4LJng8Rasow" direction="return"/>
>         <ownedParameter xmi:id="_akVEx6jQEdu4LJng8Rasow" name="statespec" type="_as1gcKjQEdu4LJng8Rasow"/>
>       </ownedOperation>
>+      <ownedOperation xmi:id="_NC8NMKAgEd6_B_ZMmDMZug" name="oclType" isQuery="true">
>+        <ownedParameter xmi:id="_NC8NMaAgEd6_B_ZMmDMZug" type="_asdGHajQEdu4LJng8Rasow" direction="return"/>
>+      </ownedOperation>
>       <ownedOperation xmi:id="_akVEyKjQEdu4LJng8Rasow" name="&lt;" isQuery="true">
>         <ownedParameter xmi:id="_akVEyajQEdu4LJng8Rasow" type="_ak_zNKjQEdu4LJng8Rasow" direction="return"/>
>         <ownedParameter xmi:id="_akVEyqjQEdu4LJng8Rasow" name="object" type="_awji1ajQEdu4LJng8Rasow"/>
>@@ -100,6 +103,9 @@
>         <ownedParameter xmi:id="_ak5shqjQEdu4LJng8Rasow" type="_ak_zNKjQEdu4LJng8Rasow" direction="return"/>
>         <ownedParameter xmi:id="_ak5sh6jQEdu4LJng8Rasow" name="statespec" type="_as1gcKjQEdu4LJng8Rasow"/>
>       </ownedOperation>
>+      <ownedOperation xmi:id="_furzQKAjEd6_B_ZMmDMZug" name="oclType" isQuery="true">
>+        <ownedParameter xmi:id="_furzQaAjEd6_B_ZMmDMZug" type="_asdGHajQEdu4LJng8Rasow" direction="return"/>
>+      </ownedOperation>
>       <ownedOperation xmi:id="_ak5siKjQEdu4LJng8Rasow" name="&lt;" isQuery="true">
>         <ownedParameter xmi:id="_ak5siajQEdu4LJng8Rasow" type="_ak_zNKjQEdu4LJng8Rasow" direction="return"/>
>         <ownedParameter xmi:id="_ak5siqjQEdu4LJng8Rasow" name="object" type="_awji1ajQEdu4LJng8Rasow"/>
>@@ -202,6 +208,9 @@
>         <ownedParameter xmi:id="_alYNpqjQEdu4LJng8Rasow" type="_ak_zNKjQEdu4LJng8Rasow" direction="return"/>
>         <ownedParameter xmi:id="_alYNp6jQEdu4LJng8Rasow" name="statespec" type="_as1gcKjQEdu4LJng8Rasow"/>
>       </ownedOperation>
>+      <ownedOperation xmi:id="_bim0YKAjEd6_B_ZMmDMZug" name="oclType" isQuery="true">
>+        <ownedParameter xmi:id="_bim0YaAjEd6_B_ZMmDMZug" type="_asdGHajQEdu4LJng8Rasow" direction="return"/>
>+      </ownedOperation>
>       <ownedOperation xmi:id="_alYNqKjQEdu4LJng8Rasow" name="not" isQuery="true">
>         <ownedParameter xmi:id="_alYNqajQEdu4LJng8Rasow" type="_ak_zNKjQEdu4LJng8Rasow" direction="return"/>
>       </ownedOperation>
>@@ -256,6 +265,9 @@
>         <ownedParameter xmi:id="_amDjAajQEdu4LJng8Rasow" type="_ak_zNKjQEdu4LJng8Rasow" direction="return"/>
>         <ownedParameter xmi:id="_amDjAqjQEdu4LJng8Rasow" name="statespec" type="_as1gcKjQEdu4LJng8Rasow"/>
>       </ownedOperation>
>+      <ownedOperation xmi:id="_aj9a0KAjEd6_B_ZMmDMZug" name="oclType" isQuery="true">
>+        <ownedParameter xmi:id="_aj9a0aAjEd6_B_ZMmDMZug" type="_asdGHajQEdu4LJng8Rasow" direction="return"/>
>+      </ownedOperation>
>       <ownedOperation xmi:id="_amDjA6jQEdu4LJng8Rasow" name="&lt;" isQuery="true">
>         <ownedParameter xmi:id="_amDjBKjQEdu4LJng8Rasow" type="_ak_zNKjQEdu4LJng8Rasow" direction="return"/>
>         <ownedParameter xmi:id="_amDjBajQEdu4LJng8Rasow" name="r" type="_arrqHajQEdu4LJng8Rasow"/>
>@@ -367,6 +379,9 @@
>         <ownedParameter xmi:id="_arrp46jQEdu4LJng8Rasow" type="_ak_zNKjQEdu4LJng8Rasow" direction="return"/>
>         <ownedParameter xmi:id="_arrp5KjQEdu4LJng8Rasow" name="statespec" type="_as1gcKjQEdu4LJng8Rasow"/>
>       </ownedOperation>
>+      <ownedOperation xmi:id="_ZEQioKAjEd6_B_ZMmDMZug" name="oclType" isQuery="true">
>+        <ownedParameter xmi:id="_ZEQioaAjEd6_B_ZMmDMZug" type="_asdGHajQEdu4LJng8Rasow" direction="return"/>
>+      </ownedOperation>
>       <ownedOperation xmi:id="_arrp5ajQEdu4LJng8Rasow" name="&lt;" isQuery="true">
>         <ownedParameter xmi:id="_arrp5qjQEdu4LJng8Rasow" type="_ak_zNKjQEdu4LJng8Rasow" direction="return"/>
>         <ownedParameter xmi:id="_arrp56jQEdu4LJng8Rasow" name="r" type="_arrqHajQEdu4LJng8Rasow"/>
>@@ -478,6 +493,9 @@
>         <ownedParameter xmi:id="_asEEZ6jQEdu4LJng8Rasow" type="_ak_zNKjQEdu4LJng8Rasow" direction="return"/>
>         <ownedParameter xmi:id="_asEEaKjQEdu4LJng8Rasow" name="statespec" type="_as1gcKjQEdu4LJng8Rasow"/>
>       </ownedOperation>
>+      <ownedOperation xmi:id="_Xbxh4KAjEd6_B_ZMmDMZug" name="oclType" isQuery="true">
>+        <ownedParameter xmi:id="_Xbxh4aAjEd6_B_ZMmDMZug" type="_asdGHajQEdu4LJng8Rasow" direction="return"/>
>+      </ownedOperation>
>       <ownedOperation xmi:id="_asEEaajQEdu4LJng8Rasow" name="&lt;" isQuery="true">
>         <ownedParameter xmi:id="_asEEaqjQEdu4LJng8Rasow" type="_ak_zNKjQEdu4LJng8Rasow" direction="return"/>
>         <ownedParameter xmi:id="_asEEa6jQEdu4LJng8Rasow" name="r" type="_arrqHajQEdu4LJng8Rasow"/>
>@@ -565,6 +583,9 @@
>         <ownedParameter xmi:id="_asdF_qjQEdu4LJng8Rasow" type="_ak_zNKjQEdu4LJng8Rasow" direction="return"/>
>         <ownedParameter xmi:id="_asdF_6jQEdu4LJng8Rasow" name="statespec" type="_as1gcKjQEdu4LJng8Rasow"/>
>       </ownedOperation>
>+      <ownedOperation xmi:id="_udAwQKAgEd6_B_ZMmDMZug" name="oclType" isQuery="true">
>+        <ownedParameter xmi:id="_udAwQaAgEd6_B_ZMmDMZug" type="_asdGHajQEdu4LJng8Rasow" direction="return"/>
>+      </ownedOperation>
>       <ownedOperation xmi:id="_asdGAKjQEdu4LJng8Rasow" name="&lt;" isQuery="true">
>         <ownedParameter xmi:id="_asdGAajQEdu4LJng8Rasow" type="_ak_zNKjQEdu4LJng8Rasow" direction="return"/>
>         <ownedParameter xmi:id="_asdGAqjQEdu4LJng8Rasow" name="s" type="_asEEj6jQEdu4LJng8Rasow"/>
>@@ -640,6 +661,9 @@
>         <ownedParameter xmi:id="_asjMmqjQEdu4LJng8Rasow" type="_ak_zNKjQEdu4LJng8Rasow" direction="return"/>
>         <ownedParameter xmi:id="_asjMm6jQEdu4LJng8Rasow" name="statespec" type="_as1gcKjQEdu4LJng8Rasow"/>
>       </ownedOperation>
>+      <ownedOperation xmi:id="_u7yPkKAjEd6_B_ZMmDMZug" name="oclType" isQuery="true">
>+        <ownedParameter xmi:id="_u7yPkaAjEd6_B_ZMmDMZug" type="_asdGHajQEdu4LJng8Rasow" direction="return"/>
>+      </ownedOperation>
>       <ownedOperation xmi:id="_asjMnKjQEdu4LJng8Rasow" name="allInstances" isQuery="true">
>         <ownedParameter xmi:id="_asjMnajQEdu4LJng8Rasow" type="_auE2s6jQEdu4LJng8Rasow" direction="return"/>
>       </ownedOperation>
>@@ -678,6 +702,9 @@
>         <ownedParameter xmi:id="_asjMtajQEdu4LJng8Rasow" type="_ak_zNKjQEdu4LJng8Rasow" direction="return"/>
>         <ownedParameter xmi:id="_asjMtqjQEdu4LJng8Rasow" name="statespec" type="_as1gcKjQEdu4LJng8Rasow"/>
>       </ownedOperation>
>+      <ownedOperation xmi:id="_v4beAKAjEd6_B_ZMmDMZug" name="oclType" isQuery="true">
>+        <ownedParameter xmi:id="_v4beAaAjEd6_B_ZMmDMZug" type="_asdGHajQEdu4LJng8Rasow" direction="return"/>
>+      </ownedOperation>
>       <ownedOperation xmi:id="_asjMt6jQEdu4LJng8Rasow" name="hasReturned" isQuery="true">
>         <ownedParameter xmi:id="_asjMuKjQEdu4LJng8Rasow" type="_ak_zNKjQEdu4LJng8Rasow" direction="return"/>
>       </ownedOperation>

Actions: View | Diff

Attachments on bug 259031: 147054