Bug 466832: [CSS] Regression: displayStereotypes:false stopped working

for Dependencies
https://bugs.eclipse.org/bugs/show_bug.cgi?id=466832

Update the place where the displayStereotypes CSS properties is taken
into account.

Change-Id: Icc6259411a73537745bf114a6e3ab79e62998dea
Signed-off-by: Céline Janssens <Celine.Janssens@all4tec.net>
Reviewed-on: https://git.eclipse.org/r/48980
Tested-by: Hudson CI
Reviewed-by: Gabriel Pascual <gabriel.pascual@all4tec.net>
Reviewed-by: Camille Letavernier <camille.letavernier@cea.fr>

3 files changed, 6 insertions, 33 deletions

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editparts/NamedElementEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editparts/NamedElementEditPart.java
index 06aef38f56c..10dae3d853e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editparts/NamedElementEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editparts/NamedElementEditPart.java
@@ -244,32 +244,22 @@ public abstract class NamedElementEditPart extends UMLNodeEditPart implements IU
 		if (svgNodePlate != null) {
 			if (svgNodePlate.hasLabelBounds()) {
 				figure.getNameLabel().setTextWrap(true);
-			}
-			else {
+			} else {
 				figure.getNameLabel().setTextWrap(false);
 			}
 		}
 		// Get NamedStyle display preferences
 		BooleanValueStyle displayNameStyle = (BooleanValueStyle) view.getNamedStyle(NotationPackage.eINSTANCE.getBooleanValueStyle(), NameDisplayEditPolicy.DISPLAY_NAME);
-		BooleanValueStyle displayStereotypes = (BooleanValueStyle) view.getNamedStyle(NotationPackage.eINSTANCE.getBooleanValueStyle(), DISPLAY_STEREOTYPES);
 		BooleanValueStyle displayTags = (BooleanValueStyle) view.getNamedStyle(NotationPackage.eINSTANCE.getBooleanValueStyle(), DISPLAY_TAGS);
 
 
 		// Manage the display of Name Label
 		if (displayNameStyle != null && !displayNameStyle.isBooleanValue()) {
 			figure.removeNameLabel();
-			figure.removeStereotypeLabel();
 			figure.removeTaggedLabel();
 		} else {
 			figure.restoreNameLabel();
 
-			// Manage the display of Stereotypes Label
-			if (displayStereotypes != null && !displayStereotypes.isBooleanValue()) {
-				figure.removeStereotypeLabel();
-			} else {
-				figure.restoreStereotypeLabel();
-
-			}
 
 			// Manage the display of the Stereotypes Properties Label
 			if (displayTags != null && !displayTags.isBooleanValue()) {
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editpolicies/AppliedStereotypeNodeLabelDisplayEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editpolicies/AppliedStereotypeNodeLabelDisplayEditPolicy.java
index 3e9589353af..f9a1d362820 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editpolicies/AppliedStereotypeNodeLabelDisplayEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editpolicies/AppliedStereotypeNodeLabelDisplayEditPolicy.java
@@ -18,9 +18,6 @@ package org.eclipse.papyrus.uml.diagram.common.editpolicies;
 import org.eclipse.draw2d.IFigure;
 import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IPapyrusEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.model.NotationUtils;
-import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.IPapyrusNodeNamedElementFigure;
 import org.eclipse.papyrus.uml.diagram.common.figure.node.IPapyrusNodeUMLElementFigure;
 import org.eclipse.swt.graphics.Image;
 
@@ -30,7 +27,7 @@ import org.eclipse.swt.graphics.Image;
  */
 public class AppliedStereotypeNodeLabelDisplayEditPolicy extends AppliedStereotypeLabelDisplayEditPolicy {
 
-	private String EMPTY_STRING = "";
+	private String EMPTY_STRING = ""; //$NON-NLS-1$
 
 	public AppliedStereotypeNodeLabelDisplayEditPolicy() {
 		super();
@@ -68,27 +65,10 @@ public class AppliedStereotypeNodeLabelDisplayEditPolicy extends AppliedStereoty
 		// Refresh Stereotype Label
 		figure.setStereotypeDisplay(tag + stereotypesToDisplay, imageToDisplay);
 
-		refreshAppliedStereotypesLabel(figure);
 
 	}
 
 
-	/**
-	 * Refreshes the displayed stereotypes for this edit part.
-	 */
-	protected void refreshAppliedStereotypesLabel(IPapyrusNodeUMLElementFigure figure) {
-		// If node has a Label
-		if (figure instanceof IPapyrusNodeNamedElementFigure) {
-
-			// Refresh Label
-			boolean displayStereotypes = NotationUtils.getBooleanValue(getView(), NamedElementEditPart.DISPLAY_STEREOTYPES, true);
-			if (!displayStereotypes) {
-				((IPapyrusNodeNamedElementFigure) figure).removeStereotypeLabel();
-			} else {
-				((IPapyrusNodeNamedElementFigure) figure).restoreStereotypeLabel();
-			}
-		}
-	}
 
 
 	/**
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/stereotype/display/helper/StereotypeDisplayUtil.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/stereotype/display/helper/StereotypeDisplayUtil.java
index 9e3c0af4d21..dfdbda490e5 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/stereotype/display/helper/StereotypeDisplayUtil.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/stereotype/display/helper/StereotypeDisplayUtil.java
@@ -29,6 +29,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.papyrus.infra.gmfdiag.common.model.NotationUtils;

 import org.eclipse.papyrus.infra.gmfdiag.common.utils.GMFUnsafe;

 import org.eclipse.papyrus.uml.diagram.common.Activator;

+import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;

 import org.eclipse.papyrus.uml.diagram.common.stereotype.display.command.UnsetPersistentViewCommand;

 import org.eclipse.papyrus.uml.tools.utils.StereotypeUtil;

 import org.eclipse.swt.widgets.Display;

@@ -174,11 +175,13 @@ public class StereotypeDisplayUtil {
 

 		Iterator<?> childrenIterator = model.getChildren().iterator();

 

+		boolean displayStereotypes = NotationUtils.getBooleanValue(model, NamedElementEditPart.DISPLAY_STEREOTYPES, true);

+

 		// For all children, check if it's a StereotypeLabel and add the Name

 		while (childrenIterator.hasNext()) {

 			Object object = childrenIterator.next();

 			if (isStereotypeLabel(object)) {

-				if (((View) object).isVisible()) {

+				if (((View) object).isVisible() && displayStereotypes) {

 					if (!EMPTY_STRING.equals(textToDisplay.toString()) && (textToDisplay != null)) {

 						textToDisplay.append(StereotypeDisplayConstant.STEREOTYPE_LABEL_SEPARATOR);

 					}