Bug 483302 - [Composite] Show/Hide related links not working

 - "Show/Hide related links" for port connector fix
 - "Show/Hide related links" for property part connector fix

Change-Id: I32651dc1b96c5ff9543a5a22134f91751d6dd36a
Signed-off-by: ashatilov <shatilov@montages.com>
Signed-off-by: Benoit Maggi <benoit.maggi@cea.fr>

2 files changed, 104 insertions, 2 deletions

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/edit/policies/ShowHideRelatedLinkEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/edit/policies/ShowHideRelatedLinkEditPolicy.java
index 7a410253507..0783f2f3558 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/edit/policies/ShowHideRelatedLinkEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/edit/policies/ShowHideRelatedLinkEditPolicy.java
@@ -16,7 +16,7 @@ package org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies;
 import org.eclipse.papyrus.infra.gmfdiag.common.structure.DiagramStructure;
 import org.eclipse.papyrus.infra.gmfdiag.common.updater.DiagramUpdater;
 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AbstractUMLShowHideRelatedLinkEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLDiagramUpdater;
+import org.eclipse.papyrus.uml.diagram.composite.custom.parts.CompositeUMLDiagramUpdater;
 import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
 
 /**
@@ -42,7 +42,7 @@ public class ShowHideRelatedLinkEditPolicy extends AbstractUMLShowHideRelatedLin
 	 */
 	@Override
 	public DiagramUpdater getDiagramUpdater() {
-		return UMLDiagramUpdater.INSTANCE;
+		return CompositeUMLDiagramUpdater.INSTANCE;
 	}
 
 	/**
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/parts/CompositeUMLDiagramUpdater.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/parts/CompositeUMLDiagramUpdater.java
new file mode 100644
index 00000000000..991f0b94b38
--- /dev/null
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/parts/CompositeUMLDiagramUpdater.java
@@ -0,0 +1,102 @@
+/*****************************************************************************
+ * Copyright (c) 2016 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:
+ *  Benoit Maggi (CEA LIST) benoit.maggi@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.diagram.composite.custom.parts;
+
+import java.util.Collection;
+import java.util.LinkedList;
+import java.util.List;
+
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.gmf.runtime.emf.core.util.CrossReferenceAdapter;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConnectorEditPart;
+import org.eclipse.papyrus.uml.diagram.composite.part.UMLDiagramUpdater;
+import org.eclipse.papyrus.uml.diagram.composite.part.UMLLinkDescriptor;
+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
+import org.eclipse.uml2.uml.Connector;
+import org.eclipse.uml2.uml.ConnectorEnd;
+import org.eclipse.uml2.uml.Element;
+import org.eclipse.uml2.uml.Port;
+import org.eclipse.uml2.uml.Property;
+import org.eclipse.uml2.uml.UMLPackage;
+
+/**
+ * This class provides incoming links logic for port/connector and property/connector pairs
+ * 
+ * @see https://bugs.eclipse.org/bugs/show_bug.cgi?id=483302
+ */
+public class CompositeUMLDiagramUpdater extends UMLDiagramUpdater {
+
+	public static final CompositeUMLDiagramUpdater INSTANCE = new CompositeUMLDiagramUpdater();
+
+	private CompositeUMLDiagramUpdater() {
+		super();
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.uml.diagram.composite.part.UMLDiagramUpdater#getPort_Shape_IncomingLinks(org.eclipse.gmf.runtime.notation.View)
+	 *
+	 * @param view
+	 * @return
+	 */
+	@Override
+	public List<UMLLinkDescriptor> getPort_Shape_IncomingLinks(View view) {
+		Port modelElement = (Port) view.getElement();
+		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());
+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
+		result.addAll(super.getPort_Shape_IncomingLinks(view));
+		result.addAll(getIncomingFeatureModelFacetLinks_Connector_Edge(modelElement, crossReferencer));
+		return result;
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.uml.diagram.composite.part.UMLDiagramUpdater#getProperty_Shape_IncomingLinks(org.eclipse.gmf.runtime.notation.View)
+	 *
+	 * @param view
+	 * @return
+	 */
+	@Override
+	public List<UMLLinkDescriptor> getProperty_Shape_IncomingLinks(View view) {
+		Property modelElement = (Property) view.getElement();
+		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());
+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
+		result.addAll(super.getProperty_Shape_IncomingLinks(view));
+		result.addAll(getIncomingFeatureModelFacetLinks_Connector_Edge(modelElement, crossReferencer));
+		return result;
+	}
+
+	/**
+	 * @param target
+	 * @param crossReferencer
+	 * @return
+	 */
+	public Collection<UMLLinkDescriptor> getIncomingFeatureModelFacetLinks_Connector_Edge(Element target, CrossReferenceAdapter crossReferencer) {
+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
+		Collection<EStructuralFeature.Setting> settings = crossReferencer.getInverseReferences(target);
+		for (EStructuralFeature.Setting setting : settings) {
+			if (setting.getEStructuralFeature() != UMLPackage.eINSTANCE.getConnectorEnd_Role()) {
+				continue;
+			}
+			ConnectorEnd source = (ConnectorEnd) setting.getEObject();
+			Connector connector = (Connector) source.eContainer();
+			List<ConnectorEnd> ends = connector.getEnds();
+			if (ends == null || ends.size() != 2) {
+				continue;
+			}
+			result.add(new UMLLinkDescriptor(ends.get(0).getRole(), ends.get(1).getRole(), connector, UMLElementTypes.Connector_Edge, ConnectorEditPart.VISUAL_ID));
+		}
+		return result;
+	}
+}