436547: [Diagram] All shapes shall be refactored

https://bugs.eclipse.org/bugs/show_bug.cgi?id=436547

-Add CSS default properties for activityDiagram and ClassDiagram

-Fix Some bug:
	-Duration/TimeObservation name is not well placed at creation
	-SVG figure is resized when the label is showed
	-Regression for batik test: deletion of unecessary dependencies

Change-Id: I69c559080c409f9b2da48779f12f6f14db27db31
Signed-off-by: Mickael ADAM <mickael.adam@ALL4TEC.net>

8 files changed, 134 insertions, 17 deletions

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.theme/theme/papyrus_theme.css b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.theme/theme/papyrus_theme.css
index 6ac50b4d5c2..416d090cbca 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.theme/theme/papyrus_theme.css
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.theme/theme/papyrus_theme.css
@@ -126,3 +126,23 @@ ParametricDiagram [appliedStereotypes~=ConstraintProperty] {
 Label {

 	elementIcon: false;

 }

+

+ActivityDiagram Activity *,InteractionOverviewDiagram Activity * {

+	elementIcon:false; 

+}

+

+ClassDiagram Dependency{

+	fillColor:Black;

+	gradient:none;

+}

+

+/*

+ * The Actor element icon is not useful either

+ */

+UseCaseDiagram Actor {

+	elementIcon:false;

+}

+

+TimingDiagram * {

+	gradient:none;

+}

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 1cf9bdcda2e..9c7ae7bd4f2 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
@@ -39,8 +39,7 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.papyrus.emf.facet.custom.core;bundle-version="1.1.0",
  org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="1.1.0",
  org.eclipse.papyrus.views.properties;bundle-version="1.1.0",
- org.eclipse.papyrus.views.properties.model;bundle-version="1.1.0",
- org.apache.batik.dom.svg
+ org.eclipse.papyrus.views.properties.model;bundle-version="1.1.0"

 Bundle-Vendor: %providerName
 Bundle-ActivationPolicy: lazy
 Bundle-Version: 1.1.0.qualifier
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/resources/base.css b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/resources/base.css
index 563abb356da..5e13d9b6224 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/resources/base.css
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/resources/base.css
@@ -29,6 +29,62 @@ Compartment[kind=symbol]{
  	showTitle:false;
 }
 
+
+/*
+ * The Actor element icon is not useful either
+ */
+UseCaseDiagram Actor {
+	elementIcon:false;
+}
+
+TimingDiagram * {
+	gradient:none;
+}
+
+/*---------- Activity Diagram ----------*/
+
+ActivityDiagram MergeNode, 
+ActivityDiagram InitialNode, 
+ActivityDiagram ActivityFinalNode, 
+ActivityDiagram FlowFinalNode, 
+ActivityDiagram DecisionNode, 
+ActivityDiagram MergeNode, 
+ActivityDiagram SendSignalAction,
+ActivityDiagram AcceptEventAction
+{
+	displayBorder:false;
+	displayName:false;
+	diplayIcon:false;
+	displayTag:false;
+	followSVGSymbol:true;
+	maintainSymbolRatio:true;
+	transparency:100;
+	displayFloatingLabel:true;
+	maxNumberOfSymbol:1;
+	useOriginalColors:false;
+	gradient:none;
+	fillColor:white;
+}
+
+
+ActivityDiagram MergeNode > Compartment[kind="symbol"], 
+ActivityDiagram InitialNode > Compartment[kind="symbol"], 
+ActivityDiagram ActivityFinalNode > Compartment[kind="symbol"], 
+ActivityDiagram FlowFinalNode > Compartment[kind="symbol"], 
+ActivityDiagram MergeNode > Compartment[kind="symbol"], 
+ActivityDiagram SendSignalAction > Compartment[kind="symbol"], 
+ActivityDiagram DecisionNode > Compartment[kind="symbol"], 
+ActivityDiagram AcceptEventAction > Compartment[kind="symbol"]
+{
+    visible:true;
+}
+
+ActivityDiagram SendSignalAction, 
+ActivityDiagram AcceptEventAction{
+	maintainSymbolRatio:false;
+	displayName:true;
+}
+
 /* For most Activity diagram nodes (e.g. initial, final, fork, decision, ...), 
  * the element icon is displayed next to the actual object. 
  * By default, we prevent this. 
@@ -40,14 +96,34 @@ ActivityDiagram Activity *,InteractionOverviewDiagram Activity * {
 	elementIcon:false; 
 }
 
-/*
- * The Actor element icon is not useful either
- */
-UseCaseDiagram Actor {
-	elementIcon:false;
+/*---------- Class Diagram ----------*/
+ClassDiagram Association
+{
+	displayBorder:false;
+	displayName:false;
+	diplayIcon:false;
+	displayTag:false;
+	followSVGSymbol:true;
+	maintainSymbolRatio:true;
+	transparency:100;
+	displayFloatingLabel:true;
+	maxNumberOfSymbol:1;
+	useOriginalColors:false;
+	gradient:none;
+	fillColor:white;
 }
 
-TimingDiagram * {
+ClassDiagram  Association > Compartment[kind="symbol"],
+ClassDiagram  DurationObservation > Compartment[kind="symbol"],
+ClassDiagram  TimeObservation > Compartment[kind="symbol"]
+{
+    visible:true;
+}
+
+ClassDiagram Dependency
+{
+	fillColor:Black;
 	gradient:none;
 }
 
+
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/icons/symbols/flag.svg b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/icons/symbols/flag.svg
index 00d56356412..e4e24f91782 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/icons/symbols/flag.svg
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/icons/symbols/flag.svg
@@ -30,8 +30,8 @@
 	    id="PapyrusLabel" 
 	    width="145" 
 	    height="15" 
-	    x="10" 
-	    y="1" 
+	    x="20" 
+	    y="5" 
 	    transform="translate(0,1012.3617)" />
   </g>
 </svg>
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/edit/part/CustomDurationObservationFloatingNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/edit/part/CustomDurationObservationFloatingNameEditPart.java
index bde07984b2b..388f5fa6373 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/edit/part/CustomDurationObservationFloatingNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/edit/part/CustomDurationObservationFloatingNameEditPart.java
@@ -13,6 +13,7 @@
 package org.eclipse.papyrus.uml.diagram.clazz.custom.edit.part;
 
 
+import org.eclipse.draw2d.PositionConstants;
 import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DurationObservationFloatingNameEditPart;
 
@@ -38,4 +39,14 @@ public class CustomDurationObservationFloatingNameEditPart extends DurationObser
 	protected boolean getDefaultLabelDisplayedValue() {
 		return LABEL_DISPLAYED_VALUE;
 	}
+
+	/**
+	 * Gets the default text alignment.
+	 *
+	 * @return the default text alignment
+	 */
+	@Override
+	protected int getDefaultTextAlignment() {
+		return PositionConstants.LEFT;
+	}
 }
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/edit/part/CustomTimeObservationFloatingNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/edit/part/CustomTimeObservationFloatingNameEditPart.java
index da367d00a22..439d1b48a4c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/edit/part/CustomTimeObservationFloatingNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/edit/part/CustomTimeObservationFloatingNameEditPart.java
@@ -13,6 +13,7 @@
 package org.eclipse.papyrus.uml.diagram.clazz.custom.edit.part;
 
 
+import org.eclipse.draw2d.PositionConstants;
 import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.TimeObservationFloatingNameEditPart;
 
@@ -38,4 +39,14 @@ public class CustomTimeObservationFloatingNameEditPart extends TimeObservationFl
 	protected boolean getDefaultLabelDisplayedValue() {
 		return LABEL_DISPLAYED_VALUE;
 	}
+
+	/**
+	 * Gets the default text alignment.
+	 *
+	 * @return the default text alignment
+	 */
+	@Override
+	protected int getDefaultTextAlignment() {
+		return PositionConstants.LEFT;
+	}
 }
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/figure/node/AutomaticCompartmentLayoutManager.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/figure/node/AutomaticCompartmentLayoutManager.java
index bc3611a34d9..9baab5ce45e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/figure/node/AutomaticCompartmentLayoutManager.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/figure/node/AutomaticCompartmentLayoutManager.java
@@ -104,9 +104,12 @@ public class AutomaticCompartmentLayoutManager extends AbstractLayout {
 		}
 		if (!visibleCompartments.isEmpty()) {
 			for (Object o : container.getChildren()) {
-				IFigure child = (IFigure) o;
-				minimumHeight += child.getPreferredSize().height;
-				minimumWith = Math.max(minimumWith, child.getPreferredSize().width);
+				//only for child which are compartment
+				if (o instanceof ResizableCompartmentFigure) {
+					IFigure child = (IFigure) o;
+					minimumHeight += child.getPreferredSize().height;
+					minimumWith = Math.max(minimumWith, child.getPreferredSize().width);
+				}
 			}
 		} else {
 			for (IFigure child : visibleOthers) {
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.symbols/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.symbols/META-INF/MANIFEST.MF
index 3bff6385406..77a3988aece 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.symbols/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.symbols/META-INF/MANIFEST.MF
@@ -18,10 +18,7 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.papyrus.uml.diagram.common;bundle-version="1.1.0",
  org.eclipse.papyrus.uml.appearance;bundle-version="1.1.0",
  org.eclipse.papyrus.infra.emf;bundle-version="1.1.0",
- org.w3c.dom.svg;bundle-version="1.1.0",
- org.apache.batik.dom.svg,
- org.eclipse.gmf.runtime.notation.edit,
- org.eclipse.e4.ui.css.core
+ org.w3c.dom.svg;bundle-version="1.1.0"

 Bundle-Vendor: %Bundle-Vendor
 Bundle-ActivationPolicy: lazy
 Bundle-Version: 1.1.0.qualifier