Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCamille Letavernier2014-02-06 15:00:07 +0000
committerCamille Letavernier2014-02-06 15:00:07 +0000
commitade9d574e165b8b0dcd4dc717b68eb7a39bb3ceb (patch)
tree7bb0ac42133780920fcacd29cbf61c3cb71e87ca
parent33d3f5094d650b92279ef5a99909e04d66cf2283 (diff)
downloadorg.eclipse.papyrus-ade9d574e165b8b0dcd4dc717b68eb7a39bb3ceb.tar.gz
org.eclipse.papyrus-ade9d574e165b8b0dcd4dc717b68eb7a39bb3ceb.tar.xz
org.eclipse.papyrus-ade9d574e165b8b0dcd4dc717b68eb7a39bb3ceb.zip
417396: [CSS] The CSS Engine shall support label visibility & mask
https://bugs.eclipse.org/bugs/show_bug.cgi?id=417396 - Remove the manually defined contributions to NotationsTypesMap extension point - Update the compartments tests
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/plugin.xml31
-rw-r--r--tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/stylesheets/compartments.css10
2 files changed, 5 insertions, 36 deletions
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/plugin.xml b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/plugin.xml
index 343f2d1d9a5..45243f3c623 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/plugin.xml
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/plugin.xml
@@ -175,37 +175,6 @@
</extension>
<extension
point="org.eclipse.papyrus.infra.gmfdiag.common.notationTypesMapping">
- <diagramMappings
- diagramID="PapyrusUMLClassDiagram">
- <mapping
- humanReadableType="Name"
- type="6002">
- </mapping>
- <mapping
- humanReadableType="Source role"
- type="6003">
- </mapping>
- <mapping
- humanReadableType="Target role"
- type="6005">
- </mapping>
- <mapping
- humanReadableType="Source multiplicity"
- type="6033">
- </mapping>
- <mapping
- humanReadableType="Target multiplicity"
- type="6034">
- </mapping>
- <mapping
- humanReadableType="role"
- type="6035">
- </mapping>
- <mapping
- humanReadableType="multiplicity"
- type="6024">
- </mapping>
- </diagramMappings>
<mapping
humanReadableType="symbol"
type="compartment_shape_display">
diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/stylesheets/compartments.css b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/stylesheets/compartments.css
index a07ea565036..13660016b20 100644
--- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/stylesheets/compartments.css
+++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/stylesheets/compartments.css
@@ -7,22 +7,22 @@
showTitle: true;
}
-Interface > Compartment[kind=attribute],
-Interface > Compartment[kind=nestedClassifier] {
+Interface > Compartment[kind=Attribute],
+Interface > Compartment[kind=NestedClassifier] {
visible:false;
}
-Interface[ownedAttribute] > Compartment[kind=attribute]{
+Interface[ownedAttribute] > Compartment[kind=Attribute]{
visible:true;
}
-Compartment[kind=nestedClassifier] {
+Compartment[kind=NestedClassifier] {
visible: false;
}
/* Collapse the Attribute compartment if the Class contains a P1 attribute (Displayed) */
-Class[ownedAttribute~="P1"] > Compartment[kind=attribute]{
+Class[ownedAttribute~="P1"] > Compartment[kind=Attribute]{
collapsed: true;
}

Back to the top