Attachment #155901 for bug #290605

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




        </eParameters>
      </eOperations>
    </eClassifiers>
    <eClassifiers xsi:type="ecore:EDataType" name="Number" instanceClassName="java.lang.Number"/>
    <eClassifiers xsi:type="ecore:EClass" name="ExpressionInOCL" abstract="true" interface="true"
        eSuperTypes="#//utilities/Visitable">
      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">

          </eGenericType>
        </eParameters>
      </eOperations>
      <eStructuralFeatures xsi:type="ecore:EAttribute" name="integerSymbol" eType="#//utilities/Number"/>
      <eGenericSuperTypes eClassifier="#//expressions/NumericLiteralExp">
        <eTypeArguments eTypeParameter="#//expressions/IntegerLiteralExp/C"/>
      </eGenericSuperTypes>

          </eGenericType>
        </eParameters>
      </eOperations>
      <eStructuralFeatures xsi:type="ecore:EAttribute" name="integerSymbol" eType="#//utilities/Number"/>
      <eStructuralFeatures xsi:type="ecore:EAttribute" name="unlimited" lowerBound="1"
          eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
          changeable="false" volatile="true" transient="true" derived="true"/>

          </eGenericType>
        </eParameters>
      </eOperations>
      <eStructuralFeatures xsi:type="ecore:EAttribute" name="realSymbol" eType="#//utilities/Number"/>
      <eGenericSuperTypes eClassifier="#//expressions/NumericLiteralExp">
        <eTypeArguments eTypeParameter="#//expressions/RealLiteralExp/C"/>
      </eGenericSuperTypes>

Lines 134-139 Link Here

(-)model/OCL.genmodel (+1 lines)
134	<nestedGenPackages xsi:type="genmodel:GenPackage" prefix="Utilities" basePackage="org.eclipse.ocl"	134	<nestedGenPackages xsi:type="genmodel:GenPackage" prefix="Utilities" basePackage="org.eclipse.ocl"
135	disposableProviderFactory="true" multipleEditorPages="false" contentTypeIdentifier="org.eclipse.ocl.ast"	135	disposableProviderFactory="true" multipleEditorPages="false" contentTypeIdentifier="org.eclipse.ocl.ast"
136	fileExtensions="oclxmi" ecorePackage="OCL.ecore#//utilities">	136	fileExtensions="oclxmi" ecorePackage="OCL.ecore#//utilities">
		137	<genDataTypes xsi:type="genmodel:GenDataType" ecoreDataType="OCL.ecore#//utilities/Number"/>
137	<genClasses xsi:type="genmodel:GenClass" ecoreClass="OCL.ecore#//utilities/ASTNode">	138	<genClasses xsi:type="genmodel:GenClass" ecoreClass="OCL.ecore#//utilities/ASTNode">
138	<genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute OCL.ecore#//utilities/ASTNode/startPosition"/>	139	<genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute OCL.ecore#//utilities/ASTNode/startPosition"/>
139	<genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute OCL.ecore#//utilities/ASTNode/endPosition"/>	140	<genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute OCL.ecore#//utilities/ASTNode/endPosition"/>




          </ownedParameter>
        </ownedTemplateSignature>
        <generalization xmi:id="_unvVyNppEdu-d8Dv4wLx9Q" general="_unvVy9ppEdu-d8Dv4wLx9Q"/>
        <ownedAttribute xmi:id="_unvVydppEdu-d8Dv4wLx9Q" name="integerSymbol" visibility="public" type="_rw67cP9tEd67_agdSFnrQQ" isOrdered="true">
          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/EcorePrimitiveTypes.library.uml#EIntegerObject"/>
          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_unvVytppEdu-d8Dv4wLx9Q"/>
        </ownedAttribute>
        <nestedClassifier xmi:type="uml:Class" xmi:id="_unvVy9ppEdu-d8Dv4wLx9Q" name="NumericLiteralExp_C">

          </ownedParameter>
        </ownedTemplateSignature>
        <generalization xmi:id="_unvV2tppEdu-d8Dv4wLx9Q" general="_unvV3tppEdu-d8Dv4wLx9Q"/>
        <ownedAttribute xmi:id="_unvV29ppEdu-d8Dv4wLx9Q" name="integerSymbol" visibility="public" type="_rw67cP9tEd67_agdSFnrQQ" isOrdered="true">
          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/EcorePrimitiveTypes.library.uml#EIntegerObject"/>
          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_unvV3NppEdu-d8Dv4wLx9Q"/>
        </ownedAttribute>
        <ownedAttribute xmi:id="_unvV3dppEdu-d8Dv4wLx9Q" name="unlimited" visibility="public" isOrdered="true" isReadOnly="true" isDerived="true">

          </ownedParameter>
        </ownedTemplateSignature>
        <generalization xmi:id="_un1aYNppEdu-d8Dv4wLx9Q" general="_un1aY9ppEdu-d8Dv4wLx9Q"/>
        <ownedAttribute xmi:id="_un1aYdppEdu-d8Dv4wLx9Q" name="realSymbol" visibility="public" type="_rw67cP9tEd67_agdSFnrQQ" isOrdered="true">
          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/EcorePrimitiveTypes.library.uml#EDoubleObject"/>
          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_un1aYtppEdu-d8Dv4wLx9Q"/>
        </ownedAttribute>
        <nestedClassifier xmi:type="uml:Class" xmi:id="_un1aY9ppEdu-d8Dv4wLx9Q" name="NumericLiteralExp_C">

      <packagedElement xmi:type="uml:Association" xmi:id="_H0w1YNLnEd6hmvYFRJXZTA" memberEnd="_ykFGANLmEd6hmvYFRJXZTA _RPJFINLnEd6hmvYFRJXZTA">
        <ownedEnd xmi:id="_RPJFINLnEd6hmvYFRJXZTA" type="_unvU2NppEdu-d8Dv4wLx9Q" association="_H0w1YNLnEd6hmvYFRJXZTA"/>
      </packagedElement>
      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_rw67cP9tEd67_agdSFnrQQ" name="Number"/>
    </packagedElement>
    <profileApplication xmi:id="_un1az9ppEdu-d8Dv4wLx9Q">
      <eAnnotations xmi:id="_un1a0NppEdu-d8Dv4wLx9Q" source="http://www.eclipse.org/uml2/2.0.0/UML">

  <Ecore:EParameter xmi:id="_SCfO4N1nEduZ74nG8yJaxg" base_Parameter="_FcnTgN1nEduZ74nG8yJaxg"/>
  <Ecore_1:EClass xmi:id="_1lMzkNXZEd6ci-srLwOkAQ" base_Class="_-PCtwNLlEd6hmvYFRJXZTA"/>
  <Ecore:EReference xmi:id="_82aXYNXZEd6ci-srLwOkAQ" base_Property="_ykFGANLmEd6hmvYFRJXZTA"/>
  <Ecore:EDataType xmi:id="_t-sakP9tEd67_agdSFnrQQ" instanceClassName="java.lang.Number" base_PrimitiveType="_rw67cP9tEd67_agdSFnrQQ"/>
</xmi:XMI>




      <eStructuralFeatures xsi:type="ecore:EAttribute" name="symbol" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
    </eClassifiers>
    <eClassifiers xsi:type="ecore:EClass" name="IntegerLiteralExpCS" eSuperTypes="#//cst/PrimitiveLiteralExpCS">
      <eStructuralFeatures xsi:type="ecore:EAttribute" name="integerSymbol" eType="#//cst/Number"/>
    </eClassifiers>
    <eClassifiers xsi:type="ecore:EDataType" name="Number" instanceClassName="java.lang.Number"/>
    <eClassifiers xsi:type="ecore:EClass" name="UnlimitedNaturalLiteralExpCS" eSuperTypes="#//cst/PrimitiveLiteralExpCS">
      <eStructuralFeatures xsi:type="ecore:EAttribute" name="integerSymbol" eType="#//cst/Number"/>
    </eClassifiers>
    <eClassifiers xsi:type="ecore:EClass" name="RealLiteralExpCS" eSuperTypes="#//cst/PrimitiveLiteralExpCS">
      <eStructuralFeatures xsi:type="ecore:EAttribute" name="realSymbol" eType="#//cst/Number"/>
    </eClassifiers>
    <eClassifiers xsi:type="ecore:EClass" name="StringLiteralExpCS" eSuperTypes="#//cst/PrimitiveLiteralExpCS">
      <eStructuralFeatures xsi:type="ecore:EAttribute" name="stringSymbol" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

Lines 70-75 Link Here

(-)model/OCLCST.genmodel (+1 lines)
70	<genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="OCLCST.ecore#//cst/DotOrArrowEnum/arrow"/>	70	<genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="OCLCST.ecore#//cst/DotOrArrowEnum/arrow"/>
71	</genEnums>	71	</genEnums>
72	<genDataTypes xsi:type="genmodel:GenDataType" ecoreDataType="OCLCST.ecore#//cst/IToken"/>	72	<genDataTypes xsi:type="genmodel:GenDataType" ecoreDataType="OCLCST.ecore#//cst/IToken"/>
		73	<genDataTypes xsi:type="genmodel:GenDataType" ecoreDataType="OCLCST.ecore#//cst/Number"/>
73	<genClasses xsi:type="genmodel:GenClass" image="false" ecoreClass="OCLCST.ecore#//cst/CSTNode">	74	<genClasses xsi:type="genmodel:GenClass" image="false" ecoreClass="OCLCST.ecore#//cst/CSTNode">
74	<genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute OCLCST.ecore#//cst/CSTNode/startOffset"/>	75	<genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute OCLCST.ecore#//cst/CSTNode/startOffset"/>
75	<genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute OCLCST.ecore#//cst/CSTNode/endOffset"/>	76	<genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute OCLCST.ecore#//cst/CSTNode/endOffset"/>




      </packagedElement>
      <packagedElement xmi:type="uml:Class" xmi:id="_qdx-A_8fEduhWtVvKtiQ7w" name="IntegerLiteralExpCS">
        <generalization xmi:id="_qdx-BP8fEduhWtVvKtiQ7w" general="_qdx9__8fEduhWtVvKtiQ7w"/>
        <ownedAttribute xmi:id="_qdx-Bf8fEduhWtVvKtiQ7w" name="integerSymbol" visibility="public" type="_7S9-8P9rEd67_agdSFnrQQ" isOrdered="true">
          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/EcorePrimitiveTypes.library.uml#EIntegerObject"/>
          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_qdx-Bv8fEduhWtVvKtiQ7w"/>
        </ownedAttribute>
      </packagedElement>
      <packagedElement xmi:type="uml:Class" xmi:id="_qdx-B_8fEduhWtVvKtiQ7w" name="UnlimitedNaturalLiteralExpCS">
        <generalization xmi:id="_qdx-CP8fEduhWtVvKtiQ7w" general="_qdx9__8fEduhWtVvKtiQ7w"/>
        <ownedAttribute xmi:id="_qdx-Cf8fEduhWtVvKtiQ7w" name="integerSymbol" visibility="public" type="_7S9-8P9rEd67_agdSFnrQQ" isOrdered="true">
          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/EcorePrimitiveTypes.library.uml#EIntegerObject"/>
          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_qdx-Cv8fEduhWtVvKtiQ7w"/>
        </ownedAttribute>
      </packagedElement>
      <packagedElement xmi:type="uml:Class" xmi:id="_qdx-C_8fEduhWtVvKtiQ7w" name="RealLiteralExpCS">
        <generalization xmi:id="_qdx-DP8fEduhWtVvKtiQ7w" general="_qdx9__8fEduhWtVvKtiQ7w"/>
        <ownedAttribute xmi:id="_qdx-Df8fEduhWtVvKtiQ7w" name="realSymbol" visibility="public" type="_7S9-8P9rEd67_agdSFnrQQ" isOrdered="true">
          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/EcorePrimitiveTypes.library.uml#EDoubleObject"/>
          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_qdx-Dv8fEduhWtVvKtiQ7w"/>
        </ownedAttribute>
      </packagedElement>

      <packagedElement xmi:type="uml:Association" xmi:id="_z7wVcLZcEd6yDcYCBdIWCA" memberEnd="_tRI3kLZcEd6yDcYCBdIWCA _CiFFoLZdEd6yDcYCBdIWCA">
        <ownedEnd xmi:id="_CiFFoLZdEd6yDcYCBdIWCA" type="_qdx9C_8fEduhWtVvKtiQ7w" association="_z7wVcLZcEd6yDcYCBdIWCA"/>
      </packagedElement>
      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_7S9-8P9rEd67_agdSFnrQQ" name="Number"/>
    </packagedElement>
    <profileApplication xmi:id="_qdx-XP8fEduhWtVvKtiQ7w">
      <eAnnotations xmi:id="_qdx-Xf8fEduhWtVvKtiQ7w" source="http://www.eclipse.org/uml2/2.0.0/UML">

  <Ecore:EClass xmi:id="_u2txsL8sEd2tbsirxV4pLA" base_Class="_WuZt4L8sEd2tbsirxV4pLA"/>
  <Ecore:EReference xmi:id="_xEai4L8tEd2tbsirxV4pLA" base_Property="_woRO4L8sEd2tbsirxV4pLA"/>
  <Ecore:EAttribute xmi:id="_K42H8AKSEd6O0MANVU0HEw" base_Property="_HPVqoAKSEd6O0MANVU0HEw"/>
  <Ecore:EAttribute xmi:id="_GDcw4P9qEd67_agdSFnrQQ"/>
  <Ecore:EDataType xmi:id="__GNnEP9rEd67_agdSFnrQQ" instanceClassName="java.lang.Number" base_PrimitiveType="_7S9-8P9rEd67_agdSFnrQQ"/>
</xmi:XMI>

Lines 3668-3675 Link Here

(-)src/org/eclipse/ocl/cst/CSTPackage.java (-2 / +31 lines)
3668	/**	3668	/**
3669	* The feature id for the '<em><b>Real Symbol</b></em>' attribute.	3669	* The feature id for the '<em><b>Real Symbol</b></em>' attribute.
3670	* <!-- begin-user-doc -->	3670	* <!-- begin-user-doc -->
3671	* This value may change when the model code is regenerated.
3672	* It is subject to change without notice.
3673	* <!-- end-user-doc -->	3671	* <!-- end-user-doc -->
3674	* @generated	3672	* @generated
3675	* @ordered	3673	* @ordered
Lines 5204-5209 Link Here
5204	int ITOKEN = 54;	5202	int ITOKEN = 54;
5205		5203
5206	/**	5204	/**
		5205	* The meta object id for the '<em>Number</em>' data type.
		5206	* <!-- begin-user-doc -->
		5207	* <!-- end-user-doc -->
		5208	* @see java.lang.Number
		5209	* @see org.eclipse.ocl.cst.impl.CSTPackageImpl#getNumber()
		5210	* @generated
		5211	*/
		5212	int NUMBER = 55;
		5213
		5214	/**
5207	* Returns the meta object for class '{@link org.eclipse.ocl.cst.CSTNode <em>Node</em>}'.	5215	* Returns the meta object for class '{@link org.eclipse.ocl.cst.CSTNode <em>Node</em>}'.
5208	* <!-- begin-user-doc -->	5216	* <!-- begin-user-doc -->
5209	* <!-- end-user-doc -->	5217	* <!-- end-user-doc -->
Lines 6627-6632 Link Here
6627	EDataType getIToken();	6635	EDataType getIToken();
6628		6636
6629	/**	6637	/**
		6638	* Returns the meta object for data type '{@link java.lang.Number <em>Number</em>}'.
		6639	* <!-- begin-user-doc -->
		6640	* <!-- end-user-doc -->
		6641	* @return the meta object for data type '<em>Number</em>'.
		6642	* @see java.lang.Number
		6643	* @model instanceClass="java.lang.Number"
		6644	* @generated
		6645	*/
		6646	EDataType getNumber();
		6647
		6648	/**
6630	* Returns the factory that creates the instances of the model.	6649	* Returns the factory that creates the instances of the model.
6631	* <!-- begin-user-doc -->	6650	* <!-- begin-user-doc -->
6632	* <!-- end-user-doc -->	6651	* <!-- end-user-doc -->
Lines 7904-7909 Link Here
7904	*/	7923	*/
7905	EDataType ITOKEN = eINSTANCE.getIToken();	7924	EDataType ITOKEN = eINSTANCE.getIToken();
7906		7925
		7926	/**
		7927	* The meta object literal for the '<em>Number</em>' data type.
		7928	* <!-- begin-user-doc -->
		7929	* <!-- end-user-doc -->
		7930	* @see java.lang.Number
		7931	* @see org.eclipse.ocl.cst.impl.CSTPackageImpl#getNumber()
		7932	* @generated
		7933	*/
		7934	EDataType NUMBER = eINSTANCE.getNumber();
		7935
7907	}	7936	}
7908		7937
7909	} //CSTPackage	7938	} //CSTPackage




	 * If the meaning of the '<em>Integer Symbol</em>' attribute isn't clear,
	 * there really should be more of a description here...
	 * </p>
	 * @since 3.0
	 * <!-- end-user-doc -->
	 * @return the value of the '<em>Integer Symbol</em>' attribute.
	 * @see #setIntegerSymbol(Number)
	 * @see org.eclipse.ocl.cst.CSTPackage#getIntegerLiteralExpCS_IntegerSymbol()
	 * @model dataType="org.eclipse.ocl.cst.Number"
	 * @generated
	 */
	Number getIntegerSymbol();

	/**
	 * Sets the value of the '{@link org.eclipse.ocl.cst.IntegerLiteralExpCS#getIntegerSymbol <em>Integer Symbol</em>}' attribute.
	 * <!-- begin-user-doc -->
	 * @since 3.0
	 * <!-- end-user-doc -->
	 * @param value the new value of the '<em>Integer Symbol</em>' attribute.
	 * @see #getIntegerSymbol()
	 * @generated
	 */
	void setIntegerSymbol(Number value);

} // IntegerLiteralExpCS




	 * If the meaning of the '<em>Real Symbol</em>' attribute isn't clear,
	 * there really should be more of a description here...
	 * </p>
	 * @since 3.0
	 * <!-- end-user-doc -->
	 * @return the value of the '<em>Real Symbol</em>' attribute.
	 * @see #setRealSymbol(Number)
	 * @see org.eclipse.ocl.cst.CSTPackage#getRealLiteralExpCS_RealSymbol()
	 * @model dataType="org.eclipse.ocl.cst.Number"
	 * @generated
	 */
	Number getRealSymbol();

	/**
	 * Sets the value of the '{@link org.eclipse.ocl.cst.RealLiteralExpCS#getRealSymbol <em>Real Symbol</em>}' attribute.
	 * <!-- begin-user-doc -->
	 * @since 3.0
	 * <!-- end-user-doc -->
	 * @param value the new value of the '<em>Real Symbol</em>' attribute.
	 * @see #getRealSymbol()
	 * @generated
	 */
	void setRealSymbol(Number value);

} // RealLiteralExpCS




	 * If the meaning of the '<em>Integer Symbol</em>' attribute isn't clear,
	 * there really should be more of a description here...
	 * </p>
	 * @since 3.0
	 * <!-- end-user-doc -->
	 * @return the value of the '<em>Integer Symbol</em>' attribute.
	 * @see #setIntegerSymbol(Number)
	 * @see org.eclipse.ocl.cst.CSTPackage#getUnlimitedNaturalLiteralExpCS_IntegerSymbol()
	 * @model dataType="org.eclipse.ocl.cst.Number"
	 * @generated
	 */
	Number getIntegerSymbol();

	/**
	 * Sets the value of the '{@link org.eclipse.ocl.cst.UnlimitedNaturalLiteralExpCS#getIntegerSymbol <em>Integer Symbol</em>}' attribute.
	 * <!-- begin-user-doc -->
	 * @since 3.0
	 * <!-- end-user-doc -->
	 * @param value the new value of the '<em>Integer Symbol</em>' attribute.
	 * @see #getIntegerSymbol()
	 * @generated
	 */
	void setIntegerSymbol(Number value);

} // UnlimitedNaturalLiteralExpCS

Lines 74-79 Link Here

(-)src/org/eclipse/ocl/cst/impl/CSTFactoryImpl.java (+31 lines)
74	import org.eclipse.ocl.cst.UnlimitedNaturalLiteralExpCS;	74	import org.eclipse.ocl.cst.UnlimitedNaturalLiteralExpCS;
75	import org.eclipse.ocl.cst.VariableCS;	75	import org.eclipse.ocl.cst.VariableCS;
76	import org.eclipse.ocl.cst.VariableExpCS;	76	import org.eclipse.ocl.cst.VariableExpCS;
		77	import org.eclipse.ocl.util.ObjectUtil;
77		78
78	/**	79	/**
79	* <!-- begin-user-doc -->	80	* <!-- begin-user-doc -->
Lines 234-239 Link Here
234	return createDotOrArrowEnumFromString(eDataType, initialValue);	235	return createDotOrArrowEnumFromString(eDataType, initialValue);
235	case CSTPackage.ITOKEN :	236	case CSTPackage.ITOKEN :
236	return createITokenFromString(eDataType, initialValue);	237	return createITokenFromString(eDataType, initialValue);
		238	case CSTPackage.NUMBER :
		239	return createNumberFromString(eDataType, initialValue);
237	default :	240	default :
238	throw new IllegalArgumentException(	241	throw new IllegalArgumentException(
239	"The datatype '" + eDataType.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$	242	"The datatype '" + eDataType.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
Lines 262-267 Link Here
262	return convertDotOrArrowEnumToString(eDataType, instanceValue);	265	return convertDotOrArrowEnumToString(eDataType, instanceValue);
263	case CSTPackage.ITOKEN :	266	case CSTPackage.ITOKEN :
264	return convertITokenToString(eDataType, instanceValue);	267	return convertITokenToString(eDataType, instanceValue);
		268	case CSTPackage.NUMBER :
		269	return convertNumberToString(eDataType, instanceValue);
265	default :	270	default :
266	throw new IllegalArgumentException(	271	throw new IllegalArgumentException(
267	"The datatype '" + eDataType.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$	272	"The datatype '" + eDataType.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
Lines 818-823 Link Here
818		823
819	/**	824	/**
820	* <!-- begin-user-doc -->	825	* <!-- begin-user-doc -->
		826	* @since 3.0
		827	* <!-- end-user-doc -->
		828	* @generated NOT
		829	*/
		830	public Number createNumberFromString(EDataType eDataType,
		831	String initialValue) {
		832	if (initialValue.contains(".") \|\| initialValue.contains("e") \|\| initialValue.contains("E")) { //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$
		833	return ObjectUtil.createRealNumber(initialValue);
		834	} else {
		835	return ObjectUtil.createIntegerNumber(initialValue);
		836	}
		837	}
		838
		839	/**
		840	* <!-- begin-user-doc -->
		841	* @since 3.0
		842	* <!-- end-user-doc -->
		843	* @generated NOT
		844	*/
		845	public String convertNumberToString(EDataType eDataType,
		846	Object instanceValue) {
		847	return instanceValue.toString();
		848	}
		849
		850	/**
		851	* <!-- begin-user-doc -->
821	* <!-- end-user-doc -->	852	* <!-- end-user-doc -->
822	* @generated	853	* @generated
823	*/	854	*/

Lines 477-482 Link Here

(-)src/org/eclipse/ocl/cst/impl/CSTPackageImpl.java (-4 / +24 lines)
477	* <!-- end-user-doc -->	477	* <!-- end-user-doc -->
478	* @generated	478	* @generated
479	*/	479	*/
		480	private EDataType numberEDataType = null;
		481
		482	/**
		483	* <!-- begin-user-doc -->
		484	* <!-- end-user-doc -->
		485	* @generated
		486	*/
480	private EEnum messageExpKindEEnum = null;	487	private EEnum messageExpKindEEnum = null;
481		488
482	/**	489	/**
Lines 1786-1791 Link Here
1786		1793
1787	/**	1794	/**
1788	* <!-- begin-user-doc -->	1795	* <!-- begin-user-doc -->
		1796	* @since 3.0
		1797	* <!-- end-user-doc -->
		1798	* @generated
		1799	*/
		1800	public EDataType getNumber() {
		1801	return numberEDataType;
		1802	}
		1803
		1804	/**
		1805	* <!-- begin-user-doc -->
1789	* <!-- end-user-doc -->	1806	* <!-- end-user-doc -->
1790	* @generated	1807	* @generated
1791	*/	1808	*/
Lines 2040-2045 Link Here
2040		2057
2041	// Create data types	2058	// Create data types
2042	iTokenEDataType = createEDataType(ITOKEN);	2059	iTokenEDataType = createEDataType(ITOKEN);
		2060	numberEDataType = createEDataType(NUMBER);
2043	}	2061	}
2044		2062
2045	/**	2063	/**
Lines 2589-2595 Link Here
2589	"IntegerLiteralExpCS", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$	2607	"IntegerLiteralExpCS", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
2590	initEAttribute(	2608	initEAttribute(
2591	getIntegerLiteralExpCS_IntegerSymbol(),	2609	getIntegerLiteralExpCS_IntegerSymbol(),
2592	ecorePackage.getEIntegerObject(),	2610	this.getNumber(),
2593	"integerSymbol", null, 0, 1, IntegerLiteralExpCS.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$	2611	"integerSymbol", null, 0, 1, IntegerLiteralExpCS.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
2594		2612
2595	initEClass(	2613	initEClass(
Lines 2598-2604 Link Here
2598	"UnlimitedNaturalLiteralExpCS", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$	2616	"UnlimitedNaturalLiteralExpCS", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
2599	initEAttribute(	2617	initEAttribute(
2600	getUnlimitedNaturalLiteralExpCS_IntegerSymbol(),	2618	getUnlimitedNaturalLiteralExpCS_IntegerSymbol(),
2601	ecorePackage.getEIntegerObject(),	2619	this.getNumber(),
2602	"integerSymbol", null, 0, 1, UnlimitedNaturalLiteralExpCS.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$	2620	"integerSymbol", null, 0, 1, UnlimitedNaturalLiteralExpCS.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
2603		2621
2604	initEClass(	2622	initEClass(
Lines 2607-2613 Link Here
2607	"RealLiteralExpCS", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$	2625	"RealLiteralExpCS", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
2608	initEAttribute(	2626	initEAttribute(
2609	getRealLiteralExpCS_RealSymbol(),	2627	getRealLiteralExpCS_RealSymbol(),
2610	ecorePackage.getEDoubleObject(),	2628	this.getNumber(),
2611	"realSymbol", null, 0, 1, RealLiteralExpCS.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$	2629	"realSymbol", null, 0, 1, RealLiteralExpCS.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
2612		2630
2613	initEClass(	2631	initEClass(
Lines 2787-2792 Link Here
2787	// Initialize data types	2805	// Initialize data types
2788	initEDataType(iTokenEDataType, IToken.class,	2806	initEDataType(iTokenEDataType, IToken.class,
2789	"IToken", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$	2807	"IToken", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
		2808	initEDataType(numberEDataType, Number.class,
		2809	"Number", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
2790		2810
2791	// Create resource	2811	// Create resource
2792	createResource(eNS_URI);	2812	createResource(eNS_URI);
Lines 2803-2809 Link Here
2803	* @generated	2823	* @generated
2804	*/	2824	*/
2805	protected void createExtendedMetaDataAnnotations() {	2825	protected void createExtendedMetaDataAnnotations() {
2806	String source = "http:///org/eclipse/emf/ecore/util/ExtendedMetaData"; //$NON-NLS-1$	2826	String source = "http:///org/eclipse/emf/ecore/util/ExtendedMetaData"; //$NON-NLS-1$
2807	addAnnotation(oclExpressionCSEClass, source, new String[]{	2827	addAnnotation(oclExpressionCSEClass, source, new String[]{
2808	"name", "OclExpressionCS" //$NON-NLS-1$ //$NON-NLS-2$	2828	"name", "OclExpressionCS" //$NON-NLS-1$ //$NON-NLS-2$
2809	});	2829	});




	 * @generated
	 * @ordered
	 */
	protected static final Number INTEGER_SYMBOL_EDEFAULT = null;

	/**
	 * The cached value of the '{@link #getIntegerSymbol() <em>Integer Symbol</em>}' attribute.

	 * @generated
	 * @ordered
	 */
	protected Number integerSymbol = INTEGER_SYMBOL_EDEFAULT;

	/**
	 * <!-- begin-user-doc -->


	/**
	 * <!-- begin-user-doc -->
	 * @since 3.0
	 * <!-- end-user-doc -->
	 * @generated
	 */
	public Number getIntegerSymbol() {
		return integerSymbol;
	}

	/**
	 * <!-- begin-user-doc -->
	 * @since 3.0
	 * <!-- end-user-doc -->
	 * @generated
	 */
	public void setIntegerSymbol(Number newIntegerSymbol) {
		Number oldIntegerSymbol = integerSymbol;
		integerSymbol = newIntegerSymbol;
		if (eNotificationRequired())
			eNotify(new ENotificationImpl(this, Notification.SET,

	public void eSet(int featureID, Object newValue) {
		switch (featureID) {
			case CSTPackage.INTEGER_LITERAL_EXP_CS__INTEGER_SYMBOL :
				setIntegerSymbol((Number) newValue);
				return;
		}
		super.eSet(featureID, newValue);




	 * @generated
	 * @ordered
	 */
	protected static final Number REAL_SYMBOL_EDEFAULT = null;

	/**
	 * The cached value of the '{@link #getRealSymbol() <em>Real Symbol</em>}' attribute.

	 * @generated
	 * @ordered
	 */
	protected Number realSymbol = REAL_SYMBOL_EDEFAULT;

	/**
	 * <!-- begin-user-doc -->


	/**
	 * <!-- begin-user-doc -->
	 * @since 3.0
	 * <!-- end-user-doc -->
	 * @generated
	 */
	public Number getRealSymbol() {
		return realSymbol;
	}

	/**
	 * <!-- begin-user-doc -->
	 * @since 3.0
	 * <!-- end-user-doc -->
	 * @generated
	 */
	public void setRealSymbol(Number newRealSymbol) {
		Number oldRealSymbol = realSymbol;
		realSymbol = newRealSymbol;
		if (eNotificationRequired())
			eNotify(new ENotificationImpl(this, Notification.SET,

	public void eSet(int featureID, Object newValue) {
		switch (featureID) {
			case CSTPackage.REAL_LITERAL_EXP_CS__REAL_SYMBOL :
				setRealSymbol((Number) newValue);
				return;
		}
		super.eSet(featureID, newValue);




	 * @generated
	 * @ordered
	 */
	protected static final Number INTEGER_SYMBOL_EDEFAULT = null;

	/**
	 * The cached value of the '{@link #getIntegerSymbol() <em>Integer Symbol</em>}' attribute.

	 * @generated
	 * @ordered
	 */
	protected Number integerSymbol = INTEGER_SYMBOL_EDEFAULT;

	/**
	 * <!-- begin-user-doc -->


	/**
	 * <!-- begin-user-doc -->
	 * @since 3.0
	 * <!-- end-user-doc -->
	 * @generated
	 */
	public Number getIntegerSymbol() {
		return integerSymbol;
	}

	/**
	 * <!-- begin-user-doc -->
	 * @since 3.0
	 * <!-- end-user-doc -->
	 * @generated
	 */
	public void setIntegerSymbol(Number newIntegerSymbol) {
		Number oldIntegerSymbol = integerSymbol;
		integerSymbol = newIntegerSymbol;
		if (eNotificationRequired())
			eNotify(new ENotificationImpl(this, Notification.SET,

	public void eSet(int featureID, Object newValue) {
		switch (featureID) {
			case CSTPackage.UNLIMITED_NATURAL_LITERAL_EXP_CS__INTEGER_SYMBOL :
				setIntegerSymbol((Number) newValue);
				return;
		}
		super.eSet(featureID, newValue);




	 * If the meaning of the '<em>Integer Symbol</em>' attribute isn't clear,
	 * there really should be more of a description here...
	 * </p>
	 * @since 3.0
	 * <!-- end-user-doc -->
	 * @return the value of the '<em>Integer Symbol</em>' attribute.
	 * @see #setIntegerSymbol(Number)
	 * @see org.eclipse.ocl.expressions.ExpressionsPackage#getIntegerLiteralExp_IntegerSymbol()
	 * @model dataType="org.eclipse.ocl.utilities.Number"
	 * @generated
	 */
	Number getIntegerSymbol();

	/**
	 * Sets the value of the '{@link org.eclipse.ocl.expressions.IntegerLiteralExp#getIntegerSymbol <em>Integer Symbol</em>}' attribute.
	 * <!-- begin-user-doc -->
	 * @since 3.0
	 * <!-- end-user-doc -->
	 * @param value the new value of the '<em>Integer Symbol</em>' attribute.
	 * @see #getIntegerSymbol()
	 * @generated
	 */
	void setIntegerSymbol(Number value);

	/**
	 * <!-- begin-user-doc -->




	 * If the meaning of the '<em>Real Symbol</em>' attribute isn't clear,
	 * there really should be more of a description here...
	 * </p>
	 * @since 3.0
	 * <!-- end-user-doc -->
	 * @return the value of the '<em>Real Symbol</em>' attribute.
	 * @see #setRealSymbol(Number)
	 * @see org.eclipse.ocl.expressions.ExpressionsPackage#getRealLiteralExp_RealSymbol()
	 * @model dataType="org.eclipse.ocl.utilities.Number"
	 * @generated
	 */
	Number getRealSymbol();

	/**
	 * Sets the value of the '{@link org.eclipse.ocl.expressions.RealLiteralExp#getRealSymbol <em>Real Symbol</em>}' attribute.
	 * <!-- begin-user-doc -->
	 * @since 3.0
	 * <!-- end-user-doc -->
	 * @param value the new value of the '<em>Real Symbol</em>' attribute.
	 * @see #getRealSymbol()
	 * @generated
	 */
	void setRealSymbol(Number value);

	/**
	 * <!-- begin-user-doc -->




	 * If the meaning of the '<em>Integer Symbol</em>' attribute isn't clear,
	 * there really should be more of a description here...
	 * </p>
	 * @since 3.0
	 * <!-- end-user-doc -->
	 * @return the value of the '<em>Integer Symbol</em>' attribute.
	 * @see #setIntegerSymbol(Number)
	 * @see org.eclipse.ocl.expressions.ExpressionsPackage#getUnlimitedNaturalLiteralExp_IntegerSymbol()
	 * @model dataType="org.eclipse.ocl.utilities.Number"
	 * @generated
	 */
	Number getIntegerSymbol();

	/**
	 * Sets the value of the '{@link org.eclipse.ocl.expressions.UnlimitedNaturalLiteralExp#getIntegerSymbol <em>Integer Symbol</em>}' attribute.
	 * <!-- begin-user-doc -->
	 * @since 3.0
	 * <!-- end-user-doc -->
	 * @param value the new value of the '<em>Integer Symbol</em>' attribute.
	 * @see #getIntegerSymbol()
	 * @generated
	 */
	void setIntegerSymbol(Number value);

	/**
	 * Returns the value of the '<em><b>Unlimited</b></em>' attribute.




			"IntegerLiteralExp", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
		initEAttribute(
			getIntegerLiteralExp_IntegerSymbol(),
			theUtilitiesPackage.getNumber(),
			"integerSymbol", null, 0, 1, IntegerLiteralExp.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

		op = addEOperation(integerLiteralExpEClass, ecorePackage.getEBoolean(),

			"UnlimitedNaturalLiteralExp", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
		initEAttribute(
			getUnlimitedNaturalLiteralExp_IntegerSymbol(),
			theUtilitiesPackage.getNumber(),
			"integerSymbol", null, 0, 1, UnlimitedNaturalLiteralExp.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
		initEAttribute(
			getUnlimitedNaturalLiteralExp_Unlimited(),

			"RealLiteralExp", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
		initEAttribute(
			getRealLiteralExp_RealSymbol(),
			theUtilitiesPackage.getNumber(),
			"realSymbol", null, 0, 1, RealLiteralExp.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

		op = addEOperation(realLiteralExpEClass, ecorePackage.getEBoolean(),

	 * @generated
	 */
	protected void createExtendedMetaDataAnnotations() {
		String source = "http:///org/eclipse/emf/ecore/util/ExtendedMetaData"; //$NON-NLS-1$		
		addAnnotation(oclExpressionEClass, source, new String[]{
			"name", "OclExpression" //$NON-NLS-1$ //$NON-NLS-2$
		});




	 * @generated
	 * @ordered
	 */
	protected static final Number INTEGER_SYMBOL_EDEFAULT = null;

	/**
	 * The cached value of the '{@link #getIntegerSymbol() <em>Integer Symbol</em>}' attribute.

	 * @generated
	 * @ordered
	 */
	protected Number integerSymbol = INTEGER_SYMBOL_EDEFAULT;

	/**
	 * <!-- begin-user-doc -->

	 * <!-- end-user-doc -->
	 * @generated
	 */
	public Number getIntegerSymbol() {
		return integerSymbol;
	}


	 * <!-- end-user-doc -->
	 * @generated
	 */
	public void setIntegerSymbol(Number newIntegerSymbol) {
		Number oldIntegerSymbol = integerSymbol;
		integerSymbol = newIntegerSymbol;
		if (eNotificationRequired())
			eNotify(new ENotificationImpl(this, Notification.SET,

	public void eSet(int featureID, Object newValue) {
		switch (featureID) {
			case ExpressionsPackage.INTEGER_LITERAL_EXP__INTEGER_SYMBOL :
				setIntegerSymbol((Number) newValue);
				return;
		}
		super.eSet(featureID, newValue);




	 * @generated
	 * @ordered
	 */
	protected static final Number REAL_SYMBOL_EDEFAULT = null;

	/**
	 * The cached value of the '{@link #getRealSymbol() <em>Real Symbol</em>}' attribute.

	 * @generated
	 * @ordered
	 */
	protected Number realSymbol = REAL_SYMBOL_EDEFAULT;

	/**
	 * <!-- begin-user-doc -->

	 * <!-- end-user-doc -->
	 * @generated
	 */
	public Number getRealSymbol() {
		return realSymbol;
	}


	 * <!-- end-user-doc -->
	 * @generated
	 */
	public void setRealSymbol(Number newRealSymbol) {
		Number oldRealSymbol = realSymbol;
		realSymbol = newRealSymbol;
		if (eNotificationRequired())
			eNotify(new ENotificationImpl(this, Notification.SET,

	public void eSet(int featureID, Object newValue) {
		switch (featureID) {
			case ExpressionsPackage.REAL_LITERAL_EXP__REAL_SYMBOL :
				setRealSymbol((Number) newValue);
				return;
		}
		super.eSet(featureID, newValue);




	 * @generated
	 * @ordered
	 */
	protected static final Number INTEGER_SYMBOL_EDEFAULT = null;

	/**
	 * The cached value of the '{@link #getIntegerSymbol() <em>Integer Symbol</em>}' attribute.

	 * @generated
	 * @ordered
	 */
	protected Number integerSymbol = INTEGER_SYMBOL_EDEFAULT;

	/**
	 * The default value of the '{@link #isUnlimited() <em>Unlimited</em>}' attribute.


	/**
	 * <!-- begin-user-doc -->
	 * @since 3.0
	 * <!-- end-user-doc -->
	 * @generated
	 */
	public Number getIntegerSymbol() {
		return integerSymbol;
	}

	/**
	 * <!-- begin-user-doc -->
	 * @since 3.0
	 * <!-- end-user-doc -->
	 * @generated
	 */
	public void setIntegerSymbol(Number newIntegerSymbol) {
		Number oldIntegerSymbol = integerSymbol;
		integerSymbol = newIntegerSymbol;
		if (eNotificationRequired())
			eNotify(new ENotificationImpl(

	 * @generated NOT
	 */
	public boolean isUnlimited() {
		return getIntegerSymbol().intValue() == UNLIMITED;
	}

	/**

	public void eSet(int featureID, Object newValue) {
		switch (featureID) {
			case ExpressionsPackage.UNLIMITED_NATURAL_LITERAL_EXP__INTEGER_SYMBOL :
				setIntegerSymbol((Number) newValue);
				return;
		}
		super.eSet(featureID, newValue);

Lines 342-348 Link Here

(-)src/org/eclipse/ocl/expressions/operations/MessageExpOperations.java (-1 / +2 lines)
342	boolean result = true;	342	boolean result = true;
343		343
344	OCLExpression<C> target = messageExp.getTarget();	344	OCLExpression<C> target = messageExp.getTarget();
345	if ((target != null) && (target.getType() instanceof CollectionType<?, ?>)) {	345	if ((target != null)
		346	&& (target.getType() instanceof CollectionType<?, ?>)) {
346	result = false;	347	result = false;
347	}	348	}
348		349




import org.eclipse.ocl.lpg.BasicEnvironment;
import org.eclipse.ocl.lpg.ProblemHandler;
import org.eclipse.ocl.options.ProblemOption;
import org.eclipse.ocl.util.ObjectUtil;

public abstract class AbstractOCLParser
		extends AbstractParser {

		IntegerLiteralExpCS result = CSTFactory.eINSTANCE
			.createIntegerLiteralExpCS();
		result.setSymbol(string);
		result.setIntegerSymbol(ObjectUtil.createIntegerNumber(string));
		return result;
	}


		if ("*".equals(string)) {
			result.setIntegerSymbol(-1);
		} else {
			result.setIntegerSymbol(ObjectUtil.createIntegerNumber(string));
		}
		return result;
	}

	protected RealLiteralExpCS createRealLiteralExpCS(String string) {
		RealLiteralExpCS result = CSTFactory.eINSTANCE.createRealLiteralExpCS();
		result.setSymbol(string);
		result.setRealSymbol(ObjectUtil.createRealNumber(string));
		return result;
	}


Lines 860-866 Link Here

(-)src/org/eclipse/ocl/types/impl/TypesPackageImpl.java (-1 / +1 lines)
860	* @generated	860	* @generated
861	*/	861	*/
862	protected void createDuplicatesAnnotations() {	862	protected void createDuplicatesAnnotations() {
863	String source = "duplicates"; //$NON-NLS-1$	863	String source = "duplicates"; //$NON-NLS-1$
864	addAnnotation(bagTypeEClass, source, new String[]{});	864	addAnnotation(bagTypeEClass, source, new String[]{});
865	addAnnotation(orderedSetTypeEClass, source, new String[]{});	865	addAnnotation(orderedSetTypeEClass, source, new String[]{});
866	addAnnotation(sequenceTypeEClass, source, new String[]{});	866	addAnnotation(sequenceTypeEClass, source, new String[]{});

Lines 16-21 Link Here

(-)src/org/eclipse/ocl/util/ObjectUtil.java (-2 / +53 lines)
16	*/	16	*/
17	package org.eclipse.ocl.util;	17	package org.eclipse.ocl.util;
18		18
		19	import java.math.BigDecimal;
		20	import java.math.BigInteger;
19	import java.util.Collection;	21	import java.util.Collection;
20	import java.util.Iterator;	22	import java.util.Iterator;
21		23
Lines 32-37 Link Here
32	*/	34	*/
33	public class ObjectUtil {	35	public class ObjectUtil {
34		36
		37	private static final String maxIntegerValue = Integer.toString(Integer.MAX_VALUE);
		38	private static final int maxIntegerSize = maxIntegerValue.length();
		39	private static final String maxLongValue = Long.toString(Long.MAX_VALUE);
		40	private static final int maxLongSize = maxLongValue.length();
		41	private static final int epsilonSize = (int)Math.floor(-Math.log10(Math.ulp(1.0d)));
		42
35	/**	43	/**
36	* Computes the equivalence of two objects, accounting for primitive numeric	44	* Computes the equivalence of two objects, accounting for primitive numeric
37	* values that OCL considers equal but Java does not. This is also safe	45	* values that OCL considers equal but Java does not. This is also safe
Lines 109-114 Link Here
109	return 37 * ((Long) anObject).intValue();	117	return 37 * ((Long) anObject).intValue();
110	} else if (anObject instanceof Double) {	118	} else if (anObject instanceof Double) {
111	return 37 * ((Double) anObject).intValue();	119	return 37 * ((Double) anObject).intValue();
		120	} else if (anObject instanceof BigDecimal) {
		121	return 37 * ((BigDecimal) anObject).intValue();
		122	} else if (anObject instanceof BigInteger) {
		123	return 37 * ((BigInteger) anObject).intValue();
112	} else if (anObject instanceof String) {	124	} else if (anObject instanceof String) {
113	return anObject.hashCode();	125	return anObject.hashCode();
114	} else if (anObject instanceof Boolean) {	126	} else if (anObject instanceof Boolean) {
Lines 133-140 Link Here
133	* @return whether it is an OCL primitive value	145	* @return whether it is an OCL primitive value
134	*/	146	*/
135	public static boolean isPrimitive(Object o) {	147	public static boolean isPrimitive(Object o) {
136	return o instanceof Integer \|\| o instanceof Long \|\| o instanceof String	148	return o instanceof Integer \|\| o instanceof Long \|\| o instanceof BigInteger
137	\|\| o instanceof Boolean \|\| o instanceof Double;	149	\|\| o instanceof String \|\| o instanceof Boolean
		150	\|\| o instanceof Double \|\| o instanceof BigDecimal;
		151	}
		152
		153	/**
		154	* Creates a Double or BigDecimal representation for aValue. For a typical
		155	* implementation of java.lang.Double, a Double is created if the length of
		156	* aValue is less than 15 characters.
		157	* @param aValue the string representation of a real number
		158	* @return the numeric representation
		159	* @throws NumberFormatException if representation cannot be created
		160	* @since 3.0
		161	*/
		162	public static Number createRealNumber(String aValue) {
		163	if (aValue.length() < epsilonSize) {
		164	return Double.valueOf(aValue);
		165	}
		166	else {
		167	return new BigDecimal(aValue);
		168	}
		169	}
		170
		171	/**
		172	* Creates the smaller of an Integer or Long or BigInteger representation for aValue.
		173	* @param aValue the string representation of an integer number
		174	* @return the numeric representation
		175	* @throws NumberFormatException if representation cannot be created
		176	* @since 3.0
		177	*/
		178	public static Number createIntegerNumber(String aValue) {
		179	int len = aValue.length();
		180	if ((len < maxIntegerSize) \|\| ((len == maxIntegerSize) && (maxIntegerValue.compareTo(aValue) >= 0))) {
		181	return Integer.valueOf(aValue);
		182	}
		183	else if ((len < maxLongSize) \|\| ((len == maxLongSize) && (maxLongValue.compareTo(aValue) >= 0))) {
		184	return Long.valueOf(aValue);
		185	}
		186	else {
		187	return new BigInteger(aValue);
		188	}
138	}	189	}
139		190
140	/**	191	/**

Lines 19-24 Link Here

(-)src/org/eclipse/ocl/utilities/UtilitiesPackage.java (+35 lines)
19		19
20	import org.eclipse.emf.ecore.EAttribute;	20	import org.eclipse.emf.ecore.EAttribute;
21	import org.eclipse.emf.ecore.EClass;	21	import org.eclipse.emf.ecore.EClass;
		22	import org.eclipse.emf.ecore.EDataType;
22	import org.eclipse.emf.ecore.EPackage;	23	import org.eclipse.emf.ecore.EPackage;
23	import org.eclipse.emf.ecore.EReference;	24	import org.eclipse.emf.ecore.EReference;
24		25
Lines 433-438 Link Here
433	int PREDEFINED_TYPE_FEATURE_COUNT = 0;	434	int PREDEFINED_TYPE_FEATURE_COUNT = 0;
434		435
435	/**	436	/**
		437	* The meta object id for the '<em>Number</em>' data type.
		438	* <!-- begin-user-doc -->
		439	* @since 3.0
		440	* <!-- end-user-doc -->
		441	* @see java.lang.Number
		442	* @see org.eclipse.ocl.utilities.impl.UtilitiesPackageImpl#getNumber()
		443	* @generated
		444	*/
		445	int NUMBER = 8;
		446
		447	/**
436	* Returns the meta object for class '{@link org.eclipse.ocl.utilities.ASTNode <em>AST Node</em>}'.	448	* Returns the meta object for class '{@link org.eclipse.ocl.utilities.ASTNode <em>AST Node</em>}'.
437	* <!-- begin-user-doc -->	449	* <!-- begin-user-doc -->
438	* <!-- end-user-doc -->	450	* <!-- end-user-doc -->
Lines 507-512 Link Here
507	EClass getPredefinedType();	519	EClass getPredefinedType();
508		520
509	/**	521	/**
		522	* Returns the meta object for data type '{@link java.lang.Number <em>Number</em>}'.
		523	* <!-- begin-user-doc -->
		524	* @since 3.0
		525	* <!-- end-user-doc -->
		526	* @return the meta object for data type '<em>Number</em>'.
		527	* @see java.lang.Number
		528	* @model instanceClass="java.lang.Number"
		529	* @generated
		530	*/
		531	EDataType getNumber();
		532
		533	/**
510	* Returns the meta object for class '{@link org.eclipse.ocl.utilities.TypedASTNode <em>Typed AST Node</em>}'.	534	* Returns the meta object for class '{@link org.eclipse.ocl.utilities.TypedASTNode <em>Typed AST Node</em>}'.
511	* <!-- begin-user-doc -->	535	* <!-- begin-user-doc -->
512	* <!-- end-user-doc -->	536	* <!-- end-user-doc -->
Lines 725-730 Link Here
725	EClass PREDEFINED_TYPE = eINSTANCE.getPredefinedType();	749	EClass PREDEFINED_TYPE = eINSTANCE.getPredefinedType();
726		750
727	/**	751	/**
		752	* The meta object literal for the '<em>Number</em>' data type.
		753	* <!-- begin-user-doc -->
		754	* @since 3.0
		755	* <!-- end-user-doc -->
		756	* @see java.lang.Number
		757	* @see org.eclipse.ocl.utilities.impl.UtilitiesPackageImpl#getNumber()
		758	* @generated
		759	*/
		760	EDataType NUMBER = eINSTANCE.getNumber();
		761
		762	/**
728	* The meta object literal for the '{@link org.eclipse.ocl.utilities.TypedASTNode <em>Typed AST Node</em>}' class.	763	* The meta object literal for the '{@link org.eclipse.ocl.utilities.TypedASTNode <em>Typed AST Node</em>}' class.
729	* <!-- begin-user-doc -->	764	* <!-- begin-user-doc -->
730	* <!-- end-user-doc -->	765	* <!-- end-user-doc -->




package org.eclipse.ocl.utilities.impl;

import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EDataType;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EPackage;
import org.eclipse.emf.ecore.impl.EFactoryImpl;
import org.eclipse.emf.ecore.plugin.EcorePlugin;
import org.eclipse.ocl.util.ObjectUtil;
//import org.eclipse.ocl.utilities.*;
import org.eclipse.ocl.utilities.UtilitiesFactory;
import org.eclipse.ocl.utilities.UtilitiesPackage;


	 * <!-- end-user-doc -->
	 * @generated
	 */
	@Override
	public Object createFromString(EDataType eDataType, String initialValue) {
		switch (eDataType.getClassifierID()) {
			case UtilitiesPackage.NUMBER :
				return createNumberFromString(eDataType, initialValue);
			default :
				throw new IllegalArgumentException(
					"The datatype '" + eDataType.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
		}
	}

	/**
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 */
	@Override
	public String convertToString(EDataType eDataType, Object instanceValue) {
		switch (eDataType.getClassifierID()) {
			case UtilitiesPackage.NUMBER :
				return convertNumberToString(eDataType, instanceValue);
			default :
				throw new IllegalArgumentException(
					"The datatype '" + eDataType.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
		}
	}

	/**
	 * <!-- begin-user-doc -->
	 * @since 3.0
	 * <!-- end-user-doc -->
	 * @generated NOT
	 */
	public Number createNumberFromString(EDataType eDataType,
			String initialValue) {
		if (initialValue.contains(".") || initialValue.contains("e") || initialValue.contains("E")) { //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$
			return ObjectUtil.createRealNumber(initialValue);
		} else {
			return ObjectUtil.createIntegerNumber(initialValue);
		}
	}

	/**
	 * <!-- begin-user-doc -->
	 * @since 3.0
	 * <!-- end-user-doc -->
	 * @generated NOT
	 */
	public String convertNumberToString(EDataType eDataType,
			Object instanceValue) {
		return instanceValue.toString();
	}

	/**
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 */
	public UtilitiesPackage getUtilitiesPackage() {
		return (UtilitiesPackage) getEPackage();
	}

Lines 18-23 Link Here

(-)src/org/eclipse/ocl/utilities/impl/UtilitiesPackageImpl.java (-1 / +25 lines)
18		18
19	import org.eclipse.emf.ecore.EAttribute;	19	import org.eclipse.emf.ecore.EAttribute;
20	import org.eclipse.emf.ecore.EClass;	20	import org.eclipse.emf.ecore.EClass;
		21	import org.eclipse.emf.ecore.EDataType;
21	import org.eclipse.emf.ecore.EGenericType;	22	import org.eclipse.emf.ecore.EGenericType;
22	import org.eclipse.emf.ecore.EOperation;	23	import org.eclipse.emf.ecore.EOperation;
23	import org.eclipse.emf.ecore.EPackage;	24	import org.eclipse.emf.ecore.EPackage;
Lines 75-80 Link Here
75	* <!-- end-user-doc -->	76	* <!-- end-user-doc -->
76	* @generated	77	* @generated
77	*/	78	*/
		79	private EDataType numberEDataType = null;
		80
		81	/**
		82	* <!-- begin-user-doc -->
		83	* <!-- end-user-doc -->
		84	* @generated
		85	*/
78	private EClass typedASTNodeEClass = null;	86	private EClass typedASTNodeEClass = null;
79		87
80	/**	88	/**
Lines 256-261 Link Here
256	* <!-- end-user-doc -->	264	* <!-- end-user-doc -->
257	* @generated	265	* @generated
258	*/	266	*/
		267	public EDataType getNumber() {
		268	return numberEDataType;
		269	}
		270
		271	/**
		272	* <!-- begin-user-doc -->
		273	* <!-- end-user-doc -->
		274	* @generated
		275	*/
259	public EClass getTypedASTNode() {	276	public EClass getTypedASTNode() {
260	return typedASTNodeEClass;	277	return typedASTNodeEClass;
261	}	278	}
Lines 428-433 Link Here
428	EXPRESSION_IN_OCL__GENERATED_TYPE);	445	EXPRESSION_IN_OCL__GENERATED_TYPE);
429		446
430	predefinedTypeEClass = createEClass(PREDEFINED_TYPE);	447	predefinedTypeEClass = createEClass(PREDEFINED_TYPE);
		448
		449	// Create data types
		450	numberEDataType = createEDataType(NUMBER);
431	}	451	}
432		452
433	/**	453	/**
Lines 948-953 Link Here
948	g1 = createEGenericType(predefinedTypeEClass_O);	968	g1 = createEGenericType(predefinedTypeEClass_O);
949	initEOperation(op, g1);	969	initEOperation(op, g1);
950		970
		971	// Initialize data types
		972	initEDataType(numberEDataType, Number.class,
		973	"Number", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
		974
951	// Create resource	975	// Create resource
952	createResource(eNS_URI);	976	createResource(eNS_URI);
953		977
Lines 963-969 Link Here
963	* @generated	987	* @generated
964	*/	988	*/
965	protected void createExtendedMetaDataAnnotations() {	989	protected void createExtendedMetaDataAnnotations() {
966	String source = "http:///org/eclipse/emf/ecore/util/ExtendedMetaData"; //$NON-NLS-1$	990	String source = "http:///org/eclipse/emf/ecore/util/ExtendedMetaData"; //$NON-NLS-1$
967	addAnnotation(expressionInOCLEClass, source, new String[]{	991	addAnnotation(expressionInOCLEClass, source, new String[]{
968	"name", "ExpressionInOcl" //$NON-NLS-1$ //$NON-NLS-2$	992	"name", "ExpressionInOcl" //$NON-NLS-1$ //$NON-NLS-2$
969	});	993	});




	 * @generated
	 * @ordered
	 */
	protected static final Number INTEGER_SYMBOL_EDEFAULT = null;

	/**
	 * The cached value of the '{@link #getIntegerSymbol() <em>Integer Symbol</em>}' attribute.

	 * @generated
	 * @ordered
	 */
	protected Number integerSymbol = INTEGER_SYMBOL_EDEFAULT;

	/**
	 * <!-- begin-user-doc -->


	/**
	 * <!-- begin-user-doc -->
	 * @since 3.0
	 * <!-- end-user-doc -->
	 * @generated
	 */
	public Number getIntegerSymbol() {
		return integerSymbol;
	}

	/**
	 * <!-- begin-user-doc -->
	 * @since 3.0
	 * <!-- end-user-doc -->
	 * @generated
	 */
	public void setIntegerSymbol(Number newIntegerSymbol) {
		Number oldIntegerSymbol = integerSymbol;
		integerSymbol = newIntegerSymbol;
		if (eNotificationRequired())
			eNotify(new ENotificationImpl(this, Notification.SET,

	public void eSet(int featureID, Object newValue) {
		switch (featureID) {
			case EcorePackage.INTEGER_LITERAL_EXP__INTEGER_SYMBOL :
				setIntegerSymbol((Number) newValue);
				return;
		}
		super.eSet(featureID, newValue);




	 * @generated
	 * @ordered
	 */
	protected static final Number REAL_SYMBOL_EDEFAULT = null;

	/**
	 * The cached value of the '{@link #getRealSymbol() <em>Real Symbol</em>}' attribute.

	 * @generated
	 * @ordered
	 */
	protected Number realSymbol = REAL_SYMBOL_EDEFAULT;

	/**
	 * <!-- begin-user-doc -->


	/**
	 * <!-- begin-user-doc -->
	 * @since 3.0
	 * <!-- end-user-doc -->
	 * @generated
	 */
	public Number getRealSymbol() {
		return realSymbol;
	}

	/**
	 * <!-- begin-user-doc -->
	 * @since 3.0
	 * <!-- end-user-doc -->
	 * @generated
	 */
	public void setRealSymbol(Number newRealSymbol) {
		Number oldRealSymbol = realSymbol;
		realSymbol = newRealSymbol;
		if (eNotificationRequired())
			eNotify(new ENotificationImpl(this, Notification.SET,

	public void eSet(int featureID, Object newValue) {
		switch (featureID) {
			case EcorePackage.REAL_LITERAL_EXP__REAL_SYMBOL :
				setRealSymbol((Number) newValue);
				return;
		}
		super.eSet(featureID, newValue);




	 * @generated
	 * @ordered
	 */
	protected static final Number INTEGER_SYMBOL_EDEFAULT = null;

	/**
	 * The cached value of the '{@link #getIntegerSymbol() <em>Integer Symbol</em>}' attribute.

	 * @generated
	 * @ordered
	 */
	protected Number integerSymbol = INTEGER_SYMBOL_EDEFAULT;

	/**
	 * The default value of the '{@link #isUnlimited() <em>Unlimited</em>}' attribute.


	/**
	 * <!-- begin-user-doc -->
	 * @since 3.0
	 * <!-- end-user-doc -->
	 * @generated
	 */
	public Number getIntegerSymbol() {
		return integerSymbol;
	}

	/**
	 * <!-- begin-user-doc -->
	 * @since 3.0
	 * <!-- end-user-doc -->
	 * @generated
	 */
	public void setIntegerSymbol(Number newIntegerSymbol) {
		Number oldIntegerSymbol = integerSymbol;
		integerSymbol = newIntegerSymbol;
		if (eNotificationRequired())
			eNotify(new ENotificationImpl(this, Notification.SET,

	 * @generated NOT
	 */
	public boolean isUnlimited() {
		return getIntegerSymbol().intValue() == UNLIMITED;
	}

	/**

	public void eSet(int featureID, Object newValue) {
		switch (featureID) {
			case EcorePackage.UNLIMITED_NATURAL_LITERAL_EXP__INTEGER_SYMBOL :
				setIntegerSymbol((Number) newValue);
				return;
		}
		super.eSet(featureID, newValue);




/**
 * <copyright>
 *
 * Copyright (c) 2009 Eclipse Modeling Project and others.
 * All rights reserved.   This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *   IBM - Initial API and implementation
 *
 * </copyright>
 *
 * $Id$
 */
package org.eclipse.ocl.ecore.validation;

/**
 * A sample validator interface for {@link org.eclipse.ocl.ecore.AnyType}.
 * This doesn't really do anything, and it's not a real EMF artifact.
 * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
 * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
 */
public interface AnyTypeValidator {

	boolean validate();

}




/**
 * <copyright>
 *
 * Copyright (c) 2009 Eclipse Modeling Project and others.
 * All rights reserved.   This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *   IBM - Initial API and implementation
 *
 * </copyright>
 *
 * $Id$
 */
package org.eclipse.ocl.ecore.validation;

/**
 * A sample validator interface for {@link org.eclipse.ocl.ecore.AssociationClassCallExp}.
 * This doesn't really do anything, and it's not a real EMF artifact.
 * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
 * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
 */
public interface AssociationClassCallExpValidator {

	boolean validate();

}




/**
 * <copyright>
 *
 * Copyright (c) 2009 Eclipse Modeling Project and others.
 * All rights reserved.   This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *   IBM - Initial API and implementation
 *
 * </copyright>
 *
 * $Id$
 */
package org.eclipse.ocl.ecore.validation;

/**
 * A sample validator interface for {@link org.eclipse.ocl.ecore.BagType}.
 * This doesn't really do anything, and it's not a real EMF artifact.
 * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
 * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
 */
public interface BagTypeValidator {

	boolean validate();

}




/**
 * <copyright>
 *
 * Copyright (c) 2009 Eclipse Modeling Project and others.
 * All rights reserved.   This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *   IBM - Initial API and implementation
 *
 * </copyright>
 *
 * $Id$
 */
package org.eclipse.ocl.ecore.validation;

/**
 * A sample validator interface for {@link org.eclipse.ocl.ecore.BooleanLiteralExp}.
 * This doesn't really do anything, and it's not a real EMF artifact.
 * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
 * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
 */
public interface BooleanLiteralExpValidator {

	boolean validate();

}




/**
 * <copyright>
 *
 * Copyright (c) 2009 Eclipse Modeling Project and others.
 * All rights reserved.   This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *   IBM - Initial API and implementation
 *
 * </copyright>
 *
 * $Id$
 */
package org.eclipse.ocl.ecore.validation;

/**
 * A sample validator interface for {@link org.eclipse.ocl.ecore.CallExp}.
 * This doesn't really do anything, and it's not a real EMF artifact.
 * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
 * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
 */
public interface CallExpValidator {

	boolean validate();

}




/**
 * <copyright>
 *
 * Copyright (c) 2009 Eclipse Modeling Project and others.
 * All rights reserved.   This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *   IBM - Initial API and implementation
 *
 * </copyright>
 *
 * $Id$
 */
package org.eclipse.ocl.ecore.validation;

import org.eclipse.emf.ecore.EOperation;

/**
 * A sample validator interface for {@link org.eclipse.ocl.ecore.CallOperationAction}.
 * This doesn't really do anything, and it's not a real EMF artifact.
 * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
 * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
 */
public interface CallOperationActionValidator {

	boolean validate();

	boolean validateOperation(EOperation value);
}




/**
 * <copyright>
 *
 * Copyright (c) 2009 Eclipse Modeling Project and others.
 * All rights reserved.   This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *   IBM - Initial API and implementation
 *
 * </copyright>
 *
 * $Id$
 */
package org.eclipse.ocl.ecore.validation;

/**
 * A sample validator interface for {@link org.eclipse.ocl.ecore.CollectionItem}.
 * This doesn't really do anything, and it's not a real EMF artifact.
 * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
 * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
 */
public interface CollectionItemValidator {

	boolean validate();

}




/**
 * <copyright>
 *
 * Copyright (c) 2009 Eclipse Modeling Project and others.
 * All rights reserved.   This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *   IBM - Initial API and implementation
 *
 * </copyright>
 *
 * $Id$
 */
package org.eclipse.ocl.ecore.validation;

/**
 * A sample validator interface for {@link org.eclipse.ocl.ecore.CollectionLiteralExp}.
 * This doesn't really do anything, and it's not a real EMF artifact.
 * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
 * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
 */
public interface CollectionLiteralExpValidator {

	boolean validate();

}




/**
 * <copyright>
 *
 * Copyright (c) 2009 Eclipse Modeling Project and others.
 * All rights reserved.   This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *   IBM - Initial API and implementation
 *
 * </copyright>
 *
 * $Id$
 */
package org.eclipse.ocl.ecore.validation;

/**
 * A sample validator interface for {@link org.eclipse.ocl.ecore.CollectionLiteralPart}.
 * This doesn't really do anything, and it's not a real EMF artifact.
 * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
 * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
 */
public interface CollectionLiteralPartValidator {

	boolean validate();

}




/**
 * <copyright>
 *
 * Copyright (c) 2009 Eclipse Modeling Project and others.
 * All rights reserved.   This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *   IBM - Initial API and implementation
 *
 * </copyright>
 *
 * $Id$
 */
package org.eclipse.ocl.ecore.validation;

/**
 * A sample validator interface for {@link org.eclipse.ocl.ecore.CollectionRange}.
 * This doesn't really do anything, and it's not a real EMF artifact.
 * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
 * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
 */
public interface CollectionRangeValidator {

	boolean validate();

}




/**
 * <copyright>
 *
 * Copyright (c) 2009 Eclipse Modeling Project and others.
 * All rights reserved.   This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *   IBM - Initial API and implementation
 *
 * </copyright>
 *
 * $Id$
 */
package org.eclipse.ocl.ecore.validation;

/**
 * A sample validator interface for {@link org.eclipse.ocl.ecore.CollectionType}.
 * This doesn't really do anything, and it's not a real EMF artifact.
 * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
 * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
 */
public interface CollectionTypeValidator {

	boolean validate();

}




/**
 * <copyright>
 *
 * Copyright (c) 2009 Eclipse Modeling Project and others.
 * All rights reserved.   This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *   IBM - Initial API and implementation
 *
 * </copyright>
 *
 * $Id$
 */
package org.eclipse.ocl.ecore.validation;

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

import org.eclipse.emf.ecore.EClassifier;
import org.eclipse.emf.ecore.ENamedElement;
import org.eclipse.emf.ecore.EParameter;

import org.eclipse.ocl.utilities.ExpressionInOCL;

/**
 * A sample validator interface for {@link org.eclipse.ocl.ecore.Constraint}.
 * This doesn't really do anything, and it's not a real EMF artifact.
 * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
 * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
 */
public interface ConstraintValidator {

	boolean validate();

	boolean validateSpecification(ExpressionInOCL<EClassifier, EParameter> value);

	boolean validateConstrainedElements(EList<ENamedElement> value);

	boolean validateStereotype(String value);
}




/**
 * <copyright>
 *
 * Copyright (c) 2009 Eclipse Modeling Project and others.
 * All rights reserved.   This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *   IBM - Initial API and implementation
 *
 * </copyright>
 *
 * $Id$
 */
package org.eclipse.ocl.ecore.validation;

/**
 * A sample validator interface for {@link org.eclipse.ocl.ecore.ElementType}.
 * This doesn't really do anything, and it's not a real EMF artifact.
 * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
 * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
 */
public interface ElementTypeValidator {

	boolean validate();

}




/**
 * <copyright>
 *
 * Copyright (c) 2009 Eclipse Modeling Project and others.
 * All rights reserved.   This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *   IBM - Initial API and implementation
 *
 * </copyright>
 *
 * $Id$
 */
package org.eclipse.ocl.ecore.validation;

/**
 * A sample validator interface for {@link org.eclipse.ocl.ecore.EnumLiteralExp}.
 * This doesn't really do anything, and it's not a real EMF artifact.
 * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
 * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
 */
public interface EnumLiteralExpValidator {

	boolean validate();

}




/**
 * <copyright>
 *
 * Copyright (c) 2009 Eclipse Modeling Project and others.
 * All rights reserved.   This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *   IBM - Initial API and implementation
 *
 * </copyright>
 *
 * $Id$
 */
package org.eclipse.ocl.ecore.validation;

/**
 * A sample validator interface for {@link org.eclipse.ocl.ecore.ExpressionInOCL}.
 * This doesn't really do anything, and it's not a real EMF artifact.
 * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
 * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
 */
public interface ExpressionInOCLValidator {

	boolean validate();

}




/**
 * <copyright>
 *
 * Copyright (c) 2009 Eclipse Modeling Project and others.
 * All rights reserved.   This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *   IBM - Initial API and implementation
 *
 * </copyright>
 *
 * $Id$
 */
package org.eclipse.ocl.ecore.validation;

/**
 * A sample validator interface for {@link org.eclipse.ocl.ecore.FeatureCallExp}.
 * This doesn't really do anything, and it's not a real EMF artifact.
 * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
 * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
 */
public interface FeatureCallExpValidator {

	boolean validate();

}




/**
 * <copyright>
 *
 * Copyright (c) 2009 Eclipse Modeling Project and others.
 * All rights reserved.   This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *   IBM - Initial API and implementation
 *
 * </copyright>
 *
 * $Id$
 */
package org.eclipse.ocl.ecore.validation;

/**
 * A sample validator interface for {@link org.eclipse.ocl.ecore.IfExp}.
 * This doesn't really do anything, and it's not a real EMF artifact.
 * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
 * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
 */
public interface IfExpValidator {

	boolean validate();

}




/**
 * <copyright>
 *
 * Copyright (c) 2009 Eclipse Modeling Project and others.
 * All rights reserved.   This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *   IBM - Initial API and implementation
 *
 * </copyright>
 *
 * $Id$
 */
package org.eclipse.ocl.ecore.validation;

/**
 * A sample validator interface for {@link org.eclipse.ocl.ecore.IntegerLiteralExp}.
 * This doesn't really do anything, and it's not a real EMF artifact.
 * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
 * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
 */
public interface IntegerLiteralExpValidator {

	boolean validate();

}




/**
 * <copyright>
 *
 * Copyright (c) 2009 Eclipse Modeling Project and others.
 * All rights reserved.   This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *   IBM - Initial API and implementation
 *
 * </copyright>
 *
 * $Id$
 */
package org.eclipse.ocl.ecore.validation;

/**
 * A sample validator interface for {@link org.eclipse.ocl.ecore.InvalidLiteralExp}.
 * This doesn't really do anything, and it's not a real EMF artifact.
 * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
 * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
 */
public interface InvalidLiteralExpValidator {

	boolean validate();

}




/**
 * <copyright>
 *
 * Copyright (c) 2009 Eclipse Modeling Project and others.
 * All rights reserved.   This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *   IBM - Initial API and implementation
 *
 * </copyright>
 *
 * $Id$
 */
package org.eclipse.ocl.ecore.validation;

/**
 * A sample validator interface for {@link org.eclipse.ocl.ecore.InvalidType}.
 * This doesn't really do anything, and it's not a real EMF artifact.
 * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
 * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
 */
public interface InvalidTypeValidator {

	boolean validate();

}




/**
 * <copyright>
 *
 * Copyright (c) 2009 Eclipse Modeling Project and others.
 * All rights reserved.   This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *   IBM - Initial API and implementation
 *
 * </copyright>
 *
 * $Id$
 */
package org.eclipse.ocl.ecore.validation;

/**
 * A sample validator interface for {@link org.eclipse.ocl.ecore.IterateExp}.
 * This doesn't really do anything, and it's not a real EMF artifact.
 * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
 * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
 */
public interface IterateExpValidator {

	boolean validate();

}




/**
 * <copyright>
 *
 * Copyright (c) 2009 Eclipse Modeling Project and others.
 * All rights reserved.   This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *   IBM - Initial API and implementation
 *
 * </copyright>
 *
 * $Id$
 */
package org.eclipse.ocl.ecore.validation;

/**
 * A sample validator interface for {@link org.eclipse.ocl.ecore.IteratorExp}.
 * This doesn't really do anything, and it's not a real EMF artifact.
 * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
 * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
 */
public interface IteratorExpValidator {

	boolean validate();

}




/**
 * <copyright>
 *
 * Copyright (c) 2009 Eclipse Modeling Project and others.
 * All rights reserved.   This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *   IBM - Initial API and implementation
 *
 * </copyright>
 *
 * $Id$
 */
package org.eclipse.ocl.ecore.validation;

/**
 * A sample validator interface for {@link org.eclipse.ocl.ecore.LetExp}.
 * This doesn't really do anything, and it's not a real EMF artifact.
 * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
 * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
 */
public interface LetExpValidator {

	boolean validate();

}




/**
 * <copyright>
 *
 * Copyright (c) 2009 Eclipse Modeling Project and others.
 * All rights reserved.   This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *   IBM - Initial API and implementation
 *
 * </copyright>
 *
 * $Id$
 */
package org.eclipse.ocl.ecore.validation;

/**
 * A sample validator interface for {@link org.eclipse.ocl.ecore.LiteralExp}.
 * This doesn't really do anything, and it's not a real EMF artifact.
 * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
 * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
 */
public interface LiteralExpValidator {

	boolean validate();

}




/**
 * <copyright>
 *
 * Copyright (c) 2009 Eclipse Modeling Project and others.
 * All rights reserved.   This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *   IBM - Initial API and implementation
 *
 * </copyright>
 *
 * $Id$
 */
package org.eclipse.ocl.ecore.validation;

/**
 * A sample validator interface for {@link org.eclipse.ocl.ecore.LoopExp}.
 * This doesn't really do anything, and it's not a real EMF artifact.
 * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
 * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
 */
public interface LoopExpValidator {

	boolean validate();

}




/**
 * <copyright>
 *
 * Copyright (c) 2009 Eclipse Modeling Project and others.
 * All rights reserved.   This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *   IBM - Initial API and implementation
 *
 * </copyright>
 *
 * $Id$
 */
package org.eclipse.ocl.ecore.validation;

/**
 * A sample validator interface for {@link org.eclipse.ocl.ecore.MessageExp}.
 * This doesn't really do anything, and it's not a real EMF artifact.
 * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
 * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
 */
public interface MessageExpValidator {

	boolean validate();

}




/**
 * <copyright>
 *
 * Copyright (c) 2009 Eclipse Modeling Project and others.
 * All rights reserved.   This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *   IBM - Initial API and implementation
 *
 * </copyright>
 *
 * $Id$
 */
package org.eclipse.ocl.ecore.validation;

/**
 * A sample validator interface for {@link org.eclipse.ocl.ecore.MessageType}.
 * This doesn't really do anything, and it's not a real EMF artifact.
 * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
 * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
 */
public interface MessageTypeValidator {

	boolean validate();

}




/**
 * <copyright>
 *
 * Copyright (c) 2009 Eclipse Modeling Project and others.
 * All rights reserved.   This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *   IBM - Initial API and implementation
 *
 * </copyright>
 *
 * $Id$
 */
package org.eclipse.ocl.ecore.validation;

/**
 * A sample validator interface for {@link org.eclipse.ocl.ecore.NavigationCallExp}.
 * This doesn't really do anything, and it's not a real EMF artifact.
 * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
 * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
 */
public interface NavigationCallExpValidator {

	boolean validate();

}




/**
 * <copyright>
 *
 * Copyright (c) 2009 Eclipse Modeling Project and others.
 * All rights reserved.   This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *   IBM - Initial API and implementation
 *
 * </copyright>
 *
 * $Id$
 */
package org.eclipse.ocl.ecore.validation;

/**
 * A sample validator interface for {@link org.eclipse.ocl.ecore.NullLiteralExp}.
 * This doesn't really do anything, and it's not a real EMF artifact.
 * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
 * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
 */
public interface NullLiteralExpValidator {

	boolean validate();

}




/**
 * <copyright>
 *
 * Copyright (c) 2009 Eclipse Modeling Project and others.
 * All rights reserved.   This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *   IBM - Initial API and implementation
 *
 * </copyright>
 *
 * $Id$
 */
package org.eclipse.ocl.ecore.validation;

/**
 * A sample validator interface for {@link org.eclipse.ocl.ecore.NumericLiteralExp}.
 * This doesn't really do anything, and it's not a real EMF artifact.
 * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
 * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
 */
public interface NumericLiteralExpValidator {

	boolean validate();

}




/**
 * <copyright>
 *
 * Copyright (c) 2009 Eclipse Modeling Project and others.
 * All rights reserved.   This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *   IBM - Initial API and implementation
 *
 * </copyright>
 *
 * $Id$
 */
package org.eclipse.ocl.ecore.validation;

/**
 * A sample validator interface for {@link org.eclipse.ocl.ecore.OCLExpression}.
 * This doesn't really do anything, and it's not a real EMF artifact.
 * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
 * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
 */
public interface OCLExpressionValidator {

	boolean validate();

}




/**
 * <copyright>
 *
 * Copyright (c) 2009 Eclipse Modeling Project and others.
 * All rights reserved.   This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *   IBM - Initial API and implementation
 *
 * </copyright>
 *
 * $Id$
 */
package org.eclipse.ocl.ecore.validation;

/**
 * A sample validator interface for {@link org.eclipse.ocl.ecore.OperationCallExp}.
 * This doesn't really do anything, and it's not a real EMF artifact.
 * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
 * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
 */
public interface OperationCallExpValidator {

	boolean validate();

}




/**
 * <copyright>
 *
 * Copyright (c) 2009 Eclipse Modeling Project and others.
 * All rights reserved.   This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *   IBM - Initial API and implementation
 *
 * </copyright>
 *
 * $Id$
 */
package org.eclipse.ocl.ecore.validation;

/**
 * A sample validator interface for {@link org.eclipse.ocl.ecore.OrderedSetType}.
 * This doesn't really do anything, and it's not a real EMF artifact.
 * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
 * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
 */
public interface OrderedSetTypeValidator {

	boolean validate();

}




/**
 * <copyright>
 *
 * Copyright (c) 2009 Eclipse Modeling Project and others.
 * All rights reserved.   This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *   IBM - Initial API and implementation
 *
 * </copyright>
 *
 * $Id$
 */
package org.eclipse.ocl.ecore.validation;

/**
 * A sample validator interface for {@link org.eclipse.ocl.ecore.PrimitiveLiteralExp}.
 * This doesn't really do anything, and it's not a real EMF artifact.
 * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
 * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
 */
public interface PrimitiveLiteralExpValidator {

	boolean validate();

}




/**
 * <copyright>
 *
 * Copyright (c) 2009 Eclipse Modeling Project and others.
 * All rights reserved.   This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *   IBM - Initial API and implementation
 *
 * </copyright>
 *
 * $Id$
 */
package org.eclipse.ocl.ecore.validation;

/**
 * A sample validator interface for {@link org.eclipse.ocl.ecore.PrimitiveType}.
 * This doesn't really do anything, and it's not a real EMF artifact.
 * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
 * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
 */
public interface PrimitiveTypeValidator {

	boolean validate();

}




/**
 * <copyright>
 *
 * Copyright (c) 2009 Eclipse Modeling Project and others.
 * All rights reserved.   This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *   IBM - Initial API and implementation
 *
 * </copyright>
 *
 * $Id$
 */
package org.eclipse.ocl.ecore.validation;

/**
 * A sample validator interface for {@link org.eclipse.ocl.ecore.PropertyCallExp}.
 * This doesn't really do anything, and it's not a real EMF artifact.
 * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
 * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
 */
public interface PropertyCallExpValidator {

	boolean validate();

}




/**
 * <copyright>
 *
 * Copyright (c) 2009 Eclipse Modeling Project and others.
 * All rights reserved.   This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *   IBM - Initial API and implementation
 *
 * </copyright>
 *
 * $Id$
 */
package org.eclipse.ocl.ecore.validation;

/**
 * A sample validator interface for {@link org.eclipse.ocl.ecore.RealLiteralExp}.
 * This doesn't really do anything, and it's not a real EMF artifact.
 * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
 * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
 */
public interface RealLiteralExpValidator {

	boolean validate();

}




/**
 * <copyright>
 *
 * Copyright (c) 2009 Eclipse Modeling Project and others.
 * All rights reserved.   This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *   IBM - Initial API and implementation
 *
 * </copyright>
 *
 * $Id$
 */
package org.eclipse.ocl.ecore.validation;

import org.eclipse.emf.ecore.EClass;

/**
 * A sample validator interface for {@link org.eclipse.ocl.ecore.SendSignalAction}.
 * This doesn't really do anything, and it's not a real EMF artifact.
 * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
 * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
 */
public interface SendSignalActionValidator {

	boolean validate();

	boolean validateSignal(EClass value);
}




/**
 * <copyright>
 *
 * Copyright (c) 2009 Eclipse Modeling Project and others.
 * All rights reserved.   This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *   IBM - Initial API and implementation
 *
 * </copyright>
 *
 * $Id$
 */
package org.eclipse.ocl.ecore.validation;

/**
 * A sample validator interface for {@link org.eclipse.ocl.ecore.SequenceType}.
 * This doesn't really do anything, and it's not a real EMF artifact.
 * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
 * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
 */
public interface SequenceTypeValidator {

	boolean validate();

}




/**
 * <copyright>
 *
 * Copyright (c) 2009 Eclipse Modeling Project and others.
 * All rights reserved.   This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *   IBM - Initial API and implementation
 *
 * </copyright>
 *
 * $Id$
 */
package org.eclipse.ocl.ecore.validation;

/**
 * A sample validator interface for {@link org.eclipse.ocl.ecore.SetType}.
 * This doesn't really do anything, and it's not a real EMF artifact.
 * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
 * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
 */
public interface SetTypeValidator {

	boolean validate();

}




/**
 * <copyright>
 *
 * Copyright (c) 2009 Eclipse Modeling Project and others.
 * All rights reserved.   This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *   IBM - Initial API and implementation
 *
 * </copyright>
 *
 * $Id$
 */
package org.eclipse.ocl.ecore.validation;

/**
 * A sample validator interface for {@link org.eclipse.ocl.ecore.StateExp}.
 * This doesn't really do anything, and it's not a real EMF artifact.
 * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
 * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
 */
public interface StateExpValidator {

	boolean validate();

}




/**
 * <copyright>
 *
 * Copyright (c) 2009 Eclipse Modeling Project and others.
 * All rights reserved.   This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *   IBM - Initial API and implementation
 *
 * </copyright>
 *
 * $Id$
 */
package org.eclipse.ocl.ecore.validation;

/**
 * A sample validator interface for {@link org.eclipse.ocl.ecore.StringLiteralExp}.
 * This doesn't really do anything, and it's not a real EMF artifact.
 * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
 * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
 */
public interface StringLiteralExpValidator {

	boolean validate();

}




/**
 * <copyright>
 *
 * Copyright (c) 2009 Eclipse Modeling Project and others.
 * All rights reserved.   This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *   IBM - Initial API and implementation
 *
 * </copyright>
 *
 * $Id$
 */
package org.eclipse.ocl.ecore.validation;

/**
 * A sample validator interface for {@link org.eclipse.ocl.ecore.TemplateParameterType}.
 * This doesn't really do anything, and it's not a real EMF artifact.
 * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
 * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
 */
public interface TemplateParameterTypeValidator {

	boolean validate();

}




/**
 * <copyright>
 *
 * Copyright (c) 2009 Eclipse Modeling Project and others.
 * All rights reserved.   This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *   IBM - Initial API and implementation
 *
 * </copyright>
 *
 * $Id$
 */
package org.eclipse.ocl.ecore.validation;

/**
 * A sample validator interface for {@link org.eclipse.ocl.ecore.TupleLiteralExp}.
 * This doesn't really do anything, and it's not a real EMF artifact.
 * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
 * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
 */
public interface TupleLiteralExpValidator {

	boolean validate();

}




/**
 * <copyright>
 *
 * Copyright (c) 2009 Eclipse Modeling Project and others.
 * All rights reserved.   This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *   IBM - Initial API and implementation
 *
 * </copyright>
 *
 * $Id$
 */
package org.eclipse.ocl.ecore.validation;

/**
 * A sample validator interface for {@link org.eclipse.ocl.ecore.TupleLiteralPart}.
 * This doesn't really do anything, and it's not a real EMF artifact.
 * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
 * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
 */
public interface TupleLiteralPartValidator {

	boolean validate();

}




/**
 * <copyright>
 *
 * Copyright (c) 2009 Eclipse Modeling Project and others.
 * All rights reserved.   This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *   IBM - Initial API and implementation
 *
 * </copyright>
 *
 * $Id$
 */
package org.eclipse.ocl.ecore.validation;

/**
 * A sample validator interface for {@link org.eclipse.ocl.ecore.TupleType}.
 * This doesn't really do anything, and it's not a real EMF artifact.
 * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
 * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
 */
public interface TupleTypeValidator {

	boolean validate();

}




/**
 * <copyright>
 *
 * Copyright (c) 2009 Eclipse Modeling Project and others.
 * All rights reserved.   This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *   IBM - Initial API and implementation
 *
 * </copyright>
 *
 * $Id$
 */
package org.eclipse.ocl.ecore.validation;

/**
 * A sample validator interface for {@link org.eclipse.ocl.ecore.TypeExp}.
 * This doesn't really do anything, and it's not a real EMF artifact.
 * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
 * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
 */
public interface TypeExpValidator {

	boolean validate();

}




/**
 * <copyright>
 *
 * Copyright (c) 2009 Eclipse Modeling Project and others.
 * All rights reserved.   This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *   IBM - Initial API and implementation
 *
 * </copyright>
 *
 * $Id$
 */
package org.eclipse.ocl.ecore.validation;

/**
 * A sample validator interface for {@link org.eclipse.ocl.ecore.TypeType}.
 * This doesn't really do anything, and it's not a real EMF artifact.
 * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
 * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
 */
public interface TypeTypeValidator {

	boolean validate();

}




/**
 * <copyright>
 *
 * Copyright (c) 2009 Eclipse Modeling Project and others.
 * All rights reserved.   This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *   IBM - Initial API and implementation
 *
 * </copyright>
 *
 * $Id$
 */
package org.eclipse.ocl.ecore.validation;

/**
 * A sample validator interface for {@link org.eclipse.ocl.ecore.UnlimitedNaturalLiteralExp}.
 * This doesn't really do anything, and it's not a real EMF artifact.
 * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
 * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
 */
public interface UnlimitedNaturalLiteralExpValidator {

	boolean validate();

}




/**
 * <copyright>
 *
 * Copyright (c) 2009 Eclipse Modeling Project and others.
 * All rights reserved.   This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *   IBM - Initial API and implementation
 *
 * </copyright>
 *
 * $Id$
 */
package org.eclipse.ocl.ecore.validation;

/**
 * A sample validator interface for {@link org.eclipse.ocl.ecore.UnspecifiedValueExp}.
 * This doesn't really do anything, and it's not a real EMF artifact.
 * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
 * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
 */
public interface UnspecifiedValueExpValidator {

	boolean validate();

}




/**
 * <copyright>
 *
 * Copyright (c) 2009 Eclipse Modeling Project and others.
 * All rights reserved.   This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *   IBM - Initial API and implementation
 *
 * </copyright>
 *
 * $Id$
 */
package org.eclipse.ocl.ecore.validation;

/**
 * A sample validator interface for {@link org.eclipse.ocl.ecore.VariableExp}.
 * This doesn't really do anything, and it's not a real EMF artifact.
 * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
 * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
 */
public interface VariableExpValidator {

	boolean validate();

}




/**
 * <copyright>
 *
 * Copyright (c) 2009 Eclipse Modeling Project and others.
 * All rights reserved.   This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *   IBM - Initial API and implementation
 *
 * </copyright>
 *
 * $Id$
 */
package org.eclipse.ocl.ecore.validation;

/**
 * A sample validator interface for {@link org.eclipse.ocl.ecore.Variable}.
 * This doesn't really do anything, and it's not a real EMF artifact.
 * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
 * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
 */
public interface VariableValidator {

	boolean validate();

}




/**
 * <copyright>
 *
 * Copyright (c) 2009 Eclipse Modeling Project and others.
 * All rights reserved.   This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *   IBM - Initial API and implementation
 *
 * </copyright>
 *
 * $Id$
 */
package org.eclipse.ocl.ecore.validation;

/**
 * A sample validator interface for {@link org.eclipse.ocl.ecore.VoidType}.
 * This doesn't really do anything, and it's not a real EMF artifact.
 * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
 * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
 */
public interface VoidTypeValidator {

	boolean validate();

}





import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.math.BigInteger;
import java.util.Collections;
import java.util.Iterator;
import java.util.List;

	}
	
	/**
	 * Tests the serialization of an expression that uses OCL integer values.
	 */
	public void test_integerTypeSerialization() {
		OCLExpression<EClassifier> expr = parseExpression(
				EcorePackage.Literals.EPACKAGE,
				BigInteger.valueOf(Long.MAX_VALUE).add(BigInteger.valueOf(1)) + " > " + Long.MAX_VALUE + " - " + Integer.MAX_VALUE);

		String toStringForm = expr.toString();
		String serialForm = serialize(expr);
		
		expr = loadExpression(serialForm);
		validate(expr);  // ensure that it is structurally valid
		assertEquals(toStringForm, expr.toString());  // should "look" the same
	}
	
	/**
	 * Tests the serialization of an expression that uses OCL real values.
	 */
	public void test_realTypeSerialization() {
		OCLExpression<EClassifier> expr = parseExpression(
				EcorePackage.Literals.EPACKAGE,
				"12345678901234567890.123456789e44 > 1.234");

		String toStringForm = expr.toString();
		String serialForm = serialize(expr);
		
		expr = loadExpression(serialForm);
		validate(expr);  // ensure that it is structurally valid
		assertEquals(toStringForm, expr.toString());  // should "look" the same
	}
	
	/**
	 * Tests the serialization of an expression that uses collections of
	 * primitive types.
	 */




	 * @generated
	 * @ordered
	 */
	protected static final Number INTEGER_SYMBOL_EDEFAULT = null;

	/**
	 * The cached value of the '{@link #getIntegerSymbol() <em>Integer Symbol</em>}' attribute.

	 * @generated
	 * @ordered
	 */
	protected Number integerSymbol = INTEGER_SYMBOL_EDEFAULT;

	/**
	 * <!-- begin-user-doc -->


	/**
	 * <!-- begin-user-doc -->
	 * @since 3.0
	 * <!-- end-user-doc -->
	 * @generated
	 */
	public Number getIntegerSymbol() {
		return integerSymbol;
	}

	/**
	 * <!-- begin-user-doc -->
	 * @since 3.0
	 * <!-- end-user-doc -->
	 * @generated
	 */
	public void setIntegerSymbol(Number newIntegerSymbol) {
		Number oldIntegerSymbol = integerSymbol;
		integerSymbol = newIntegerSymbol;
		if (eNotificationRequired())
			eNotify(new ENotificationImpl(this, Notification.SET,

	public void eSet(int featureID, Object newValue) {
		switch (featureID) {
			case UMLPackage.INTEGER_LITERAL_EXP__INTEGER_SYMBOL :
				setIntegerSymbol((Number) newValue);
				return;
		}
		super.eSet(featureID, newValue);




	 * @generated
	 * @ordered
	 */
	protected static final Number REAL_SYMBOL_EDEFAULT = null;

	/**
	 * The cached value of the '{@link #getRealSymbol() <em>Real Symbol</em>}' attribute.

	 * @generated
	 * @ordered
	 */
	protected Number realSymbol = REAL_SYMBOL_EDEFAULT;

	/**
	 * <!-- begin-user-doc -->


	/**
	 * <!-- begin-user-doc -->
	 * @since 3.0
	 * <!-- end-user-doc -->
	 * @generated
	 */
	public Number getRealSymbol() {
		return realSymbol;
	}

	/**
	 * <!-- begin-user-doc -->
	 * @since 3.0
	 * <!-- end-user-doc -->
	 * @generated
	 */
	public void setRealSymbol(Number newRealSymbol) {
		Number oldRealSymbol = realSymbol;
		realSymbol = newRealSymbol;
		if (eNotificationRequired())
			eNotify(new ENotificationImpl(this, Notification.SET,

	public void eSet(int featureID, Object newValue) {
		switch (featureID) {
			case UMLPackage.REAL_LITERAL_EXP__REAL_SYMBOL :
				setRealSymbol((Number) newValue);
				return;
		}
		super.eSet(featureID, newValue);




	 * @generated
	 */
	protected void createSubsetsAnnotations() {
		String source = "subsets"; //$NON-NLS-1$		
		addAnnotation(getAnyType_OwnedOperation(), source, new String[]{},
			new URI[]{URI.createURI(org.eclipse.uml2.uml.UMLPackage.eNS_URI)
				.appendFragment("//Classifier/feature") //$NON-NLS-1$

	 * @generated
	 */
	protected void createExtendedMetaDataAnnotations() {
		String source = "http:///org/eclipse/emf/ecore/util/ExtendedMetaData"; //$NON-NLS-1$								
		addAnnotation(expressionInOCLEClass, source, new String[]{
			"name", "ExpressionInOcl" //$NON-NLS-1$ //$NON-NLS-2$
		});

	 * @generated
	 */
	protected void createEcoreAnnotations() {
		String source = "http://www.eclipse.org/emf/2002/Ecore"; //$NON-NLS-1$										
		addAnnotation(oclExpressionEClass, source, new String[]{
			"constraints", "has_type" //$NON-NLS-1$ //$NON-NLS-2$
		});




	 * @generated
	 * @ordered
	 */
	protected static final Number INTEGER_SYMBOL_EDEFAULT = null;

	/**
	 * The cached value of the '{@link #getIntegerSymbol() <em>Integer Symbol</em>}' attribute.

	 * @generated
	 * @ordered
	 */
	protected Number integerSymbol = INTEGER_SYMBOL_EDEFAULT;

	/**
	 * The default value of the '{@link #isUnlimited() <em>Unlimited</em>}' attribute.


	/**
	 * <!-- begin-user-doc -->
	 * @since 3.0
	 * <!-- end-user-doc -->
	 * @generated
	 */
	public Number getIntegerSymbol() {
		return integerSymbol;
	}

	/**
	 * <!-- begin-user-doc -->
	 * @since 3.0
	 * <!-- end-user-doc -->
	 * @generated
	 */
	public void setIntegerSymbol(Number newIntegerSymbol) {
		Number oldIntegerSymbol = integerSymbol;
		integerSymbol = newIntegerSymbol;
		if (eNotificationRequired())
			eNotify(new ENotificationImpl(this, Notification.SET,

	 * @generated NOT
	 */
	public boolean isUnlimited() {
		return getIntegerSymbol().intValue() == UNLIMITED;
	}

	/**

	public void eSet(int featureID, Object newValue) {
		switch (featureID) {
			case UMLPackage.UNLIMITED_NATURAL_LITERAL_EXP__INTEGER_SYMBOL :
				setIntegerSymbol((Number) newValue);
				return;
		}
		super.eSet(featureID, newValue);





import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.math.BigInteger;
import java.util.Collections;
import java.util.Iterator;
import java.util.List;

	}
	
	/**
	 * Tests the serialization of an expression that uses OCL integer values.
	 */
	public void test_integerTypeSerialization() {
		OCLExpression<Classifier> expr = parseExpression(
				getMetaclass("Package"),
				BigInteger.valueOf(Long.MAX_VALUE).add(BigInteger.valueOf(1)) + " > " + Long.MAX_VALUE + " - " + Integer.MAX_VALUE);

		String toStringForm = expr.toString();
		String serialForm = serialize(expr);
		
		expr = loadExpression(serialForm);
		validate(expr);  // ensure that it is structurally valid
		assertEquals(toStringForm, expr.toString());  // should "look" the same
	}
	
	/**
	 * Tests the serialization of an expression that uses OCL real values.
	 */
	public void test_realTypeSerialization() {
		OCLExpression<Classifier> expr = parseExpression(
				getMetaclass("Package"),
				"12345678901234567890.123456789e44 > 1.234");

		String toStringForm = expr.toString();
		String serialForm = serialize(expr);
		
		expr = loadExpression(serialForm);
		validate(expr);  // ensure that it is structurally valid
		assertEquals(toStringForm, expr.toString());  // should "look" the same
	}
	
	/**
	 * Tests the serialization of an expression that uses collections of
	 * primitive types.
	 */

Return to bug 290605

Lines 675-680 Link Here

(-)model/OCL.ecore (-3 / +4 lines)
675	</eParameters>	675	</eParameters>
676	</eOperations>	676	</eOperations>
677	</eClassifiers>	677	</eClassifiers>
		678	<eClassifiers xsi:type="ecore:EDataType" name="Number" instanceClassName="java.lang.Number"/>
678	<eClassifiers xsi:type="ecore:EClass" name="ExpressionInOCL" abstract="true" interface="true"	679	<eClassifiers xsi:type="ecore:EClass" name="ExpressionInOCL" abstract="true" interface="true"
679	eSuperTypes="#//utilities/Visitable">	680	eSuperTypes="#//utilities/Visitable">
680	<eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">	681	<eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
Lines 1119-1125 Link Here
1119	</eGenericType>	1120	</eGenericType>
1120	</eParameters>	1121	</eParameters>
1121	</eOperations>	1122	</eOperations>
1122	<eStructuralFeatures xsi:type="ecore:EAttribute" name="integerSymbol" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EIntegerObject"/>	1123	<eStructuralFeatures xsi:type="ecore:EAttribute" name="integerSymbol" eType="#//utilities/Number"/>
1123	<eGenericSuperTypes eClassifier="#//expressions/NumericLiteralExp">	1124	<eGenericSuperTypes eClassifier="#//expressions/NumericLiteralExp">
1124	<eTypeArguments eTypeParameter="#//expressions/IntegerLiteralExp/C"/>	1125	<eTypeArguments eTypeParameter="#//expressions/IntegerLiteralExp/C"/>
1125	</eGenericSuperTypes>	1126	</eGenericSuperTypes>
Lines 1151-1157 Link Here
1151	</eGenericType>	1152	</eGenericType>
1152	</eParameters>	1153	</eParameters>
1153	</eOperations>	1154	</eOperations>
1154	<eStructuralFeatures xsi:type="ecore:EAttribute" name="integerSymbol" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EIntegerObject"/>	1155	<eStructuralFeatures xsi:type="ecore:EAttribute" name="integerSymbol" eType="#//utilities/Number"/>
1155	<eStructuralFeatures xsi:type="ecore:EAttribute" name="unlimited" lowerBound="1"	1156	<eStructuralFeatures xsi:type="ecore:EAttribute" name="unlimited" lowerBound="1"
1156	eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"	1157	eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
1157	changeable="false" volatile="true" transient="true" derived="true"/>	1158	changeable="false" volatile="true" transient="true" derived="true"/>
Lines 1703-1709 Link Here
1703	</eGenericType>	1704	</eGenericType>
1704	</eParameters>	1705	</eParameters>
1705	</eOperations>	1706	</eOperations>
1706	<eStructuralFeatures xsi:type="ecore:EAttribute" name="realSymbol" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDoubleObject"/>	1707	<eStructuralFeatures xsi:type="ecore:EAttribute" name="realSymbol" eType="#//utilities/Number"/>
1707	<eGenericSuperTypes eClassifier="#//expressions/NumericLiteralExp">	1708	<eGenericSuperTypes eClassifier="#//expressions/NumericLiteralExp">
1708	<eTypeArguments eTypeParameter="#//expressions/RealLiteralExp/C"/>	1709	<eTypeArguments eTypeParameter="#//expressions/RealLiteralExp/C"/>
1709	</eGenericSuperTypes>	1710	</eGenericSuperTypes>

Lines 1951-1957 Link Here

(-)src/org/eclipse/ocl/expressions/impl/ExpressionsPackageImpl.java (-4 / +4 lines)
1951	"IntegerLiteralExp", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$	1951	"IntegerLiteralExp", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
1952	initEAttribute(	1952	initEAttribute(
1953	getIntegerLiteralExp_IntegerSymbol(),	1953	getIntegerLiteralExp_IntegerSymbol(),
1954	ecorePackage.getEIntegerObject(),	1954	theUtilitiesPackage.getNumber(),
1955	"integerSymbol", null, 0, 1, IntegerLiteralExp.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$	1955	"integerSymbol", null, 0, 1, IntegerLiteralExp.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
1956		1956
1957	op = addEOperation(integerLiteralExpEClass, ecorePackage.getEBoolean(),	1957	op = addEOperation(integerLiteralExpEClass, ecorePackage.getEBoolean(),
Lines 1976-1982 Link Here
1976	"UnlimitedNaturalLiteralExp", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$	1976	"UnlimitedNaturalLiteralExp", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
1977	initEAttribute(	1977	initEAttribute(
1978	getUnlimitedNaturalLiteralExp_IntegerSymbol(),	1978	getUnlimitedNaturalLiteralExp_IntegerSymbol(),
1979	ecorePackage.getEIntegerObject(),	1979	theUtilitiesPackage.getNumber(),
1980	"integerSymbol", null, 0, 1, UnlimitedNaturalLiteralExp.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$	1980	"integerSymbol", null, 0, 1, UnlimitedNaturalLiteralExp.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
1981	initEAttribute(	1981	initEAttribute(
1982	getUnlimitedNaturalLiteralExp_Unlimited(),	1982	getUnlimitedNaturalLiteralExp_Unlimited(),
Lines 2378-2384 Link Here
2378	"RealLiteralExp", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$	2378	"RealLiteralExp", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
2379	initEAttribute(	2379	initEAttribute(
2380	getRealLiteralExp_RealSymbol(),	2380	getRealLiteralExp_RealSymbol(),
2381	ecorePackage.getEDoubleObject(),	2381	theUtilitiesPackage.getNumber(),
2382	"realSymbol", null, 0, 1, RealLiteralExp.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$	2382	"realSymbol", null, 0, 1, RealLiteralExp.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
2383		2383
2384	op = addEOperation(realLiteralExpEClass, ecorePackage.getEBoolean(),	2384	op = addEOperation(realLiteralExpEClass, ecorePackage.getEBoolean(),
Lines 2553-2559 Link Here
2553	* @generated	2553	* @generated
2554	*/	2554	*/
2555	protected void createExtendedMetaDataAnnotations() {	2555	protected void createExtendedMetaDataAnnotations() {
2556	String source = "http:///org/eclipse/emf/ecore/util/ExtendedMetaData"; //$NON-NLS-1$	2556	String source = "http:///org/eclipse/emf/ecore/util/ExtendedMetaData"; //$NON-NLS-1$
2557	addAnnotation(oclExpressionEClass, source, new String[]{	2557	addAnnotation(oclExpressionEClass, source, new String[]{
2558	"name", "OclExpression" //$NON-NLS-1$ //$NON-NLS-2$	2558	"name", "OclExpression" //$NON-NLS-1$ //$NON-NLS-2$
2559	});	2559	});

Lines 713-720 Link Here

(-)model/OCL.uml (-6 / +5 lines)
713	</ownedParameter>	713	</ownedParameter>
714	</ownedTemplateSignature>	714	</ownedTemplateSignature>
715	<generalization xmi:id="_unvVyNppEdu-d8Dv4wLx9Q" general="_unvVy9ppEdu-d8Dv4wLx9Q"/>	715	<generalization xmi:id="_unvVyNppEdu-d8Dv4wLx9Q" general="_unvVy9ppEdu-d8Dv4wLx9Q"/>
716	<ownedAttribute xmi:id="_unvVydppEdu-d8Dv4wLx9Q" name="integerSymbol" visibility="public" isOrdered="true">	716	<ownedAttribute xmi:id="_unvVydppEdu-d8Dv4wLx9Q" name="integerSymbol" visibility="public" type="_rw67cP9tEd67_agdSFnrQQ" isOrdered="true">
717	<type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/EcorePrimitiveTypes.library.uml#EIntegerObject"/>
718	<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_unvVytppEdu-d8Dv4wLx9Q"/>	717	<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_unvVytppEdu-d8Dv4wLx9Q"/>
719	</ownedAttribute>	718	</ownedAttribute>
720	<nestedClassifier xmi:type="uml:Class" xmi:id="_unvVy9ppEdu-d8Dv4wLx9Q" name="NumericLiteralExp_C">	719	<nestedClassifier xmi:type="uml:Class" xmi:id="_unvVy9ppEdu-d8Dv4wLx9Q" name="NumericLiteralExp_C">
Lines 749-756 Link Here
749	</ownedParameter>	748	</ownedParameter>
750	</ownedTemplateSignature>	749	</ownedTemplateSignature>
751	<generalization xmi:id="_unvV2tppEdu-d8Dv4wLx9Q" general="_unvV3tppEdu-d8Dv4wLx9Q"/>	750	<generalization xmi:id="_unvV2tppEdu-d8Dv4wLx9Q" general="_unvV3tppEdu-d8Dv4wLx9Q"/>
752	<ownedAttribute xmi:id="_unvV29ppEdu-d8Dv4wLx9Q" name="integerSymbol" visibility="public" isOrdered="true">	751	<ownedAttribute xmi:id="_unvV29ppEdu-d8Dv4wLx9Q" name="integerSymbol" visibility="public" type="_rw67cP9tEd67_agdSFnrQQ" isOrdered="true">
753	<type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/EcorePrimitiveTypes.library.uml#EIntegerObject"/>
754	<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_unvV3NppEdu-d8Dv4wLx9Q"/>	752	<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_unvV3NppEdu-d8Dv4wLx9Q"/>
755	</ownedAttribute>	753	</ownedAttribute>
756	<ownedAttribute xmi:id="_unvV3dppEdu-d8Dv4wLx9Q" name="unlimited" visibility="public" isOrdered="true" isReadOnly="true" isDerived="true">	754	<ownedAttribute xmi:id="_unvV3dppEdu-d8Dv4wLx9Q" name="unlimited" visibility="public" isOrdered="true" isReadOnly="true" isDerived="true">
Lines 1182-1189 Link Here
1182	</ownedParameter>	1180	</ownedParameter>
1183	</ownedTemplateSignature>	1181	</ownedTemplateSignature>
1184	<generalization xmi:id="_un1aYNppEdu-d8Dv4wLx9Q" general="_un1aY9ppEdu-d8Dv4wLx9Q"/>	1182	<generalization xmi:id="_un1aYNppEdu-d8Dv4wLx9Q" general="_un1aY9ppEdu-d8Dv4wLx9Q"/>
1185	<ownedAttribute xmi:id="_un1aYdppEdu-d8Dv4wLx9Q" name="realSymbol" visibility="public" isOrdered="true">	1183	<ownedAttribute xmi:id="_un1aYdppEdu-d8Dv4wLx9Q" name="realSymbol" visibility="public" type="_rw67cP9tEd67_agdSFnrQQ" isOrdered="true">
1186	<type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/EcorePrimitiveTypes.library.uml#EDoubleObject"/>
1187	<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_un1aYtppEdu-d8Dv4wLx9Q"/>	1184	<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_un1aYtppEdu-d8Dv4wLx9Q"/>
1188	</ownedAttribute>	1185	</ownedAttribute>
1189	<nestedClassifier xmi:type="uml:Class" xmi:id="_un1aY9ppEdu-d8Dv4wLx9Q" name="NumericLiteralExp_C">	1186	<nestedClassifier xmi:type="uml:Class" xmi:id="_un1aY9ppEdu-d8Dv4wLx9Q" name="NumericLiteralExp_C">
Lines 1913-1918 Link Here
1913	<packagedElement xmi:type="uml:Association" xmi:id="_H0w1YNLnEd6hmvYFRJXZTA" memberEnd="_ykFGANLmEd6hmvYFRJXZTA _RPJFINLnEd6hmvYFRJXZTA">	1910	<packagedElement xmi:type="uml:Association" xmi:id="_H0w1YNLnEd6hmvYFRJXZTA" memberEnd="_ykFGANLmEd6hmvYFRJXZTA _RPJFINLnEd6hmvYFRJXZTA">
1914	<ownedEnd xmi:id="_RPJFINLnEd6hmvYFRJXZTA" type="_unvU2NppEdu-d8Dv4wLx9Q" association="_H0w1YNLnEd6hmvYFRJXZTA"/>	1911	<ownedEnd xmi:id="_RPJFINLnEd6hmvYFRJXZTA" type="_unvU2NppEdu-d8Dv4wLx9Q" association="_H0w1YNLnEd6hmvYFRJXZTA"/>
1915	</packagedElement>	1912	</packagedElement>
		1913	<packagedElement xmi:type="uml:PrimitiveType" xmi:id="_rw67cP9tEd67_agdSFnrQQ" name="Number"/>
1916	</packagedElement>	1914	</packagedElement>
1917	<profileApplication xmi:id="_un1az9ppEdu-d8Dv4wLx9Q">	1915	<profileApplication xmi:id="_un1az9ppEdu-d8Dv4wLx9Q">
1918	<eAnnotations xmi:id="_un1a0NppEdu-d8Dv4wLx9Q" source="http://www.eclipse.org/uml2/2.0.0/UML">	1916	<eAnnotations xmi:id="_un1a0NppEdu-d8Dv4wLx9Q" source="http://www.eclipse.org/uml2/2.0.0/UML">
Lines 2302-2305 Link Here
2302	<Ecore:EParameter xmi:id="_SCfO4N1nEduZ74nG8yJaxg" base_Parameter="_FcnTgN1nEduZ74nG8yJaxg"/>	2300	<Ecore:EParameter xmi:id="_SCfO4N1nEduZ74nG8yJaxg" base_Parameter="_FcnTgN1nEduZ74nG8yJaxg"/>
2303	<Ecore_1:EClass xmi:id="_1lMzkNXZEd6ci-srLwOkAQ" base_Class="_-PCtwNLlEd6hmvYFRJXZTA"/>	2301	<Ecore_1:EClass xmi:id="_1lMzkNXZEd6ci-srLwOkAQ" base_Class="_-PCtwNLlEd6hmvYFRJXZTA"/>
2304	<Ecore:EReference xmi:id="_82aXYNXZEd6ci-srLwOkAQ" base_Property="_ykFGANLmEd6hmvYFRJXZTA"/>	2302	<Ecore:EReference xmi:id="_82aXYNXZEd6ci-srLwOkAQ" base_Property="_ykFGANLmEd6hmvYFRJXZTA"/>
		2303	<Ecore:EDataType xmi:id="_t-sakP9tEd67_agdSFnrQQ" instanceClassName="java.lang.Number" base_PrimitiveType="_rw67cP9tEd67_agdSFnrQQ"/>
2305	</xmi:XMI>	2304	</xmi:XMI>

Lines 240-252 Link Here

(-)model/OCLCST.ecore (-3 / +4 lines)
240	<eStructuralFeatures xsi:type="ecore:EAttribute" name="symbol" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>	240	<eStructuralFeatures xsi:type="ecore:EAttribute" name="symbol" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
241	</eClassifiers>	241	</eClassifiers>
242	<eClassifiers xsi:type="ecore:EClass" name="IntegerLiteralExpCS" eSuperTypes="#//cst/PrimitiveLiteralExpCS">	242	<eClassifiers xsi:type="ecore:EClass" name="IntegerLiteralExpCS" eSuperTypes="#//cst/PrimitiveLiteralExpCS">
243	<eStructuralFeatures xsi:type="ecore:EAttribute" name="integerSymbol" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EIntegerObject"/>	243	<eStructuralFeatures xsi:type="ecore:EAttribute" name="integerSymbol" eType="#//cst/Number"/>
244	</eClassifiers>	244	</eClassifiers>
		245	<eClassifiers xsi:type="ecore:EDataType" name="Number" instanceClassName="java.lang.Number"/>
245	<eClassifiers xsi:type="ecore:EClass" name="UnlimitedNaturalLiteralExpCS" eSuperTypes="#//cst/PrimitiveLiteralExpCS">	246	<eClassifiers xsi:type="ecore:EClass" name="UnlimitedNaturalLiteralExpCS" eSuperTypes="#//cst/PrimitiveLiteralExpCS">
246	<eStructuralFeatures xsi:type="ecore:EAttribute" name="integerSymbol" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EIntegerObject"/>	247	<eStructuralFeatures xsi:type="ecore:EAttribute" name="integerSymbol" eType="#//cst/Number"/>
247	</eClassifiers>	248	</eClassifiers>
248	<eClassifiers xsi:type="ecore:EClass" name="RealLiteralExpCS" eSuperTypes="#//cst/PrimitiveLiteralExpCS">	249	<eClassifiers xsi:type="ecore:EClass" name="RealLiteralExpCS" eSuperTypes="#//cst/PrimitiveLiteralExpCS">
249	<eStructuralFeatures xsi:type="ecore:EAttribute" name="realSymbol" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDoubleObject"/>	250	<eStructuralFeatures xsi:type="ecore:EAttribute" name="realSymbol" eType="#//cst/Number"/>
250	</eClassifiers>	251	</eClassifiers>
251	<eClassifiers xsi:type="ecore:EClass" name="StringLiteralExpCS" eSuperTypes="#//cst/PrimitiveLiteralExpCS">	252	<eClassifiers xsi:type="ecore:EClass" name="StringLiteralExpCS" eSuperTypes="#//cst/PrimitiveLiteralExpCS">
252	<eStructuralFeatures xsi:type="ecore:EAttribute" name="stringSymbol" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>	253	<eStructuralFeatures xsi:type="ecore:EAttribute" name="stringSymbol" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

Lines 508-529 Link Here

(-)model/OCLCST.uml (-6 / +6 lines)
508	</packagedElement>	508	</packagedElement>
509	<packagedElement xmi:type="uml:Class" xmi:id="_qdx-A_8fEduhWtVvKtiQ7w" name="IntegerLiteralExpCS">	509	<packagedElement xmi:type="uml:Class" xmi:id="_qdx-A_8fEduhWtVvKtiQ7w" name="IntegerLiteralExpCS">
510	<generalization xmi:id="_qdx-BP8fEduhWtVvKtiQ7w" general="_qdx9__8fEduhWtVvKtiQ7w"/>	510	<generalization xmi:id="_qdx-BP8fEduhWtVvKtiQ7w" general="_qdx9__8fEduhWtVvKtiQ7w"/>
511	<ownedAttribute xmi:id="_qdx-Bf8fEduhWtVvKtiQ7w" name="integerSymbol" visibility="public" isOrdered="true">	511	<ownedAttribute xmi:id="_qdx-Bf8fEduhWtVvKtiQ7w" name="integerSymbol" visibility="public" type="_7S9-8P9rEd67_agdSFnrQQ" isOrdered="true">
512	<type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/EcorePrimitiveTypes.library.uml#EIntegerObject"/>
513	<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_qdx-Bv8fEduhWtVvKtiQ7w"/>	512	<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_qdx-Bv8fEduhWtVvKtiQ7w"/>
514	</ownedAttribute>	513	</ownedAttribute>
515	</packagedElement>	514	</packagedElement>
516	<packagedElement xmi:type="uml:Class" xmi:id="_qdx-B_8fEduhWtVvKtiQ7w" name="UnlimitedNaturalLiteralExpCS">	515	<packagedElement xmi:type="uml:Class" xmi:id="_qdx-B_8fEduhWtVvKtiQ7w" name="UnlimitedNaturalLiteralExpCS">
517	<generalization xmi:id="_qdx-CP8fEduhWtVvKtiQ7w" general="_qdx9__8fEduhWtVvKtiQ7w"/>	516	<generalization xmi:id="_qdx-CP8fEduhWtVvKtiQ7w" general="_qdx9__8fEduhWtVvKtiQ7w"/>
518	<ownedAttribute xmi:id="_qdx-Cf8fEduhWtVvKtiQ7w" name="integerSymbol" visibility="public" isOrdered="true">	517	<ownedAttribute xmi:id="_qdx-Cf8fEduhWtVvKtiQ7w" name="integerSymbol" visibility="public" type="_7S9-8P9rEd67_agdSFnrQQ" isOrdered="true">
519	<type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/EcorePrimitiveTypes.library.uml#EIntegerObject"/>
520	<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_qdx-Cv8fEduhWtVvKtiQ7w"/>	518	<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_qdx-Cv8fEduhWtVvKtiQ7w"/>
521	</ownedAttribute>	519	</ownedAttribute>
522	</packagedElement>	520	</packagedElement>
523	<packagedElement xmi:type="uml:Class" xmi:id="_qdx-C_8fEduhWtVvKtiQ7w" name="RealLiteralExpCS">	521	<packagedElement xmi:type="uml:Class" xmi:id="_qdx-C_8fEduhWtVvKtiQ7w" name="RealLiteralExpCS">
524	<generalization xmi:id="_qdx-DP8fEduhWtVvKtiQ7w" general="_qdx9__8fEduhWtVvKtiQ7w"/>	522	<generalization xmi:id="_qdx-DP8fEduhWtVvKtiQ7w" general="_qdx9__8fEduhWtVvKtiQ7w"/>
525	<ownedAttribute xmi:id="_qdx-Df8fEduhWtVvKtiQ7w" name="realSymbol" visibility="public" isOrdered="true">	523	<ownedAttribute xmi:id="_qdx-Df8fEduhWtVvKtiQ7w" name="realSymbol" visibility="public" type="_7S9-8P9rEd67_agdSFnrQQ" isOrdered="true">
526	<type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/EcorePrimitiveTypes.library.uml#EDoubleObject"/>
527	<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_qdx-Dv8fEduhWtVvKtiQ7w"/>	524	<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_qdx-Dv8fEduhWtVvKtiQ7w"/>
528	</ownedAttribute>	525	</ownedAttribute>
529	</packagedElement>	526	</packagedElement>
Lines 681-686 Link Here
681	<packagedElement xmi:type="uml:Association" xmi:id="_z7wVcLZcEd6yDcYCBdIWCA" memberEnd="_tRI3kLZcEd6yDcYCBdIWCA _CiFFoLZdEd6yDcYCBdIWCA">	678	<packagedElement xmi:type="uml:Association" xmi:id="_z7wVcLZcEd6yDcYCBdIWCA" memberEnd="_tRI3kLZcEd6yDcYCBdIWCA _CiFFoLZdEd6yDcYCBdIWCA">
682	<ownedEnd xmi:id="_CiFFoLZdEd6yDcYCBdIWCA" type="_qdx9C_8fEduhWtVvKtiQ7w" association="_z7wVcLZcEd6yDcYCBdIWCA"/>	679	<ownedEnd xmi:id="_CiFFoLZdEd6yDcYCBdIWCA" type="_qdx9C_8fEduhWtVvKtiQ7w" association="_z7wVcLZcEd6yDcYCBdIWCA"/>
683	</packagedElement>	680	</packagedElement>
		681	<packagedElement xmi:type="uml:PrimitiveType" xmi:id="_7S9-8P9rEd67_agdSFnrQQ" name="Number"/>
684	</packagedElement>	682	</packagedElement>
685	<profileApplication xmi:id="_qdx-XP8fEduhWtVvKtiQ7w">	683	<profileApplication xmi:id="_qdx-XP8fEduhWtVvKtiQ7w">
686	<eAnnotations xmi:id="_qdx-Xf8fEduhWtVvKtiQ7w" source="http://www.eclipse.org/uml2/2.0.0/UML">	684	<eAnnotations xmi:id="_qdx-Xf8fEduhWtVvKtiQ7w" source="http://www.eclipse.org/uml2/2.0.0/UML">
Lines 856-859 Link Here
856	<Ecore:EClass xmi:id="_u2txsL8sEd2tbsirxV4pLA" base_Class="_WuZt4L8sEd2tbsirxV4pLA"/>	854	<Ecore:EClass xmi:id="_u2txsL8sEd2tbsirxV4pLA" base_Class="_WuZt4L8sEd2tbsirxV4pLA"/>
857	<Ecore:EReference xmi:id="_xEai4L8tEd2tbsirxV4pLA" base_Property="_woRO4L8sEd2tbsirxV4pLA"/>	855	<Ecore:EReference xmi:id="_xEai4L8tEd2tbsirxV4pLA" base_Property="_woRO4L8sEd2tbsirxV4pLA"/>
858	<Ecore:EAttribute xmi:id="_K42H8AKSEd6O0MANVU0HEw" base_Property="_HPVqoAKSEd6O0MANVU0HEw"/>	856	<Ecore:EAttribute xmi:id="_K42H8AKSEd6O0MANVU0HEw" base_Property="_HPVqoAKSEd6O0MANVU0HEw"/>
		857	<Ecore:EAttribute xmi:id="_GDcw4P9qEd67_agdSFnrQQ"/>
		858	<Ecore:EDataType xmi:id="__GNnEP9rEd67_agdSFnrQQ" instanceClassName="java.lang.Number" base_PrimitiveType="_7S9-8P9rEd67_agdSFnrQQ"/>
859	</xmi:XMI>	859	</xmi:XMI>

Lines 43-65 Link Here

(-)src/org/eclipse/ocl/cst/IntegerLiteralExpCS.java (-4 / +6 lines)
43	* If the meaning of the '<em>Integer Symbol</em>' attribute isn't clear,	43	* If the meaning of the '<em>Integer Symbol</em>' attribute isn't clear,
44	* there really should be more of a description here...	44	* there really should be more of a description here...
45	* </p>	45	* </p>
		46	* @since 3.0
46	* <!-- end-user-doc -->	47	* <!-- end-user-doc -->
47	* @return the value of the '<em>Integer Symbol</em>' attribute.	48	* @return the value of the '<em>Integer Symbol</em>' attribute.
48	* @see #setIntegerSymbol(Integer)	49	* @see #setIntegerSymbol(Number)
49	* @see org.eclipse.ocl.cst.CSTPackage#getIntegerLiteralExpCS_IntegerSymbol()	50	* @see org.eclipse.ocl.cst.CSTPackage#getIntegerLiteralExpCS_IntegerSymbol()
50	* @model	51	* @model dataType="org.eclipse.ocl.cst.Number"
51	* @generated	52	* @generated
52	*/	53	*/
53	Integer getIntegerSymbol();	54	Number getIntegerSymbol();
54		55
55	/**	56	/**
56	* Sets the value of the '{@link org.eclipse.ocl.cst.IntegerLiteralExpCS#getIntegerSymbol <em>Integer Symbol</em>}' attribute.	57	* Sets the value of the '{@link org.eclipse.ocl.cst.IntegerLiteralExpCS#getIntegerSymbol <em>Integer Symbol</em>}' attribute.
57	* <!-- begin-user-doc -->	58	* <!-- begin-user-doc -->
		59	* @since 3.0
58	* <!-- end-user-doc -->	60	* <!-- end-user-doc -->
59	* @param value the new value of the '<em>Integer Symbol</em>' attribute.	61	* @param value the new value of the '<em>Integer Symbol</em>' attribute.
60	* @see #getIntegerSymbol()	62	* @see #getIntegerSymbol()
61	* @generated	63	* @generated
62	*/	64	*/
63	void setIntegerSymbol(Integer value);	65	void setIntegerSymbol(Number value);
64		66
65	} // IntegerLiteralExpCS	67	} // IntegerLiteralExpCS

Lines 43-65 Link Here

(-)src/org/eclipse/ocl/cst/RealLiteralExpCS.java (-4 / +6 lines)
43	* If the meaning of the '<em>Real Symbol</em>' attribute isn't clear,	43	* If the meaning of the '<em>Real Symbol</em>' attribute isn't clear,
44	* there really should be more of a description here...	44	* there really should be more of a description here...
45	* </p>	45	* </p>
		46	* @since 3.0
46	* <!-- end-user-doc -->	47	* <!-- end-user-doc -->
47	* @return the value of the '<em>Real Symbol</em>' attribute.	48	* @return the value of the '<em>Real Symbol</em>' attribute.
48	* @see #setRealSymbol(Double)	49	* @see #setRealSymbol(Number)
49	* @see org.eclipse.ocl.cst.CSTPackage#getRealLiteralExpCS_RealSymbol()	50	* @see org.eclipse.ocl.cst.CSTPackage#getRealLiteralExpCS_RealSymbol()
50	* @model	51	* @model dataType="org.eclipse.ocl.cst.Number"
51	* @generated	52	* @generated
52	*/	53	*/
53	Double getRealSymbol();	54	Number getRealSymbol();
54		55
55	/**	56	/**
56	* Sets the value of the '{@link org.eclipse.ocl.cst.RealLiteralExpCS#getRealSymbol <em>Real Symbol</em>}' attribute.	57	* Sets the value of the '{@link org.eclipse.ocl.cst.RealLiteralExpCS#getRealSymbol <em>Real Symbol</em>}' attribute.
57	* <!-- begin-user-doc -->	58	* <!-- begin-user-doc -->
		59	* @since 3.0
58	* <!-- end-user-doc -->	60	* <!-- end-user-doc -->
59	* @param value the new value of the '<em>Real Symbol</em>' attribute.	61	* @param value the new value of the '<em>Real Symbol</em>' attribute.
60	* @see #getRealSymbol()	62	* @see #getRealSymbol()
61	* @generated	63	* @generated
62	*/	64	*/
63	void setRealSymbol(Double value);	65	void setRealSymbol(Number value);
64		66
65	} // RealLiteralExpCS	67	} // RealLiteralExpCS

Lines 43-65 Link Here

(-)src/org/eclipse/ocl/cst/UnlimitedNaturalLiteralExpCS.java (-4 / +6 lines)
43	* If the meaning of the '<em>Integer Symbol</em>' attribute isn't clear,	43	* If the meaning of the '<em>Integer Symbol</em>' attribute isn't clear,
44	* there really should be more of a description here...	44	* there really should be more of a description here...
45	* </p>	45	* </p>
		46	* @since 3.0
46	* <!-- end-user-doc -->	47	* <!-- end-user-doc -->
47	* @return the value of the '<em>Integer Symbol</em>' attribute.	48	* @return the value of the '<em>Integer Symbol</em>' attribute.
48	* @see #setIntegerSymbol(Integer)	49	* @see #setIntegerSymbol(Number)
49	* @see org.eclipse.ocl.cst.CSTPackage#getUnlimitedNaturalLiteralExpCS_IntegerSymbol()	50	* @see org.eclipse.ocl.cst.CSTPackage#getUnlimitedNaturalLiteralExpCS_IntegerSymbol()
50	* @model	51	* @model dataType="org.eclipse.ocl.cst.Number"
51	* @generated	52	* @generated
52	*/	53	*/
53	Integer getIntegerSymbol();	54	Number getIntegerSymbol();
54		55
55	/**	56	/**
56	* Sets the value of the '{@link org.eclipse.ocl.cst.UnlimitedNaturalLiteralExpCS#getIntegerSymbol <em>Integer Symbol</em>}' attribute.	57	* Sets the value of the '{@link org.eclipse.ocl.cst.UnlimitedNaturalLiteralExpCS#getIntegerSymbol <em>Integer Symbol</em>}' attribute.
57	* <!-- begin-user-doc -->	58	* <!-- begin-user-doc -->
		59	* @since 3.0
58	* <!-- end-user-doc -->	60	* <!-- end-user-doc -->
59	* @param value the new value of the '<em>Integer Symbol</em>' attribute.	61	* @param value the new value of the '<em>Integer Symbol</em>' attribute.
60	* @see #getIntegerSymbol()	62	* @see #getIntegerSymbol()
61	* @generated	63	* @generated
62	*/	64	*/
63	void setIntegerSymbol(Integer value);	65	void setIntegerSymbol(Number value);
64		66
65	} // UnlimitedNaturalLiteralExpCS	67	} // UnlimitedNaturalLiteralExpCS

Lines 48-54 Link Here

(-)src/org/eclipse/ocl/cst/impl/IntegerLiteralExpCSImpl.java (-6 / +8 lines)
48	* @generated	48	* @generated
49	* @ordered	49	* @ordered
50	*/	50	*/
51	protected static final Integer INTEGER_SYMBOL_EDEFAULT = null;	51	protected static final Number INTEGER_SYMBOL_EDEFAULT = null;
52		52
53	/**	53	/**
54	* The cached value of the '{@link #getIntegerSymbol() <em>Integer Symbol</em>}' attribute.	54	* The cached value of the '{@link #getIntegerSymbol() <em>Integer Symbol</em>}' attribute.
Lines 58-64 Link Here
58	* @generated	58	* @generated
59	* @ordered	59	* @ordered
60	*/	60	*/
61	protected Integer integerSymbol = INTEGER_SYMBOL_EDEFAULT;	61	protected Number integerSymbol = INTEGER_SYMBOL_EDEFAULT;
62		62
63	/**	63	/**
64	* <!-- begin-user-doc -->	64	* <!-- begin-user-doc -->
Lines 81-100 Link Here
81		81
82	/**	82	/**
83	* <!-- begin-user-doc -->	83	* <!-- begin-user-doc -->
		84	* @since 3.0
84	* <!-- end-user-doc -->	85	* <!-- end-user-doc -->
85	* @generated	86	* @generated
86	*/	87	*/
87	public Integer getIntegerSymbol() {	88	public Number getIntegerSymbol() {
88	return integerSymbol;	89	return integerSymbol;
89	}	90	}
90		91
91	/**	92	/**
92	* <!-- begin-user-doc -->	93	* <!-- begin-user-doc -->
		94	* @since 3.0
93	* <!-- end-user-doc -->	95	* <!-- end-user-doc -->
94	* @generated	96	* @generated
95	*/	97	*/
96	public void setIntegerSymbol(Integer newIntegerSymbol) {	98	public void setIntegerSymbol(Number newIntegerSymbol) {
97	Integer oldIntegerSymbol = integerSymbol;	99	Number oldIntegerSymbol = integerSymbol;
98	integerSymbol = newIntegerSymbol;	100	integerSymbol = newIntegerSymbol;
99	if (eNotificationRequired())	101	if (eNotificationRequired())
100	eNotify(new ENotificationImpl(this, Notification.SET,	102	eNotify(new ENotificationImpl(this, Notification.SET,
Lines 125-131 Link Here
125	public void eSet(int featureID, Object newValue) {	127	public void eSet(int featureID, Object newValue) {
126	switch (featureID) {	128	switch (featureID) {
127	case CSTPackage.INTEGER_LITERAL_EXP_CS__INTEGER_SYMBOL :	129	case CSTPackage.INTEGER_LITERAL_EXP_CS__INTEGER_SYMBOL :
128	setIntegerSymbol((Integer) newValue);	130	setIntegerSymbol((Number) newValue);
129	return;	131	return;
130	}	132	}
131	super.eSet(featureID, newValue);	133	super.eSet(featureID, newValue);

Lines 48-54 Link Here

(-)src/org/eclipse/ocl/cst/impl/RealLiteralExpCSImpl.java (-6 / +8 lines)
48	* @generated	48	* @generated
49	* @ordered	49	* @ordered
50	*/	50	*/
51	protected static final Double REAL_SYMBOL_EDEFAULT = null;	51	protected static final Number REAL_SYMBOL_EDEFAULT = null;
52		52
53	/**	53	/**
54	* The cached value of the '{@link #getRealSymbol() <em>Real Symbol</em>}' attribute.	54	* The cached value of the '{@link #getRealSymbol() <em>Real Symbol</em>}' attribute.
Lines 58-64 Link Here
58	* @generated	58	* @generated
59	* @ordered	59	* @ordered
60	*/	60	*/
61	protected Double realSymbol = REAL_SYMBOL_EDEFAULT;	61	protected Number realSymbol = REAL_SYMBOL_EDEFAULT;
62		62
63	/**	63	/**
64	* <!-- begin-user-doc -->	64	* <!-- begin-user-doc -->
Lines 81-100 Link Here
81		81
82	/**	82	/**
83	* <!-- begin-user-doc -->	83	* <!-- begin-user-doc -->
		84	* @since 3.0
84	* <!-- end-user-doc -->	85	* <!-- end-user-doc -->
85	* @generated	86	* @generated
86	*/	87	*/
87	public Double getRealSymbol() {	88	public Number getRealSymbol() {
88	return realSymbol;	89	return realSymbol;
89	}	90	}
90		91
91	/**	92	/**
92	* <!-- begin-user-doc -->	93	* <!-- begin-user-doc -->
		94	* @since 3.0
93	* <!-- end-user-doc -->	95	* <!-- end-user-doc -->
94	* @generated	96	* @generated
95	*/	97	*/
96	public void setRealSymbol(Double newRealSymbol) {	98	public void setRealSymbol(Number newRealSymbol) {
97	Double oldRealSymbol = realSymbol;	99	Number oldRealSymbol = realSymbol;
98	realSymbol = newRealSymbol;	100	realSymbol = newRealSymbol;
99	if (eNotificationRequired())	101	if (eNotificationRequired())
100	eNotify(new ENotificationImpl(this, Notification.SET,	102	eNotify(new ENotificationImpl(this, Notification.SET,
Lines 125-131 Link Here
125	public void eSet(int featureID, Object newValue) {	127	public void eSet(int featureID, Object newValue) {
126	switch (featureID) {	128	switch (featureID) {
127	case CSTPackage.REAL_LITERAL_EXP_CS__REAL_SYMBOL :	129	case CSTPackage.REAL_LITERAL_EXP_CS__REAL_SYMBOL :
128	setRealSymbol((Double) newValue);	130	setRealSymbol((Number) newValue);
129	return;	131	return;
130	}	132	}
131	super.eSet(featureID, newValue);	133	super.eSet(featureID, newValue);

Lines 48-54 Link Here

(-)src/org/eclipse/ocl/cst/impl/UnlimitedNaturalLiteralExpCSImpl.java (-6 / +8 lines)
48	* @generated	48	* @generated
49	* @ordered	49	* @ordered
50	*/	50	*/
51	protected static final Integer INTEGER_SYMBOL_EDEFAULT = null;	51	protected static final Number INTEGER_SYMBOL_EDEFAULT = null;
52		52
53	/**	53	/**
54	* The cached value of the '{@link #getIntegerSymbol() <em>Integer Symbol</em>}' attribute.	54	* The cached value of the '{@link #getIntegerSymbol() <em>Integer Symbol</em>}' attribute.
Lines 58-64 Link Here
58	* @generated	58	* @generated
59	* @ordered	59	* @ordered
60	*/	60	*/
61	protected Integer integerSymbol = INTEGER_SYMBOL_EDEFAULT;	61	protected Number integerSymbol = INTEGER_SYMBOL_EDEFAULT;
62		62
63	/**	63	/**
64	* <!-- begin-user-doc -->	64	* <!-- begin-user-doc -->
Lines 81-100 Link Here
81		81
82	/**	82	/**
83	* <!-- begin-user-doc -->	83	* <!-- begin-user-doc -->
		84	* @since 3.0
84	* <!-- end-user-doc -->	85	* <!-- end-user-doc -->
85	* @generated	86	* @generated
86	*/	87	*/
87	public Integer getIntegerSymbol() {	88	public Number getIntegerSymbol() {
88	return integerSymbol;	89	return integerSymbol;
89	}	90	}
90		91
91	/**	92	/**
92	* <!-- begin-user-doc -->	93	* <!-- begin-user-doc -->
		94	* @since 3.0
93	* <!-- end-user-doc -->	95	* <!-- end-user-doc -->
94	* @generated	96	* @generated
95	*/	97	*/
96	public void setIntegerSymbol(Integer newIntegerSymbol) {	98	public void setIntegerSymbol(Number newIntegerSymbol) {
97	Integer oldIntegerSymbol = integerSymbol;	99	Number oldIntegerSymbol = integerSymbol;
98	integerSymbol = newIntegerSymbol;	100	integerSymbol = newIntegerSymbol;
99	if (eNotificationRequired())	101	if (eNotificationRequired())
100	eNotify(new ENotificationImpl(this, Notification.SET,	102	eNotify(new ENotificationImpl(this, Notification.SET,
Lines 125-131 Link Here
125	public void eSet(int featureID, Object newValue) {	127	public void eSet(int featureID, Object newValue) {
126	switch (featureID) {	128	switch (featureID) {
127	case CSTPackage.UNLIMITED_NATURAL_LITERAL_EXP_CS__INTEGER_SYMBOL :	129	case CSTPackage.UNLIMITED_NATURAL_LITERAL_EXP_CS__INTEGER_SYMBOL :
128	setIntegerSymbol((Integer) newValue);	130	setIntegerSymbol((Number) newValue);
129	return;	131	return;
130	}	132	}
131	super.eSet(featureID, newValue);	133	super.eSet(featureID, newValue);

Lines 46-69 Link Here

(-)src/org/eclipse/ocl/expressions/IntegerLiteralExp.java (-4 / +6 lines)
46	* If the meaning of the '<em>Integer Symbol</em>' attribute isn't clear,	46	* If the meaning of the '<em>Integer Symbol</em>' attribute isn't clear,
47	* there really should be more of a description here...	47	* there really should be more of a description here...
48	* </p>	48	* </p>
		49	* @since 3.0
49	* <!-- end-user-doc -->	50	* <!-- end-user-doc -->
50	* @return the value of the '<em>Integer Symbol</em>' attribute.	51	* @return the value of the '<em>Integer Symbol</em>' attribute.
51	* @see #setIntegerSymbol(Integer)	52	* @see #setIntegerSymbol(Number)
52	* @see org.eclipse.ocl.expressions.ExpressionsPackage#getIntegerLiteralExp_IntegerSymbol()	53	* @see org.eclipse.ocl.expressions.ExpressionsPackage#getIntegerLiteralExp_IntegerSymbol()
53	* @model	54	* @model dataType="org.eclipse.ocl.utilities.Number"
54	* @generated	55	* @generated
55	*/	56	*/
56	Integer getIntegerSymbol();	57	Number getIntegerSymbol();
57		58
58	/**	59	/**
59	* Sets the value of the '{@link org.eclipse.ocl.expressions.IntegerLiteralExp#getIntegerSymbol <em>Integer Symbol</em>}' attribute.	60	* Sets the value of the '{@link org.eclipse.ocl.expressions.IntegerLiteralExp#getIntegerSymbol <em>Integer Symbol</em>}' attribute.
60	* <!-- begin-user-doc -->	61	* <!-- begin-user-doc -->
		62	* @since 3.0
61	* <!-- end-user-doc -->	63	* <!-- end-user-doc -->
62	* @param value the new value of the '<em>Integer Symbol</em>' attribute.	64	* @param value the new value of the '<em>Integer Symbol</em>' attribute.
63	* @see #getIntegerSymbol()	65	* @see #getIntegerSymbol()
64	* @generated	66	* @generated
65	*/	67	*/
66	void setIntegerSymbol(Integer value);	68	void setIntegerSymbol(Number value);
67		69
68	/**	70	/**
69	* <!-- begin-user-doc -->	71	* <!-- begin-user-doc -->

Lines 46-69 Link Here

(-)src/org/eclipse/ocl/expressions/RealLiteralExp.java (-4 / +6 lines)
46	* If the meaning of the '<em>Real Symbol</em>' attribute isn't clear,	46	* If the meaning of the '<em>Real Symbol</em>' attribute isn't clear,
47	* there really should be more of a description here...	47	* there really should be more of a description here...
48	* </p>	48	* </p>
		49	* @since 3.0
49	* <!-- end-user-doc -->	50	* <!-- end-user-doc -->
50	* @return the value of the '<em>Real Symbol</em>' attribute.	51	* @return the value of the '<em>Real Symbol</em>' attribute.
51	* @see #setRealSymbol(Double)	52	* @see #setRealSymbol(Number)
52	* @see org.eclipse.ocl.expressions.ExpressionsPackage#getRealLiteralExp_RealSymbol()	53	* @see org.eclipse.ocl.expressions.ExpressionsPackage#getRealLiteralExp_RealSymbol()
53	* @model	54	* @model dataType="org.eclipse.ocl.utilities.Number"
54	* @generated	55	* @generated
55	*/	56	*/
56	Double getRealSymbol();	57	Number getRealSymbol();
57		58
58	/**	59	/**
59	* Sets the value of the '{@link org.eclipse.ocl.expressions.RealLiteralExp#getRealSymbol <em>Real Symbol</em>}' attribute.	60	* Sets the value of the '{@link org.eclipse.ocl.expressions.RealLiteralExp#getRealSymbol <em>Real Symbol</em>}' attribute.
60	* <!-- begin-user-doc -->	61	* <!-- begin-user-doc -->
		62	* @since 3.0
61	* <!-- end-user-doc -->	63	* <!-- end-user-doc -->
62	* @param value the new value of the '<em>Real Symbol</em>' attribute.	64	* @param value the new value of the '<em>Real Symbol</em>' attribute.
63	* @see #getRealSymbol()	65	* @see #getRealSymbol()
64	* @generated	66	* @generated
65	*/	67	*/
66	void setRealSymbol(Double value);	68	void setRealSymbol(Number value);
67		69
68	/**	70	/**
69	* <!-- begin-user-doc -->	71	* <!-- begin-user-doc -->

Lines 50-73 Link Here

(-)src/org/eclipse/ocl/expressions/UnlimitedNaturalLiteralExp.java (-4 / +6 lines)
50	* If the meaning of the '<em>Integer Symbol</em>' attribute isn't clear,	50	* If the meaning of the '<em>Integer Symbol</em>' attribute isn't clear,
51	* there really should be more of a description here...	51	* there really should be more of a description here...
52	* </p>	52	* </p>
		53	* @since 3.0
53	* <!-- end-user-doc -->	54	* <!-- end-user-doc -->
54	* @return the value of the '<em>Integer Symbol</em>' attribute.	55	* @return the value of the '<em>Integer Symbol</em>' attribute.
55	* @see #setIntegerSymbol(Integer)	56	* @see #setIntegerSymbol(Number)
56	* @see org.eclipse.ocl.expressions.ExpressionsPackage#getUnlimitedNaturalLiteralExp_IntegerSymbol()	57	* @see org.eclipse.ocl.expressions.ExpressionsPackage#getUnlimitedNaturalLiteralExp_IntegerSymbol()
57	* @model	58	* @model dataType="org.eclipse.ocl.utilities.Number"
58	* @generated	59	* @generated
59	*/	60	*/
60	Integer getIntegerSymbol();	61	Number getIntegerSymbol();
61		62
62	/**	63	/**
63	* Sets the value of the '{@link org.eclipse.ocl.expressions.UnlimitedNaturalLiteralExp#getIntegerSymbol <em>Integer Symbol</em>}' attribute.	64	* Sets the value of the '{@link org.eclipse.ocl.expressions.UnlimitedNaturalLiteralExp#getIntegerSymbol <em>Integer Symbol</em>}' attribute.
64	* <!-- begin-user-doc -->	65	* <!-- begin-user-doc -->
		66	* @since 3.0
65	* <!-- end-user-doc -->	67	* <!-- end-user-doc -->
66	* @param value the new value of the '<em>Integer Symbol</em>' attribute.	68	* @param value the new value of the '<em>Integer Symbol</em>' attribute.
67	* @see #getIntegerSymbol()	69	* @see #getIntegerSymbol()
68	* @generated	70	* @generated
69	*/	71	*/
70	void setIntegerSymbol(Integer value);	72	void setIntegerSymbol(Number value);
71		73
72	/**	74	/**
73	* Returns the value of the '<em><b>Unlimited</b></em>' attribute.	75	* Returns the value of the '<em><b>Unlimited</b></em>' attribute.

Lines 86-91 Link Here

(-)src/org/eclipse/ocl/parser/AbstractOCLParser.java (-3 / +4 lines)
86	import org.eclipse.ocl.lpg.BasicEnvironment;	86	import org.eclipse.ocl.lpg.BasicEnvironment;
87	import org.eclipse.ocl.lpg.ProblemHandler;	87	import org.eclipse.ocl.lpg.ProblemHandler;
88	import org.eclipse.ocl.options.ProblemOption;	88	import org.eclipse.ocl.options.ProblemOption;
		89	import org.eclipse.ocl.util.ObjectUtil;
89		90
90	public abstract class AbstractOCLParser	91	public abstract class AbstractOCLParser
91	extends AbstractParser {	92	extends AbstractParser {
Lines 491-497 Link Here
491	IntegerLiteralExpCS result = CSTFactory.eINSTANCE	492	IntegerLiteralExpCS result = CSTFactory.eINSTANCE
492	.createIntegerLiteralExpCS();	493	.createIntegerLiteralExpCS();
493	result.setSymbol(string);	494	result.setSymbol(string);
494	result.setIntegerSymbol(Integer.valueOf(string));	495	result.setIntegerSymbol(ObjectUtil.createIntegerNumber(string));
495	return result;	496	return result;
496	}	497	}
497		498
Lines 504-510 Link Here
504	if ("*".equals(string)) {	505	if ("*".equals(string)) {
505	result.setIntegerSymbol(-1);	506	result.setIntegerSymbol(-1);
506	} else {	507	} else {
507	result.setIntegerSymbol(Integer.valueOf(string));	508	result.setIntegerSymbol(ObjectUtil.createIntegerNumber(string));
508	}	509	}
509	return result;	510	return result;
510	}	511	}
Lines 512-518 Link Here
512	protected RealLiteralExpCS createRealLiteralExpCS(String string) {	513	protected RealLiteralExpCS createRealLiteralExpCS(String string) {
513	RealLiteralExpCS result = CSTFactory.eINSTANCE.createRealLiteralExpCS();	514	RealLiteralExpCS result = CSTFactory.eINSTANCE.createRealLiteralExpCS();
514	result.setSymbol(string);	515	result.setSymbol(string);
515	result.setRealSymbol(Double.valueOf(string));	516	result.setRealSymbol(ObjectUtil.createRealNumber(string));
516	return result;	517	return result;
517	}	518	}
518		519

Lines 16-27 Link Here

(-)src/org/eclipse/ocl/utilities/impl/UtilitiesFactoryImpl.java (-2 / +60 lines)
16	package org.eclipse.ocl.utilities.impl;	16	package org.eclipse.ocl.utilities.impl;
17		17
18	import org.eclipse.emf.ecore.EClass;	18	import org.eclipse.emf.ecore.EClass;
		19	import org.eclipse.emf.ecore.EDataType;
19	import org.eclipse.emf.ecore.EObject;	20	import org.eclipse.emf.ecore.EObject;
20	import org.eclipse.emf.ecore.EPackage;	21	import org.eclipse.emf.ecore.EPackage;
21	import org.eclipse.emf.ecore.impl.EFactoryImpl;	22	import org.eclipse.emf.ecore.impl.EFactoryImpl;
22	import org.eclipse.emf.ecore.plugin.EcorePlugin;	23	import org.eclipse.emf.ecore.plugin.EcorePlugin;
23		24	import org.eclipse.ocl.util.ObjectUtil;
24	//import org.eclipse.ocl.utilities.*;
25	import org.eclipse.ocl.utilities.UtilitiesFactory;	25	import org.eclipse.ocl.utilities.UtilitiesFactory;
26	import org.eclipse.ocl.utilities.UtilitiesPackage;	26	import org.eclipse.ocl.utilities.UtilitiesPackage;
27		27
Lines 83-88 Link Here
83	* <!-- end-user-doc -->	83	* <!-- end-user-doc -->
84	* @generated	84	* @generated
85	*/	85	*/
		86	@Override
		87	public Object createFromString(EDataType eDataType, String initialValue) {
		88	switch (eDataType.getClassifierID()) {
		89	case UtilitiesPackage.NUMBER :
		90	return createNumberFromString(eDataType, initialValue);
		91	default :
		92	throw new IllegalArgumentException(
		93	"The datatype '" + eDataType.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
		94	}
		95	}
		96
		97	/**
		98	* <!-- begin-user-doc -->
		99	* <!-- end-user-doc -->
		100	* @generated
		101	*/
		102	@Override
		103	public String convertToString(EDataType eDataType, Object instanceValue) {
		104	switch (eDataType.getClassifierID()) {
		105	case UtilitiesPackage.NUMBER :
		106	return convertNumberToString(eDataType, instanceValue);
		107	default :
		108	throw new IllegalArgumentException(
		109	"The datatype '" + eDataType.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
		110	}
		111	}
		112
		113	/**
		114	* <!-- begin-user-doc -->
		115	* @since 3.0
		116	* <!-- end-user-doc -->
		117	* @generated NOT
		118	*/
		119	public Number createNumberFromString(EDataType eDataType,
		120	String initialValue) {
		121	if (initialValue.contains(".") \|\| initialValue.contains("e") \|\| initialValue.contains("E")) { //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$
		122	return ObjectUtil.createRealNumber(initialValue);
		123	} else {
		124	return ObjectUtil.createIntegerNumber(initialValue);
		125	}
		126	}
		127
		128	/**
		129	* <!-- begin-user-doc -->
		130	* @since 3.0
		131	* <!-- end-user-doc -->
		132	* @generated NOT
		133	*/
		134	public String convertNumberToString(EDataType eDataType,
		135	Object instanceValue) {
		136	return instanceValue.toString();
		137	}
		138
		139	/**
		140	* <!-- begin-user-doc -->
		141	* <!-- end-user-doc -->
		142	* @generated
		143	*/
86	public UtilitiesPackage getUtilitiesPackage() {	144	public UtilitiesPackage getUtilitiesPackage() {
87	return (UtilitiesPackage) getEPackage();	145	return (UtilitiesPackage) getEPackage();
88	}	146	}

Lines 63-69 Link Here

(-)src/org/eclipse/ocl/ecore/impl/IntegerLiteralExpImpl.java (-6 / +8 lines)
63	* @generated	63	* @generated
64	* @ordered	64	* @ordered
65	*/	65	*/
66	protected static final Integer INTEGER_SYMBOL_EDEFAULT = null;	66	protected static final Number INTEGER_SYMBOL_EDEFAULT = null;
67		67
68	/**	68	/**
69	* The cached value of the '{@link #getIntegerSymbol() <em>Integer Symbol</em>}' attribute.	69	* The cached value of the '{@link #getIntegerSymbol() <em>Integer Symbol</em>}' attribute.
Lines 73-79 Link Here
73	* @generated	73	* @generated
74	* @ordered	74	* @ordered
75	*/	75	*/
76	protected Integer integerSymbol = INTEGER_SYMBOL_EDEFAULT;	76	protected Number integerSymbol = INTEGER_SYMBOL_EDEFAULT;
77		77
78	/**	78	/**
79	* <!-- begin-user-doc -->	79	* <!-- begin-user-doc -->
Lines 96-115 Link Here
96		96
97	/**	97	/**
98	* <!-- begin-user-doc -->	98	* <!-- begin-user-doc -->
		99	* @since 3.0
99	* <!-- end-user-doc -->	100	* <!-- end-user-doc -->
100	* @generated	101	* @generated
101	*/	102	*/
102	public Integer getIntegerSymbol() {	103	public Number getIntegerSymbol() {
103	return integerSymbol;	104	return integerSymbol;
104	}	105	}
105		106
106	/**	107	/**
107	* <!-- begin-user-doc -->	108	* <!-- begin-user-doc -->
		109	* @since 3.0
108	* <!-- end-user-doc -->	110	* <!-- end-user-doc -->
109	* @generated	111	* @generated
110	*/	112	*/
111	public void setIntegerSymbol(Integer newIntegerSymbol) {	113	public void setIntegerSymbol(Number newIntegerSymbol) {
112	Integer oldIntegerSymbol = integerSymbol;	114	Number oldIntegerSymbol = integerSymbol;
113	integerSymbol = newIntegerSymbol;	115	integerSymbol = newIntegerSymbol;
114	if (eNotificationRequired())	116	if (eNotificationRequired())
115	eNotify(new ENotificationImpl(this, Notification.SET,	117	eNotify(new ENotificationImpl(this, Notification.SET,
Lines 151-157 Link Here
151	public void eSet(int featureID, Object newValue) {	153	public void eSet(int featureID, Object newValue) {
152	switch (featureID) {	154	switch (featureID) {
153	case EcorePackage.INTEGER_LITERAL_EXP__INTEGER_SYMBOL :	155	case EcorePackage.INTEGER_LITERAL_EXP__INTEGER_SYMBOL :
154	setIntegerSymbol((Integer) newValue);	156	setIntegerSymbol((Number) newValue);
155	return;	157	return;
156	}	158	}
157	super.eSet(featureID, newValue);	159	super.eSet(featureID, newValue);

Lines 63-69 Link Here

(-)src/org/eclipse/ocl/ecore/impl/RealLiteralExpImpl.java (-6 / +8 lines)
63	* @generated	63	* @generated
64	* @ordered	64	* @ordered
65	*/	65	*/
66	protected static final Double REAL_SYMBOL_EDEFAULT = null;	66	protected static final Number REAL_SYMBOL_EDEFAULT = null;
67		67
68	/**	68	/**
69	* The cached value of the '{@link #getRealSymbol() <em>Real Symbol</em>}' attribute.	69	* The cached value of the '{@link #getRealSymbol() <em>Real Symbol</em>}' attribute.
Lines 73-79 Link Here
73	* @generated	73	* @generated
74	* @ordered	74	* @ordered
75	*/	75	*/
76	protected Double realSymbol = REAL_SYMBOL_EDEFAULT;	76	protected Number realSymbol = REAL_SYMBOL_EDEFAULT;
77		77
78	/**	78	/**
79	* <!-- begin-user-doc -->	79	* <!-- begin-user-doc -->
Lines 106-125 Link Here
106		106
107	/**	107	/**
108	* <!-- begin-user-doc -->	108	* <!-- begin-user-doc -->
		109	* @since 3.0
109	* <!-- end-user-doc -->	110	* <!-- end-user-doc -->
110	* @generated	111	* @generated
111	*/	112	*/
112	public Double getRealSymbol() {	113	public Number getRealSymbol() {
113	return realSymbol;	114	return realSymbol;
114	}	115	}
115		116
116	/**	117	/**
117	* <!-- begin-user-doc -->	118	* <!-- begin-user-doc -->
		119	* @since 3.0
118	* <!-- end-user-doc -->	120	* <!-- end-user-doc -->
119	* @generated	121	* @generated
120	*/	122	*/
121	public void setRealSymbol(Double newRealSymbol) {	123	public void setRealSymbol(Number newRealSymbol) {
122	Double oldRealSymbol = realSymbol;	124	Number oldRealSymbol = realSymbol;
123	realSymbol = newRealSymbol;	125	realSymbol = newRealSymbol;
124	if (eNotificationRequired())	126	if (eNotificationRequired())
125	eNotify(new ENotificationImpl(this, Notification.SET,	127	eNotify(new ENotificationImpl(this, Notification.SET,
Lines 161-167 Link Here
161	public void eSet(int featureID, Object newValue) {	163	public void eSet(int featureID, Object newValue) {
162	switch (featureID) {	164	switch (featureID) {
163	case EcorePackage.REAL_LITERAL_EXP__REAL_SYMBOL :	165	case EcorePackage.REAL_LITERAL_EXP__REAL_SYMBOL :
164	setRealSymbol((Double) newValue);	166	setRealSymbol((Number) newValue);
165	return;	167	return;
166	}	168	}
167	super.eSet(featureID, newValue);	169	super.eSet(featureID, newValue);

Lines 64-70 Link Here

(-)src/org/eclipse/ocl/ecore/impl/UnlimitedNaturalLiteralExpImpl.java (-7 / +9 lines)
64	* @generated	64	* @generated
65	* @ordered	65	* @ordered
66	*/	66	*/
67	protected static final Integer INTEGER_SYMBOL_EDEFAULT = null;	67	protected static final Number INTEGER_SYMBOL_EDEFAULT = null;
68		68
69	/**	69	/**
70	* The cached value of the '{@link #getIntegerSymbol() <em>Integer Symbol</em>}' attribute.	70	* The cached value of the '{@link #getIntegerSymbol() <em>Integer Symbol</em>}' attribute.
Lines 74-80 Link Here
74	* @generated	74	* @generated
75	* @ordered	75	* @ordered
76	*/	76	*/
77	protected Integer integerSymbol = INTEGER_SYMBOL_EDEFAULT;	77	protected Number integerSymbol = INTEGER_SYMBOL_EDEFAULT;
78		78
79	/**	79	/**
80	* The default value of the '{@link #isUnlimited() <em>Unlimited</em>}' attribute.	80	* The default value of the '{@link #isUnlimited() <em>Unlimited</em>}' attribute.
Lines 107-126 Link Here
107		107
108	/**	108	/**
109	* <!-- begin-user-doc -->	109	* <!-- begin-user-doc -->
		110	* @since 3.0
110	* <!-- end-user-doc -->	111	* <!-- end-user-doc -->
111	* @generated	112	* @generated
112	*/	113	*/
113	public Integer getIntegerSymbol() {	114	public Number getIntegerSymbol() {
114	return integerSymbol;	115	return integerSymbol;
115	}	116	}
116		117
117	/**	118	/**
118	* <!-- begin-user-doc -->	119	* <!-- begin-user-doc -->
		120	* @since 3.0
119	* <!-- end-user-doc -->	121	* <!-- end-user-doc -->
120	* @generated	122	* @generated
121	*/	123	*/
122	public void setIntegerSymbol(Integer newIntegerSymbol) {	124	public void setIntegerSymbol(Number newIntegerSymbol) {
123	Integer oldIntegerSymbol = integerSymbol;	125	Number oldIntegerSymbol = integerSymbol;
124	integerSymbol = newIntegerSymbol;	126	integerSymbol = newIntegerSymbol;
125	if (eNotificationRequired())	127	if (eNotificationRequired())
126	eNotify(new ENotificationImpl(this, Notification.SET,	128	eNotify(new ENotificationImpl(this, Notification.SET,
Lines 134-140 Link Here
134	* @generated NOT	136	* @generated NOT
135	*/	137	*/
136	public boolean isUnlimited() {	138	public boolean isUnlimited() {
137	return getIntegerSymbol() == UNLIMITED;	139	return getIntegerSymbol().intValue() == UNLIMITED;
138	}	140	}
139		141
140	/**	142	/**
Lines 173-179 Link Here
173	public void eSet(int featureID, Object newValue) {	175	public void eSet(int featureID, Object newValue) {
174	switch (featureID) {	176	switch (featureID) {
175	case EcorePackage.UNLIMITED_NATURAL_LITERAL_EXP__INTEGER_SYMBOL :	177	case EcorePackage.UNLIMITED_NATURAL_LITERAL_EXP__INTEGER_SYMBOL :
176	setIntegerSymbol((Integer) newValue);	178	setIntegerSymbol((Number) newValue);
177	return;	179	return;
178	}	180	}
179	super.eSet(featureID, newValue);	181	super.eSet(featureID, newValue);

Added Link Here

(-)src/org/eclipse/ocl/ecore/validation/AnyTypeValidator.java (+29 lines)
1	/**
2	* <copyright>
3	*
4	* Copyright (c) 2009 Eclipse Modeling Project and others.
5	* All rights reserved. This program and the accompanying materials
6	* are made available under the terms of the Eclipse Public License v1.0
7	* which accompanies this distribution, and is available at
8	* http://www.eclipse.org/legal/epl-v10.html
9	*
10	* Contributors:
11	* IBM - Initial API and implementation
12	*
13	* </copyright>
14	*
15	* $Id$
16	*/
17	package org.eclipse.ocl.ecore.validation;
18
19	/**
20	* A sample validator interface for {@link org.eclipse.ocl.ecore.AnyType}.
21	* This doesn't really do anything, and it's not a real EMF artifact.
22	* It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
23	* This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
24	*/
25	public interface AnyTypeValidator {
26
27	boolean validate();
28
29	}

Lines 20-25 Link Here

(-)src/org/eclipse/ocl/ecore/tests/SerializationTest.java (+33 lines)
20		20
21	import java.io.ByteArrayInputStream;	21	import java.io.ByteArrayInputStream;
22	import java.io.ByteArrayOutputStream;	22	import java.io.ByteArrayOutputStream;
		23	import java.math.BigInteger;
23	import java.util.Collections;	24	import java.util.Collections;
24	import java.util.Iterator;	25	import java.util.Iterator;
25	import java.util.List;	26	import java.util.List;
Lines 94-99 Link Here
94	}	95	}
95		96
96	/**	97	/**
		98	* Tests the serialization of an expression that uses OCL integer values.
		99	*/
		100	public void test_integerTypeSerialization() {
		101	OCLExpression<EClassifier> expr = parseExpression(
		102	EcorePackage.Literals.EPACKAGE,
		103	BigInteger.valueOf(Long.MAX_VALUE).add(BigInteger.valueOf(1)) + " > " + Long.MAX_VALUE + " - " + Integer.MAX_VALUE);
		104
		105	String toStringForm = expr.toString();
		106	String serialForm = serialize(expr);
		107
		108	expr = loadExpression(serialForm);
		109	validate(expr); // ensure that it is structurally valid
		110	assertEquals(toStringForm, expr.toString()); // should "look" the same
		111	}
		112
		113	/**
		114	* Tests the serialization of an expression that uses OCL real values.
		115	*/
		116	public void test_realTypeSerialization() {
		117	OCLExpression<EClassifier> expr = parseExpression(
		118	EcorePackage.Literals.EPACKAGE,
		119	"12345678901234567890.123456789e44 > 1.234");
		120
		121	String toStringForm = expr.toString();
		122	String serialForm = serialize(expr);
		123
		124	expr = loadExpression(serialForm);
		125	validate(expr); // ensure that it is structurally valid
		126	assertEquals(toStringForm, expr.toString()); // should "look" the same
		127	}
		128
		129	/**
97	* Tests the serialization of an expression that uses collections of	130	* Tests the serialization of an expression that uses collections of
98	* primitive types.	131	* primitive types.
99	*/	132	*/

Lines 55-61 Link Here

(-)src/org/eclipse/ocl/uml/impl/IntegerLiteralExpImpl.java (-6 / +8 lines)
55	* @generated	55	* @generated
56	* @ordered	56	* @ordered
57	*/	57	*/
58	protected static final Integer INTEGER_SYMBOL_EDEFAULT = null;	58	protected static final Number INTEGER_SYMBOL_EDEFAULT = null;
59		59
60	/**	60	/**
61	* The cached value of the '{@link #getIntegerSymbol() <em>Integer Symbol</em>}' attribute.	61	* The cached value of the '{@link #getIntegerSymbol() <em>Integer Symbol</em>}' attribute.
Lines 65-71 Link Here
65	* @generated	65	* @generated
66	* @ordered	66	* @ordered
67	*/	67	*/
68	protected Integer integerSymbol = INTEGER_SYMBOL_EDEFAULT;	68	protected Number integerSymbol = INTEGER_SYMBOL_EDEFAULT;
69		69
70	/**	70	/**
71	* <!-- begin-user-doc -->	71	* <!-- begin-user-doc -->
Lines 88-107 Link Here
88		88
89	/**	89	/**
90	* <!-- begin-user-doc -->	90	* <!-- begin-user-doc -->
		91	* @since 3.0
91	* <!-- end-user-doc -->	92	* <!-- end-user-doc -->
92	* @generated	93	* @generated
93	*/	94	*/
94	public Integer getIntegerSymbol() {	95	public Number getIntegerSymbol() {
95	return integerSymbol;	96	return integerSymbol;
96	}	97	}
97		98
98	/**	99	/**
99	* <!-- begin-user-doc -->	100	* <!-- begin-user-doc -->
		101	* @since 3.0
100	* <!-- end-user-doc -->	102	* <!-- end-user-doc -->
101	* @generated	103	* @generated
102	*/	104	*/
103	public void setIntegerSymbol(Integer newIntegerSymbol) {	105	public void setIntegerSymbol(Number newIntegerSymbol) {
104	Integer oldIntegerSymbol = integerSymbol;	106	Number oldIntegerSymbol = integerSymbol;
105	integerSymbol = newIntegerSymbol;	107	integerSymbol = newIntegerSymbol;
106	if (eNotificationRequired())	108	if (eNotificationRequired())
107	eNotify(new ENotificationImpl(this, Notification.SET,	109	eNotify(new ENotificationImpl(this, Notification.SET,
Lines 143-149 Link Here
143	public void eSet(int featureID, Object newValue) {	145	public void eSet(int featureID, Object newValue) {
144	switch (featureID) {	146	switch (featureID) {
145	case UMLPackage.INTEGER_LITERAL_EXP__INTEGER_SYMBOL :	147	case UMLPackage.INTEGER_LITERAL_EXP__INTEGER_SYMBOL :
146	setIntegerSymbol((Integer) newValue);	148	setIntegerSymbol((Number) newValue);
147	return;	149	return;
148	}	150	}
149	super.eSet(featureID, newValue);	151	super.eSet(featureID, newValue);

Lines 55-61 Link Here

(-)src/org/eclipse/ocl/uml/impl/RealLiteralExpImpl.java (-6 / +8 lines)
55	* @generated	55	* @generated
56	* @ordered	56	* @ordered
57	*/	57	*/
58	protected static final Double REAL_SYMBOL_EDEFAULT = null;	58	protected static final Number REAL_SYMBOL_EDEFAULT = null;
59		59
60	/**	60	/**
61	* The cached value of the '{@link #getRealSymbol() <em>Real Symbol</em>}' attribute.	61	* The cached value of the '{@link #getRealSymbol() <em>Real Symbol</em>}' attribute.
Lines 65-71 Link Here
65	* @generated	65	* @generated
66	* @ordered	66	* @ordered
67	*/	67	*/
68	protected Double realSymbol = REAL_SYMBOL_EDEFAULT;	68	protected Number realSymbol = REAL_SYMBOL_EDEFAULT;
69		69
70	/**	70	/**
71	* <!-- begin-user-doc -->	71	* <!-- begin-user-doc -->
Lines 88-107 Link Here
88		88
89	/**	89	/**
90	* <!-- begin-user-doc -->	90	* <!-- begin-user-doc -->
		91	* @since 3.0
91	* <!-- end-user-doc -->	92	* <!-- end-user-doc -->
92	* @generated	93	* @generated
93	*/	94	*/
94	public Double getRealSymbol() {	95	public Number getRealSymbol() {
95	return realSymbol;	96	return realSymbol;
96	}	97	}
97		98
98	/**	99	/**
99	* <!-- begin-user-doc -->	100	* <!-- begin-user-doc -->
		101	* @since 3.0
100	* <!-- end-user-doc -->	102	* <!-- end-user-doc -->
101	* @generated	103	* @generated
102	*/	104	*/
103	public void setRealSymbol(Double newRealSymbol) {	105	public void setRealSymbol(Number newRealSymbol) {
104	Double oldRealSymbol = realSymbol;	106	Number oldRealSymbol = realSymbol;
105	realSymbol = newRealSymbol;	107	realSymbol = newRealSymbol;
106	if (eNotificationRequired())	108	if (eNotificationRequired())
107	eNotify(new ENotificationImpl(this, Notification.SET,	109	eNotify(new ENotificationImpl(this, Notification.SET,
Lines 143-149 Link Here
143	public void eSet(int featureID, Object newValue) {	145	public void eSet(int featureID, Object newValue) {
144	switch (featureID) {	146	switch (featureID) {
145	case UMLPackage.REAL_LITERAL_EXP__REAL_SYMBOL :	147	case UMLPackage.REAL_LITERAL_EXP__REAL_SYMBOL :
146	setRealSymbol((Double) newValue);	148	setRealSymbol((Number) newValue);
147	return;	149	return;
148	}	150	}
149	super.eSet(featureID, newValue);	151	super.eSet(featureID, newValue);

Lines 1876-1882 Link Here

(-)src/org/eclipse/ocl/uml/impl/UMLPackageImpl.java (-3 / +3 lines)
1876	* @generated	1876	* @generated
1877	*/	1877	*/
1878	protected void createSubsetsAnnotations() {	1878	protected void createSubsetsAnnotations() {
1879	String source = "subsets"; //$NON-NLS-1$	1879	String source = "subsets"; //$NON-NLS-1$
1880	addAnnotation(getAnyType_OwnedOperation(), source, new String[]{},	1880	addAnnotation(getAnyType_OwnedOperation(), source, new String[]{},
1881	new URI[]{URI.createURI(org.eclipse.uml2.uml.UMLPackage.eNS_URI)	1881	new URI[]{URI.createURI(org.eclipse.uml2.uml.UMLPackage.eNS_URI)
1882	.appendFragment("//Classifier/feature") //$NON-NLS-1$	1882	.appendFragment("//Classifier/feature") //$NON-NLS-1$
Lines 1915-1921 Link Here
1915	* @generated	1915	* @generated
1916	*/	1916	*/
1917	protected void createExtendedMetaDataAnnotations() {	1917	protected void createExtendedMetaDataAnnotations() {
1918	String source = "http:///org/eclipse/emf/ecore/util/ExtendedMetaData"; //$NON-NLS-1$	1918	String source = "http:///org/eclipse/emf/ecore/util/ExtendedMetaData"; //$NON-NLS-1$
1919	addAnnotation(expressionInOCLEClass, source, new String[]{	1919	addAnnotation(expressionInOCLEClass, source, new String[]{
1920	"name", "ExpressionInOcl" //$NON-NLS-1$ //$NON-NLS-2$	1920	"name", "ExpressionInOcl" //$NON-NLS-1$ //$NON-NLS-2$
1921	});	1921	});
Lines 1931-1937 Link Here
1931	* @generated	1931	* @generated
1932	*/	1932	*/
1933	protected void createEcoreAnnotations() {	1933	protected void createEcoreAnnotations() {
1934	String source = "http://www.eclipse.org/emf/2002/Ecore"; //$NON-NLS-1$	1934	String source = "http://www.eclipse.org/emf/2002/Ecore"; //$NON-NLS-1$
1935	addAnnotation(oclExpressionEClass, source, new String[]{	1935	addAnnotation(oclExpressionEClass, source, new String[]{
1936	"constraints", "has_type" //$NON-NLS-1$ //$NON-NLS-2$	1936	"constraints", "has_type" //$NON-NLS-1$ //$NON-NLS-2$
1937	});	1937	});

Lines 56-62 Link Here

(-)src/org/eclipse/ocl/uml/impl/UnlimitedNaturalLiteralExpImpl.java (-7 / +9 lines)
56	* @generated	56	* @generated
57	* @ordered	57	* @ordered
58	*/	58	*/
59	protected static final Integer INTEGER_SYMBOL_EDEFAULT = null;	59	protected static final Number INTEGER_SYMBOL_EDEFAULT = null;
60		60
61	/**	61	/**
62	* The cached value of the '{@link #getIntegerSymbol() <em>Integer Symbol</em>}' attribute.	62	* The cached value of the '{@link #getIntegerSymbol() <em>Integer Symbol</em>}' attribute.
Lines 66-72 Link Here
66	* @generated	66	* @generated
67	* @ordered	67	* @ordered
68	*/	68	*/
69	protected Integer integerSymbol = INTEGER_SYMBOL_EDEFAULT;	69	protected Number integerSymbol = INTEGER_SYMBOL_EDEFAULT;
70		70
71	/**	71	/**
72	* The default value of the '{@link #isUnlimited() <em>Unlimited</em>}' attribute.	72	* The default value of the '{@link #isUnlimited() <em>Unlimited</em>}' attribute.
Lines 99-118 Link Here
99		99
100	/**	100	/**
101	* <!-- begin-user-doc -->	101	* <!-- begin-user-doc -->
		102	* @since 3.0
102	* <!-- end-user-doc -->	103	* <!-- end-user-doc -->
103	* @generated	104	* @generated
104	*/	105	*/
105	public Integer getIntegerSymbol() {	106	public Number getIntegerSymbol() {
106	return integerSymbol;	107	return integerSymbol;
107	}	108	}
108		109
109	/**	110	/**
110	* <!-- begin-user-doc -->	111	* <!-- begin-user-doc -->
		112	* @since 3.0
111	* <!-- end-user-doc -->	113	* <!-- end-user-doc -->
112	* @generated	114	* @generated
113	*/	115	*/
114	public void setIntegerSymbol(Integer newIntegerSymbol) {	116	public void setIntegerSymbol(Number newIntegerSymbol) {
115	Integer oldIntegerSymbol = integerSymbol;	117	Number oldIntegerSymbol = integerSymbol;
116	integerSymbol = newIntegerSymbol;	118	integerSymbol = newIntegerSymbol;
117	if (eNotificationRequired())	119	if (eNotificationRequired())
118	eNotify(new ENotificationImpl(this, Notification.SET,	120	eNotify(new ENotificationImpl(this, Notification.SET,
Lines 126-132 Link Here
126	* @generated NOT	128	* @generated NOT
127	*/	129	*/
128	public boolean isUnlimited() {	130	public boolean isUnlimited() {
129	return getIntegerSymbol() == UNLIMITED;	131	return getIntegerSymbol().intValue() == UNLIMITED;
130	}	132	}
131		133
132	/**	134	/**
Lines 165-171 Link Here
165	public void eSet(int featureID, Object newValue) {	167	public void eSet(int featureID, Object newValue) {
166	switch (featureID) {	168	switch (featureID) {
167	case UMLPackage.UNLIMITED_NATURAL_LITERAL_EXP__INTEGER_SYMBOL :	169	case UMLPackage.UNLIMITED_NATURAL_LITERAL_EXP__INTEGER_SYMBOL :
168	setIntegerSymbol((Integer) newValue);	170	setIntegerSymbol((Number) newValue);
169	return;	171	return;
170	}	172	}
171	super.eSet(featureID, newValue);	173	super.eSet(featureID, newValue);

Lines 20-25 Link Here

(-)src/org/eclipse/ocl/uml/tests/SerializationTest.java (+33 lines)
20		20
21	import java.io.ByteArrayInputStream;	21	import java.io.ByteArrayInputStream;
22	import java.io.ByteArrayOutputStream;	22	import java.io.ByteArrayOutputStream;
		23	import java.math.BigInteger;
23	import java.util.Collections;	24	import java.util.Collections;
24	import java.util.Iterator;	25	import java.util.Iterator;
25	import java.util.List;	26	import java.util.List;
Lines 92-97 Link Here
92	}	93	}
93		94
94	/**	95	/**
		96	* Tests the serialization of an expression that uses OCL integer values.
		97	*/
		98	public void test_integerTypeSerialization() {
		99	OCLExpression<Classifier> expr = parseExpression(
		100	getMetaclass("Package"),
		101	BigInteger.valueOf(Long.MAX_VALUE).add(BigInteger.valueOf(1)) + " > " + Long.MAX_VALUE + " - " + Integer.MAX_VALUE);
		102
		103	String toStringForm = expr.toString();
		104	String serialForm = serialize(expr);
		105
		106	expr = loadExpression(serialForm);
		107	validate(expr); // ensure that it is structurally valid
		108	assertEquals(toStringForm, expr.toString()); // should "look" the same
		109	}
		110
		111	/**
		112	* Tests the serialization of an expression that uses OCL real values.
		113	*/
		114	public void test_realTypeSerialization() {
		115	OCLExpression<Classifier> expr = parseExpression(
		116	getMetaclass("Package"),
		117	"12345678901234567890.123456789e44 > 1.234");
		118
		119	String toStringForm = expr.toString();
		120	String serialForm = serialize(expr);
		121
		122	expr = loadExpression(serialForm);
		123	validate(expr); // ensure that it is structurally valid
		124	assertEquals(toStringForm, expr.toString()); // should "look" the same
		125	}
		126
		127	/**
95	* Tests the serialization of an expression that uses collections of	128	* Tests the serialization of an expression that uses collections of
96	* primitive types.	129	* primitive types.
97	*/	130	*/