From 802efd6972dd44f9a2b29f9306b6d8c68f90e905 Mon Sep 17 00:00:00 2001
From: Vincent Lorenzo
Date: Mon, 13 Apr 2015 15:41:48 +0200
Subject: 464129: [Class Diagram] Italic font style not kept after re-opening
 any diagrams

---
 .../common/editparts/ClassifierEditPart.java       | 23 +++++++++-----
 .../theme/uml.css                                  | 37 ++++++++++++++++++++++
 2 files changed, 52 insertions(+), 8 deletions(-)
 mode change 100644 => 100755 plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editparts/ClassifierEditPart.java

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editparts/ClassifierEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editparts/ClassifierEditPart.java
old mode 100644
new mode 100755
index e627fb7196e..2c752ecab26
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editparts/ClassifierEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editparts/ClassifierEditPart.java
@@ -8,7 +8,7 @@
  *
  * Contributors:
  *		Thibault Landre (Atos Origin) - Initial API and implementation
- *
+ *      Vincent Lorenzo (CEA-LIST)  - vincent.lorenzo@cea.fr - 464129: [Class Diagram] Italic font style not kept after re-opening any diagrams - italic is now done with CSS
  *****************************************************************************/
 package org.eclipse.papyrus.uml.diagram.common.editparts;
 
@@ -91,13 +91,20 @@ public abstract class ClassifierEditPart extends NamedElementEditPart {
 	 */
 	@Override
 	protected FontData getFontData(FontStyle style) {
-		FontData data = super.getFontData(style);
-		if (isAbstract) {
-			data.setStyle(data.getStyle() | SWT.ITALIC); // Force the Italic flag
-		} else {
-			data.setStyle(data.getStyle() & ~SWT.ITALIC); // Remove the Italic flag
-		}
-		return data;
+		return super.getFontData(style);
+
+		//next line commented for bug  464129: [Class Diagram] Italic font style not kept after re-opening any diagrams
+		// https://bugs.eclipse.org/bugs/show_bug.cgi?id=464129
+		//new implementation use CSS (umlBase.css)
+		
+		
+		// FontData data = super.getFontData(style);
+		// if (isAbstract) {
+		// data.setStyle(data.getStyle() | SWT.ITALIC); // Force the Italic flag
+		// } else {
+		// data.setStyle(data.getStyle() & ~SWT.ITALIC); // Remove the Italic flag
+		// }
+		// return data;
 	}
 
 }
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.css/theme/uml.css b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.css/theme/uml.css
index 3ff65297c8c..10e66b2a3f3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.css/theme/uml.css
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.css/theme/uml.css
@@ -11,3 +11,40 @@ InformationFlow > Label:name
 {
 	visible: false;
 }
+
+/* Display name in italic when isAbstract=true for Classifier (bug 464129)*/
+Artifact[isAbstract=true],
+DeploymentSpecification[isAbstract=true],
+Association[isAbstract=true],
+CommunicationPath[isAbstract=true],
+Extension[isAbstract=true],
+BehavioredClassifier[isAbstract=true],
+Actor[isAbstract=true], 
+Usecase[isAbstract=true],
+DataType[isAbstract=true],
+Enumeration[isAbstract=true],
+PrimitiveType[isAbstract=true],
+InformationItem[isAbstract=true], 
+Interface[isAbstract=true],
+Signal[isAbstract=true], 
+Collaboration[isAbstract=true],
+Class[isAbstract=true], 
+AssociationClass[isAbstract=true], 
+Activity[isAbstract=true],
+Interaction[isAbstract=true], 
+OpaqueBehavior[isAbstract=true],
+FunctionBehavior[isAbstract=true],
+StateMachine[isAbstract=true], 
+ProtocolStateMachine[isAbstract=true],
+Component[isAbstract=true],
+Node[isAbstract=true],
+Device[isAbstract=true],
+ExecutionEnvironment[isAbstract=true], 
+Stereotype[isAbstract=true] {
+	italic:true;
+}
+
+/* Display name in italic when isAbstract=true for BehavioralFeature (bug 464129)*/
+Operation[isAbstract=true],Reception[isAbstract=true]{
+	italic:true;
+}
-- 
cgit v1.2.3