Commit 04c82761 authored by Alexander Diewald's avatar Alexander Diewald

Merge remote-tracking branch 'origin/3365' into 4008

parents 80c8b94b aca05e95
dseml.ecore 9a07a7ea81eff402eeb35bde7b2cebe2482792bb GREEN
exploration.ecore f80d9935c8fbbe992614e7cc768429861d43121d YELLOW
exploration.ecore dde7f5d2c244f48739ee156608f003f5ad941645 YELLOW
......@@ -32,7 +32,7 @@
<eOperations name="getResultType" lowerBound="1">
<eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
<details key="documentation" value="Returns the type that is expected from an evaluation result of this {@link ExplorationTarget}."/>
<details key="body" value="if(resultTypeInternal != null) {&#xA; return resultTypeInternal;&#xA;}&#xA;&#xA;return org.fortiss.af3.exploration.util.ExplorationReflectionUtils.getSubstitutionTypeOfGenericIface(this, IExplorationTarget.class, resultTypeInternal);"/>
<details key="body" value="if(resultTypeInternal != null) {&#xA; return resultTypeInternal;&#xA;}&#xA;&#xA;return org.fortiss.af3.exploration.util.ExplorationReflectionUtils.getSubstitutionTypeOfGenericIface(this, org.fortiss.af3.exploration.model.IExplorationTarget.class, resultTypeInternal);"/>
</eAnnotations>
<eGenericType eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaClass">
<eTypeArguments eTypeParameter="#//IExplorationTarget/T"/>
......
......@@ -20,7 +20,7 @@
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute exploration.ecore#//IExplorationTarget/resultTypeInternal"/>
<genFeatures createChild="false" ecoreFeature="ecore:EReference exploration.ecore#//IExplorationTarget/problemDimension"/>
<genOperations ecoreOperation="exploration.ecore#//IExplorationTarget/getResultType"
body="if(resultTypeInternal != null) {&#xA; return resultTypeInternal;&#xA;}&#xA;&#xA;return org.fortiss.af3.exploration.util.ExplorationReflectionUtils.getSubstitutionTypeOfGenericIface(this, IExplorationTarget.class, resultTypeInternal);"/>
body="if(resultTypeInternal != null) {&#xA; return resultTypeInternal;&#xA;}&#xA;&#xA;return org.fortiss.af3.exploration.util.ExplorationReflectionUtils.getSubstitutionTypeOfGenericIface(this, org.fortiss.af3.exploration.model.IExplorationTarget.class, resultTypeInternal);"/>
<genOperations ecoreOperation="exploration.ecore#//IExplorationTarget/setResultType"
body="if(type != null) {&#xD;&#xA; resultTypeInternal = type;&#xD;&#xA;}">
<genParameters ecoreParameter="exploration.ecore#//IExplorationTarget/setResultType/type"/>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment