Bug 499604 : replace the links by object's name, amend comments
Change-Id: Id3c082a911b9d5dd5ed88ada6835f307f7a2c278
Signed-off-by: jcelmer <jan.celmer@atos.net>
diff --git a/plugins/org.eclipse.gendoc.bundle.acceleo.papyrus/META-INF/MANIFEST.MF b/plugins/org.eclipse.gendoc.bundle.acceleo.papyrus/META-INF/MANIFEST.MF
index 36b0896..6d3911b 100644
--- a/plugins/org.eclipse.gendoc.bundle.acceleo.papyrus/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.gendoc.bundle.acceleo.papyrus/META-INF/MANIFEST.MF
@@ -22,7 +22,8 @@
org.eclipse.papyrus.infra.gmfdiag.common,
org.eclipse.papyrus.uml.tools,
org.eclipse.papyrus.infra.core.log,
- org.eclipse.papyrus.infra.services.resourceloading
+ org.eclipse.papyrus.infra.services.resourceloading,
+ org.eclipse.gendoc.bundle.acceleo.commons;bundle-version="0.6.0"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
Eclipse-LazyStart: true
diff --git a/plugins/org.eclipse.gendoc.bundle.acceleo.papyrus/src/org/eclipse/gendoc/bundle/acceleo/papyrus/mtl/papyrus.emtl b/plugins/org.eclipse.gendoc.bundle.acceleo.papyrus/src/org/eclipse/gendoc/bundle/acceleo/papyrus/mtl/papyrus.emtl
index 2bedc5c..7a72953 100644
--- a/plugins/org.eclipse.gendoc.bundle.acceleo.papyrus/src/org/eclipse/gendoc/bundle/acceleo/papyrus/mtl/papyrus.emtl
+++ b/plugins/org.eclipse.gendoc.bundle.acceleo.papyrus/src/org/eclipse/gendoc/bundle/acceleo/papyrus/mtl/papyrus.emtl
@@ -11,7 +11,7 @@
<parameter name="arg0">
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
</parameter>
- <expression xsi:type="ocl.ecore:OperationCallExp" referredOperation="/1/OclAny_Class/invoke">
+ <expression xsi:type="ocl.ecore:OperationCallExp" referredOperation="/1/oclstdlib_OclAny_Class/invoke">
<eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
<source xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/5">
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
@@ -33,13 +33,13 @@
</expression>
</ownedModuleElement>
<ownedModuleElement xsi:type="mtl:Comment">
- <body startPosition="651" endPosition="689" value=" - get the documentation of an object "/>
+ <body startPosition="649" endPosition="687" value=" - get the documentation of an object "/>
</ownedModuleElement>
<ownedModuleElement xsi:type="mtl:Query" name="getDocumentation" visibility="Public">
<parameter name="arg0">
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
</parameter>
- <expression xsi:type="ocl.ecore:OperationCallExp" referredOperation="/1/OclAny_Class/invoke">
+ <expression xsi:type="ocl.ecore:OperationCallExp" referredOperation="/1/oclstdlib_OclAny_Class/invoke">
<eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
<source xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/8">
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
@@ -62,13 +62,13 @@
<type xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
</ownedModuleElement>
<ownedModuleElement xsi:type="mtl:Comment">
- <body startPosition="916" endPosition="964" value=" - get the documentation resources of an object "/>
+ <body startPosition="912" endPosition="960" value=" - get the documentation resources of an object "/>
</ownedModuleElement>
<ownedModuleElement xsi:type="mtl:Query" name="getDocumentationResources" visibility="Public" type="/3/Sequence(String)">
<parameter name="arg0">
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
</parameter>
- <expression xsi:type="ocl.ecore:OperationCallExp" referredOperation="/1/OclAny_Class/invoke">
+ <expression xsi:type="ocl.ecore:OperationCallExp" referredOperation="/1/oclstdlib_OclAny_Class/invoke">
<eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
<source xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/11">
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
@@ -89,349 +89,111 @@
</argument>
</expression>
</ownedModuleElement>
+ <ownedModuleElement xsi:type="mtl:Query" name="replaceLinksByNameOrLabel" visibility="Public">
+ <parameter name="arg0">
+ <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
+ </parameter>
+ <parameter name="arg1">
+ <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
+ </parameter>
+ <expression xsi:type="ocl.ecore:OperationCallExp" referredOperation="/1/oclstdlib_OclAny_Class/invoke">
+ <eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
+ <source xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/14">
+ <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
+ </source>
+ <argument xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="org.eclipse.gendoc.bundle.acceleo.papyrus.service.PapyrusServices">
+ <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
+ </argument>
+ <argument xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="replaceLinksByNameOrLabel(java.lang.String, org.eclipse.emf.ecore.EObject)">
+ <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
+ </argument>
+ <argument xsi:type="ocl.ecore:CollectionLiteralExp" eType="/3/Sequence(OclAny)" kind="Sequence">
+ <part xsi:type="ocl.ecore:CollectionItem">
+ <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
+ <item xsi:type="ocl.ecore:VariableExp" name="arg0" referredVariable="/0/replaceLinksByNameOrLabel/arg0">
+ <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
+ </item>
+ </part>
+ <part xsi:type="ocl.ecore:CollectionItem">
+ <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
+ <item xsi:type="ocl.ecore:VariableExp" name="arg1" referredVariable="/0/replaceLinksByNameOrLabel/arg1">
+ <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
+ </item>
+ </part>
+ </argument>
+ </expression>
+ <type xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
+ </ownedModuleElement>
<ownedModuleElement xsi:type="mtl:Comment">
- <body startPosition="1218" endPosition="1301" value=" - virtual order methods must be implemented if the module is integrated to papyrus"/>
+ <body startPosition="1482" endPosition="1565" value=" - virtual order methods must be implemented if the module is integrated to papyrus"/>
</ownedModuleElement>
</mtl:Module>
<ecore:EPackage name="additions">
- <eClassifiers xsi:type="ecore:EClass" name="String_Class">
+ <eClassifiers xsi:type="ecore:EClass" name="oclstdlib_String_Class">
<eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
<references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
</eAnnotations>
- <eOperations name="substitute">
- <eAnnotations source="MTL"/>
- <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
- <eParameters name="r">
- <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
- </eParameters>
- <eParameters name="t">
- <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
- </eParameters>
- </eOperations>
- <eOperations name="index">
- <eAnnotations source="MTL"/>
- <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Integer"/>
- <eParameters name="r">
- <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
- </eParameters>
- </eOperations>
- <eOperations name="first">
- <eAnnotations source="MTL"/>
- <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
- <eParameters name="n">
- <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Integer"/>
- </eParameters>
- </eOperations>
- <eOperations name="last">
- <eAnnotations source="MTL"/>
- <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
- <eParameters name="n">
- <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Integer"/>
- </eParameters>
- </eOperations>
- <eOperations name="strstr">
- <eAnnotations source="MTL"/>
- <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
- <eParameters name="r">
- <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
- </eParameters>
- </eOperations>
- <eOperations name="strtok">
- <eAnnotations source="MTL"/>
- <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
- <eParameters name="s1">
- <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
- </eParameters>
- <eParameters name="flag">
- <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Integer"/>
- </eParameters>
- </eOperations>
- <eOperations name="strcmp">
- <eAnnotations source="MTL"/>
- <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Integer"/>
- <eParameters name="s1">
- <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
- </eParameters>
- </eOperations>
- <eOperations name="isAlpha">
- <eAnnotations source="MTL"/>
- <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
- </eOperations>
- <eOperations name="isAlphanum">
- <eAnnotations source="MTL"/>
- <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
- </eOperations>
- <eOperations name="toUpperFirst">
- <eAnnotations source="MTL"/>
- <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
- </eOperations>
- <eOperations name="toLowerFirst">
- <eAnnotations source="MTL"/>
- <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
- </eOperations>
- <eOperations name="replace">
- <eAnnotations source="MTL non-standard"/>
- <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
- <eParameters name="substring">
- <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
- </eParameters>
- <eParameters name="replacement">
- <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
- </eParameters>
- </eOperations>
- <eOperations name="replaceAll">
- <eAnnotations source="MTL non-standard"/>
- <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
- <eParameters name="substring">
- <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
- </eParameters>
- <eParameters name="replacement">
- <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
- </eParameters>
- </eOperations>
- <eOperations name="substituteAll">
- <eAnnotations source="MTL non-standard"/>
- <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
- <eParameters name="substring">
- <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
- </eParameters>
- <eParameters name="replacement">
- <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
- </eParameters>
- </eOperations>
- <eOperations name="startsWith">
- <eAnnotations source="MTL non-standard"/>
- <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
- <eParameters name="substring">
- <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
- </eParameters>
- </eOperations>
- <eOperations name="endsWith">
- <eAnnotations source="MTL non-standard"/>
- <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
- <eParameters name="substring">
- <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
- </eParameters>
- </eOperations>
- <eOperations name="trim">
- <eAnnotations source="MTL non-standard"/>
- <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
- </eOperations>
- <eOperations name="tokenize">
- <eAnnotations source="MTL non-standard"/>
- <eType xsi:type="ocl.ecore:SequenceType" href="http://www.eclipse.org/acceleo/mtl/3.0/mtlnonstdlib.ecore#//Sequence(String)"/>
- <eParameters name="delimiters">
- <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
- </eParameters>
- </eOperations>
- <eOperations name="contains">
- <eAnnotations source="MTL non-standard"/>
- <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
- <eParameters name="substring">
- <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
- </eParameters>
- </eOperations>
- <eOperations name="matches">
- <eAnnotations source="MTL non-standard"/>
- <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
- <eParameters name="regex">
- <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
- </eParameters>
- </eOperations>
- <eOperations name="lastIndex">
- <eAnnotations source="MTL non-standard"/>
- <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Integer"/>
- <eParameters name="substring">
- <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
- </eParameters>
- </eOperations>
- <eOperations name="equalsIgnoreCase">
- <eAnnotations source="MTL non-standard"/>
- <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
- <eParameters name="other">
- <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
- </eParameters>
- </eOperations>
- <eOperations name="substring">
- <eAnnotations source="MTL non-standard"/>
- <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
- <eParameters name="startIndex">
- <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Integer"/>
- </eParameters>
- </eOperations>
- <eOperations name="+">
- <eAnnotations source="MTL non-standard"/>
- <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
- <eParameters name="other">
- <eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
- </eParameters>
- </eOperations>
</eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="Integer_Class">
+ <eClassifiers xsi:type="ecore:EClass" name="oclstdlib_Integer_Class">
<eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
<references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Integer"/>
</eAnnotations>
- <eOperations name="toString">
- <eAnnotations source="MTL"/>
- <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
- </eOperations>
</eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="Real_Class">
+ <eClassifiers xsi:type="ecore:EClass" name="oclstdlib_Real_Class">
<eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
<references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Real"/>
</eAnnotations>
- <eOperations name="toString">
- <eAnnotations source="MTL"/>
- <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
- </eOperations>
</eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="EObject_Class">
+ <eClassifiers xsi:type="ecore:EClass" name="ecore_EObject_Class">
<eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
<references href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
</eAnnotations>
- <eOperations name="eAllContents">
- <eAnnotations source="MTL non-standard"/>
- <eType xsi:type="ocl.ecore:SequenceType" href="http://www.eclipse.org/acceleo/mtl/3.0/mtlnonstdlib.ecore#//Sequence(OclAny)"/>
- </eOperations>
- <eOperations name="eAllContents">
- <eAnnotations source="MTL non-standard"/>
- <eType xsi:type="ocl.ecore:SequenceType" href="http://www.eclipse.org/acceleo/mtl/3.0/mtlnonstdlib.ecore#//Sequence(OclAny)"/>
- <eParameters name="filter">
- <eType xsi:type="ocl.ecore:TypeType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclType"/>
+ <eOperations name="getPapyrusDiagrams" eType="/3/Sequence(Diagram)">
+ <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
+ <contents xsi:type="ocl.ecore:Constraint"/>
+ </eAnnotations>
+ <eAnnotations source="MTL" references="/0/getPapyrusDiagrams"/>
+ <eParameters name="arg0">
+ <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
</eParameters>
</eOperations>
- <eOperations name="ancestors">
- <eAnnotations source="MTL non-standard"/>
- <eType xsi:type="ocl.ecore:SequenceType" href="http://www.eclipse.org/acceleo/mtl/3.0/mtlnonstdlib.ecore#//Sequence(OclAny)"/>
- </eOperations>
- <eOperations name="ancestors">
- <eAnnotations source="MTL non-standard"/>
- <eType xsi:type="ocl.ecore:SequenceType" href="http://www.eclipse.org/acceleo/mtl/3.0/mtlnonstdlib.ecore#//Sequence(OclAny)"/>
- <eParameters name="filter">
- <eType xsi:type="ocl.ecore:TypeType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclType"/>
+ <eOperations name="getDocumentation">
+ <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
+ <contents xsi:type="ocl.ecore:Constraint"/>
+ </eAnnotations>
+ <eAnnotations source="MTL" references="/0/getDocumentation"/>
+ <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
+ <eParameters name="arg0">
+ <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
</eParameters>
</eOperations>
- <eOperations name="siblings">
- <eAnnotations source="MTL non-standard"/>
- <eType xsi:type="ocl.ecore:SequenceType" href="http://www.eclipse.org/acceleo/mtl/3.0/mtlnonstdlib.ecore#//Sequence(OclAny)"/>
- </eOperations>
- <eOperations name="siblings">
- <eAnnotations source="MTL non-standard"/>
- <eType xsi:type="ocl.ecore:SequenceType" href="http://www.eclipse.org/acceleo/mtl/3.0/mtlnonstdlib.ecore#//Sequence(OclAny)"/>
- <eParameters name="filter">
- <eType xsi:type="ocl.ecore:TypeType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclType"/>
+ <eOperations name="getDocumentationResources" eType="/3/Sequence(String)">
+ <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
+ <contents xsi:type="ocl.ecore:Constraint"/>
+ </eAnnotations>
+ <eAnnotations source="MTL" references="/0/getDocumentationResources"/>
+ <eParameters name="arg0">
+ <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
</eParameters>
</eOperations>
- <eOperations name="eInverse">
- <eAnnotations source="MTL non-standard"/>
- <eType xsi:type="ocl.ecore:OrderedSetType" href="http://www.eclipse.org/acceleo/mtl/3.0/mtlnonstdlib.ecore#//OrderedSet(OclAny)"/>
- </eOperations>
- <eOperations name="eInverse">
- <eAnnotations source="MTL non-standard"/>
- <eType xsi:type="ocl.ecore:OrderedSetType" href="http://www.eclipse.org/acceleo/mtl/3.0/mtlnonstdlib.ecore#//OrderedSet(OclAny)"/>
- <eParameters name="filter">
- <eType xsi:type="ocl.ecore:TypeType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclType"/>
- </eParameters>
- </eOperations>
- <eOperations name="precedingSiblings">
- <eAnnotations source="MTL non-standard"/>
- <eType xsi:type="ocl.ecore:SequenceType" href="http://www.eclipse.org/acceleo/mtl/3.0/mtlnonstdlib.ecore#//Sequence(OclAny)"/>
- </eOperations>
- <eOperations name="precedingSiblings">
- <eAnnotations source="MTL non-standard"/>
- <eType xsi:type="ocl.ecore:SequenceType" href="http://www.eclipse.org/acceleo/mtl/3.0/mtlnonstdlib.ecore#//Sequence(OclAny)"/>
- <eParameters name="filter">
- <eType xsi:type="ocl.ecore:TypeType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclType"/>
- </eParameters>
- </eOperations>
- <eOperations name="followingSiblings">
- <eAnnotations source="MTL non-standard"/>
- <eType xsi:type="ocl.ecore:SequenceType" href="http://www.eclipse.org/acceleo/mtl/3.0/mtlnonstdlib.ecore#//Sequence(OclAny)"/>
- </eOperations>
- <eOperations name="followingSiblings">
- <eAnnotations source="MTL non-standard"/>
- <eType xsi:type="ocl.ecore:SequenceType" href="http://www.eclipse.org/acceleo/mtl/3.0/mtlnonstdlib.ecore#//Sequence(OclAny)"/>
- <eParameters name="filter">
- <eType xsi:type="ocl.ecore:TypeType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclType"/>
- </eParameters>
- </eOperations>
- <eOperations name="eContainer">
- <eAnnotations source="MTL non-standard"/>
- <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/acceleo/mtl/3.0/mtlnonstdlib.ecore#//OclAny"/>
- <eParameters name="filter">
- <eType xsi:type="ocl.ecore:TypeType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclType"/>
- </eParameters>
- </eOperations>
- <eOperations name="eContents">
- <eAnnotations source="MTL non-standard"/>
- <eType xsi:type="ocl.ecore:SequenceType" href="http://www.eclipse.org/acceleo/mtl/3.0/mtlnonstdlib.ecore#//Sequence(OclAny)"/>
- <eParameters name="filter">
- <eType xsi:type="ocl.ecore:TypeType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclType"/>
- </eParameters>
- </eOperations>
- <eOperations name="eGet">
- <eAnnotations source="MTL non-standard"/>
- <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>
- <eParameters name="featureName">
+ <eOperations name="replaceLinksByNameOrLabel">
+ <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
+ <contents xsi:type="ocl.ecore:Constraint"/>
+ </eAnnotations>
+ <eAnnotations source="MTL" references="/0/replaceLinksByNameOrLabel"/>
+ <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
+ <eParameters name="arg0">
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
</eParameters>
- </eOperations>
- <eOperations name="getPapyrusDiagrams" eType="/3/Sequence(Diagram)">
- <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
- <contents xsi:type="ocl.ecore:Constraint"/>
- </eAnnotations>
- <eAnnotations source="MTL" references="/0/getPapyrusDiagrams"/>
- <eParameters name="arg0">
+ <eParameters name="arg1">
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
</eParameters>
</eOperations>
- <eOperations name="getPapyrusDiagrams" eType="/3/Sequence(Diagram)">
- <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
- <contents xsi:type="ocl.ecore:Constraint"/>
- </eAnnotations>
- <eAnnotations source="MTL" references="/0/getPapyrusDiagrams"/>
- </eOperations>
- <eOperations name="getDocumentation">
- <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
- <contents xsi:type="ocl.ecore:Constraint"/>
- </eAnnotations>
- <eAnnotations source="MTL" references="/0/getDocumentation"/>
- <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
- <eParameters name="arg0">
- <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
- </eParameters>
- </eOperations>
- <eOperations name="getDocumentation">
- <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
- <contents xsi:type="ocl.ecore:Constraint"/>
- </eAnnotations>
- <eAnnotations source="MTL" references="/0/getDocumentation"/>
- <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
- </eOperations>
- <eOperations name="getDocumentationResources" eType="/3/Sequence(String)">
- <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
- <contents xsi:type="ocl.ecore:Constraint"/>
- </eAnnotations>
- <eAnnotations source="MTL" references="/0/getDocumentationResources"/>
- <eParameters name="arg0">
- <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
- </eParameters>
- </eOperations>
- <eOperations name="getDocumentationResources" eType="/3/Sequence(String)">
- <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
- <contents xsi:type="ocl.ecore:Constraint"/>
- </eAnnotations>
- <eAnnotations source="MTL" references="/0/getDocumentationResources"/>
- </eOperations>
</eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="OclAny_Class">
+ <eClassifiers xsi:type="ecore:EClass" name="oclstdlib_OclAny_Class">
<eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
<references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
</eAnnotations>
- <eOperations name="toString">
- <eAnnotations source="MTL non-standard"/>
- <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
- </eOperations>
<eOperations name="invoke">
<eAnnotations source="MTL non-standard"/>
<eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
@@ -445,118 +207,21 @@
<eType xsi:type="ocl.ecore:SequenceType" href="http://www.eclipse.org/acceleo/mtl/3.0/mtlnonstdlib.ecore#//Sequence(OclAny)"/>
</eParameters>
</eOperations>
- <eOperations name="current">
- <eAnnotations source="MTL non-standard"/>
- <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/acceleo/mtl/3.0/mtlnonstdlib.ecore#//OclAny"/>
- <eParameters name="index">
- <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Integer"/>
- </eParameters>
- </eOperations>
- <eOperations name="current">
- <eAnnotations source="MTL non-standard"/>
- <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/acceleo/mtl/3.0/mtlnonstdlib.ecore#//OclAny"/>
- <eParameters name="filter">
- <eType xsi:type="ocl.ecore:TypeType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclType"/>
- </eParameters>
- </eOperations>
- <eOperations name="getProperty">
- <eAnnotations source="MTL non-standard"/>
- <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
- <eParameters name="key">
- <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
- </eParameters>
- </eOperations>
- <eOperations name="getProperty">
- <eAnnotations source="MTL non-standard"/>
- <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
- <eParameters name="key">
- <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
- </eParameters>
- <eParameters name="arguments">
- <eType xsi:type="ocl.ecore:SequenceType" href="http://www.eclipse.org/acceleo/mtl/3.0/mtlnonstdlib.ecore#//Sequence(OclAny)"/>
- </eParameters>
- </eOperations>
- <eOperations name="getProperty">
- <eAnnotations source="MTL non-standard"/>
- <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
- <eParameters name="propertiesFileName">
- <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
- </eParameters>
- <eParameters name="key">
- <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
- </eParameters>
- </eOperations>
- <eOperations name="getProperty">
- <eAnnotations source="MTL non-standard"/>
- <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
- <eParameters name="propertiesFileName">
- <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
- </eParameters>
- <eParameters name="key">
- <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
- </eParameters>
- <eParameters name="arguments">
- <eType xsi:type="ocl.ecore:SequenceType" href="http://www.eclipse.org/acceleo/mtl/3.0/mtlnonstdlib.ecore#//Sequence(OclAny)"/>
- </eParameters>
- </eOperations>
- <eOperations name="+">
- <eAnnotations source="MTL non-standard"/>
- <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
- <eParameters name="other">
- <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
- </eParameters>
- </eOperations>
</eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="Collection(T)_Class">
+ <eClassifiers xsi:type="ecore:EClass" name="oclstdlib_Collection(T)_Class">
<eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
<references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Collection(T)"/>
</eAnnotations>
- <eOperations name="sep">
- <eAnnotations source="MTL non-standard"/>
- <eType xsi:type="ocl.ecore:SequenceType" href="http://www.eclipse.org/acceleo/mtl/3.0/mtlnonstdlib.ecore#//Sequence(OclAny)"/>
- <eParameters name="separatorString">
- <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
- </eParameters>
- </eOperations>
- <eOperations name="filter">
- <eAnnotations source="MTL non-standard"/>
- <eType xsi:type="ocl.ecore:CollectionType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Collection(T)"/>
- <eParameters name="filter">
- <eType xsi:type="ocl.ecore:TypeType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclType"/>
- </eParameters>
- </eOperations>
</eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="Sequence(T)_Class">
+ <eClassifiers xsi:type="ecore:EClass" name="oclstdlib_Sequence(T)_Class">
<eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
<references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Sequence(T)"/>
</eAnnotations>
- <eOperations name="reverse">
- <eAnnotations source="MTL non-standard"/>
- <eType xsi:type="ocl.ecore:SequenceType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Sequence(T)"/>
- </eOperations>
- <eOperations name="lastIndexOf">
- <eAnnotations source="MTL non-standard"/>
- <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Integer"/>
- <eParameters name="element">
- <eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/T"/>
- </eParameters>
- </eOperations>
</eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="OrderedSet(T)_Class">
+ <eClassifiers xsi:type="ecore:EClass" name="oclstdlib_OrderedSet(T)_Class">
<eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
<references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OrderedSet(T)"/>
</eAnnotations>
- <eOperations name="reverse">
- <eAnnotations source="MTL non-standard"/>
- <eType xsi:type="ocl.ecore:OrderedSetType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OrderedSet(T)"/>
- </eOperations>
- <eOperations name="lastIndexOf">
- <eAnnotations source="MTL non-standard"/>
- <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Integer"/>
- <eParameters name="element">
- <eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/T"/>
- </eParameters>
- </eOperations>
</eClassifiers>
</ecore:EPackage>
<ocl.ecore:Variable name="self">
@@ -572,7 +237,7 @@
<eClassifiers xsi:type="ocl.ecore:SequenceType" name="Sequence(EObject)" instanceClassName="java.util.List">
<elementType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
</eClassifiers>
- <eClassifiers xsi:type="ocl.ecore:SequenceType" instanceClassName="java.util.List">
+ <eClassifiers xsi:type="ocl.ecore:SequenceType" name="Sequence(OclAny)" instanceClassName="java.util.List">
<elementType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
</eClassifiers>
</ecore:EPackage>
@@ -603,15 +268,24 @@
<ocl.ecore:Variable name="self">
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
</ocl.ecore:Variable>
+ <ocl.ecore:Variable name="self">
+ <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
+ </ocl.ecore:Variable>
+ <ocl.ecore:Variable name="self">
+ <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
+ </ocl.ecore:Variable>
+ <ocl.ecore:Variable name="self">
+ <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
+ </ocl.ecore:Variable>
<ecore:EAnnotation source="positions">
- <eAnnotations source="positions.0" references="/0/@ownedModuleElement.0">
+ <eAnnotations source="positions.0" references="/0/%">
<details key="start" value="369"/>
<details key="end" value="412"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.1" references="/0/getPapyrusDiagrams">
<details key="start" value="413"/>
- <details key="end" value="641"/>
+ <details key="end" value="639"/>
<details key="line" value="13"/>
</eAnnotations>
<eAnnotations source="positions.2" references="/0/getPapyrusDiagrams/arg0">
@@ -619,129 +293,179 @@
<details key="end" value="467"/>
<details key="line" value="13"/>
</eAnnotations>
- <eAnnotations source="positions.3" references="/0/getPapyrusDiagrams/@expression">
+ <eAnnotations source="positions.3" references="/0/getPapyrusDiagrams/%">
<details key="start" value="492"/>
- <details key="end" value="638"/>
- <details key="line" value="0"/>
- </eAnnotations>
- <eAnnotations source="positions.4" references="/0/getPapyrusDiagrams/@expression/self">
- <details key="start" value="-1"/>
- <details key="end" value="-1"/>
- <details key="line" value="0"/>
- </eAnnotations>
- <eAnnotations source="positions.5" references="/0/getPapyrusDiagrams/@expression/@argument.0">
- <details key="start" value="499"/>
- <details key="end" value="568"/>
- <details key="line" value="0"/>
- </eAnnotations>
- <eAnnotations source="positions.6" references="/0/getPapyrusDiagrams/@expression/@argument.1">
- <details key="start" value="570"/>
- <details key="end" value="621"/>
- <details key="line" value="0"/>
- </eAnnotations>
- <eAnnotations source="positions.7" references="/0/getPapyrusDiagrams/@expression/@argument.2">
- <details key="start" value="623"/>
- <details key="end" value="637"/>
- <details key="line" value="0"/>
- </eAnnotations>
- <eAnnotations source="positions.8" references="/0/getPapyrusDiagrams/@expression/@argument.2/@part.0/arg0">
- <details key="start" value="632"/>
<details key="end" value="636"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.9" references="/0/@ownedModuleElement.2">
- <details key="start" value="643"/>
- <details key="end" value="691"/>
+ <eAnnotations source="positions.4" references="/0/getPapyrusDiagrams/%/self">
+ <details key="start" value="-1"/>
+ <details key="end" value="-1"/>
+ <details key="line" value="0"/>
+ </eAnnotations>
+ <eAnnotations source="positions.5" references="/0/getPapyrusDiagrams/%/%">
+ <details key="start" value="499"/>
+ <details key="end" value="566"/>
+ <details key="line" value="0"/>
+ </eAnnotations>
+ <eAnnotations source="positions.6" references="/0/getPapyrusDiagrams/%/%.1">
+ <details key="start" value="568"/>
+ <details key="end" value="619"/>
+ <details key="line" value="0"/>
+ </eAnnotations>
+ <eAnnotations source="positions.7" references="/0/getPapyrusDiagrams/%/%.2">
+ <details key="start" value="621"/>
+ <details key="end" value="635"/>
+ <details key="line" value="0"/>
+ </eAnnotations>
+ <eAnnotations source="positions.8" references="/0/getPapyrusDiagrams/%/%.2/%/arg0">
+ <details key="start" value="630"/>
+ <details key="end" value="634"/>
+ <details key="line" value="0"/>
+ </eAnnotations>
+ <eAnnotations source="positions.9" references="/0/%.1">
+ <details key="start" value="641"/>
+ <details key="end" value="689"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.10" references="/0/getDocumentation">
- <details key="start" value="693"/>
- <details key="end" value="906"/>
+ <details key="start" value="691"/>
+ <details key="end" value="902"/>
<details key="line" value="17"/>
</eAnnotations>
<eAnnotations source="positions.11" references="/0/getDocumentation/arg0">
- <details key="start" value="724"/>
- <details key="end" value="745"/>
+ <details key="start" value="722"/>
+ <details key="end" value="743"/>
<details key="line" value="17"/>
</eAnnotations>
- <eAnnotations source="positions.12" references="/0/getDocumentation/@expression">
- <details key="start" value="759"/>
- <details key="end" value="903"/>
+ <eAnnotations source="positions.12" references="/0/getDocumentation/%">
+ <details key="start" value="757"/>
+ <details key="end" value="899"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.13" references="/0/getDocumentation/@expression/self">
+ <eAnnotations source="positions.13" references="/0/getDocumentation/%/self">
<details key="start" value="-1"/>
<details key="end" value="-1"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.14" references="/0/getDocumentation/@expression/@argument.0">
- <details key="start" value="766"/>
- <details key="end" value="835"/>
+ <eAnnotations source="positions.14" references="/0/getDocumentation/%/%">
+ <details key="start" value="764"/>
+ <details key="end" value="831"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.15" references="/0/getDocumentation/@expression/@argument.1">
- <details key="start" value="837"/>
- <details key="end" value="886"/>
+ <eAnnotations source="positions.15" references="/0/getDocumentation/%/%.1">
+ <details key="start" value="833"/>
+ <details key="end" value="882"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.16" references="/0/getDocumentation/@expression/@argument.2">
- <details key="start" value="888"/>
- <details key="end" value="902"/>
+ <eAnnotations source="positions.16" references="/0/getDocumentation/%/%.2">
+ <details key="start" value="884"/>
+ <details key="end" value="898"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.17" references="/0/getDocumentation/@expression/@argument.2/@part.0/arg0">
- <details key="start" value="897"/>
- <details key="end" value="901"/>
+ <eAnnotations source="positions.17" references="/0/getDocumentation/%/%.2/%/arg0">
+ <details key="start" value="893"/>
+ <details key="end" value="897"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.18" references="/0/@ownedModuleElement.4">
- <details key="start" value="908"/>
- <details key="end" value="966"/>
+ <eAnnotations source="positions.18" references="/0/%.2">
+ <details key="start" value="904"/>
+ <details key="end" value="962"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.19" references="/0/getDocumentationResources">
- <details key="start" value="967"/>
- <details key="end" value="1208"/>
+ <details key="start" value="963"/>
+ <details key="end" value="1202"/>
<details key="line" value="21"/>
</eAnnotations>
<eAnnotations source="positions.20" references="/0/getDocumentationResources/arg0">
- <details key="start" value="1007"/>
- <details key="end" value="1028"/>
+ <details key="start" value="1003"/>
+ <details key="end" value="1024"/>
<details key="line" value="21"/>
</eAnnotations>
- <eAnnotations source="positions.21" references="/0/getDocumentationResources/@expression">
- <details key="start" value="1052"/>
- <details key="end" value="1205"/>
+ <eAnnotations source="positions.21" references="/0/getDocumentationResources/%">
+ <details key="start" value="1048"/>
+ <details key="end" value="1199"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.22" references="/0/getDocumentationResources/@expression/self">
+ <eAnnotations source="positions.22" references="/0/getDocumentationResources/%/self">
<details key="start" value="-1"/>
<details key="end" value="-1"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.23" references="/0/getDocumentationResources/@expression/@argument.0">
- <details key="start" value="1059"/>
- <details key="end" value="1128"/>
+ <eAnnotations source="positions.23" references="/0/getDocumentationResources/%/%">
+ <details key="start" value="1055"/>
+ <details key="end" value="1122"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.24" references="/0/getDocumentationResources/@expression/@argument.1">
- <details key="start" value="1130"/>
- <details key="end" value="1188"/>
+ <eAnnotations source="positions.24" references="/0/getDocumentationResources/%/%.1">
+ <details key="start" value="1124"/>
+ <details key="end" value="1182"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.25" references="/0/getDocumentationResources/@expression/@argument.2">
- <details key="start" value="1190"/>
- <details key="end" value="1204"/>
+ <eAnnotations source="positions.25" references="/0/getDocumentationResources/%/%.2">
+ <details key="start" value="1184"/>
+ <details key="end" value="1198"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.26" references="/0/getDocumentationResources/@expression/@argument.2/@part.0/arg0">
- <details key="start" value="1199"/>
- <details key="end" value="1203"/>
+ <eAnnotations source="positions.26" references="/0/getDocumentationResources/%/%.2/%/arg0">
+ <details key="start" value="1193"/>
+ <details key="end" value="1197"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.27" references="/0/@ownedModuleElement.6">
- <details key="start" value="1210"/>
- <details key="end" value="1303"/>
+ <eAnnotations source="positions.27" references="/0/replaceLinksByNameOrLabel">
+ <details key="start" value="1204"/>
+ <details key="end" value="1472"/>
+ <details key="line" value="24"/>
+ </eAnnotations>
+ <eAnnotations source="positions.28" references="/0/replaceLinksByNameOrLabel/arg0">
+ <details key="start" value="1244"/>
+ <details key="end" value="1257"/>
+ <details key="line" value="24"/>
+ </eAnnotations>
+ <eAnnotations source="positions.29" references="/0/replaceLinksByNameOrLabel/arg1">
+ <details key="start" value="1259"/>
+ <details key="end" value="1280"/>
+ <details key="line" value="24"/>
+ </eAnnotations>
+ <eAnnotations source="positions.30" references="/0/replaceLinksByNameOrLabel/%">
+ <details key="start" value="1294"/>
+ <details key="end" value="1469"/>
+ <details key="line" value="0"/>
+ </eAnnotations>
+ <eAnnotations source="positions.31" references="/0/replaceLinksByNameOrLabel/%/self">
+ <details key="start" value="-1"/>
+ <details key="end" value="-1"/>
+ <details key="line" value="0"/>
+ </eAnnotations>
+ <eAnnotations source="positions.32" references="/0/replaceLinksByNameOrLabel/%/%">
+ <details key="start" value="1301"/>
+ <details key="end" value="1368"/>
+ <details key="line" value="0"/>
+ </eAnnotations>
+ <eAnnotations source="positions.33" references="/0/replaceLinksByNameOrLabel/%/%.1">
+ <details key="start" value="1370"/>
+ <details key="end" value="1446"/>
+ <details key="line" value="0"/>
+ </eAnnotations>
+ <eAnnotations source="positions.34" references="/0/replaceLinksByNameOrLabel/%/%.2">
+ <details key="start" value="1448"/>
+ <details key="end" value="1468"/>
+ <details key="line" value="0"/>
+ </eAnnotations>
+ <eAnnotations source="positions.35" references="/0/replaceLinksByNameOrLabel/%/%.2/%/arg0">
+ <details key="start" value="1457"/>
+ <details key="end" value="1461"/>
+ <details key="line" value="0"/>
+ </eAnnotations>
+ <eAnnotations source="positions.36" references="/0/replaceLinksByNameOrLabel/%/%.2/%.1/arg1">
+ <details key="start" value="1463"/>
+ <details key="end" value="1467"/>
+ <details key="line" value="0"/>
+ </eAnnotations>
+ <eAnnotations source="positions.37" references="/0/%.3">
+ <details key="start" value="1474"/>
+ <details key="end" value="1567"/>
<details key="line" value="0"/>
</eAnnotations>
</ecore:EAnnotation>
diff --git a/plugins/org.eclipse.gendoc.bundle.acceleo.papyrus/src/org/eclipse/gendoc/bundle/acceleo/papyrus/mtl/papyrus.mtl b/plugins/org.eclipse.gendoc.bundle.acceleo.papyrus/src/org/eclipse/gendoc/bundle/acceleo/papyrus/mtl/papyrus.mtl
index 2c0834c..62f5438 100644
--- a/plugins/org.eclipse.gendoc.bundle.acceleo.papyrus/src/org/eclipse/gendoc/bundle/acceleo/papyrus/mtl/papyrus.mtl
+++ b/plugins/org.eclipse.gendoc.bundle.acceleo.papyrus/src/org/eclipse/gendoc/bundle/acceleo/papyrus/mtl/papyrus.mtl
@@ -21,4 +21,7 @@
[query public getDocumentationResources(arg0 : ecore::EObject) : Sequence(String)
= invoke('org.eclipse.gendoc.bundle.acceleo.papyrus.service.PapyrusServices', 'getDocumentationResources(org.eclipse.emf.ecore.EObject)', Sequence{arg0}) /]
+[query public replaceLinksByNameOrLabel(arg0 : String, arg1 : ecore::EObject) : String
+ = invoke('org.eclipse.gendoc.bundle.acceleo.papyrus.service.PapyrusServices', 'replaceLinksByNameOrLabel(java.lang.String, org.eclipse.emf.ecore.EObject)', Sequence{arg0, arg1}) /]
+
[comment - virtual order methods must be implemented if the module is integrated to papyrus/]
\ No newline at end of file
diff --git a/plugins/org.eclipse.gendoc.bundle.acceleo.papyrus/src/org/eclipse/gendoc/bundle/acceleo/papyrus/service/PapyrusServices.java b/plugins/org.eclipse.gendoc.bundle.acceleo.papyrus/src/org/eclipse/gendoc/bundle/acceleo/papyrus/service/PapyrusServices.java
index d3886d2..e2a44de 100644
--- a/plugins/org.eclipse.gendoc.bundle.acceleo.papyrus/src/org/eclipse/gendoc/bundle/acceleo/papyrus/service/PapyrusServices.java
+++ b/plugins/org.eclipse.gendoc.bundle.acceleo.papyrus/src/org/eclipse/gendoc/bundle/acceleo/papyrus/service/PapyrusServices.java
@@ -19,25 +19,34 @@
import java.util.LinkedList;
import java.util.List;
import java.util.Map.Entry;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Path;
import org.eclipse.core.runtime.Status;
+import org.eclipse.emf.common.util.BasicDiagnostic;
+import org.eclipse.emf.common.util.Diagnostic;
import org.eclipse.emf.common.util.EList;
import org.eclipse.emf.common.util.EMap;
import org.eclipse.emf.common.util.URI;
import org.eclipse.emf.ecore.EAnnotation;
import org.eclipse.emf.ecore.EModelElement;
import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.uml2.uml.Comment;
-import org.eclipse.uml2.uml.Element;
+import org.eclipse.gendoc.bundle.acceleo.commons.files.CommonService;
import org.eclipse.gendoc.bundle.acceleo.gmf.service.GMFServices;
import org.eclipse.gendoc.bundle.acceleo.papyrus.Activator;
import org.eclipse.gendoc.services.GendocServices;
+import org.eclipse.gendoc.services.IGendocDiagnostician;
+import org.eclipse.gendoc.services.ILogger;
import org.eclipse.gendoc.services.exception.ModelNotFoundException;
import org.eclipse.gendoc.tags.handlers.IEMFModelLoaderService;
+import org.eclipse.gmf.runtime.notation.Diagram;
+import org.eclipse.uml2.uml.Comment;
+import org.eclipse.uml2.uml.Element;
+import org.eclipse.uml2.uml.NamedElement;
public class PapyrusServices extends GMFServices {
@@ -45,7 +54,8 @@
private static final String PAPYRUS_DOCUMENTATION_STEREOTYPE_QUALIFIED_NAME = "Papyrus::Documentation::Documentation";
private static final String PREFIX_WORKSPACE_RESOURCE = "WR"; //$NON-NLS-1$
private static final String PREFIX_EXTERNAL_RESOURCE = "ER"; //$NON-NLS-1$
- private static final String PREFIX_REMOTE_RESOURCE = "RR"; //$NON-NLS-1$
+ private static final String PREFIX_REMOTE_RESOURCE = "RR"; //$NON-NLS-1$
+ private static Pattern LINK_PATTERN = Pattern.compile("\\{@link #(\\w*)(\\s|$)*\\}");
@Override
public List<Diagram> getDiagrams(EObject e, URI uri) {
@@ -113,7 +123,8 @@
for (Comment comment : ownedComments) {
if (comment
.getAppliedStereotype(PAPYRUS_DOCUMENTATION_STEREOTYPE_QUALIFIED_NAME) != null) {
- return comment.getBody();
+ String body = comment.getBody();
+ return body;
}
}
}
@@ -150,7 +161,51 @@
}
return absolutePaths;
}
-
+
+ /**
+ * Replace links text with the appropriate name of the linked object
+ * @param body, the string potentially containing {@link #(\w*)(\s|$)*}
+ * @param context, a given EObject, links will be searched inside this eobject's resource
+ * @return the modified String
+ */
+ public String replaceLinksByNameOrLabel(String body, EObject context){
+ ILogger logger = GendocServices.getDefault().getService(ILogger.class);
+ String result = "" ;
+ Matcher m = LINK_PATTERN.matcher(body);
+ int startIndex = 0;
+ int lastIndex = 0 ;
+ if (context == null || context.eResource() == null){
+ IGendocDiagnostician diag = GendocServices.getDefault().getService(IGendocDiagnostician.class);
+ diag.addDiagnostic(new BasicDiagnostic(Diagnostic.WARNING, Activator.PLUGIN_ID, 0, String.format("error in script, invalid parameter for operation replaceLinksByNameOrLabel for text : %s",body), new Object[]{body}));
+ return body;
+ }
+ while(m.find()){
+ String theLink = m.group(1);
+ startIndex = m.start();
+ EObject linkedEObject = context.eResource().getEObject(theLink);
+ if (linkedEObject == null){
+ logger.log(String.format("The linked object (%s) from %s is null", theLink, CommonService.getText(context)), IStatus.WARNING);
+ }
+ String toInsert = null;
+ if (linkedEObject == null){
+ // Papyrus displays UNKNOWN when the element does not exist
+ toInsert = "UNKNOWN" ;
+ }
+ //it the object is a NamedElement return its name, otherwise get the label
+ else if(linkedEObject instanceof NamedElement){
+ toInsert = ((NamedElement) linkedEObject).getName();
+ }
+ else{
+ toInsert = CommonService.getText(linkedEObject);
+ }
+ // part between the linked objects
+ String staticPart = body.substring(lastIndex, startIndex);
+ result += staticPart + toInsert ;
+ lastIndex = m.end();
+ }
+ return result.concat(body.substring(lastIndex));
+ }
+
private List<URI> getAssociatedResources(EObject eObject) {
if (eObject instanceof EModelElement
&& !(eObject instanceof EAnnotation)) {
