Attachment #147054 for bug #259031

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

View | Details | Raw Unified | Return to bug 259031
Collapse All | Expand All

Lines 121-126 Link Here

(-)src/org/eclipse/ocl/util/OCLStandardLibraryUtil.java (+6 lines)
121	operationCodes.put(GREATER_THAN_EQUAL_NAME, GREATER_THAN_EQUAL);	121	operationCodes.put(GREATER_THAN_EQUAL_NAME, GREATER_THAN_EQUAL);
122	operationCodes.put(OCL_IS_NEW_NAME, OCL_IS_NEW);	122	operationCodes.put(OCL_IS_NEW_NAME, OCL_IS_NEW);
123	operationCodes.put(OCL_IS_IN_STATE_NAME, OCL_IS_IN_STATE);	123	operationCodes.put(OCL_IS_IN_STATE_NAME, OCL_IS_IN_STATE);
		124	operationCodes.put(OCL_TYPE_NAME, OCL_TYPE);
124	operationCodes.put(HAS_RETURNED_NAME, HAS_RETURNED);	125	operationCodes.put(HAS_RETURNED_NAME, HAS_RETURNED);
125	operationCodes.put(RESULT_NAME, RESULT);	126	operationCodes.put(RESULT_NAME, RESULT);
126	operationCodes.put(IS_SIGNAL_SENT_NAME, IS_SIGNAL_SENT);	127	operationCodes.put(IS_SIGNAL_SENT_NAME, IS_SIGNAL_SENT);
Lines 178-183 Link Here
178	oclAnyOperationCodes.put(GREATER_THAN_EQUAL_NAME, GREATER_THAN_EQUAL);	179	oclAnyOperationCodes.put(GREATER_THAN_EQUAL_NAME, GREATER_THAN_EQUAL);
179	oclAnyOperationCodes.put(OCL_IS_NEW_NAME, OCL_IS_NEW);	180	oclAnyOperationCodes.put(OCL_IS_NEW_NAME, OCL_IS_NEW);
180	oclAnyOperationCodes.put(OCL_IS_IN_STATE_NAME, OCL_IS_IN_STATE);	181	oclAnyOperationCodes.put(OCL_IS_IN_STATE_NAME, OCL_IS_IN_STATE);
		182	oclAnyOperationCodes.put(OCL_TYPE_NAME, OCL_TYPE);
181	}	183	}
182		184
183	// not instantiable by clients	185	// not instantiable by clients
Lines 307-312 Link Here
307	return OCL_IS_NEW_NAME;	309	return OCL_IS_NEW_NAME;
308	case OCL_IS_IN_STATE :	310	case OCL_IS_IN_STATE :
309	return OCL_IS_IN_STATE_NAME;	311	return OCL_IS_IN_STATE_NAME;
		312	case OCL_TYPE :
		313	return OCL_TYPE_NAME;
310	case HAS_RETURNED :	314	case HAS_RETURNED :
311	return HAS_RETURNED_NAME;	315	return HAS_RETURNED_NAME;
312	case RESULT :	316	case RESULT :
Lines 1251-1256 Link Here
1251	OCL_IS_NEW_NAME));	1255	OCL_IS_NEW_NAME));
1252	result.add(createBinaryOperation(uml, stdlib.getBoolean(),	1256	result.add(createBinaryOperation(uml, stdlib.getBoolean(),
1253	OCL_IS_IN_STATE_NAME, stdlib.getState(), "statespec")); //$NON-NLS-1$	1257	OCL_IS_IN_STATE_NAME, stdlib.getState(), "statespec")); //$NON-NLS-1$
		1258	result.add(createUnaryOperation(uml, stdlib.getOclType(),
		1259	OCL_TYPE_NAME));
1254		1260
1255	return result;	1261	return result;
1256	}	1262	}

Lines 34-40 Link Here

(-)src/org/eclipse/ocl/AbstractTypeChecker.java (-2 / +1 lines)
34	import org.eclipse.emf.common.util.EList;	34	import org.eclipse.emf.common.util.EList;
35	import org.eclipse.emf.ecore.ENamedElement;	35	import org.eclipse.emf.ecore.ENamedElement;
36	import org.eclipse.ocl.expressions.CollectionKind;	36	import org.eclipse.ocl.expressions.CollectionKind;
37	import org.eclipse.ocl.expressions.TypeExp;
38	import org.eclipse.ocl.expressions.Variable;	37	import org.eclipse.ocl.expressions.Variable;
39	import org.eclipse.ocl.internal.l10n.OCLMessages;	38	import org.eclipse.ocl.internal.l10n.OCLMessages;
40	import org.eclipse.ocl.lpg.BasicEnvironment;	39	import org.eclipse.ocl.lpg.BasicEnvironment;
Lines 1012-1018 Link Here
1012		1011
1013	// handle parameters of type OclType	1012	// handle parameters of type OclType
1014	if (popType instanceof TypeType<?, ?>) {	1013	if (popType instanceof TypeType<?, ?>) {
1015	if (arg instanceof TypeExp<?>) {	1014	if (argType instanceof TypeType<?, ?>) {
1016	continue;	1015	continue;
1017	}	1016	}
1018	return false;	1017	return false;

Lines 402-407 Link Here

(-)src/org/eclipse/ocl/EvaluationVisitorImpl.java (+9 lines)
402	return (sourceVal == getInvalid())?	402	return (sourceVal == getInvalid())?
403	Boolean.TRUE : Boolean.FALSE;	403	Boolean.TRUE : Boolean.FALSE;
404		404
		405	case PredefinedType.OCL_TYPE:
		406	// OclAny::oclType()
		407	return sourceType;
		408
405	case PredefinedType.SIZE:	409	case PredefinedType.SIZE:
406	if (sourceType == getString()) {	410	if (sourceType == getString()) {
407	// String::size()	411	// String::size()
Lines 1290-1295 Link Here
1290	}	1294	}
1291	}	1295	}
1292		1296
		1297	// AnyType::oclType()
		1298	else if (opCode == PredefinedType.OCL_TYPE) {
		1299	return sourceType;
		1300	}
		1301
1293	// Handle < (lessThan)	1302	// Handle < (lessThan)
1294	else if ((opCode == PredefinedType.LESS_THAN) && (sourceVal instanceof Comparable<?>)) {	1303	else if ((opCode == PredefinedType.LESS_THAN) && (sourceVal instanceof Comparable<?>)) {
1295	@SuppressWarnings("unchecked")	1304	@SuppressWarnings("unchecked")





	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
	 */

Lines 132-137 Link Here

(-)src/org/eclipse/ocl/internal/helper/OCLSyntaxHelper.java (+1 lines)
132	ANY_TYPE_OPERATIONS.add(PredefinedType.OCL_IS_INVALID_NAME);	132	ANY_TYPE_OPERATIONS.add(PredefinedType.OCL_IS_INVALID_NAME);
133	ANY_TYPE_OPERATIONS.add(PredefinedType.OCL_IS_NEW_NAME);	133	ANY_TYPE_OPERATIONS.add(PredefinedType.OCL_IS_NEW_NAME);
134	ANY_TYPE_OPERATIONS.add(PredefinedType.OCL_IS_IN_STATE_NAME);	134	ANY_TYPE_OPERATIONS.add(PredefinedType.OCL_IS_IN_STATE_NAME);
		135	ANY_TYPE_OPERATIONS.add(PredefinedType.OCL_TYPE_NAME);
135	ANY_TYPE_OPERATIONS.add(PredefinedType.LESS_THAN_NAME);	136	ANY_TYPE_OPERATIONS.add(PredefinedType.LESS_THAN_NAME);
136	ANY_TYPE_OPERATIONS.add(PredefinedType.GREATER_THAN_NAME);	137	ANY_TYPE_OPERATIONS.add(PredefinedType.GREATER_THAN_NAME);
137	ANY_TYPE_OPERATIONS.add(PredefinedType.LESS_THAN_EQUAL_NAME);	138	ANY_TYPE_OPERATIONS.add(PredefinedType.LESS_THAN_EQUAL_NAME);

Lines 28-33 Link Here

(-)model/oclstdlib.ecore (+1 lines)
28	<eOperations name="oclIsInState" eType="#/0/Boolean">	28	<eOperations name="oclIsInState" eType="#/0/Boolean">
29	<eParameters name="statespec" eType="#/0/State"/>	29	<eParameters name="statespec" eType="#/0/State"/>
30	</eOperations>	30	</eOperations>
		31	<eOperations name="oclType" eType="#/0/OclType"/>
31	<eOperations name="<" eType="#/0/Boolean">	32	<eOperations name="<" eType="#/0/Boolean">
32	<eParameters name="object" eType="#/0/T"/>	33	<eParameters name="object" eType="#/0/T"/>
33	</eOperations>	34	</eOperations>




        }
    }
    
    /**
     * 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 {




    }
    
    /**
     * 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.
     */

Lines 1048-1053 Link Here

(-)src/org/eclipse/ocl/uml/UMLEvaluationEnvironment.java (+3 lines)
1048	&& !(eclassifier instanceof EClass)) {	1048	&& !(eclassifier instanceof EClass)) {
1049	return object.getClass() == eclassifier.getInstanceClass();	1049	return object.getClass() == eclassifier.getInstanceClass();
1050	}	1050	}
		1051	} else {
		1052	Classifier oClassifier = getType(object);
		1053	return oClassifier == classifier;
1051	}	1054	}
1052	break;	1055	break;
1053	}	1056	}

Lines 1-5 Link Here

(-)model/oclstdlib.uml (-1 / +28 lines)
1	<?xml version="1.0" encoding="UTF-8"?>	1	<?xml version="1.0" encoding="UTF-8"?>
2	<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">	2	<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">
3	<uml:Package xmi:id="_ajR70KjQEdu4LJng8Rasow" name="oclstdlib">	3	<uml:Package xmi:id="_ajR70KjQEdu4LJng8Rasow" name="oclstdlib">
4	<eAnnotations xmi:id="_awji16jQEdu4LJng8Rasow" source="http://www.eclipse.org/ocl/1.1.0/OCL">	4	<eAnnotations xmi:id="_awji16jQEdu4LJng8Rasow" source="http://www.eclipse.org/ocl/1.1.0/OCL">
5	<contents xmi:type="ecore:EPackage" xmi:id="_awji2KjQEdu4LJng8Rasow" name="oclstdlib" nsURI="http://www.eclipse.org/ocl/1.1.0/oclstdlib.uml" nsPrefix="oclstdlib">	5	<contents xmi:type="ecore:EPackage" xmi:id="_awji2KjQEdu4LJng8Rasow" name="oclstdlib" nsURI="http://www.eclipse.org/ocl/1.1.0/oclstdlib.uml" nsPrefix="oclstdlib">
Lines 49-54 Link Here
49	<ownedParameter xmi:id="_akVExqjQEdu4LJng8Rasow" type="_ak_zNKjQEdu4LJng8Rasow" direction="return"/>	49	<ownedParameter xmi:id="_akVExqjQEdu4LJng8Rasow" type="_ak_zNKjQEdu4LJng8Rasow" direction="return"/>
50	<ownedParameter xmi:id="_akVEx6jQEdu4LJng8Rasow" name="statespec" type="_as1gcKjQEdu4LJng8Rasow"/>	50	<ownedParameter xmi:id="_akVEx6jQEdu4LJng8Rasow" name="statespec" type="_as1gcKjQEdu4LJng8Rasow"/>
51	</ownedOperation>	51	</ownedOperation>
		52	<ownedOperation xmi:id="_NC8NMKAgEd6_B_ZMmDMZug" name="oclType" isQuery="true">
		53	<ownedParameter xmi:id="_NC8NMaAgEd6_B_ZMmDMZug" type="_asdGHajQEdu4LJng8Rasow" direction="return"/>
		54	</ownedOperation>
52	<ownedOperation xmi:id="_akVEyKjQEdu4LJng8Rasow" name="<" isQuery="true">	55	<ownedOperation xmi:id="_akVEyKjQEdu4LJng8Rasow" name="<" isQuery="true">
53	<ownedParameter xmi:id="_akVEyajQEdu4LJng8Rasow" type="_ak_zNKjQEdu4LJng8Rasow" direction="return"/>	56	<ownedParameter xmi:id="_akVEyajQEdu4LJng8Rasow" type="_ak_zNKjQEdu4LJng8Rasow" direction="return"/>
54	<ownedParameter xmi:id="_akVEyqjQEdu4LJng8Rasow" name="object" type="_awji1ajQEdu4LJng8Rasow"/>	57	<ownedParameter xmi:id="_akVEyqjQEdu4LJng8Rasow" name="object" type="_awji1ajQEdu4LJng8Rasow"/>
Lines 100-105 Link Here
100	<ownedParameter xmi:id="_ak5shqjQEdu4LJng8Rasow" type="_ak_zNKjQEdu4LJng8Rasow" direction="return"/>	103	<ownedParameter xmi:id="_ak5shqjQEdu4LJng8Rasow" type="_ak_zNKjQEdu4LJng8Rasow" direction="return"/>
101	<ownedParameter xmi:id="_ak5sh6jQEdu4LJng8Rasow" name="statespec" type="_as1gcKjQEdu4LJng8Rasow"/>	104	<ownedParameter xmi:id="_ak5sh6jQEdu4LJng8Rasow" name="statespec" type="_as1gcKjQEdu4LJng8Rasow"/>
102	</ownedOperation>	105	</ownedOperation>
		106	<ownedOperation xmi:id="_furzQKAjEd6_B_ZMmDMZug" name="oclType" isQuery="true">
		107	<ownedParameter xmi:id="_furzQaAjEd6_B_ZMmDMZug" type="_asdGHajQEdu4LJng8Rasow" direction="return"/>
		108	</ownedOperation>
103	<ownedOperation xmi:id="_ak5siKjQEdu4LJng8Rasow" name="<" isQuery="true">	109	<ownedOperation xmi:id="_ak5siKjQEdu4LJng8Rasow" name="<" isQuery="true">
104	<ownedParameter xmi:id="_ak5siajQEdu4LJng8Rasow" type="_ak_zNKjQEdu4LJng8Rasow" direction="return"/>	110	<ownedParameter xmi:id="_ak5siajQEdu4LJng8Rasow" type="_ak_zNKjQEdu4LJng8Rasow" direction="return"/>
105	<ownedParameter xmi:id="_ak5siqjQEdu4LJng8Rasow" name="object" type="_awji1ajQEdu4LJng8Rasow"/>	111	<ownedParameter xmi:id="_ak5siqjQEdu4LJng8Rasow" name="object" type="_awji1ajQEdu4LJng8Rasow"/>
Lines 202-207 Link Here
202	<ownedParameter xmi:id="_alYNpqjQEdu4LJng8Rasow" type="_ak_zNKjQEdu4LJng8Rasow" direction="return"/>	208	<ownedParameter xmi:id="_alYNpqjQEdu4LJng8Rasow" type="_ak_zNKjQEdu4LJng8Rasow" direction="return"/>
203	<ownedParameter xmi:id="_alYNp6jQEdu4LJng8Rasow" name="statespec" type="_as1gcKjQEdu4LJng8Rasow"/>	209	<ownedParameter xmi:id="_alYNp6jQEdu4LJng8Rasow" name="statespec" type="_as1gcKjQEdu4LJng8Rasow"/>
204	</ownedOperation>	210	</ownedOperation>
		211	<ownedOperation xmi:id="_bim0YKAjEd6_B_ZMmDMZug" name="oclType" isQuery="true">
		212	<ownedParameter xmi:id="_bim0YaAjEd6_B_ZMmDMZug" type="_asdGHajQEdu4LJng8Rasow" direction="return"/>
		213	</ownedOperation>
205	<ownedOperation xmi:id="_alYNqKjQEdu4LJng8Rasow" name="not" isQuery="true">	214	<ownedOperation xmi:id="_alYNqKjQEdu4LJng8Rasow" name="not" isQuery="true">
206	<ownedParameter xmi:id="_alYNqajQEdu4LJng8Rasow" type="_ak_zNKjQEdu4LJng8Rasow" direction="return"/>	215	<ownedParameter xmi:id="_alYNqajQEdu4LJng8Rasow" type="_ak_zNKjQEdu4LJng8Rasow" direction="return"/>
207	</ownedOperation>	216	</ownedOperation>
Lines 256-261 Link Here
256	<ownedParameter xmi:id="_amDjAajQEdu4LJng8Rasow" type="_ak_zNKjQEdu4LJng8Rasow" direction="return"/>	265	<ownedParameter xmi:id="_amDjAajQEdu4LJng8Rasow" type="_ak_zNKjQEdu4LJng8Rasow" direction="return"/>
257	<ownedParameter xmi:id="_amDjAqjQEdu4LJng8Rasow" name="statespec" type="_as1gcKjQEdu4LJng8Rasow"/>	266	<ownedParameter xmi:id="_amDjAqjQEdu4LJng8Rasow" name="statespec" type="_as1gcKjQEdu4LJng8Rasow"/>
258	</ownedOperation>	267	</ownedOperation>
		268	<ownedOperation xmi:id="_aj9a0KAjEd6_B_ZMmDMZug" name="oclType" isQuery="true">
		269	<ownedParameter xmi:id="_aj9a0aAjEd6_B_ZMmDMZug" type="_asdGHajQEdu4LJng8Rasow" direction="return"/>
		270	</ownedOperation>
259	<ownedOperation xmi:id="_amDjA6jQEdu4LJng8Rasow" name="<" isQuery="true">	271	<ownedOperation xmi:id="_amDjA6jQEdu4LJng8Rasow" name="<" isQuery="true">
260	<ownedParameter xmi:id="_amDjBKjQEdu4LJng8Rasow" type="_ak_zNKjQEdu4LJng8Rasow" direction="return"/>	272	<ownedParameter xmi:id="_amDjBKjQEdu4LJng8Rasow" type="_ak_zNKjQEdu4LJng8Rasow" direction="return"/>
261	<ownedParameter xmi:id="_amDjBajQEdu4LJng8Rasow" name="r" type="_arrqHajQEdu4LJng8Rasow"/>	273	<ownedParameter xmi:id="_amDjBajQEdu4LJng8Rasow" name="r" type="_arrqHajQEdu4LJng8Rasow"/>
Lines 367-372 Link Here
367	<ownedParameter xmi:id="_arrp46jQEdu4LJng8Rasow" type="_ak_zNKjQEdu4LJng8Rasow" direction="return"/>	379	<ownedParameter xmi:id="_arrp46jQEdu4LJng8Rasow" type="_ak_zNKjQEdu4LJng8Rasow" direction="return"/>
368	<ownedParameter xmi:id="_arrp5KjQEdu4LJng8Rasow" name="statespec" type="_as1gcKjQEdu4LJng8Rasow"/>	380	<ownedParameter xmi:id="_arrp5KjQEdu4LJng8Rasow" name="statespec" type="_as1gcKjQEdu4LJng8Rasow"/>
369	</ownedOperation>	381	</ownedOperation>
		382	<ownedOperation xmi:id="_ZEQioKAjEd6_B_ZMmDMZug" name="oclType" isQuery="true">
		383	<ownedParameter xmi:id="_ZEQioaAjEd6_B_ZMmDMZug" type="_asdGHajQEdu4LJng8Rasow" direction="return"/>
		384	</ownedOperation>
370	<ownedOperation xmi:id="_arrp5ajQEdu4LJng8Rasow" name="<" isQuery="true">	385	<ownedOperation xmi:id="_arrp5ajQEdu4LJng8Rasow" name="<" isQuery="true">
371	<ownedParameter xmi:id="_arrp5qjQEdu4LJng8Rasow" type="_ak_zNKjQEdu4LJng8Rasow" direction="return"/>	386	<ownedParameter xmi:id="_arrp5qjQEdu4LJng8Rasow" type="_ak_zNKjQEdu4LJng8Rasow" direction="return"/>
372	<ownedParameter xmi:id="_arrp56jQEdu4LJng8Rasow" name="r" type="_arrqHajQEdu4LJng8Rasow"/>	387	<ownedParameter xmi:id="_arrp56jQEdu4LJng8Rasow" name="r" type="_arrqHajQEdu4LJng8Rasow"/>
Lines 478-483 Link Here
478	<ownedParameter xmi:id="_asEEZ6jQEdu4LJng8Rasow" type="_ak_zNKjQEdu4LJng8Rasow" direction="return"/>	493	<ownedParameter xmi:id="_asEEZ6jQEdu4LJng8Rasow" type="_ak_zNKjQEdu4LJng8Rasow" direction="return"/>
479	<ownedParameter xmi:id="_asEEaKjQEdu4LJng8Rasow" name="statespec" type="_as1gcKjQEdu4LJng8Rasow"/>	494	<ownedParameter xmi:id="_asEEaKjQEdu4LJng8Rasow" name="statespec" type="_as1gcKjQEdu4LJng8Rasow"/>
480	</ownedOperation>	495	</ownedOperation>
		496	<ownedOperation xmi:id="_Xbxh4KAjEd6_B_ZMmDMZug" name="oclType" isQuery="true">
		497	<ownedParameter xmi:id="_Xbxh4aAjEd6_B_ZMmDMZug" type="_asdGHajQEdu4LJng8Rasow" direction="return"/>
		498	</ownedOperation>
481	<ownedOperation xmi:id="_asEEaajQEdu4LJng8Rasow" name="<" isQuery="true">	499	<ownedOperation xmi:id="_asEEaajQEdu4LJng8Rasow" name="<" isQuery="true">
482	<ownedParameter xmi:id="_asEEaqjQEdu4LJng8Rasow" type="_ak_zNKjQEdu4LJng8Rasow" direction="return"/>	500	<ownedParameter xmi:id="_asEEaqjQEdu4LJng8Rasow" type="_ak_zNKjQEdu4LJng8Rasow" direction="return"/>
483	<ownedParameter xmi:id="_asEEa6jQEdu4LJng8Rasow" name="r" type="_arrqHajQEdu4LJng8Rasow"/>	501	<ownedParameter xmi:id="_asEEa6jQEdu4LJng8Rasow" name="r" type="_arrqHajQEdu4LJng8Rasow"/>
Lines 565-570 Link Here
565	<ownedParameter xmi:id="_asdF_qjQEdu4LJng8Rasow" type="_ak_zNKjQEdu4LJng8Rasow" direction="return"/>	583	<ownedParameter xmi:id="_asdF_qjQEdu4LJng8Rasow" type="_ak_zNKjQEdu4LJng8Rasow" direction="return"/>
566	<ownedParameter xmi:id="_asdF_6jQEdu4LJng8Rasow" name="statespec" type="_as1gcKjQEdu4LJng8Rasow"/>	584	<ownedParameter xmi:id="_asdF_6jQEdu4LJng8Rasow" name="statespec" type="_as1gcKjQEdu4LJng8Rasow"/>
567	</ownedOperation>	585	</ownedOperation>
		586	<ownedOperation xmi:id="_udAwQKAgEd6_B_ZMmDMZug" name="oclType" isQuery="true">
		587	<ownedParameter xmi:id="_udAwQaAgEd6_B_ZMmDMZug" type="_asdGHajQEdu4LJng8Rasow" direction="return"/>
		588	</ownedOperation>
568	<ownedOperation xmi:id="_asdGAKjQEdu4LJng8Rasow" name="<" isQuery="true">	589	<ownedOperation xmi:id="_asdGAKjQEdu4LJng8Rasow" name="<" isQuery="true">
569	<ownedParameter xmi:id="_asdGAajQEdu4LJng8Rasow" type="_ak_zNKjQEdu4LJng8Rasow" direction="return"/>	590	<ownedParameter xmi:id="_asdGAajQEdu4LJng8Rasow" type="_ak_zNKjQEdu4LJng8Rasow" direction="return"/>
570	<ownedParameter xmi:id="_asdGAqjQEdu4LJng8Rasow" name="s" type="_asEEj6jQEdu4LJng8Rasow"/>	591	<ownedParameter xmi:id="_asdGAqjQEdu4LJng8Rasow" name="s" type="_asEEj6jQEdu4LJng8Rasow"/>
Lines 640-645 Link Here
640	<ownedParameter xmi:id="_asjMmqjQEdu4LJng8Rasow" type="_ak_zNKjQEdu4LJng8Rasow" direction="return"/>	661	<ownedParameter xmi:id="_asjMmqjQEdu4LJng8Rasow" type="_ak_zNKjQEdu4LJng8Rasow" direction="return"/>
641	<ownedParameter xmi:id="_asjMm6jQEdu4LJng8Rasow" name="statespec" type="_as1gcKjQEdu4LJng8Rasow"/>	662	<ownedParameter xmi:id="_asjMm6jQEdu4LJng8Rasow" name="statespec" type="_as1gcKjQEdu4LJng8Rasow"/>
642	</ownedOperation>	663	</ownedOperation>
		664	<ownedOperation xmi:id="_u7yPkKAjEd6_B_ZMmDMZug" name="oclType" isQuery="true">
		665	<ownedParameter xmi:id="_u7yPkaAjEd6_B_ZMmDMZug" type="_asdGHajQEdu4LJng8Rasow" direction="return"/>
		666	</ownedOperation>
643	<ownedOperation xmi:id="_asjMnKjQEdu4LJng8Rasow" name="allInstances" isQuery="true">	667	<ownedOperation xmi:id="_asjMnKjQEdu4LJng8Rasow" name="allInstances" isQuery="true">
644	<ownedParameter xmi:id="_asjMnajQEdu4LJng8Rasow" type="_auE2s6jQEdu4LJng8Rasow" direction="return"/>	668	<ownedParameter xmi:id="_asjMnajQEdu4LJng8Rasow" type="_auE2s6jQEdu4LJng8Rasow" direction="return"/>
645	</ownedOperation>	669	</ownedOperation>
Lines 678-683 Link Here
678	<ownedParameter xmi:id="_asjMtajQEdu4LJng8Rasow" type="_ak_zNKjQEdu4LJng8Rasow" direction="return"/>	702	<ownedParameter xmi:id="_asjMtajQEdu4LJng8Rasow" type="_ak_zNKjQEdu4LJng8Rasow" direction="return"/>
679	<ownedParameter xmi:id="_asjMtqjQEdu4LJng8Rasow" name="statespec" type="_as1gcKjQEdu4LJng8Rasow"/>	703	<ownedParameter xmi:id="_asjMtqjQEdu4LJng8Rasow" name="statespec" type="_as1gcKjQEdu4LJng8Rasow"/>
680	</ownedOperation>	704	</ownedOperation>
		705	<ownedOperation xmi:id="_v4beAKAjEd6_B_ZMmDMZug" name="oclType" isQuery="true">
		706	<ownedParameter xmi:id="_v4beAaAjEd6_B_ZMmDMZug" type="_asdGHajQEdu4LJng8Rasow" direction="return"/>
		707	</ownedOperation>
681	<ownedOperation xmi:id="_asjMt6jQEdu4LJng8Rasow" name="hasReturned" isQuery="true">	708	<ownedOperation xmi:id="_asjMt6jQEdu4LJng8Rasow" name="hasReturned" isQuery="true">
682	<ownedParameter xmi:id="_asjMuKjQEdu4LJng8Rasow" type="_ak_zNKjQEdu4LJng8Rasow" direction="return"/>	709	<ownedParameter xmi:id="_asjMuKjQEdu4LJng8Rasow" type="_ak_zNKjQEdu4LJng8Rasow" direction="return"/>
683	</ownedOperation>	710	</ownedOperation>

Return to bug 259031

Lines 192-197 Link Here

(-)src/org/eclipse/ocl/utilities/PredefinedType.java (+10 lines)
192		192
193	String OCL_IS_IN_STATE_NAME = "oclIsInState"; //$NON-NLS-1$	193	String OCL_IS_IN_STATE_NAME = "oclIsInState"; //$NON-NLS-1$
194		194
		195	/**
		196	* @since 3.0
		197	*/
		198	int OCL_TYPE = 73;
		199
		200	/**
		201	* @since 3.0
		202	*/
		203	String OCL_TYPE_NAME = "oclType"; //$NON-NLS-1$
		204
195	/*	205	/*
196	* OclMessage operations	206	* OclMessage operations
197	*/	207	*/

Lines 681-686 Link Here

(-)src/org/eclipse/ocl/ecore/tests/BasicOCLTest.java (+24 lines)
681	}	681	}
682	}	682	}
683		683
		684	/**
		685	* Tests that oclType returns the type.
		686	*/
		687	public void test_oclType() {
		688	helper.setContext(EcorePackage.Literals.ESTRING);
		689
		690	try {
		691	assertTrue(
		692	check(helper, EcorePackage.eNS_URI, "'a'.oclIsTypeOf('b'.oclType())")); //$NON-NLS-1$
		693	assertTrue(
		694	check(helper, EcorePackage.eNS_URI, "self.oclIsTypeOf('b'.oclType())")); //$NON-NLS-1$
		695	assertTrue(
		696	check(helper, EcorePackage.eNS_URI, "4.oclIsTypeOf(9.oclType())")); //$NON-NLS-1$
		697	assertTrue(
		698	check(helper, EcorePackage.eNS_URI, "3.14.oclIsTypeOf(2.0.oclType())")); //$NON-NLS-1$
		699	assertTrue(
		700	check(helper, EcorePackage.eNS_URI, "true.oclIsTypeOf(false.oclType())")); //$NON-NLS-1$
		701	assertFalse(
		702	check(helper, EcorePackage.eNS_URI, "'a'.oclIsTypeOf(4.oclType())")); //$NON-NLS-1$
		703	} catch (ParserException e) {
		704	fail("Failed to parse or evaluate: " + e.getLocalizedMessage()); //$NON-NLS-1$
		705	}
		706	}
		707
684	private void assertInvalidString(String input) {	708	private void assertInvalidString(String input) {
685	boolean isParserError = false;	709	boolean isParserError = false;
686	try {	710	try {

Lines 369-374 Link Here

(-)src/org/eclipse/ocl/uml/tests/BasicOCLTest.java (+25 lines)
369	}	369	}
370		370
371	/**	371	/**
		372	* Tests that oclType returns the type.
		373	*/
		374	public void test_oclType() {
		375	helper.setContext(getMetaclass("Stereotype")); //$NON-NLS-1$
		376	Stereotype stereo = umlf.createStereotype();
		377
		378	try {
		379	assertTrue(
		380	check(helper, stereo, "'a'.oclIsTypeOf('b'.oclType())")); //$NON-NLS-1$
		381	assertTrue(
		382	check(helper, stereo, "self.oclIsTypeOf(let a : Stereotype = self in a.oclType())")); //$NON-NLS-1$
		383	assertTrue(
		384	check(helper, stereo, "4.oclIsTypeOf(9.oclType())")); //$NON-NLS-1$
		385	assertTrue(
		386	check(helper, stereo, "3.14.oclIsTypeOf(2.0.oclType())")); //$NON-NLS-1$
		387	assertTrue(
		388	check(helper, stereo, "true.oclIsTypeOf(false.oclType())")); //$NON-NLS-1$
		389	assertFalse(
		390	check(helper, stereo, "'a'.oclIsTypeOf(4.oclType())")); //$NON-NLS-1$
		391	} catch (ParserException e) {
		392	fail("Failed to parse or evaluate: " + e.getLocalizedMessage()); //$NON-NLS-1$
		393	}
		394	}
		395
		396	/**
372	* Tests that the value of an enumeration literal expression is the Java	397	* Tests that the value of an enumeration literal expression is the Java
373	* enumerated type instance, not the <tt>EnumerationLiteral</tt> model element.	398	* enumerated type instance, not the <tt>EnumerationLiteral</tt> model element.
374	*/	399	*/