Commit f0e0a6ea authored by Reiner Jung's avatar Reiner Jung

Update MDL. Fixed some language and build issues. Integrated Xtend Validator

parent df084981
This diff is collapsed.
......@@ -2,7 +2,7 @@
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="src-gen"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="output" path="bin"/>
</classpath>
......@@ -21,5 +21,5 @@ Import-Package: org.apache.log4j,
org.junit.runners;version="4.5.0",
org.junit.runners.model;version="4.5.0",
org.hamcrest.core
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Export-Package: de.cau.cs.se.measure.definition.language
......@@ -2,7 +2,7 @@
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="src-gen"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="output" path="bin"/>
</classpath>
......@@ -20,7 +20,7 @@ Require-Bundle: de.cau.cs.se.measure.definition.language;visibility:=reexport,
org.eclipse.xtext.ui.ecore;bundle-version="2.3.1"
Import-Package: org.apache.log4j,
org.apache.commons.logging
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Export-Package: de.cau.cs.se.measure.definition.language.ui.contentassist,
de.cau.cs.se.measure.definition.language.ui.contentassist.antlr,
de.cau.cs.se.measure.definition.language.ui.internal
......
......@@ -20,9 +20,6 @@ public class AbstractMeasureDefinitionLanguageProposalProvider extends Terminals
public void completeModel_Name(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
}
public void completeModel_Imports(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
}
public void completeModel_Metamodels(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
}
......@@ -35,12 +32,6 @@ public class AbstractMeasureDefinitionLanguageProposalProvider extends Terminals
public void completeModel_Measures(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
}
public void completeImport_ImportedType(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
lookupCrossReference(((CrossReference)assignment.getTerminal()), context, acceptor);
}
public void completeImport_ImportedNamespace(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
}
public void completeMetaModel_Name(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
}
......@@ -348,9 +339,6 @@ public class AbstractMeasureDefinitionLanguageProposalProvider extends Terminals
public void complete_Model(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
// subclasses may override
}
public void complete_Import(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
// subclasses may override
}
public void complete_MetaModel(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
// subclasses may override
}
......
......@@ -37,7 +37,6 @@ public class MeasureDefinitionLanguageParser extends AbstractContentAssistParser
nameMappings = new HashMap<AbstractElement, String>() {
private static final long serialVersionUID = 1L;
{
put(grammarAccess.getImportAccess().getAlternatives_1(), "rule__Import__Alternatives_1");
put(grammarAccess.getUnitAccess().getAlternatives(), "rule__Unit__Alternatives");
put(grammarAccess.getUnitCombinationAccess().getAlternatives(), "rule__UnitCombination__Alternatives");
put(grammarAccess.getTypeReferenceAccess().getAlternatives(), "rule__TypeReference__Alternatives");
......@@ -58,7 +57,6 @@ public class MeasureDefinitionLanguageParser extends AbstractContentAssistParser
put(grammarAccess.getFunctionNameAccess().getAlternatives(), "rule__FunctionName__Alternatives");
put(grammarAccess.getReflectionTypeAccess().getAlternatives(), "rule__ReflectionType__Alternatives");
put(grammarAccess.getModelAccess().getGroup(), "rule__Model__Group__0");
put(grammarAccess.getImportAccess().getGroup(), "rule__Import__Group__0");
put(grammarAccess.getMetaModelAccess().getGroup(), "rule__MetaModel__Group__0");
put(grammarAccess.getCharacteristicAccess().getGroup(), "rule__Characteristic__Group__0");
put(grammarAccess.getCharacteristicAccess().getGroup_2(), "rule__Characteristic__Group_2__0");
......@@ -145,13 +143,10 @@ public class MeasureDefinitionLanguageParser extends AbstractContentAssistParser
put(grammarAccess.getQualifiedNameAccess().getGroup_1(), "rule__QualifiedName__Group_1__0");
put(grammarAccess.getQualifiedNameWithWildcardAccess().getGroup(), "rule__QualifiedNameWithWildcard__Group__0");
put(grammarAccess.getModelAccess().getNameAssignment_1(), "rule__Model__NameAssignment_1");
put(grammarAccess.getModelAccess().getImportsAssignment_2(), "rule__Model__ImportsAssignment_2");
put(grammarAccess.getModelAccess().getMetamodelsAssignment_3(), "rule__Model__MetamodelsAssignment_3");
put(grammarAccess.getModelAccess().getTypesAssignment_4(), "rule__Model__TypesAssignment_4");
put(grammarAccess.getModelAccess().getCharacteristicsAssignment_5(), "rule__Model__CharacteristicsAssignment_5");
put(grammarAccess.getModelAccess().getMeasuresAssignment_6(), "rule__Model__MeasuresAssignment_6");
put(grammarAccess.getImportAccess().getImportedTypeAssignment_1_0(), "rule__Import__ImportedTypeAssignment_1_0");
put(grammarAccess.getImportAccess().getImportedNamespaceAssignment_1_1(), "rule__Import__ImportedNamespaceAssignment_1_1");
put(grammarAccess.getModelAccess().getMetamodelsAssignment_2(), "rule__Model__MetamodelsAssignment_2");
put(grammarAccess.getModelAccess().getTypesAssignment_3(), "rule__Model__TypesAssignment_3");
put(grammarAccess.getModelAccess().getCharacteristicsAssignment_4(), "rule__Model__CharacteristicsAssignment_4");
put(grammarAccess.getModelAccess().getMeasuresAssignment_5(), "rule__Model__MeasuresAssignment_5");
put(grammarAccess.getMetaModelAccess().getNameAssignment_1(), "rule__MetaModel__NameAssignment_1");
put(grammarAccess.getMetaModelAccess().getPackageAssignment_2(), "rule__MetaModel__PackageAssignment_2");
put(grammarAccess.getCharacteristicAccess().getNameAssignment_1(), "rule__Characteristic__NameAssignment_1");
......
......@@ -50,7 +50,6 @@ T__81=81
T__47=47
T__82=82
T__44=44
T__83=83
T__45=45
T__48=48
T__49=49
......@@ -79,74 +78,73 @@ T__79=79
T__78=78
T__77=77
'deci'=30
'#'=80
'count'=64
'#'=79
'count'=63
'>='=12
'=='=16
'/'=22
'model'=54
'model'=53
'tera'=34
'measure'=61
'giga'=33
'exists'=75
'measure'=60
'exists'=74
'>'=14
'||'=82
'&&'=83
'forall'=73
'typedef'=57
'parent'=56
'||'=81
'&&'=82
'forall'=72
'typedef'=56
'parent'=55
'+'=18
'.'=77
'.'=76
'gram'=38
'library'=52
'import'=53
'isKindOf'=51
'else'=72
'else'=71
'centi'=29
'{'=69
'{'=68
'sum'=40
'def'=66
'def'=65
'pico'=25
'kilo'=31
'standard-deviation'=42
'floor'=47
'if'=71
':'=62
'('=58
'if'=70
':'=61
'('=57
'-'=19
'**'=21
','=63
','=62
'second'=37
'in'=76
'select'=65
'in'=75
'select'=64
'ceil'=48
'liter'=39
']'=79
']'=78
'milli'=28
'average'=41
'!'=24
'|'=74
'|'=73
'sd'=43
'meter'=36
'nano'=26
'null'=81
'null'=80
'peta'=35
'micro'=27
'::'=60
'collect'=67
')'=59
'::'=59
'collect'=66
')'=58
'mega'=32
'%'=23
'max'=44
'}'=70
'}'=69
'size'=49
'abs'=46
'<='=13
'scope'=68
'scope'=67
'!='=17
'<'=15
'trait'=55
'trait'=54
'isTypeOf'=50
'['=78
'['=77
'*'=20
'min'=45
......@@ -5,7 +5,7 @@
<classpathentry kind="src" path="xtend-gen"/>
<classpathentry kind="src" path="model"/>
<classpathentry kind="src" path="model-gen"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="output" path="bin"/>
</classpath>
......@@ -19,7 +19,7 @@ Require-Bundle: org.eclipse.xtext;visibility:=reexport,
org.eclipse.xtext.common.types
Import-Package: org.apache.log4j,
org.eclipse.xtext.xbase.lib
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Export-Package: de.cau.cs.se.measure.definition.language,
de.cau.cs.se.measure.definition.language.services,
de.cau.cs.se.measure.definition.language.definition,
......@@ -37,7 +37,6 @@ Export-Package: de.cau.cs.se.measure.definition.language,
org.omg.adm.smm.extended,
org.omg.adm.smm.measure,
org.omg.adm.smm.measurement
Bundle-ClassPath: lib/mamba-core-1.0.0-SNAPSHOT.jar
.
source.. = src/,\
src-gen/,\
xtend-gen/
xtend-gen/,\
model/,\
model-gen/
bin.includes = META-INF/,\
.,\
plugin.xml,\
lib/mamba-core-1.0.0-SNAPSHOT.jar
plugin.xml
......@@ -4,8 +4,6 @@
nsPrefix="definition">
<eClassifiers xsi:type="ecore:EClass" name="Model">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType ../../../../../../../../../org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="imports" upperBound="-1"
eType="#//Import" containment="true"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="metamodels" upperBound="-1"
eType="#//MetaModel" containment="true"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="types" upperBound="-1"
......@@ -15,10 +13,6 @@
<eStructuralFeatures xsi:type="ecore:EReference" name="measures" upperBound="-1"
eType="#//Measure" containment="true"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="Import">
<eStructuralFeatures xsi:type="ecore:EReference" name="importedType" eType="ecore:EClass ../../../../../../../../../org.eclipse.xtext.common.types/model/JavaVMTypes.ecore#//JvmType"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="importedNamespace" eType="ecore:EDataType ../../../../../../../../../org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="MetaModel">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType ../../../../../../../../../org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="package" eType="ecore:EClass ../../../../../../../../../org.eclipse.emf.ecore/model/Ecore.ecore#//EPackage"/>
......
......@@ -6,7 +6,7 @@
modelName="MeasureDefinitionLanguage" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
complianceLevel="5.0" copyrightFields="false" editPluginID="de.cau.cs.se.measure.definition.language.edit"
editorPluginID="de.cau.cs.se.measure.definition.language.editor" runtimeVersion="2.8"
usedGenPackages="../../../../../../../../../org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore ../../../../../../../../../org.eclipse.xtext.common.types/model/JavaVMTypes.genmodel#//types">
usedGenPackages="../../../../../../../../../org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
<genPackages prefix="Definition" basePackage="de.cau.cs.se.measure.definition.language"
disposableProviderFactory="true" ecorePackage="MeasureDefinitionLanguage.ecore#/">
<genEnums typeSafeEnumCompatible="false" ecoreEnum="MeasureDefinitionLanguage.ecore#//Prefix">
......@@ -47,16 +47,11 @@
</genEnums>
<genClasses ecoreClass="MeasureDefinitionLanguage.ecore#//Model">
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute MeasureDefinitionLanguage.ecore#//Model/name"/>
<genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference MeasureDefinitionLanguage.ecore#//Model/imports"/>
<genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference MeasureDefinitionLanguage.ecore#//Model/metamodels"/>
<genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference MeasureDefinitionLanguage.ecore#//Model/types"/>
<genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference MeasureDefinitionLanguage.ecore#//Model/characteristics"/>
<genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference MeasureDefinitionLanguage.ecore#//Model/measures"/>
</genClasses>
<genClasses ecoreClass="MeasureDefinitionLanguage.ecore#//Import">
<genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference MeasureDefinitionLanguage.ecore#//Import/importedType"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute MeasureDefinitionLanguage.ecore#//Import/importedNamespace"/>
</genClasses>
<genClasses ecoreClass="MeasureDefinitionLanguage.ecore#//MetaModel">
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute MeasureDefinitionLanguage.ecore#//MetaModel/name"/>
<genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference MeasureDefinitionLanguage.ecore#//MetaModel/package"/>
......
......@@ -31,15 +31,6 @@ public interface DefinitionFactory extends EFactory
*/
Model createModel();
/**
* Returns a new object of class '<em>Import</em>'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return a new object of class '<em>Import</em>'.
* @generated
*/
Import createImport();
/**
* Returns a new object of class '<em>Meta Model</em>'.
* <!-- begin-user-doc -->
......
/**
*/
package de.cau.cs.se.measure.definition.language.definition;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.xtext.common.types.JvmType;
/**
* <!-- begin-user-doc -->
* A representation of the model object '<em><b>Import</b></em>'.
* <!-- end-user-doc -->
*
* <p>
* The following features are supported:
* <ul>
* <li>{@link de.cau.cs.se.measure.definition.language.definition.Import#getImportedType <em>Imported Type</em>}</li>
* <li>{@link de.cau.cs.se.measure.definition.language.definition.Import#getImportedNamespace <em>Imported Namespace</em>}</li>
* </ul>
* </p>
*
* @see de.cau.cs.se.measure.definition.language.definition.DefinitionPackage#getImport()
* @model
* @generated
*/
public interface Import extends EObject
{
/**
* Returns the value of the '<em><b>Imported Type</b></em>' reference.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Imported Type</em>' reference isn't clear,
* there really should be more of a description here...
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Imported Type</em>' reference.
* @see #setImportedType(JvmType)
* @see de.cau.cs.se.measure.definition.language.definition.DefinitionPackage#getImport_ImportedType()
* @model
* @generated
*/
JvmType getImportedType();
/**
* Sets the value of the '{@link de.cau.cs.se.measure.definition.language.definition.Import#getImportedType <em>Imported Type</em>}' reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @param value the new value of the '<em>Imported Type</em>' reference.
* @see #getImportedType()
* @generated
*/
void setImportedType(JvmType value);
/**
* Returns the value of the '<em><b>Imported Namespace</b></em>' attribute.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Imported Namespace</em>' attribute isn't clear,
* there really should be more of a description here...
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Imported Namespace</em>' attribute.
* @see #setImportedNamespace(String)
* @see de.cau.cs.se.measure.definition.language.definition.DefinitionPackage#getImport_ImportedNamespace()
* @model
* @generated
*/
String getImportedNamespace();
/**
* Sets the value of the '{@link de.cau.cs.se.measure.definition.language.definition.Import#getImportedNamespace <em>Imported Namespace</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @param value the new value of the '<em>Imported Namespace</em>' attribute.
* @see #getImportedNamespace()
* @generated
*/
void setImportedNamespace(String value);
} // Import
......@@ -15,7 +15,6 @@ import org.eclipse.emf.ecore.EObject;
* The following features are supported:
* <ul>
* <li>{@link de.cau.cs.se.measure.definition.language.definition.Model#getName <em>Name</em>}</li>
* <li>{@link de.cau.cs.se.measure.definition.language.definition.Model#getImports <em>Imports</em>}</li>
* <li>{@link de.cau.cs.se.measure.definition.language.definition.Model#getMetamodels <em>Metamodels</em>}</li>
* <li>{@link de.cau.cs.se.measure.definition.language.definition.Model#getTypes <em>Types</em>}</li>
* <li>{@link de.cau.cs.se.measure.definition.language.definition.Model#getCharacteristics <em>Characteristics</em>}</li>
......@@ -55,22 +54,6 @@ public interface Model extends EObject
*/
void setName(String value);
/**
* Returns the value of the '<em><b>Imports</b></em>' containment reference list.
* The list contents are of type {@link de.cau.cs.se.measure.definition.language.definition.Import}.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Imports</em>' containment reference list isn't clear,
* there really should be more of a description here...
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Imports</em>' containment reference list.
* @see de.cau.cs.se.measure.definition.language.definition.DefinitionPackage#getModel_Imports()
* @model containment="true"
* @generated
*/
EList<Import> getImports();
/**
* Returns the value of the '<em><b>Metamodels</b></em>' containment reference list.
* The list contents are of type {@link de.cau.cs.se.measure.definition.language.definition.MetaModel}.
......
......@@ -66,7 +66,6 @@ public class DefinitionFactoryImpl extends EFactoryImpl implements DefinitionFac
switch (eClass.getClassifierID())
{
case DefinitionPackage.MODEL: return createModel();
case DefinitionPackage.IMPORT: return createImport();
case DefinitionPackage.META_MODEL: return createMetaModel();
case DefinitionPackage.CHARACTERISTIC: return createCharacteristic();
case DefinitionPackage.CHARACTERISTIC_REFERENCE: return createCharacteristicReference();
......@@ -176,17 +175,6 @@ public class DefinitionFactoryImpl extends EFactoryImpl implements DefinitionFac
return model;
}
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
public Import createImport()
{
ImportImpl import_ = new ImportImpl();
return import_;
}
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
......
......@@ -20,7 +20,6 @@ import de.cau.cs.se.measure.definition.language.definition.FreeUnit;
import de.cau.cs.se.measure.definition.language.definition.FunctionCall;
import de.cau.cs.se.measure.definition.language.definition.FunctionName;
import de.cau.cs.se.measure.definition.language.definition.IfExpression;
import de.cau.cs.se.measure.definition.language.definition.Import;
import de.cau.cs.se.measure.definition.language.definition.IntLiteral;
import de.cau.cs.se.measure.definition.language.definition.Kind;
import de.cau.cs.se.measure.definition.language.definition.Literal;
......@@ -64,8 +63,6 @@ import org.eclipse.emf.ecore.EcorePackage;
import org.eclipse.emf.ecore.impl.EPackageImpl;
import org.eclipse.xtext.common.types.TypesPackage;
/**
* <!-- begin-user-doc -->
* An implementation of the model <b>Package</b>.
......@@ -81,13 +78,6 @@ public class DefinitionPackageImpl extends EPackageImpl implements DefinitionPac
*/
private EClass modelEClass = null;
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
private EClass importEClass = null;
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
......@@ -474,7 +464,6 @@ public class DefinitionPackageImpl extends EPackageImpl implements DefinitionPac
// Initialize simple dependencies
EcorePackage.eINSTANCE.eClass();
TypesPackage.eINSTANCE.eClass();
// Create package meta-data objects
theDefinitionPackage.createPackageContents();
......@@ -511,16 +500,6 @@ public class DefinitionPackageImpl extends EPackageImpl implements DefinitionPac
return (EAttribute)modelEClass.getEStructuralFeatures().get(0);
}
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
public EReference getModel_Imports()
{
return (EReference)modelEClass.getEStructuralFeatures().get(1);
}
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
......@@ -528,7 +507,7 @@ public class DefinitionPackageImpl extends EPackageImpl implements DefinitionPac
*/
public EReference getModel_Metamodels()
{
return (EReference)modelEClass.getEStructuralFeatures().get(2);
return (EReference)modelEClass.getEStructuralFeatures().get(1);
}
/**
......@@ -538,7 +517,7 @@ public class DefinitionPackageImpl extends EPackageImpl implements DefinitionPac
*/
public EReference getModel_Types()
{
return (EReference)modelEClass.getEStructuralFeatures().get(3);
return (EReference)modelEClass.getEStructuralFeatures().get(2);
}
/**
......@@ -548,7 +527,7 @@ public class DefinitionPackageImpl extends EPackageImpl implements DefinitionPac
*/
public EReference getModel_Characteristics()
{
return (EReference)modelEClass.getEStructuralFeatures().get(4);
return (EReference)modelEClass.getEStructuralFeatures().get(3);
}
/**
......@@ -558,37 +537,7 @@ public class DefinitionPackageImpl extends EPackageImpl implements DefinitionPac
*/
public EReference getModel_Measures()
{
return (EReference)modelEClass.getEStructuralFeatures().get(5);
}
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
public EClass getImport()
{
return importEClass;
}
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
public EReference getImport_ImportedType()
{
return (EReference)importEClass.getEStructuralFeatures().get(0);
}
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
public EAttribute getImport_ImportedNamespace()
{
return (EAttribute)importEClass.getEStructuralFeatures().get(1);
return (EReference)modelEClass.getEStructuralFeatures().get(4);
}
/**
......@@ -1803,16 +1752,11 @@ public class DefinitionPackageImpl extends EPackageImpl implements DefinitionPac
// Create classes and their features
modelEClass = createEClass(MODEL);
createEAttribute(modelEClass, MODEL__NAME);
createEReference(modelEClass, MODEL__IMPORTS);
createEReference(modelEClass, MODEL__METAMODELS);
createEReference(modelEClass, MODEL__TYPES);
createEReference(modelEClass, MODEL__CHARACTERISTICS);
createEReference(modelEClass, MODEL__MEASURES);
importEClass = createEClass(IMPORT);
createEReference(importEClass, IMPORT__IMPORTED_TYPE);
createEAttribute(importEClass, IMPORT__IMPORTED_NAMESPACE);
metaModelEClass = createEClass(META_MODEL);
createEAttribute(metaModelEClass, META_MODEL__NAME);
createEReference(metaModelEClass, META_MODEL__PACKAGE);
......@@ -2003,7 +1947,6 @@ public class DefinitionPackageImpl extends EPackageImpl implements DefinitionPac
// Obtain other dependent packages
EcorePackage theEcorePackage = (EcorePackage)EPackage.Registry.INSTANCE.getEPackage(EcorePackage.eNS_URI);
TypesPackage theTypesPackage = (TypesPackage)EPackage.Registry.INSTANCE.getEPackage(TypesPackage.eNS_URI);
// Create type parameters
......@@ -2046,16 +1989,11 @@ public class DefinitionPackageImpl extends EPackageImpl implements DefinitionPac
// Initialize classes and features; add operations and parameters
initEClass(modelEClass, Model.class, "Model", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
initEAttribute(getModel_Name(), theEcorePackage.getEString(), "name", null, 0, 1, Model.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEReference(getModel_Imports(), this.getImport(), null, "imports", null, 0, -1, Model.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEReference(getModel_Metamodels(), this.getMetaModel(), null, "metamodels", null, 0, -1, Model.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEReference(getModel_Types(), this.getMeasureType(), null, "types", null, 0, -1, Model.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEReference(getModel_Characteristics(), this.getCharacteristic(), null, "characteristics", null, 0, -1, Model.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEReference(getModel_Measures(), this.getMeasure(), null, "measures", null, 0, -1, Model.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(importEClass, Import.class, "Import", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
initEReference(getImport_ImportedType(), theTypesPackage.getJvmType(), null, "importedType", null, 0, 1, Import.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEAttribute(getImport_ImportedNamespace(), theEcorePackage.getEString(), "importedNamespace", null, 0, 1, Import.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);