aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCamille Letavernier2017-09-25 09:12:21 -0400
committerCamille Letavernier2017-09-28 10:16:33 -0400
commit90a0576baac1f9189164e1463ca5369e9487dcc3 (patch)
treea158aefbab096455222621104a36e3c154c3192b
parent567de95c7f6ed825576c995a5e393fc125989cec (diff)
downloadorg.eclipse.papyrus-90a0576baac1f9189164e1463ca5369e9487dcc3.zip
org.eclipse.papyrus-90a0576baac1f9189164e1463ca5369e9487dcc3.tar.gz
org.eclipse.papyrus-90a0576baac1f9189164e1463ca5369e9487dcc3.tar.xz
Bug 522730: [CSS] "Reset style" shouldn't reset the description of
notation Views https://bugs.eclipse.org/bugs/show_bug.cgi?id=522730 Change-Id: Ic780bd30c9eac22c870a550ef43a7f577a7e676d Signed-off-by: Camille Letavernier <cletavernier@eclipsesource.com> (cherry picked from commit 54b641375dcaefdc8b42df6c55855e4d78bba533)
-rw-r--r--plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/META-INF/MANIFEST.MF2
-rw-r--r--plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/pom.xml2
-rw-r--r--plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/command/ResetStyleCommand.java7
3 files changed, 9 insertions, 2 deletions
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/META-INF/MANIFEST.MF
index e9d802b..9f717b2 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/META-INF/MANIFEST.MF
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/META-INF/MANIFEST.MF
@@ -26,7 +26,7 @@ Require-Bundle: org.eclipse.e4.ui.css.core;bundle-version="[0.11.0,1.0.0)",
org.eclipse.papyrus.infra.gmfdiag.representation;bundle-version="[1.0.0,2.0.0)"
Bundle-Vendor: %providerName
Bundle-ActivationPolicy: lazy
-Bundle-Version: 2.2.0.qualifier
+Bundle-Version: 2.2.1.qualifier
Bundle-Localization: plugin
Bundle-Name: %pluginName
Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.css.Activator
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/pom.xml b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/pom.xml
index ad4e497..8e80d15 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/pom.xml
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/pom.xml
@@ -7,6 +7,6 @@
<version>0.0.1-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.papyrus.infra.gmfdiag.css</artifactId>
- <version>2.2.0-SNAPSHOT</version>
+ <version>2.2.1-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project> \ No newline at end of file
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/command/ResetStyleCommand.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/command/ResetStyleCommand.java
index a5ab5ba..70e6689 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/command/ResetStyleCommand.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/command/ResetStyleCommand.java
@@ -193,6 +193,13 @@ public class ResetStyleCommand extends RecordingCommand {
}
for (EStructuralFeature feature : style.eClass().getEAllStructuralFeatures()) {
+ if (feature == NotationPackage.Literals.DESCRIPTION_STYLE__DESCRIPTION) {
+ //Bug 522730: Description is typically used for Notes or Plain-text shapes,
+ //stored in the notation model. They shouldn't be considered as a real style
+ //property
+ continue;
+ }
+
// Only edit Style features
if (NotationPackage.eINSTANCE.getStyle().isSuperTypeOf(feature.getEContainingClass())) {
// Reset the value to default