Bug 568953 - [Model2Doc][Architecture] The cell editor to edit the field
PapyrusDocumentPrototype#creationClassCommand is broken
* Fix tests CreateGenericDocumentTemplateTest
Signed-off-by: Pauline DEVILLE <pauline.deville@cea.fr>
Change-Id: I9e87a94124fcfd9db7be8c91ddd87a67f59d97fa
diff --git a/plugins/integration/org.eclipse.papyrus.model2doc.integration.docx.uml.architecture/resources/docx-genericTextDocumentPrototype.pdst b/plugins/integration/org.eclipse.papyrus.model2doc.integration.docx.uml.architecture/resources/docx-genericTextDocumentPrototype.pdst
index 98aafab..488aa0b 100755
--- a/plugins/integration/org.eclipse.papyrus.model2doc.integration.docx.uml.architecture/resources/docx-genericTextDocumentPrototype.pdst
+++ b/plugins/integration/org.eclipse.papyrus.model2doc.integration.docx.uml.architecture/resources/docx-genericTextDocumentPrototype.pdst
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<documentstructuretemplate:DocumentTemplatePrototype xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:author="http://www.eclipse.org/papyrus/model2doc/core/1.0.0/Author" xmlns:documentstructuretemplate="http://www.eclipse.org/papyrus/model2doc/emf/1.0.0/documentstructuretemplate" xmlns:documentstructuretemplate_1="http://www.eclipse.org/papyrus/model2doc/gmf/integration/1.0.0/documentstructuretemplate" xmlns:documentstructuretemplate_2="http://www.eclipse.org/papyrus/model2doc/nattable/integration/1.0.0/documentstructuretemplate" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:generatorconfiguration="http://www.eclipse.org/papyrus/model2doc/1.0.0/generatorconfiguration" xmlns:umldocumentstructuretemplate="http://www.eclipse.org/papyrus/model2doc/uml/1.0.0/documentstructuretemplate" xmi:id="DOCX-GenericUMLDocumentStructureTemplate" type="DOCX-GenericUMLDocumentStructureTemplate" iconPath="platform:/plugin/org.eclipse.papyrus.model2doc.docx/icons/docx_generic_document.png" description="Generic Template for UML documentation under docx format. This template allows to describe a classes stucture.">
- <documentTemplate xmi:type="documentstructuretemplate:TextDocumentTemplate" xmi:id="org.eclipse.papyrus.model2doc.integration.docx.uml.architecture.genericDocument" documentTemplatePrototype="DOCX-GenericUMLDocumentStructureTemplate" name="UML Document" kindId="org.eclipse.papyrus.model2doc.integration.docx.uml.architecture.genericDocument">
+<documentstructuretemplate:DocumentTemplatePrototype xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:author="http://www.eclipse.org/papyrus/model2doc/core/1.0.0/Author" xmlns:documentstructuretemplate="http://www.eclipse.org/papyrus/model2doc/emf/1.0.0/documentstructuretemplate" xmlns:documentstructuretemplate_1="http://www.eclipse.org/papyrus/model2doc/gmf/integration/1.0.0/documentstructuretemplate" xmlns:documentstructuretemplate_2="http://www.eclipse.org/papyrus/model2doc/nattable/integration/1.0.0/documentstructuretemplate" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:generatorconfiguration="http://www.eclipse.org/papyrus/model2doc/1.0.0/generatorconfiguration" xmlns:umldocumentstructuretemplate="http://www.eclipse.org/papyrus/model2doc/uml/1.0.0/documentstructuretemplate" xmi:id="DOCX-GenericUMLDocumentStructureTemplateType" type="DOCX-GenericUMLDocumentStructureTemplateType" iconPath="platform:/plugin/org.eclipse.papyrus.model2doc.docx/icons/docx_generic_document.png" description="Generic Template for UML documentation under docx format. This template allows to describe a classes stucture.">
+ <documentTemplate xmi:type="documentstructuretemplate:TextDocumentTemplate" xmi:id="org.eclipse.papyrus.model2doc.integration.docx.uml.architecture.genericDocument" documentTemplatePrototype="DOCX-GenericUMLDocumentStructureTemplateType" name="UML Document" kindId="org.eclipse.papyrus.model2doc.integration.docx.uml.architecture.genericDocument">
<documentStructureGeneratorConfiguration xmi:type="generatorconfiguration:DefaultDocumentStructureGeneratorConfiguration" xmi:id="_9Q98AFIeEemOIbfVEaiEvg" saveDocumentStructure="true" saveImages="true" templateFile="platform:/plugin/org.eclipse.papyrus.model2doc.docx/templates/PapyrusTemplate.dotx" documentFolder="output" documentGeneratorId="org.eclipse.papyrus.model2doc.document.generator.docx" structureGeneratorId="TextDocumentStructureGenerator.default" imageFolder="output/images" structureFolder="output"/>
<author xmi:type="author:Author" xmi:id="_HlEJEJ8uEemosPVxvgaz8g" firstName="Papyrus-Model2Doc" lastName="Generator"/>
<documentPart xmi:type="documentstructuretemplate:TableOfContents" xmi:id="_74eOgEsMEemzsPCsrzvLCg" tocTitle="Table Of Contents"/>
diff --git a/plugins/integration/org.eclipse.papyrus.model2doc.integration.docx.uml.architecture/resources/docx-umlDocument.architecture b/plugins/integration/org.eclipse.papyrus.model2doc.integration.docx.uml.architecture/resources/docx-umlDocument.architecture
index 9994918..939a694 100755
--- a/plugins/integration/org.eclipse.papyrus.model2doc.integration.docx.uml.architecture/resources/docx-umlDocument.architecture
+++ b/plugins/integration/org.eclipse.papyrus.model2doc.integration.docx.uml.architecture/resources/docx-umlDocument.architecture
@@ -13,14 +13,14 @@
</owningRules>
<documentTemplatePrototype xmi:type="documentstructuretemplate:DocumentTemplatePrototype" href="platform:/plugin/org.eclipse.papyrus.model2doc.integration.docx.uml.architecture/resources/docx-emptyTextDocumentPrototype.pdst#DOCX-EmptyUMLDocumentStructureTemplateType"/>
</representationKinds>
- <representationKinds xmi:type="representation:PapyrusDocumentPrototype" xmi:id="_4TetkCi7EeuXVsN3JsOSRg" id="org.eclipse.papyrus.model2doc.integration.docx.uml.architecture.genericDocument" name="DOCX - Generic Text Document" description="Generate generic docx document from UML models." icon="platform:/plugin/org.eclipse.papyrus.model2doc.docx/icons/docx_generic_document.png" implementationID="DOCX-GenericUMLDocumentStructureTemplate" creationCommandClass="org.eclipse.papyrus.model2doc.integration.emf.documentstructuretemplate.representation.architecture.CreatePapyrusDocumentTemplateEditorCommand">
+ <representationKinds xmi:type="representation:PapyrusDocumentPrototype" xmi:id="_4TetkCi7EeuXVsN3JsOSRg" id="org.eclipse.papyrus.model2doc.integration.docx.uml.architecture.genericDocument" name="DOCX - Generic Text Document" description="Generate generic docx document from UML models." icon="platform:/plugin/org.eclipse.papyrus.model2doc.docx/icons/docx_generic_document.png" implementationID="DOCX-GenericUMLDocumentStructureTemplateType" creationCommandClass="org.eclipse.papyrus.model2doc.integration.emf.documentstructuretemplate.representation.architecture.CreatePapyrusDocumentTemplateEditorCommand">
<modelRules xmi:type="representation_1:ModelRule" xmi:id="_4TetkSi7EeuXVsN3JsOSRg" permit="true" elementMultiplicity="1" multiplicity="-1">
<element xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
</modelRules>
<owningRules xmi:type="representation_1:OwningRule" xmi:id="_4Tetkii7EeuXVsN3JsOSRg" permit="true" multiplicity="-1">
<element xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
</owningRules>
- <documentTemplatePrototype xmi:type="documentstructuretemplate:DocumentTemplatePrototype" href="platform:/plugin/org.eclipse.papyrus.model2doc.integration.docx.uml.architecture/resources/docx-genericTextDocumentPrototype.pdst#DOCX-GenericUMLDocumentStructureTemplate"/>
+ <documentTemplatePrototype xmi:type="documentstructuretemplate:DocumentTemplatePrototype" href="platform:/plugin/org.eclipse.papyrus.model2doc.integration.docx.uml.architecture/resources/docx-genericTextDocumentPrototype.pdst#DOCX-GenericUMLDocumentStructureTemplateType"/>
</representationKinds>
<metamodel xmi:type="ecore:EPackage" href="http://www.eclipse.org/uml2/5.0.0/UML#/"/>
</contexts>
diff --git a/plugins/integration/org.eclipse.papyrus.model2doc.integration.odt.uml.architecture/resources/odt-genericTextDocumentPrototype.pdst b/plugins/integration/org.eclipse.papyrus.model2doc.integration.odt.uml.architecture/resources/odt-genericTextDocumentPrototype.pdst
index 5dd4930..3e4c503 100755
--- a/plugins/integration/org.eclipse.papyrus.model2doc.integration.odt.uml.architecture/resources/odt-genericTextDocumentPrototype.pdst
+++ b/plugins/integration/org.eclipse.papyrus.model2doc.integration.odt.uml.architecture/resources/odt-genericTextDocumentPrototype.pdst
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<documentstructuretemplate:DocumentTemplatePrototype xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:author="http://www.eclipse.org/papyrus/model2doc/core/1.0.0/Author" xmlns:documentstructuretemplate="http://www.eclipse.org/papyrus/model2doc/emf/1.0.0/documentstructuretemplate" xmlns:documentstructuretemplate_1="http://www.eclipse.org/papyrus/model2doc/gmf/integration/1.0.0/documentstructuretemplate" xmlns:documentstructuretemplate_2="http://www.eclipse.org/papyrus/model2doc/nattable/integration/1.0.0/documentstructuretemplate" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:generatorconfiguration="http://www.eclipse.org/papyrus/model2doc/1.0.0/generatorconfiguration" xmlns:umldocumentstructuretemplate="http://www.eclipse.org/papyrus/model2doc/uml/1.0.0/documentstructuretemplate" xmi:id="ODT-GenericUMLDocumentStructureTemplate" type="ODT-GenericUMLDocumentStructureTemplate" iconPath="platform:/plugin/org.eclipse.papyrus.model2doc.odt/icons/odt_generic_document.png" description="Generic Template for UML documentation under odt format. This template allows to describe a classes stucture.">
- <documentTemplate xmi:type="documentstructuretemplate:TextDocumentTemplate" xmi:id="org.eclipse.papyrus.model2doc.integration.odt.uml.architecture.genericDocument" documentTemplatePrototype="ODT-GenericUMLDocumentStructureTemplate" name="UML Document" kindId="org.eclipse.papyrus.model2doc.integration.odt.uml.architecture.genericDocument">
+<documentstructuretemplate:DocumentTemplatePrototype xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:author="http://www.eclipse.org/papyrus/model2doc/core/1.0.0/Author" xmlns:documentstructuretemplate="http://www.eclipse.org/papyrus/model2doc/emf/1.0.0/documentstructuretemplate" xmlns:documentstructuretemplate_1="http://www.eclipse.org/papyrus/model2doc/gmf/integration/1.0.0/documentstructuretemplate" xmlns:documentstructuretemplate_2="http://www.eclipse.org/papyrus/model2doc/nattable/integration/1.0.0/documentstructuretemplate" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:generatorconfiguration="http://www.eclipse.org/papyrus/model2doc/1.0.0/generatorconfiguration" xmlns:umldocumentstructuretemplate="http://www.eclipse.org/papyrus/model2doc/uml/1.0.0/documentstructuretemplate" xmi:id="ODT-GenericUMLDocumentStructureTemplateType" type="ODT-GenericUMLDocumentStructureTemplateType" iconPath="platform:/plugin/org.eclipse.papyrus.model2doc.odt/icons/odt_generic_document.png" description="Generic Template for UML documentation under odt format. This template allows to describe a classes structure.">
+ <documentTemplate xmi:type="documentstructuretemplate:TextDocumentTemplate" xmi:id="org.eclipse.papyrus.model2doc.integration.odt.uml.architecture.genericDocument" documentTemplatePrototype="ODT-GenericUMLDocumentStructureTemplateType" name="UML Document" kindId="org.eclipse.papyrus.model2doc.integration.odt.uml.architecture.genericDocument">
<documentStructureGeneratorConfiguration xmi:type="generatorconfiguration:DefaultDocumentStructureGeneratorConfiguration" xmi:id="_9Q98AFIeEemOIbfVEaiEvg" saveDocumentStructure="true" saveImages="true" templateFile="platform:/plugin/org.eclipse.papyrus.model2doc.odt/templates/PapyrusTemplate.ott" documentFolder="output" documentGeneratorId="org.eclipse.papyrus.model2doc.document.generator.odt" structureGeneratorId="TextDocumentStructureGenerator.default" imageFolder="output/images" structureFolder="output"/>
<author xmi:type="author:Author" xmi:id="_HlEJEJ8uEemosPVxvgaz8g" firstName="Papyrus-Model2Doc" lastName="Generator"/>
<documentPart xmi:type="documentstructuretemplate:TableOfContents" xmi:id="_74eOgEsMEemzsPCsrzvLCg" tocTitle="Table Of Contents"/>
diff --git a/plugins/integration/org.eclipse.papyrus.model2doc.integration.odt.uml.architecture/resources/odt-umlDocument.architecture b/plugins/integration/org.eclipse.papyrus.model2doc.integration.odt.uml.architecture/resources/odt-umlDocument.architecture
index 971b8d9..1c97779 100755
--- a/plugins/integration/org.eclipse.papyrus.model2doc.integration.odt.uml.architecture/resources/odt-umlDocument.architecture
+++ b/plugins/integration/org.eclipse.papyrus.model2doc.integration.odt.uml.architecture/resources/odt-umlDocument.architecture
@@ -13,14 +13,14 @@
</owningRules>
<documentTemplatePrototype xmi:type="documentstructuretemplate:DocumentTemplatePrototype" href="platform:/plugin/org.eclipse.papyrus.model2doc.integration.odt.uml.architecture/resources/odt-emptyTextDocumentPrototype.pdst#ODT-EmptyUMLDocumentStructureTemplateType"/>
</representationKinds>
- <representationKinds xmi:type="representation:PapyrusDocumentPrototype" xmi:id="_4TetkCi7EeuXVsN3JsOSRg" id="org.eclipse.papyrus.model2doc.integration.odt.uml.architecture.genericDocument" name="ODT - Generic Text Document" description="Generate generic odt document from UML models." icon="platform:/plugin/org.eclipse.papyrus.model2doc.odt/icons/odt_generic_document.png" implementationID="ODT-GenericUMLDocumentStructureTemplate" creationCommandClass="org.eclipse.papyrus.model2doc.integration.emf.documentstructuretemplate.representation.architecture.CreatePapyrusDocumentTemplateEditorCommand">
+ <representationKinds xmi:type="representation:PapyrusDocumentPrototype" xmi:id="_4TetkCi7EeuXVsN3JsOSRg" id="org.eclipse.papyrus.model2doc.integration.odt.uml.architecture.genericDocument" name="ODT - Generic Text Document" description="Generate generic odt document from UML models." icon="platform:/plugin/org.eclipse.papyrus.model2doc.odt/icons/odt_generic_document.png" implementationID="ODT-GenericUMLDocumentStructureTemplateType" creationCommandClass="org.eclipse.papyrus.model2doc.integration.emf.documentstructuretemplate.representation.architecture.CreatePapyrusDocumentTemplateEditorCommand">
<modelRules xmi:type="representation_1:ModelRule" xmi:id="_4TetkSi7EeuXVsN3JsOSRg" permit="true" elementMultiplicity="1" multiplicity="-1">
<element xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
</modelRules>
<owningRules xmi:type="representation_1:OwningRule" xmi:id="_4Tetkii7EeuXVsN3JsOSRg" permit="true" multiplicity="-1">
<element xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
</owningRules>
- <documentTemplatePrototype xmi:type="documentstructuretemplate:DocumentTemplatePrototype" href="platform:/plugin/org.eclipse.papyrus.model2doc.integration.odt.uml.architecture/resources/odt-genericTextDocumentPrototype.pdst#ODT-GenericUMLDocumentStructureTemplate"/>
+ <documentTemplatePrototype xmi:type="documentstructuretemplate:DocumentTemplatePrototype" href="platform:/plugin/org.eclipse.papyrus.model2doc.integration.odt.uml.architecture/resources/odt-genericTextDocumentPrototype.pdst#ODT-GenericUMLDocumentStructureTemplateType"/>
</representationKinds>
<metamodel xmi:type="ecore:EPackage" href="http://www.eclipse.org/uml2/5.0.0/UML#/"/>
</contexts>
