diff options
author | Ed Willink | 2016-05-23 18:39:24 +0000 |
---|---|---|
committer | Ed Willink | 2016-05-23 18:39:24 +0000 |
commit | cb105ee8a48f031752709b6b743f3de60934cdde (patch) | |
tree | e263617ad3c150dbcbe199eb5e739c0cfcda5567 | |
parent | 3865e51d665c13369c16dc5fc8dedd559c2e8c84 (diff) | |
download | org.eclipse.ocl-cb105ee8a48f031752709b6b743f3de60934cdde.tar.gz org.eclipse.ocl-cb105ee8a48f031752709b6b743f3de60934cdde.tar.xz org.eclipse.ocl-cb105ee8a48f031752709b6b743f3de60934cdde.zip |
[releng] Regenerate OCLstdlib without @model tags
4 files changed, 5 insertions, 30 deletions
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/model/OCLstdlib.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/model/OCLstdlib.java index be6c41e803..f58f8bf8c8 100644 --- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/model/OCLstdlib.java +++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/model/OCLstdlib.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2010, 2016 Willink Transformations and others. + * Copyright (c) 2010, 2015 Willink Transformations 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 diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/oclstdlib/OCLstdlibPackage.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/oclstdlib/OCLstdlibPackage.java index f4532862e4..87a6f384d9 100644 --- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/oclstdlib/OCLstdlibPackage.java +++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/oclstdlib/OCLstdlibPackage.java @@ -44,7 +44,6 @@ import org.eclipse.ocl.pivot.values.UnlimitedNaturalValue; * @noreference This class is not intended to be referenced by clients. * <!-- end-user-doc --> * @see org.eclipse.ocl.pivot.oclstdlib.OCLstdlibFactory - * @model kind="package" * @generated */ public class OCLstdlibPackage extends EPackageImpl { @@ -976,7 +975,6 @@ public class OCLstdlibPackage extends EPackageImpl { * <!-- end-user-doc --> * @return the meta object for class '<em>Ocl Comparable</em>'. * @see java.lang.Object - * @model instanceClass="java.lang.Object" superTypes="org.eclipse.ocl.pivot.oclstdlib.OclAny" * @generated */ public EClass getOclComparable() { @@ -990,7 +988,6 @@ public class OCLstdlibPackage extends EPackageImpl { * <!-- end-user-doc --> * @return the meta object for class '<em>Ocl Element</em>'. * @see java.lang.Object - * @model instanceClass="java.lang.Object" superTypes="org.eclipse.ocl.pivot.oclstdlib.OclAny" * @generated */ public EClass getOclElement() { @@ -1034,7 +1031,6 @@ public class OCLstdlibPackage extends EPackageImpl { * <!-- end-user-doc --> * @return the meta object for class '<em>Ocl Any</em>'. * @see java.lang.Object - * @model instanceClass="java.lang.Object" * @generated */ public EClass getOclAny() { @@ -1048,7 +1044,6 @@ public class OCLstdlibPackage extends EPackageImpl { * <!-- end-user-doc --> * @return the meta object for class '<em>Ocl Invalid</em>'. * @see java.lang.Object - * @model instanceClass="java.lang.Object" superTypes="org.eclipse.ocl.pivot.oclstdlib.OclVoid" * @generated */ public EClass getOclInvalid() { @@ -1062,7 +1057,6 @@ public class OCLstdlibPackage extends EPackageImpl { * <!-- end-user-doc --> * @return the meta object for class '<em>Ocl Lambda</em>'. * @see java.lang.Object - * @model instanceClass="java.lang.Object" superTypes="org.eclipse.ocl.pivot.oclstdlib.OclAny" * @generated */ public EClass getOclLambda() { @@ -1076,7 +1070,6 @@ public class OCLstdlibPackage extends EPackageImpl { * <!-- end-user-doc --> * @return the meta object for class '<em>Ocl Message</em>'. * @see java.lang.Object - * @model instanceClass="java.lang.Object" superTypes="org.eclipse.ocl.pivot.oclstdlib.OclAny" * @generated */ public EClass getOclMessage() { @@ -1090,7 +1083,6 @@ public class OCLstdlibPackage extends EPackageImpl { * <!-- end-user-doc --> * @return the meta object for class '<em>Ocl State</em>'. * @see java.lang.Object - * @model instanceClass="java.lang.Object" superTypes="org.eclipse.ocl.pivot.oclstdlib.OclAny" * @generated */ public EClass getOclState() { @@ -1104,7 +1096,6 @@ public class OCLstdlibPackage extends EPackageImpl { * <!-- end-user-doc --> * @return the meta object for class '<em>Ocl Stereotype</em>'. * @see java.lang.Object - * @model instanceClass="java.lang.Object" superTypes="org.eclipse.ocl.pivot.oclstdlib.OclType" * @generated */ public EClass getOclStereotype() { @@ -1118,7 +1109,6 @@ public class OCLstdlibPackage extends EPackageImpl { * <!-- end-user-doc --> * @return the meta object for class '<em>Ocl Summable</em>'. * @see java.lang.Object - * @model instanceClass="java.lang.Object" superTypes="org.eclipse.ocl.pivot.oclstdlib.OclAny" * @generated */ public EClass getOclSummable() { @@ -1132,7 +1122,6 @@ public class OCLstdlibPackage extends EPackageImpl { * <!-- end-user-doc --> * @return the meta object for class '<em>Ocl Tuple</em>'. * @see java.lang.Object - * @model instanceClass="java.lang.Object" superTypes="org.eclipse.ocl.pivot.oclstdlib.OclAny" * @generated */ public EClass getOclTuple() { @@ -1146,7 +1135,6 @@ public class OCLstdlibPackage extends EPackageImpl { * <!-- end-user-doc --> * @return the meta object for class '<em>Ocl Type</em>'. * @see java.lang.Object - * @model instanceClass="java.lang.Object" superTypes="org.eclipse.ocl.pivot.oclstdlib.OclElement" * @generated */ public EClass getOclType() { @@ -1160,7 +1148,6 @@ public class OCLstdlibPackage extends EPackageImpl { * <!-- end-user-doc --> * @return the meta object for class '<em>Ocl Void</em>'. * @see java.lang.Object - * @model instanceClass="java.lang.Object" superTypes="org.eclipse.ocl.pivot.oclstdlib.OclAny" * @generated */ public EClass getOclVoid() { @@ -1174,7 +1161,6 @@ public class OCLstdlibPackage extends EPackageImpl { * <!-- end-user-doc --> * @return the meta object for class '<em>Ordered Collection</em>'. * @see java.util.Collection - * @model instanceClass="java.util.Collection" typeParameters="T" superTypes="org.eclipse.ocl.pivot.oclstdlib.Collection<T>" * @generated */ public EClass getOrderedCollection() { @@ -1188,7 +1174,6 @@ public class OCLstdlibPackage extends EPackageImpl { * <!-- end-user-doc --> * @return the meta object for data type '<em>Boolean</em>'. * @see java.lang.Boolean - * @model instanceClass="java.lang.Boolean" * @generated */ public EDataType getBoolean() { @@ -1201,7 +1186,6 @@ public class OCLstdlibPackage extends EPackageImpl { * <!-- end-user-doc --> * @return the meta object for data type '<em>Integer</em>'. * @see org.eclipse.ocl.pivot.values.IntegerValue - * @model instanceClass="org.eclipse.ocl.pivot.values.IntegerValue" * @generated */ public EDataType getInteger() { @@ -1214,7 +1198,6 @@ public class OCLstdlibPackage extends EPackageImpl { * <!-- end-user-doc --> * @return the meta object for data type '<em>Real</em>'. * @see org.eclipse.ocl.pivot.values.RealValue - * @model instanceClass="org.eclipse.ocl.pivot.values.RealValue" * @generated */ public EDataType getReal() { @@ -1227,7 +1210,6 @@ public class OCLstdlibPackage extends EPackageImpl { * <!-- end-user-doc --> * @return the meta object for data type '<em>String</em>'. * @see java.lang.String - * @model instanceClass="java.lang.String" * @generated */ public EDataType getString() { @@ -1240,7 +1222,6 @@ public class OCLstdlibPackage extends EPackageImpl { * <!-- end-user-doc --> * @return the meta object for data type '<em>Unlimited Natural</em>'. * @see org.eclipse.ocl.pivot.values.UnlimitedNaturalValue - * @model instanceClass="org.eclipse.ocl.pivot.values.UnlimitedNaturalValue" * @generated */ public EDataType getUnlimitedNatural() { @@ -1253,7 +1234,6 @@ public class OCLstdlibPackage extends EPackageImpl { * <!-- end-user-doc --> * @return the meta object for class '<em>Bag</em>'. * @see org.eclipse.ocl.pivot.values.Bag - * @model instanceClass="org.eclipse.ocl.pivot.values.Bag" typeParameters="T" superTypes="org.eclipse.ocl.pivot.oclstdlib.Collection<T>" * @generated */ public EClass getBag() { @@ -1266,7 +1246,6 @@ public class OCLstdlibPackage extends EPackageImpl { * <!-- end-user-doc --> * @return the meta object for class '<em>Collection</em>'. * @see java.util.Collection - * @model instanceClass="java.util.Collection" typeParameters="T" superTypes="org.eclipse.ocl.pivot.oclstdlib.OclAny" * @generated */ public EClass getCollection() { @@ -1321,7 +1300,6 @@ public class OCLstdlibPackage extends EPackageImpl { * <!-- end-user-doc --> * @return the meta object for class '<em>Ordered Set</em>'. * @see org.eclipse.ocl.pivot.values.OrderedSet - * @model instanceClass="org.eclipse.ocl.pivot.values.OrderedSet" typeParameters="T" superTypes="org.eclipse.ocl.pivot.oclstdlib.OrderedCollection<T> org.eclipse.ocl.pivot.oclstdlib.UniqueCollection<T>" * @generated */ public EClass getOrderedSet() { @@ -1334,7 +1312,6 @@ public class OCLstdlibPackage extends EPackageImpl { * <!-- end-user-doc --> * @return the meta object for class '<em>Sequence</em>'. * @see java.util.List - * @model instanceClass="java.util.List" typeParameters="T" superTypes="org.eclipse.ocl.pivot.oclstdlib.OrderedCollection<T>" * @generated */ public EClass getSequence() { @@ -1347,7 +1324,6 @@ public class OCLstdlibPackage extends EPackageImpl { * <!-- end-user-doc --> * @return the meta object for class '<em>Set</em>'. * @see java.util.Set - * @model instanceClass="java.util.Set" typeParameters="T" superTypes="org.eclipse.ocl.pivot.oclstdlib.UniqueCollection<T>" * @generated */ public EClass getSet() { @@ -1360,7 +1336,6 @@ public class OCLstdlibPackage extends EPackageImpl { * <!-- end-user-doc --> * @return the meta object for class '<em>Unique Collection</em>'. * @see java.util.Collection - * @model instanceClass="java.util.Collection" typeParameters="T" superTypes="org.eclipse.ocl.pivot.oclstdlib.Collection<T>" * @generated */ public EClass getUniqueCollection() { diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/oclstdlib/OCLstdlibTables.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/oclstdlib/OCLstdlibTables.java index 8e78c8fdf3..249024a355 100644 --- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/oclstdlib/OCLstdlibTables.java +++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/oclstdlib/OCLstdlibTables.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2010, 2016 Willink Transformations and others. + * Copyright (c) 2010, 2014 Willink Transformations 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 diff --git a/plugins/org.eclipse.ocl.pivot/model/oclstdlib.genmodel b/plugins/org.eclipse.ocl.pivot/model/oclstdlib.genmodel index 8e8c637e03..bd1084ca91 100644 --- a/plugins/org.eclipse.ocl.pivot/model/oclstdlib.genmodel +++ b/plugins/org.eclipse.ocl.pivot/model/oclstdlib.genmodel @@ -3,9 +3,9 @@ xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2010, 2014 Willink Transformations 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:
 E.D.Willink - Initial API and implementation" modelDirectory="/org.eclipse.ocl.pivot/emf-gen" editDirectory="/org.eclipse.ocl.pivot.edit/emf-gen" editorDirectory="/org.eclipse.ocl.pivot.editor/emf-gen" modelPluginID="org.eclipse.ocl.pivot" - modelName="OCLstdlib" nonNLSMarkers="true" suppressInterfaces="true" importerID="org.eclipse.emf.importer.ecore" - bundleManifest="false" complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.7" - interfaceNamePattern=""> + modelName="OCLstdlib" nonNLSMarkers="true" suppressEMFModelTags="true" suppressInterfaces="true" + importerID="org.eclipse.emf.importer.ecore" bundleManifest="false" complianceLevel="8.0" + copyrightFields="false" runtimeVersion="2.7" interfaceNamePattern=""> <genAnnotations source="http://www.eclipse.org/OCL/GenModel"> <details key="Use Delegates" value="false"/> <details key="Use Null Annotations" value="true"/> |