Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQuentin Le Menez2017-02-27 04:50:18 -0500
committerQuentin Le Menez2017-02-27 09:47:41 -0500
commit17326aa42126772b8a5da5bf2a833cf4b2e325de (patch)
tree112bc2c3628d3110974b6475d1825a6f18443b53 /tests/junit/plugins/editor
parent9d38950f7053843946586ebac7a455084f555cc3 (diff)
downloadorg.eclipse.papyrus-17326aa42126772b8a5da5bf2a833cf4b2e325de.tar.gz
org.eclipse.papyrus-17326aa42126772b8a5da5bf2a833cf4b2e325de.tar.xz
org.eclipse.papyrus-17326aa42126772b8a5da5bf2a833cf4b2e325de.zip
Bug 512113 - [Extra][Table] Archive tablemigration
- archived the tablemigration plugins - removed the associated extra feature - removed old table metamodel depdendencies in some tests models Change-Id: Ib1e6be570b137811e96f9a9474e98448c14f8f5f Signed-off-by: Quentin Le Menez <quentin.lemenez@cea.fr>
Diffstat (limited to 'tests/junit/plugins/editor')
-rw-r--r--tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/basic/complex_multipage_model.di183
-rw-r--r--tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/basic/simple_table_model.di204
-rw-r--r--tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/recovery/complex_invalid_model.di375
-rw-r--r--tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/recovery/proxy_table_recovery.di185
4 files changed, 27 insertions, 920 deletions
diff --git a/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/basic/complex_multipage_model.di b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/basic/complex_multipage_model.di
index 8148e9633e1..533332b4457 100644
--- a/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/basic/complex_multipage_model.di
+++ b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/basic/complex_multipage_model.di
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="ASCII"?>
-<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi" xmlns:org.eclipse.papyrus.infra.table.instance.papyrustableinstance="http://www.eclipse.org/Papyrus/Table/0.8.0/papyrustableinstance" xmlns:tableinstance="http://www.eclipse.org/EMF_Facet/ModelCellEditor/0.1.0/tableinstance" xmlns:tableinstance2="http://www.eclipse.org/EMF_Facet/Table/0.1.0/tableinstance2">
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+
+xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi" >
+
<di:SashWindowsMngr>
<pageList>
<availablePage>
@@ -26,7 +29,6 @@
<availablePage>
<emfPageIdentifier href="complex_multipage_model.notation#_B_L-UHqUEeK9jI2Tc6HWsA"/>
</availablePage>
- <availablePage emfPageIdentifier="/1"/>
</pageList>
<sashModel currentSelection="/0/@sashModel/@windows.0/@children.0/@children.0/@children.1">
<windows>
@@ -44,7 +46,6 @@
<children>
<emfPageIdentifier href="complex_multipage_model.notation#_1_fSIHqTEeK9jI2Tc6HWsA"/>
</children>
- <children emfPageIdentifier="/1"/>
<children>
<emfPageIdentifier href="complex_multipage_model.notation#_zyAt8XqTEeK9jI2Tc6HWsA"/>
</children>
@@ -59,179 +60,5 @@
</windows>
</sashModel>
</di:SashWindowsMngr>
- <org.eclipse.papyrus.infra.table.instance.papyrustableinstance:PapyrusTableInstance name="DefaultTable" table="/2"/>
- <tableinstance2:TableInstance2 description="Table Description">
- <tableConfiguration href="platform:/plugin/org.eclipse.papyrus.uml.table.default/resources/default.tableconfiguration2#/"/>
- <customizations href="emffacet:/customization/UMLPapyrusDefaultBrowserCustomization#/"/>
- <customizations href="#/2/@localCustomizations.1"/>
- <customizations href="#/2/@localCustomizations.0"/>
- <context href="complex_multipage_model.uml#_BYzTwHqUEeK9jI2Tc6HWsA"/>
- <columns xsi:type="tableinstance:DefaultLabelColumn"/>
- <columns xsi:type="tableinstance:MetaClassColumn"/>
- <columns xsi:type="tableinstance:EContainerColumn"/>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/emf/2002/Ecore#//EModelElement/eAnnotations"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Element/ownedComment"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Element/ownedElement"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Element/owner"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/clientDependency"/>
- </columns>
- <columns xsi:type="tableinstance:AttributeColumn">
- <attribute href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/name"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/nameExpression"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/namespace"/>
- </columns>
- <columns xsi:type="tableinstance:AttributeColumn">
- <attribute href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/qualifiedName"/>
- </columns>
- <columns xsi:type="tableinstance:AttributeColumn">
- <attribute href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/visibility"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Namespace/elementImport"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Namespace/packageImport"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Namespace/ownedRule"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Namespace/ownedMember"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Namespace/importedMember"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Namespace/member"/>
- </columns>
- <columns xsi:type="tableinstance:AttributeColumn">
- <attribute href="http://www.eclipse.org/uml2/4.0.0/UML#//RedefinableElement/isLeaf"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//RedefinableElement/redefinedElement"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//RedefinableElement/redefinitionContext"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//ParameterableElement/owningTemplateParameter"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//ParameterableElement/templateParameter"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Type/package"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//TemplateableElement/ownedTemplateSignature"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//TemplateableElement/templateBinding"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/feature"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/attribute"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/collaborationUse"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/general"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/generalization"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/powertypeExtent"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/inheritedMember"/>
- </columns>
- <columns xsi:type="tableinstance:AttributeColumn">
- <attribute href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/isAbstract"/>
- </columns>
- <columns xsi:type="tableinstance:AttributeColumn">
- <attribute href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/isFinalSpecialization"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/ownedUseCase"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/useCase"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/redefinedClassifier"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/representation"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/substitution"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//StructuredClassifier/ownedAttribute"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//StructuredClassifier/ownedConnector"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//StructuredClassifier/part"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//StructuredClassifier/role"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//EncapsulatedClassifier/ownedPort"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//BehavioredClassifier/classifierBehavior"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//BehavioredClassifier/interfaceRealization"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//BehavioredClassifier/ownedBehavior"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Class/ownedOperation"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Class/extension"/>
- </columns>
- <columns xsi:type="tableinstance:AttributeColumn">
- <attribute href="http://www.eclipse.org/uml2/4.0.0/UML#//Class/isActive"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Class/nestedClassifier"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Class/ownedReception"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Class/superClass"/>
- </columns>
- <rows>
- <element href="complex_multipage_model.uml#_CeRuEHqUEeK9jI2Tc6HWsA"/>
- </rows>
- <rows>
- <element href="complex_multipage_model.uml#_CkYWEHqUEeK9jI2Tc6HWsA"/>
- </rows>
- <localCustomizations metamodelURI="http://www.eclipse.org/emf/2002/Ecore"/>
- <localCustomizations metamodelURI="http://www.eclipse.org/uml2/4.0.0/UML"/>
- </tableinstance2:TableInstance2>
+
</xmi:XMI>
diff --git a/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/basic/simple_table_model.di b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/basic/simple_table_model.di
index f984b86c331..0a8be98fb98 100644
--- a/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/basic/simple_table_model.di
+++ b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/basic/simple_table_model.di
@@ -1,193 +1,13 @@
-<?xml version="1.0" encoding="ASCII"?>
-<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi" xmlns:org.eclipse.papyrus.infra.table.instance.papyrustableinstance="http://www.eclipse.org/Papyrus/Table/0.8.0/papyrustableinstance" xmlns:tableinstance="http://www.eclipse.org/EMF_Facet/ModelCellEditor/0.1.0/tableinstance" xmlns:tableinstance2="http://www.eclipse.org/EMF_Facet/Table/0.1.0/tableinstance2">
- <di:SashWindowsMngr>
- <pageList>
- <availablePage emfPageIdentifier="/1"/>
- </pageList>
- <sashModel currentSelection="/0/@sashModel/@windows.0/@children.0">
- <windows>
- <children xsi:type="di:TabFolder">
- <children emfPageIdentifier="/1"/>
+<?xml version="1.0" encoding="UTF-8"?>
+<di:SashWindowsMngr xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi">
+ <pageList/>
+ <sashModel currentSelection="//@sashModel/@windows.0/@children.0">
+ <windows>
+ <children xsi:type="di:TabFolder">
+ <children>
+ <emfPageIdentifier href="papyrus.welcome:dynamic#/"/>
</children>
- </windows>
- </sashModel>
- </di:SashWindowsMngr>
- <org.eclipse.papyrus.infra.table.instance.papyrustableinstance:PapyrusTableInstance name="DefaultTable" table="/2"/>
- <tableinstance2:TableInstance2 description="Table Description">
- <tableConfiguration href="platform:/plugin/org.eclipse.papyrus.uml.table.default/resources/default.tableconfiguration2#/"/>
- <customizations href="emffacet:/customization/UMLPapyrusDefaultBrowserCustomization#/"/>
- <customizations href="#/2/@localCustomizations.1"/>
- <customizations href="#/2/@localCustomizations.0"/>
- <context href="simple_table_model.uml#_a4aMkHqSEeK9jI2Tc6HWsA"/>
- <columns xsi:type="tableinstance:DefaultLabelColumn"/>
- <columns xsi:type="tableinstance:MetaClassColumn"/>
- <columns xsi:type="tableinstance:EContainerColumn"/>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/emf/2002/Ecore#//EModelElement/eAnnotations"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Element/ownedComment"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Element/ownedElement"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Element/owner"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/clientDependency"/>
- </columns>
- <columns xsi:type="tableinstance:AttributeColumn">
- <attribute href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/name"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/nameExpression"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/namespace"/>
- </columns>
- <columns xsi:type="tableinstance:AttributeColumn">
- <attribute href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/qualifiedName"/>
- </columns>
- <columns xsi:type="tableinstance:AttributeColumn">
- <attribute href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/visibility"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Namespace/elementImport"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Namespace/packageImport"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Namespace/ownedRule"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Namespace/ownedMember"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Namespace/importedMember"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Namespace/member"/>
- </columns>
- <columns xsi:type="tableinstance:AttributeColumn">
- <attribute href="http://www.eclipse.org/uml2/4.0.0/UML#//RedefinableElement/isLeaf"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//RedefinableElement/redefinedElement"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//RedefinableElement/redefinitionContext"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//ParameterableElement/owningTemplateParameter"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//ParameterableElement/templateParameter"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Type/package"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//TemplateableElement/ownedTemplateSignature"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//TemplateableElement/templateBinding"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/feature"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/attribute"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/collaborationUse"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/general"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/generalization"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/powertypeExtent"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/inheritedMember"/>
- </columns>
- <columns xsi:type="tableinstance:AttributeColumn">
- <attribute href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/isAbstract"/>
- </columns>
- <columns xsi:type="tableinstance:AttributeColumn">
- <attribute href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/isFinalSpecialization"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/ownedUseCase"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/useCase"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/redefinedClassifier"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/representation"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/substitution"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//StructuredClassifier/ownedAttribute"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//StructuredClassifier/ownedConnector"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//StructuredClassifier/part"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//StructuredClassifier/role"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//EncapsulatedClassifier/ownedPort"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//BehavioredClassifier/classifierBehavior"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//BehavioredClassifier/interfaceRealization"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//BehavioredClassifier/ownedBehavior"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Class/ownedOperation"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Class/extension"/>
- </columns>
- <columns xsi:type="tableinstance:AttributeColumn">
- <attribute href="http://www.eclipse.org/uml2/4.0.0/UML#//Class/isActive"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Class/nestedClassifier"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Class/ownedReception"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Class/superClass"/>
- </columns>
- <rows>
- <element href="simple_table_model.uml#_exmrsHqSEeK9jI2Tc6HWsA"/>
- </rows>
- <rows>
- <element href="simple_table_model.uml#_f9eo8HqSEeK9jI2Tc6HWsA"/>
- </rows>
- <rows>
- <element href="simple_table_model.uml#_ge8-UHqSEeK9jI2Tc6HWsA"/>
- </rows>
- <localCustomizations metamodelURI="http://www.eclipse.org/emf/2002/Ecore"/>
- <localCustomizations metamodelURI="http://www.eclipse.org/uml2/4.0.0/UML"/>
- </tableinstance2:TableInstance2>
-</xmi:XMI>
+ </children>
+ </windows>
+ </sashModel>
+</di:SashWindowsMngr>
diff --git a/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/recovery/complex_invalid_model.di b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/recovery/complex_invalid_model.di
index 5930bed8a28..29a27084124 100644
--- a/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/recovery/complex_invalid_model.di
+++ b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/recovery/complex_invalid_model.di
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="ASCII"?>
-<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi" xmlns:org.eclipse.papyrus.infra.table.instance.papyrustableinstance="http://www.eclipse.org/Papyrus/Table/0.8.0/papyrustableinstance" xmlns:tableinstance="http://www.eclipse.org/EMF_Facet/ModelCellEditor/0.1.0/tableinstance" xmlns:tableinstance2="http://www.eclipse.org/EMF_Facet/Table/0.1.0/tableinstance2">
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+
+xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi" >
+
<di:SashWindowsMngr>
<pageList>
<availablePage>
@@ -21,7 +24,6 @@
<children>
<emfPageIdentifier href="complex_invalid_model.notation#_yER_0XqeEeK5vdodFAvPrA"/>
</children>
- <children emfPageIdentifier="/1"/>
<children />
</children>
<children xsi:type="di:TabFolder">
@@ -36,372 +38,5 @@
</windows>
</sashModel>
</di:SashWindowsMngr>
- <org.eclipse.papyrus.infra.table.instance.papyrustableinstance:PapyrusTableInstance name="DefaultTable" table="/2"/>
- <tableinstance2:TableInstance2 description="Table Description">
- <tableConfiguration href="platform:/plugin/org.eclipse.papyrus.uml.table.default/resources/default.tableconfiguration2#/"/>
- <customizations href="emffacet:/customization/UMLPapyrusDefaultBrowserCustomization#/"/>
- <customizations href="#/2/@localCustomizations.1"/>
- <customizations href="#/2/@localCustomizations.0"/>
- <context href="complex_invalid_model.uml#_yER_0HqeEeK5vdodFAvPrA"/>
- <columns xsi:type="tableinstance:DefaultLabelColumn"/>
- <columns xsi:type="tableinstance:MetaClassColumn"/>
- <columns xsi:type="tableinstance:EContainerColumn"/>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/emf/2002/Ecore#//EModelElement/eAnnotations"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Element/ownedComment"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Element/ownedElement"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Element/owner"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/clientDependency"/>
- </columns>
- <columns xsi:type="tableinstance:AttributeColumn">
- <attribute href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/name"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/nameExpression"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/namespace"/>
- </columns>
- <columns xsi:type="tableinstance:AttributeColumn">
- <attribute href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/qualifiedName"/>
- </columns>
- <columns xsi:type="tableinstance:AttributeColumn">
- <attribute href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/visibility"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Namespace/elementImport"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Namespace/packageImport"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Namespace/ownedRule"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Namespace/ownedMember"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Namespace/importedMember"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Namespace/member"/>
- </columns>
- <columns xsi:type="tableinstance:AttributeColumn">
- <attribute href="http://www.eclipse.org/uml2/4.0.0/UML#//RedefinableElement/isLeaf"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//RedefinableElement/redefinedElement"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//RedefinableElement/redefinitionContext"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//ParameterableElement/owningTemplateParameter"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//ParameterableElement/templateParameter"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Type/package"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//TemplateableElement/ownedTemplateSignature"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//TemplateableElement/templateBinding"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/feature"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/attribute"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/collaborationUse"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/general"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/generalization"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/powertypeExtent"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/inheritedMember"/>
- </columns>
- <columns xsi:type="tableinstance:AttributeColumn">
- <attribute href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/isAbstract"/>
- </columns>
- <columns xsi:type="tableinstance:AttributeColumn">
- <attribute href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/isFinalSpecialization"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/ownedUseCase"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/useCase"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/redefinedClassifier"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/representation"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/substitution"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//StructuredClassifier/ownedAttribute"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//StructuredClassifier/ownedConnector"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//StructuredClassifier/part"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//StructuredClassifier/role"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//EncapsulatedClassifier/ownedPort"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//BehavioredClassifier/classifierBehavior"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//BehavioredClassifier/interfaceRealization"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//BehavioredClassifier/ownedBehavior"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Class/ownedOperation"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Class/extension"/>
- </columns>
- <columns xsi:type="tableinstance:AttributeColumn">
- <attribute href="http://www.eclipse.org/uml2/4.0.0/UML#//Class/isActive"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Class/nestedClassifier"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Class/ownedReception"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Class/superClass"/>
- </columns>
- <rows>
- <element href="complex_invalid_model.uml#_4Iu1kHqeEeK5vdodFAvPrA"/>
- </rows>
- <rows>
- <element href="complex_invalid_model.uml#_4QBwYHqeEeK5vdodFAvPrA"/>
- </rows>
- <rows>
- <element href="complex_invalid_model.uml#_4QnmQHqeEeK5vdodFAvPrA"/>
- </rows>
- <rows>
- <element href="complex_invalid_model.uml#_4T48sHqeEeK5vdodFAvPrA"/>
- </rows>
- <rows>
- <element href="complex_invalid_model.uml#_4WasQHqeEeK5vdodFAvPrA"/>
- </rows>
- <localCustomizations metamodelURI="http://www.eclipse.org/emf/2002/Ecore"/>
- <localCustomizations metamodelURI="http://www.eclipse.org/uml2/4.0.0/UML"/>
- </tableinstance2:TableInstance2>
- <org.eclipse.papyrus.infra.table.instance.papyrustableinstance:PapyrusTableInstance name="DefaultTable" table="/4"/>
- <tableinstance2:TableInstance2 description="Table Description">
- <tableConfiguration href="platform:/plugin/org.eclipse.papyrus.uml.table.default/resources/default.tableconfiguration2#/"/>
- <customizations href="emffacet:/customization/UMLPapyrusDefaultBrowserCustomization#/"/>
- <customizations href="#/4/@localCustomizations.1"/>
- <customizations href="#/4/@localCustomizations.0"/>
- <context href="complex_invalid_model.uml#_yER_0HqeEeK5vdodFAvPrA"/>
- <columns xsi:type="tableinstance:DefaultLabelColumn"/>
- <columns xsi:type="tableinstance:MetaClassColumn"/>
- <columns xsi:type="tableinstance:EContainerColumn"/>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/emf/2002/Ecore#//EModelElement/eAnnotations"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Element/ownedComment"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Element/ownedElement"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Element/owner"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/clientDependency"/>
- </columns>
- <columns xsi:type="tableinstance:AttributeColumn">
- <attribute href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/name"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/nameExpression"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/namespace"/>
- </columns>
- <columns xsi:type="tableinstance:AttributeColumn">
- <attribute href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/qualifiedName"/>
- </columns>
- <columns xsi:type="tableinstance:AttributeColumn">
- <attribute href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/visibility"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Namespace/elementImport"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Namespace/packageImport"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Namespace/ownedRule"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Namespace/ownedMember"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Namespace/importedMember"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Namespace/member"/>
- </columns>
- <columns xsi:type="tableinstance:AttributeColumn">
- <attribute href="http://www.eclipse.org/uml2/4.0.0/UML#//RedefinableElement/isLeaf"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//RedefinableElement/redefinedElement"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//RedefinableElement/redefinitionContext"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//ParameterableElement/owningTemplateParameter"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//ParameterableElement/templateParameter"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Type/package"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//TemplateableElement/ownedTemplateSignature"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//TemplateableElement/templateBinding"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/feature"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/attribute"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/collaborationUse"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/general"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/generalization"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/powertypeExtent"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/inheritedMember"/>
- </columns>
- <columns xsi:type="tableinstance:AttributeColumn">
- <attribute href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/isAbstract"/>
- </columns>
- <columns xsi:type="tableinstance:AttributeColumn">
- <attribute href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/isFinalSpecialization"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/ownedUseCase"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/useCase"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/redefinedClassifier"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/representation"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/substitution"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//StructuredClassifier/ownedAttribute"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//StructuredClassifier/ownedConnector"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//StructuredClassifier/part"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//StructuredClassifier/role"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//EncapsulatedClassifier/ownedPort"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//BehavioredClassifier/classifierBehavior"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//BehavioredClassifier/interfaceRealization"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//BehavioredClassifier/ownedBehavior"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Class/ownedOperation"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Class/extension"/>
- </columns>
- <columns xsi:type="tableinstance:AttributeColumn">
- <attribute href="http://www.eclipse.org/uml2/4.0.0/UML#//Class/isActive"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Class/nestedClassifier"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Class/ownedReception"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Class/superClass"/>
- </columns>
- <rows>
- <element href="complex_invalid_model.uml#_4WasQHqeEeK5vdodFAvPrA"/>
- </rows>
- <rows>
- <element href="complex_invalid_model.uml#_BkzHYHqfEeK5vdodFAvPrA"/>
- </rows>
- <rows>
- <element href="complex_invalid_model.uml#_BqKIgHqfEeK5vdodFAvPrA"/>
- </rows>
- <rows>
- <element href="complex_invalid_model.uml#_Bv0EkHqfEeK5vdodFAvPrA"/>
- </rows>
- <rows>
- <element href="complex_invalid_model.uml#_B0cF4HqfEeK5vdodFAvPrA"/>
- </rows>
- <localCustomizations metamodelURI="http://www.eclipse.org/emf/2002/Ecore"/>
- <localCustomizations metamodelURI="http://www.eclipse.org/uml2/4.0.0/UML"/>
- </tableinstance2:TableInstance2>
+
</xmi:XMI>
diff --git a/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/recovery/proxy_table_recovery.di b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/recovery/proxy_table_recovery.di
index ef395d7bb10..02990cf99e3 100644
--- a/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/recovery/proxy_table_recovery.di
+++ b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/recovery/proxy_table_recovery.di
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="ASCII"?>
-<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi" xmlns:org.eclipse.papyrus.infra.table.instance.papyrustableinstance="http://www.eclipse.org/Papyrus/Table/0.8.0/papyrustableinstance" xmlns:tableinstance="http://www.eclipse.org/EMF_Facet/ModelCellEditor/0.1.0/tableinstance" xmlns:tableinstance2="http://www.eclipse.org/EMF_Facet/Table/0.1.0/tableinstance2">
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+
+xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi" >
+
<di:SashWindowsMngr>
<pageList>
<availablePage emfPageIdentifier="/23"/>
@@ -10,7 +13,6 @@
<sashModel currentSelection="/0/@sashModel/@windows.0/@children.0">
<windows>
<children xsi:type="di:TabFolder">
- <children emfPageIdentifier="/112"/>
<children>
<emfPageIdentifier href="proxy_table_recovery.notation#_Xp_5YHqeEeK5vdodFAvPrA"/>
</children>
@@ -18,182 +20,5 @@
</windows>
</sashModel>
</di:SashWindowsMngr>
- <org.eclipse.papyrus.infra.table.instance.papyrustableinstance:PapyrusTableInstance name="DefaultTable" table="/2"/>
- <tableinstance2:TableInstance2 description="Table Description">
- <tableConfiguration href="platform:/plugin/org.eclipse.papyrus.uml.table.default/resources/default.tableconfiguration2#/"/>
- <customizations href="emffacet:/customization/UMLPapyrusDefaultBrowserCustomization#/"/>
- <customizations href="#/2/@localCustomizations.1"/>
- <customizations href="#/2/@localCustomizations.0"/>
- <context href="proxy_table_recovery.uml#_42wOoHqdEeK5vdodFAvPrA"/>
- <columns xsi:type="tableinstance:DefaultLabelColumn"/>
- <columns xsi:type="tableinstance:MetaClassColumn"/>
- <columns xsi:type="tableinstance:EContainerColumn"/>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/emf/2002/Ecore#//EModelElement/eAnnotations"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Element/ownedComment"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Element/ownedElement"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Element/owner"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/clientDependency"/>
- </columns>
- <columns xsi:type="tableinstance:AttributeColumn">
- <attribute href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/name"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/nameExpression"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/namespace"/>
- </columns>
- <columns xsi:type="tableinstance:AttributeColumn">
- <attribute href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/qualifiedName"/>
- </columns>
- <columns xsi:type="tableinstance:AttributeColumn">
- <attribute href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/visibility"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Namespace/elementImport"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Namespace/packageImport"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Namespace/ownedRule"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Namespace/ownedMember"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Namespace/importedMember"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Namespace/member"/>
- </columns>
- <columns xsi:type="tableinstance:AttributeColumn">
- <attribute href="http://www.eclipse.org/uml2/4.0.0/UML#//RedefinableElement/isLeaf"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//RedefinableElement/redefinedElement"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//RedefinableElement/redefinitionContext"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//ParameterableElement/owningTemplateParameter"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//ParameterableElement/templateParameter"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Type/package"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//TemplateableElement/ownedTemplateSignature"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//TemplateableElement/templateBinding"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/feature"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/attribute"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/collaborationUse"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/general"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/generalization"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/powertypeExtent"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/inheritedMember"/>
- </columns>
- <columns xsi:type="tableinstance:AttributeColumn">
- <attribute href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/isAbstract"/>
- </columns>
- <columns xsi:type="tableinstance:AttributeColumn">
- <attribute href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/isFinalSpecialization"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/ownedUseCase"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/useCase"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/redefinedClassifier"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/representation"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/substitution"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//StructuredClassifier/ownedAttribute"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//StructuredClassifier/ownedConnector"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//StructuredClassifier/part"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//StructuredClassifier/role"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//EncapsulatedClassifier/ownedPort"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//BehavioredClassifier/classifierBehavior"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//BehavioredClassifier/interfaceRealization"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//BehavioredClassifier/ownedBehavior"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Class/ownedOperation"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Class/extension"/>
- </columns>
- <columns xsi:type="tableinstance:AttributeColumn">
- <attribute href="http://www.eclipse.org/uml2/4.0.0/UML#//Class/isActive"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Class/nestedClassifier"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Class/ownedReception"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Class/superClass"/>
- </columns>
- <rows>
- <element href="proxy_table_recovery.uml#_6cXhkHqdEeK5vdodFAvPrA"/>
- </rows>
- <rows>
- <element href="proxy_table_recovery.uml#_7Bj5UHqdEeK5vdodFAvPrA"/>
- </rows>
- <rows>
- <element href="proxy_table_recovery.uml#_7nMV8HqdEeK5vdodFAvPrA"/>
- </rows>
- <localCustomizations metamodelURI="http://www.eclipse.org/emf/2002/Ecore"/>
- <localCustomizations metamodelURI="http://www.eclipse.org/uml2/4.0.0/UML"/>
- </tableinstance2:TableInstance2>
+
</xmi:XMI>

Back to the top