Bug 489446: [Component Diagram] impossible to create port on component

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

Change-Id: I194b089630e18edb20b0517da7c491a25837e7f3

1 files changed, 13 insertions, 9 deletions

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/providers/InnerPortViewProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/providers/InnerPortViewProvider.java
index e6bc00b2352..1c66975a84b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/providers/InnerPortViewProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/providers/InnerPortViewProvider.java
@@ -41,10 +41,13 @@ public class InnerPortViewProvider extends CustomAbstractViewProvider implements
 	 */
 	@Override
 	protected boolean provides(CreateNodeViewOperation operation) {
-		String semanticHint = operation.getSemanticHint();
-		return BehaviorPortEditPart.VISUAL_ID.equals(semanticHint) || PortEditPart.VISUAL_ID.equals(semanticHint);
+		if (super.provides(operation)) {
+			String semanticHint = operation.getSemanticHint();
+			return BehaviorPortEditPart.VISUAL_ID.equals(semanticHint) || PortEditPart.VISUAL_ID.equals(semanticHint);
+		}
+		return false;
 	}
-	
+
 	/**
 	 * @see org.eclipse.papyrus.infra.gmfdiag.common.providers.CustomAbstractViewProvider#provides(org.eclipse.gmf.runtime.diagram.core.services.view.CreateEdgeViewOperation)
 	 *
@@ -67,10 +70,11 @@ public class InnerPortViewProvider extends CustomAbstractViewProvider implements
 	protected boolean provides(CreateViewForKindOperation op) {
 		return false;
 	}
-	
-	
+
+
 	/**
-	 * @see org.eclipse.papyrus.infra.gmfdiag.common.providers.CustomAbstractViewProvider#createNode(org.eclipse.core.runtime.IAdaptable, org.eclipse.gmf.runtime.notation.View, java.lang.String, int, boolean, org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint)
+	 * @see org.eclipse.papyrus.infra.gmfdiag.common.providers.CustomAbstractViewProvider#createNode(org.eclipse.core.runtime.IAdaptable, org.eclipse.gmf.runtime.notation.View, java.lang.String, int, boolean,
+	 *      org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint)
 	 *
 	 * @param semanticAdapter
 	 * @param containerView
@@ -84,13 +88,13 @@ public class InnerPortViewProvider extends CustomAbstractViewProvider implements
 	public Node createNode(IAdaptable semanticAdapter, View containerView, String semanticHint, int index, boolean persisted, PreferencesHint preferencesHint) {
 		final EObject domainElement = getSemanticElement(semanticAdapter);
 		final String visualID;
-		if(semanticHint == null) {
+		if (semanticHint == null) {
 			visualID = UMLVisualIDRegistry.getNodeVisualID(containerView, domainElement);
 		} else {
 			visualID = UMLVisualIDRegistry.getVisualID(semanticHint);
 		}
-		if(visualID != null) {
-			switch(visualID) {
+		if (visualID != null) {
+			switch (visualID) {
 			case BehaviorPortEditPart.VISUAL_ID:
 				return umlViewProvider.createPort_3121(domainElement, containerView, index, persisted, preferencesHint);
 			case PortEditPart.VISUAL_ID: