Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaged Elaasar2017-06-01 15:18:42 -0400
committerFlorian Noyrit2017-06-06 11:05:32 -0400
commit17f500ad54d8dc9362b31a737ec19cd24627f297 (patch)
tree7afbc1ea66c80c935f0080f283f784ed99cc3720 /tests/junit/plugins/editor
parent273dd997e6462e2e1709e72dadb311460a60725c (diff)
downloadorg.eclipse.papyrus-17f500ad54d8dc9362b31a737ec19cd24627f297.tar.gz
org.eclipse.papyrus-17f500ad54d8dc9362b31a737ec19cd24627f297.tar.xz
org.eclipse.papyrus-17f500ad54d8dc9362b31a737ec19cd24627f297.zip
Bug 516901 - Replaced references to Architecture model elements by their
unique ids instead. This will avoid such elements being loaded in user model resource sets. Also, refactored the Architecture metamodel by moving the id and icon attributes to ADElement so that all elements in the model have them. This also include refactoring of the uml.architecture model to give ids to various diagrams and tables. Also, changed the UMLDiagramReconciler_1_3 to put the diagramKindId attribute instead of the diagramKind reference in the PapyrusDiagramStyle. Also, change the UMLTableReconciler_1_3 to a) test the proxy URI of the old prototype instead of name (since the legacy viewpoint configuration models were deleted earlier resulting in proxies) and to set the tableKindId instead of changing the prototype (which is now deprecated). Change-Id: I99413c1dd6daeaf395fc8c70b8b7ed2e0573acd1 Signed-off-by: Maged Elaasar <melaasar@gmail.com>
Diffstat (limited to 'tests/junit/plugins/editor')
-rw-r--r--tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/canonical/css_leaktest.notation3
-rw-r--r--tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/profile/model-no-j2ee-constraints.notation3
-rw-r--r--tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/profile/model.notation3
3 files changed, 3 insertions, 6 deletions
diff --git a/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/canonical/css_leaktest.notation b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/canonical/css_leaktest.notation
index fa683c8a433..3bfdbc03053 100644
--- a/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/canonical/css_leaktest.notation
+++ b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/canonical/css_leaktest.notation
@@ -55,9 +55,8 @@
</children>
<styles xmi:type="notation:StringValueStyle" xmi:id="_b2JjccjxEeS9XIofcN-grg" name="diagram_compatibility_version" stringValue="1.3.0"/>
<styles xmi:type="notation:DiagramStyle" xmi:id="_b2JjcsjxEeS9XIofcN-grg"/>
- <styles xmi:type="style:PapyrusDiagramStyle" xmi:id="_b7wrIBMAEeeoPd87eel4nw">
+ <styles xmi:type="style:PapyrusDiagramStyle" xmi:id="_b7wrIBMAEeeoPd87eel4nw" diagramKindId="org.eclipse.papyrus.uml.diagram.class">
<owner xmi:type="uml:Model" href="css_leaktest.uml#_b0QGAMjxEeS9XIofcN-grg"/>
- <diagramKind xmi:type="gmfdiagrepresentation:PapyrusDiagram" href="platform:/plugin/org.eclipse.papyrus.uml.architecture/model/uml.architecture#_zzf4gHDtEeWh-MssWmCB_A"/>
</styles>
<styles xmi:type="notation:EObjectListValueStyle" xmi:id="_yY3icMjxEeS9XIofcN-grg" name="css_stylesheets" eObjectListValue="_yY4wkMjxEeS9XIofcN-grg"/>
<element xmi:type="uml:Model" href="css_leaktest.uml#_b0QGAMjxEeS9XIofcN-grg"/>
diff --git a/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/profile/model-no-j2ee-constraints.notation b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/profile/model-no-j2ee-constraints.notation
index 5538fa02f69..ecc2551663c 100644
--- a/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/profile/model-no-j2ee-constraints.notation
+++ b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/profile/model-no-j2ee-constraints.notation
@@ -74,9 +74,8 @@
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_ef5KYrjVEeOUcroamP8z5w" x="221" y="120"/>
</children>
<styles xmi:type="notation:DiagramStyle" xmi:id="_J526gbjVEeOUcroamP8z5w"/>
- <styles xmi:type="style:PapyrusDiagramStyle" xmi:id="_nNAIIBL7EeeoPd87eel4nw">
+ <styles xmi:type="style:PapyrusDiagramStyle" xmi:id="_nNAIIBL7EeeoPd87eel4nw" diagramKindId="org.eclipse.papyrus.uml.diagram.class">
<owner xmi:type="uml:Model" href="model-no-j2ee-constraints.uml#_J4wuULjVEeOUcroamP8z5w"/>
- <diagramKind xmi:type="gmfdiagrepresentation:PapyrusDiagram" href="platform:/plugin/org.eclipse.papyrus.uml.architecture/model/uml.architecture#_zzf4gHDtEeWh-MssWmCB_A"/>
</styles>
<styles xmi:type="notation:StringValueStyle" xmi:id="_nX5wkBL7EeeoPd87eel4nw" name="diagram_compatibility_version" stringValue="1.3.0"/>
<element xmi:type="uml:Model" href="model-no-j2ee-constraints.uml#_J4wuULjVEeOUcroamP8z5w"/>
diff --git a/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/profile/model.notation b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/profile/model.notation
index 7fbfcf3e544..14fb3cb60ca 100644
--- a/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/profile/model.notation
+++ b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/profile/model.notation
@@ -74,9 +74,8 @@
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_ef5KYrjVEeOUcroamP8z5w" x="221" y="120"/>
</children>
<styles xmi:type="notation:DiagramStyle" xmi:id="_J526gbjVEeOUcroamP8z5w"/>
- <styles xmi:type="style:PapyrusDiagramStyle" xmi:id="_HXCp4BMAEeeoPd87eel4nw">
+ <styles xmi:type="style:PapyrusDiagramStyle" xmi:id="_HXCp4BMAEeeoPd87eel4nw" diagramKindId="org.eclipse.papyrus.uml.diagram.class">
<owner xmi:type="uml:Model" href="model.uml#_J4wuULjVEeOUcroamP8z5w"/>
- <diagramKind xmi:type="gmfdiagrepresentation:PapyrusDiagram" href="platform:/plugin/org.eclipse.papyrus.uml.architecture/model/uml.architecture#_zzf4gHDtEeWh-MssWmCB_A"/>
</styles>
<styles xmi:type="notation:StringValueStyle" xmi:id="_HaFW0BMAEeeoPd87eel4nw" name="diagram_compatibility_version" stringValue="1.3.0"/>
<element xmi:type="uml:Model" href="model.uml#_J4wuULjVEeOUcroamP8z5w"/>

Back to the top