394893: [All Diagrams] Papyrus shall support symbols in the diagrams

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

Add support for Typed lifelines

4 files changed, 66 insertions, 10 deletions

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.symbols/plugin.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.symbols/plugin.xml
index 58627697f40..140d16d63b5 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.symbols/plugin.xml
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.symbols/plugin.xml
@@ -76,4 +76,16 @@
 		<Priority name="Low"/>

 	</editpolicyProvider>

 </extension>

+<extension

+      point="org.eclipse.papyrus.infra.gmfdiag.common.shapeProvider">

+   <shapeProvider

+         class="org.eclipse.papyrus.uml.diagram.symbols.provider.LifelineShapeProvider"

+         description="Provides the shapes based on the type of the element represented by the lifeline. Relies on TypedElementShapeProvider"

+         id="org.eclipse.papyrus.uml.diagram.symbols.lifelineshapeprovider"

+         name="Lifeline Shape Provider">

+      <Priority

+            name="Lowest">

+      </Priority>

+   </shapeProvider>

+</extension>

 </plugin>

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.symbols/src/org/eclipse/papyrus/uml/diagram/symbols/provider/LifelineShapeProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.symbols/src/org/eclipse/papyrus/uml/diagram/symbols/provider/LifelineShapeProvider.java
new file mode 100644
index 00000000000..275a396c3d8
--- /dev/null
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.symbols/src/org/eclipse/papyrus/uml/diagram/symbols/provider/LifelineShapeProvider.java
@@ -0,0 +1,52 @@
+/*****************************************************************************

+ * Copyright (c) 2013 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

+ *****************************************************************************/

+package org.eclipse.papyrus.uml.diagram.symbols.provider;

+

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.uml2.uml.ConnectableElement;

+import org.eclipse.uml2.uml.Lifeline;

+import org.eclipse.uml2.uml.Type;

+

+/**

+ * Shape Provider for lifeline. It is based on the Type of the TypedElement

+ * represented by the lifeline (if any)

+ * 

+ * @author Camille Letavernier

+ *

+ */

+public class LifelineShapeProvider extends TypedElementShapeProvider {

+

+	/**

+	 * {@inheritDoc}

+	 * 

+	 * The "type" of a Lifeline is the type of the ConnectableElement represented by the Lifeline

+	 */

+	@Override

+	protected Type getType(EObject view) {

+		if (!(view instanceof View)) {

+			return null;

+		}

+

+		Object element = ((View) view).getElement();

+		if (element instanceof Lifeline) {

+			Lifeline lifeline = (Lifeline)element;

+			ConnectableElement typedElement = lifeline.getRepresents();

+			if (typedElement != null) {

+				return typedElement.getType();

+			}

+		}

+

+		return null;

+	}

+

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.symbols/src/org/eclipse/papyrus/uml/diagram/symbols/provider/StereotypedElementShapeProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.symbols/src/org/eclipse/papyrus/uml/diagram/symbols/provider/StereotypedElementShapeProvider.java
index 938e421d447..8b8bf732480 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.symbols/src/org/eclipse/papyrus/uml/diagram/symbols/provider/StereotypedElementShapeProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.symbols/src/org/eclipse/papyrus/uml/diagram/symbols/provider/StereotypedElementShapeProvider.java
@@ -6,10 +6,8 @@ import java.util.ArrayList;
 import java.util.List;

 import java.util.StringTokenizer;

 

-import org.apache.batik.dom.svg.SAXSVGDocumentFactory;

 import org.apache.batik.dom.svg.SVGOMDocument;

 import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.util.URI;

 import org.eclipse.emf.ecore.EAnnotation;

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.emf.ecore.EcorePackage;

@@ -20,13 +18,13 @@ import org.eclipse.gmf.runtime.draw2d.ui.render.factory.RenderedImageFactory;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.papyrus.infra.gmfdiag.common.service.shape.AbstractShapeProvider;

 import org.eclipse.papyrus.infra.gmfdiag.common.service.shape.ProviderNotificationManager;

+import org.eclipse.papyrus.infra.gmfdiag.common.service.shape.ShapeService;

 import org.eclipse.papyrus.uml.appearance.helper.AppliedStereotypeHelper;

 import org.eclipse.papyrus.uml.appearance.helper.UMLVisualInformationPapyrusConstant;

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

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

 import org.eclipse.uml2.uml.Element;

 import org.eclipse.uml2.uml.Stereotype;

-import org.w3c.dom.Document;

 

 /**

  * This provider is linked to the {@link ShapeService}. It returns the shapes for a given element corresponding to the stereotypes applied on the

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.symbols/src/org/eclipse/papyrus/uml/diagram/symbols/provider/TypedElementShapeProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.symbols/src/org/eclipse/papyrus/uml/diagram/symbols/provider/TypedElementShapeProvider.java
index 6c9be478df0..b59dd2b48bf 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.symbols/src/org/eclipse/papyrus/uml/diagram/symbols/provider/TypedElementShapeProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.symbols/src/org/eclipse/papyrus/uml/diagram/symbols/provider/TypedElementShapeProvider.java
@@ -16,12 +16,9 @@ package org.eclipse.papyrus.uml.diagram.symbols.provider;
 import java.io.File;

 import java.net.MalformedURLException;

 import java.net.URL;

-import java.util.ArrayList;

 import java.util.Arrays;

 import java.util.List;

-import java.util.StringTokenizer;

 

-import org.apache.batik.dom.svg.SAXSVGDocumentFactory;

 import org.apache.batik.dom.svg.SVGOMDocument;

 import org.eclipse.emf.common.notify.Notification;

 import org.eclipse.emf.common.util.URI;

@@ -33,17 +30,14 @@ import org.eclipse.gmf.runtime.draw2d.ui.render.factory.RenderedImageFactory;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.papyrus.infra.gmfdiag.common.service.shape.AbstractShapeProvider;

 import org.eclipse.papyrus.infra.gmfdiag.common.service.shape.ProviderNotificationManager;

-import org.eclipse.papyrus.uml.appearance.helper.AppliedStereotypeHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.service.shape.ShapeService;

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

 import org.eclipse.papyrus.uml.diagram.symbols.IPapyrusInternalProfileConstants;

 import org.eclipse.papyrus.uml.tools.listeners.PapyrusStereotypeListener.StereotypeCustomNotification;

-import org.eclipse.papyrus.uml.tools.utils.ElementUtil;

-import org.eclipse.uml2.uml.Element;

 import org.eclipse.uml2.uml.Stereotype;

 import org.eclipse.uml2.uml.Type;

 import org.eclipse.uml2.uml.TypedElement;

 import org.eclipse.uml2.uml.UMLPackage;

-import org.w3c.dom.Document;

 

 /**

  * This provider is linked to the {@link ShapeService}. It returns the shapes for a given typed element corresponding to the stereotypes applied on