Commit 85555229 authored by Martti Käärik's avatar Martti Käärik
Browse files

Renamed parameter to avoid compilation error in generated code.

parent d73e30d6

plugins/org.etsi.mts.tdl.model/model/tdl.ecore

+2 −2
Original line number Diff line number Diff line
@@ -54,9 +54,9 @@ 
    </eOperations>

    <eOperations name="conformsTo" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBooleanObject">

      <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot">

        <details key="body" value="&#xA;            if (self = element) then&#xA;                true&#xA;            else&#xA;                if (self.oclIsKindOf(AnnotationType) and not self.oclAsType(AnnotationType).extension.oclIsUndefined()) then&#xA;                    self.oclAsType(AnnotationType).extension.isExtending(element)&#xA;                else&#xA;                    if (self.oclIsKindOf(ComponentType) and not self.oclAsType(ComponentType).extension.oclIsUndefined()) then&#xA;                        self.oclAsType(ComponentType).extension.isExtending(element)&#xA;                    else&#xA;                        if (self.oclIsKindOf(GateType) and not self.oclAsType(GateType).extension.oclIsUndefined()) then&#xA;                            self.oclAsType(GateType).extension.isExtending(element)&#xA;                        else&#xA;                            if (self.oclIsKindOf(StructuredDataType)) then&#xA;                                self.oclAsType(StructuredDataType).extension->exists(ex | ex.isExtending(element))&#xA;                            else&#xA;                                if (self.oclIsKindOf(SimpleDataType) and not self.oclAsType(SimpleDataType).extension.oclIsUndefined()) then&#xA;                                    self.oclAsType(SimpleDataType).extension.isExtending(element)&#xA;                                else&#xA;                                    false&#xA;                                endif&#xA;                            endif&#xA;                        endif&#xA;                    endif&#xA;                endif&#xA;            endif&#xA;            "/>

        <details key="body" value="&#xA;            if (self = n) then&#xA;                true&#xA;            else&#xA;                if (self.oclIsKindOf(AnnotationType) and not self.oclAsType(AnnotationType).extension.oclIsUndefined()) then&#xA;                    self.oclAsType(AnnotationType).extension.isExtending(n)&#xA;                else&#xA;                    if (self.oclIsKindOf(ComponentType) and not self.oclAsType(ComponentType).extension.oclIsUndefined()) then&#xA;                        self.oclAsType(ComponentType).extension.isExtending(n)&#xA;                    else&#xA;                        if (self.oclIsKindOf(GateType) and not self.oclAsType(GateType).extension.oclIsUndefined()) then&#xA;                            self.oclAsType(GateType).extension.isExtending(n)&#xA;                        else&#xA;                            if (self.oclIsKindOf(StructuredDataType)) then&#xA;                                self.oclAsType(StructuredDataType).extension->exists(ex | ex.isExtending(n))&#xA;                            else&#xA;                                if (self.oclIsKindOf(SimpleDataType) and not self.oclAsType(SimpleDataType).extension.oclIsUndefined()) then&#xA;                                    self.oclAsType(SimpleDataType).extension.isExtending(n)&#xA;                                else&#xA;                                    false&#xA;                                endif&#xA;                            endif&#xA;                        endif&#xA;                    endif&#xA;                endif&#xA;            endif&#xA;            "/>

      </eAnnotations>

      <eParameters name="element" eType="#//PackageableElement"/>

      <eParameters name="n" eType="#//PackageableElement"/>

    </eOperations>

  </eClassifiers>

  <eClassifiers xsi:type="ecore:EClass" name="NamedElement" abstract="true" eSuperTypes="#//Element">

plugins/org.etsi.mts.tdl.model/model/tdl.genmodel

+1 −1
Original line number Diff line number Diff line
@@ -180,7 +180,7 @@ 
        <genParameters ecoreParameter="tdl.ecore#//PackageableElement/getElementNamed/n"/>

      </genOperations>

      <genOperations ecoreOperation="tdl.ecore#//PackageableElement/conformsTo.1">

        <genParameters ecoreParameter="tdl.ecore#//PackageableElement/conformsTo.1/element"/>

        <genParameters ecoreParameter="tdl.ecore#//PackageableElement/conformsTo.1/n"/>

      </genOperations>

    </genClasses>

    <genClasses image="false" ecoreClass="tdl.ecore#//NamedElement">