307880: [Composite Structure Diagram] Showing inherited parts and ports

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

4 files changed, 72 insertions, 315 deletions

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/DeleteElementAction.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/DeleteElementAction.java
index bfd1f49e568..2a977cf31bf 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/DeleteElementAction.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/DeleteElementAction.java
@@ -1,5 +1,4 @@
 package org.eclipse.papyrus.uml.diagram.composite.part;

 

-

 //This file is not used. 

 //The DeleteElementAction is removed from the plugin and replaced by DeleteFromModelAction in the plugin org.eclipse.diagram.common.

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/Messages.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/Messages.java
index 9308870c963..4d7bfa6b5a3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/Messages.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/Messages.java
@@ -726,21 +726,6 @@ public class Messages extends NLS {
 	/**

 	 * @generated

 	 */

-	public static String AbstractParser_UnexpectedValueType;

-

-	/**

-	 * @generated

-	 */

-	public static String AbstractParser_WrongStringConversion;

-

-	/**

-	 * @generated

-	 */

-	public static String AbstractParser_UnknownLiteral;

-

-	/**

-	 * @generated

-	 */

 	public static String MessageFormatParser_InvalidInputError;

 

 	/**

@@ -752,5 +737,4 @@ public class Messages extends NLS {
 	 * @generated

 	 */

 	public static String UMLModelingAssistantProviderMessage;

-	//TODO: put accessor fields manually	

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLDiagramUpdater.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLDiagramUpdater.java
index 125bee8cec5..60eec7567aa 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLDiagramUpdater.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLDiagramUpdater.java
@@ -1192,22 +1192,18 @@ public class UMLDiagramUpdater {
 		}

 		Activity modelElement = (Activity)containerView.getElement();

 		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for(Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

-			Property childElement = (Property)it.next();

+		for(Iterator<?> it = modelElement.getOwnedParameters().iterator(); it.hasNext();) {

+			Parameter childElement = (Parameter)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if(visualID == PortEditPart.VISUAL_ID) {

-				result.add(new UMLNodeDescriptor(childElement, visualID));

-				continue;

-			}

-			if(visualID == PropertyPartEditPartCN.VISUAL_ID) {

+			if(visualID == ParameterEditPart.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

 		}

-		for(Iterator<?> it = modelElement.getOwnedParameters().iterator(); it.hasNext();) {

-			Parameter childElement = (Parameter)it.next();

+		for(Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

+			Property childElement = (Property)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if(visualID == ParameterEditPart.VISUAL_ID) {

+			if(visualID == PropertyPartEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

@@ -1360,22 +1356,18 @@ public class UMLDiagramUpdater {
 		}

 		Interaction modelElement = (Interaction)containerView.getElement();

 		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for(Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

-			Property childElement = (Property)it.next();

+		for(Iterator<?> it = modelElement.getOwnedParameters().iterator(); it.hasNext();) {

+			Parameter childElement = (Parameter)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if(visualID == PortEditPart.VISUAL_ID) {

-				result.add(new UMLNodeDescriptor(childElement, visualID));

-				continue;

-			}

-			if(visualID == PropertyPartEditPartCN.VISUAL_ID) {

+			if(visualID == ParameterEditPart.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

 		}

-		for(Iterator<?> it = modelElement.getOwnedParameters().iterator(); it.hasNext();) {

-			Parameter childElement = (Parameter)it.next();

+		for(Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

+			Property childElement = (Property)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if(visualID == ParameterEditPart.VISUAL_ID) {

+			if(visualID == PropertyPartEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

@@ -1528,22 +1520,18 @@ public class UMLDiagramUpdater {
 		}

 		ProtocolStateMachine modelElement = (ProtocolStateMachine)containerView.getElement();

 		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for(Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

-			Property childElement = (Property)it.next();

+		for(Iterator<?> it = modelElement.getOwnedParameters().iterator(); it.hasNext();) {

+			Parameter childElement = (Parameter)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if(visualID == PortEditPart.VISUAL_ID) {

-				result.add(new UMLNodeDescriptor(childElement, visualID));

-				continue;

-			}

-			if(visualID == PropertyPartEditPartCN.VISUAL_ID) {

+			if(visualID == ParameterEditPart.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

 		}

-		for(Iterator<?> it = modelElement.getOwnedParameters().iterator(); it.hasNext();) {

-			Parameter childElement = (Parameter)it.next();

+		for(Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

+			Property childElement = (Property)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if(visualID == ParameterEditPart.VISUAL_ID) {

+			if(visualID == PropertyPartEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

@@ -1696,22 +1684,18 @@ public class UMLDiagramUpdater {
 		}

 		StateMachine modelElement = (StateMachine)containerView.getElement();

 		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for(Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

-			Property childElement = (Property)it.next();

+		for(Iterator<?> it = modelElement.getOwnedParameters().iterator(); it.hasNext();) {

+			Parameter childElement = (Parameter)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if(visualID == PortEditPart.VISUAL_ID) {

-				result.add(new UMLNodeDescriptor(childElement, visualID));

-				continue;

-			}

-			if(visualID == PropertyPartEditPartCN.VISUAL_ID) {

+			if(visualID == ParameterEditPart.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

 		}

-		for(Iterator<?> it = modelElement.getOwnedParameters().iterator(); it.hasNext();) {

-			Parameter childElement = (Parameter)it.next();

+		for(Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

+			Property childElement = (Property)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if(visualID == ParameterEditPart.VISUAL_ID) {

+			if(visualID == PropertyPartEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

@@ -1864,22 +1848,18 @@ public class UMLDiagramUpdater {
 		}

 		FunctionBehavior modelElement = (FunctionBehavior)containerView.getElement();

 		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for(Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

-			Property childElement = (Property)it.next();

+		for(Iterator<?> it = modelElement.getOwnedParameters().iterator(); it.hasNext();) {

+			Parameter childElement = (Parameter)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if(visualID == PortEditPart.VISUAL_ID) {

-				result.add(new UMLNodeDescriptor(childElement, visualID));

-				continue;

-			}

-			if(visualID == PropertyPartEditPartCN.VISUAL_ID) {

+			if(visualID == ParameterEditPart.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

 		}

-		for(Iterator<?> it = modelElement.getOwnedParameters().iterator(); it.hasNext();) {

-			Parameter childElement = (Parameter)it.next();

+		for(Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

+			Property childElement = (Property)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if(visualID == ParameterEditPart.VISUAL_ID) {

+			if(visualID == PropertyPartEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

@@ -2032,22 +2012,18 @@ public class UMLDiagramUpdater {
 		}

 		OpaqueBehavior modelElement = (OpaqueBehavior)containerView.getElement();

 		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for(Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

-			Property childElement = (Property)it.next();

+		for(Iterator<?> it = modelElement.getOwnedParameters().iterator(); it.hasNext();) {

+			Parameter childElement = (Parameter)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if(visualID == PortEditPart.VISUAL_ID) {

-				result.add(new UMLNodeDescriptor(childElement, visualID));

-				continue;

-			}

-			if(visualID == PropertyPartEditPartCN.VISUAL_ID) {

+			if(visualID == ParameterEditPart.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

 		}

-		for(Iterator<?> it = modelElement.getOwnedParameters().iterator(); it.hasNext();) {

-			Parameter childElement = (Parameter)it.next();

+		for(Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

+			Property childElement = (Property)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if(visualID == ParameterEditPart.VISUAL_ID) {

+			if(visualID == PropertyPartEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

@@ -2203,10 +2179,6 @@ public class UMLDiagramUpdater {
 		for(Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

 			Property childElement = (Property)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if(visualID == PortEditPart.VISUAL_ID) {

-				result.add(new UMLNodeDescriptor(childElement, visualID));

-				continue;

-			}

 			if(visualID == PropertyPartEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

@@ -2363,10 +2335,6 @@ public class UMLDiagramUpdater {
 		for(Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

 			Property childElement = (Property)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if(visualID == PortEditPart.VISUAL_ID) {

-				result.add(new UMLNodeDescriptor(childElement, visualID));

-				continue;

-			}

 			if(visualID == PropertyPartEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

@@ -2523,10 +2491,6 @@ public class UMLDiagramUpdater {
 		for(Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

 			Property childElement = (Property)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if(visualID == PortEditPart.VISUAL_ID) {

-				result.add(new UMLNodeDescriptor(childElement, visualID));

-				continue;

-			}

 			if(visualID == PropertyPartEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

@@ -2683,10 +2647,6 @@ public class UMLDiagramUpdater {
 		for(Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

 			Property childElement = (Property)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if(visualID == PortEditPart.VISUAL_ID) {

-				result.add(new UMLNodeDescriptor(childElement, visualID));

-				continue;

-			}

 			if(visualID == PropertyPartEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

@@ -2843,10 +2803,6 @@ public class UMLDiagramUpdater {
 		for(Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

 			Property childElement = (Property)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if(visualID == PortEditPart.VISUAL_ID) {

-				result.add(new UMLNodeDescriptor(childElement, visualID));

-				continue;

-			}

 			if(visualID == PropertyPartEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

@@ -3072,22 +3028,18 @@ public class UMLDiagramUpdater {
 		}

 		Activity modelElement = (Activity)containerView.getElement();

 		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for(Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

-			Property childElement = (Property)it.next();

+		for(Iterator<?> it = modelElement.getOwnedParameters().iterator(); it.hasNext();) {

+			Parameter childElement = (Parameter)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if(visualID == PortEditPart.VISUAL_ID) {

-				result.add(new UMLNodeDescriptor(childElement, visualID));

-				continue;

-			}

-			if(visualID == PropertyPartEditPartCN.VISUAL_ID) {

+			if(visualID == ParameterEditPart.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

 		}

-		for(Iterator<?> it = modelElement.getOwnedParameters().iterator(); it.hasNext();) {

-			Parameter childElement = (Parameter)it.next();

+		for(Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

+			Property childElement = (Property)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if(visualID == ParameterEditPart.VISUAL_ID) {

+			if(visualID == PropertyPartEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

@@ -3240,22 +3192,18 @@ public class UMLDiagramUpdater {
 		}

 		Interaction modelElement = (Interaction)containerView.getElement();

 		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for(Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

-			Property childElement = (Property)it.next();

+		for(Iterator<?> it = modelElement.getOwnedParameters().iterator(); it.hasNext();) {

+			Parameter childElement = (Parameter)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if(visualID == PortEditPart.VISUAL_ID) {

-				result.add(new UMLNodeDescriptor(childElement, visualID));

-				continue;

-			}

-			if(visualID == PropertyPartEditPartCN.VISUAL_ID) {

+			if(visualID == ParameterEditPart.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

 		}

-		for(Iterator<?> it = modelElement.getOwnedParameters().iterator(); it.hasNext();) {

-			Parameter childElement = (Parameter)it.next();

+		for(Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

+			Property childElement = (Property)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if(visualID == ParameterEditPart.VISUAL_ID) {

+			if(visualID == PropertyPartEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

@@ -3408,22 +3356,18 @@ public class UMLDiagramUpdater {
 		}

 		ProtocolStateMachine modelElement = (ProtocolStateMachine)containerView.getElement();

 		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for(Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

-			Property childElement = (Property)it.next();

+		for(Iterator<?> it = modelElement.getOwnedParameters().iterator(); it.hasNext();) {

+			Parameter childElement = (Parameter)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if(visualID == PortEditPart.VISUAL_ID) {

-				result.add(new UMLNodeDescriptor(childElement, visualID));

-				continue;

-			}

-			if(visualID == PropertyPartEditPartCN.VISUAL_ID) {

+			if(visualID == ParameterEditPart.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

 		}

-		for(Iterator<?> it = modelElement.getOwnedParameters().iterator(); it.hasNext();) {

-			Parameter childElement = (Parameter)it.next();

+		for(Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

+			Property childElement = (Property)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if(visualID == ParameterEditPart.VISUAL_ID) {

+			if(visualID == PropertyPartEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

@@ -3576,22 +3520,18 @@ public class UMLDiagramUpdater {
 		}

 		StateMachine modelElement = (StateMachine)containerView.getElement();

 		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for(Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

-			Property childElement = (Property)it.next();

+		for(Iterator<?> it = modelElement.getOwnedParameters().iterator(); it.hasNext();) {

+			Parameter childElement = (Parameter)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if(visualID == PortEditPart.VISUAL_ID) {

-				result.add(new UMLNodeDescriptor(childElement, visualID));

-				continue;

-			}

-			if(visualID == PropertyPartEditPartCN.VISUAL_ID) {

+			if(visualID == ParameterEditPart.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

 		}

-		for(Iterator<?> it = modelElement.getOwnedParameters().iterator(); it.hasNext();) {

-			Parameter childElement = (Parameter)it.next();

+		for(Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

+			Property childElement = (Property)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if(visualID == ParameterEditPart.VISUAL_ID) {

+			if(visualID == PropertyPartEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

@@ -3744,22 +3684,18 @@ public class UMLDiagramUpdater {
 		}

 		FunctionBehavior modelElement = (FunctionBehavior)containerView.getElement();

 		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for(Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

-			Property childElement = (Property)it.next();

+		for(Iterator<?> it = modelElement.getOwnedParameters().iterator(); it.hasNext();) {

+			Parameter childElement = (Parameter)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if(visualID == PortEditPart.VISUAL_ID) {

-				result.add(new UMLNodeDescriptor(childElement, visualID));

-				continue;

-			}

-			if(visualID == PropertyPartEditPartCN.VISUAL_ID) {

+			if(visualID == ParameterEditPart.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

 		}

-		for(Iterator<?> it = modelElement.getOwnedParameters().iterator(); it.hasNext();) {

-			Parameter childElement = (Parameter)it.next();

+		for(Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

+			Property childElement = (Property)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if(visualID == ParameterEditPart.VISUAL_ID) {

+			if(visualID == PropertyPartEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

@@ -3912,22 +3848,18 @@ public class UMLDiagramUpdater {
 		}

 		OpaqueBehavior modelElement = (OpaqueBehavior)containerView.getElement();

 		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for(Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

-			Property childElement = (Property)it.next();

+		for(Iterator<?> it = modelElement.getOwnedParameters().iterator(); it.hasNext();) {

+			Parameter childElement = (Parameter)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if(visualID == PortEditPart.VISUAL_ID) {

-				result.add(new UMLNodeDescriptor(childElement, visualID));

-				continue;

-			}

-			if(visualID == PropertyPartEditPartCN.VISUAL_ID) {

+			if(visualID == ParameterEditPart.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

 		}

-		for(Iterator<?> it = modelElement.getOwnedParameters().iterator(); it.hasNext();) {

-			Parameter childElement = (Parameter)it.next();

+		for(Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

+			Property childElement = (Property)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if(visualID == ParameterEditPart.VISUAL_ID) {

+			if(visualID == PropertyPartEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

@@ -4083,10 +4015,6 @@ public class UMLDiagramUpdater {
 		for(Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

 			Property childElement = (Property)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if(visualID == PortEditPart.VISUAL_ID) {

-				result.add(new UMLNodeDescriptor(childElement, visualID));

-				continue;

-			}

 			if(visualID == PropertyPartEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

@@ -4243,10 +4171,6 @@ public class UMLDiagramUpdater {
 		for(Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

 			Property childElement = (Property)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if(visualID == PortEditPart.VISUAL_ID) {

-				result.add(new UMLNodeDescriptor(childElement, visualID));

-				continue;

-			}

 			if(visualID == PropertyPartEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

@@ -4403,10 +4327,6 @@ public class UMLDiagramUpdater {
 		for(Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

 			Property childElement = (Property)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if(visualID == PortEditPart.VISUAL_ID) {

-				result.add(new UMLNodeDescriptor(childElement, visualID));

-				continue;

-			}

 			if(visualID == PropertyPartEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

@@ -4563,10 +4483,6 @@ public class UMLDiagramUpdater {
 		for(Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

 			Property childElement = (Property)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if(visualID == PortEditPart.VISUAL_ID) {

-				result.add(new UMLNodeDescriptor(childElement, visualID));

-				continue;

-			}

 			if(visualID == PropertyPartEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

@@ -4723,10 +4639,6 @@ public class UMLDiagramUpdater {
 		for(Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

 			Property childElement = (Property)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if(visualID == PortEditPart.VISUAL_ID) {

-				result.add(new UMLNodeDescriptor(childElement, visualID));

-				continue;

-			}

 			if(visualID == PropertyPartEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLVisualIDRegistry.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLVisualIDRegistry.java
index 16d70332c2d..1a043a81098 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLVisualIDRegistry.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLVisualIDRegistry.java
@@ -467,9 +467,6 @@ public class UMLVisualIDRegistry {
 			}

 			break;

 		case ActivityCompositeCompartmentEditPartCN.VISUAL_ID:

-			if(UMLPackage.eINSTANCE.getPort().isSuperTypeOf(domainElement.eClass())) {

-				return PortEditPart.VISUAL_ID;

-			}

 			if(UMLPackage.eINSTANCE.getParameter().isSuperTypeOf(domainElement.eClass())) {

 				return ParameterEditPart.VISUAL_ID;

 			}

@@ -565,9 +562,6 @@ public class UMLVisualIDRegistry {
 			}

 			break;

 		case InteractionCompositeCompartmentEditPartCN.VISUAL_ID:

-			if(UMLPackage.eINSTANCE.getPort().isSuperTypeOf(domainElement.eClass())) {

-				return PortEditPart.VISUAL_ID;

-			}

 			if(UMLPackage.eINSTANCE.getParameter().isSuperTypeOf(domainElement.eClass())) {

 				return ParameterEditPart.VISUAL_ID;

 			}

@@ -663,9 +657,6 @@ public class UMLVisualIDRegistry {
 			}

 			break;

 		case ProtocolStateMachineCompositeCompartmentEditPartCN.VISUAL_ID:

-			if(UMLPackage.eINSTANCE.getPort().isSuperTypeOf(domainElement.eClass())) {

-				return PortEditPart.VISUAL_ID;

-			}

 			if(UMLPackage.eINSTANCE.getParameter().isSuperTypeOf(domainElement.eClass())) {

 				return ParameterEditPart.VISUAL_ID;

 			}

@@ -761,9 +752,6 @@ public class UMLVisualIDRegistry {
 			}

 			break;

 		case StateMachineCompositeCompartmentEditPartCN.VISUAL_ID:

-			if(UMLPackage.eINSTANCE.getPort().isSuperTypeOf(domainElement.eClass())) {

-				return PortEditPart.VISUAL_ID;

-			}

 			if(UMLPackage.eINSTANCE.getParameter().isSuperTypeOf(domainElement.eClass())) {

 				return ParameterEditPart.VISUAL_ID;

 			}

@@ -859,9 +847,6 @@ public class UMLVisualIDRegistry {
 			}

 			break;

 		case FunctionBehaviorCompositeCompartmentEditPartCN.VISUAL_ID:

-			if(UMLPackage.eINSTANCE.getPort().isSuperTypeOf(domainElement.eClass())) {

-				return PortEditPart.VISUAL_ID;

-			}

 			if(UMLPackage.eINSTANCE.getParameter().isSuperTypeOf(domainElement.eClass())) {

 				return ParameterEditPart.VISUAL_ID;

 			}

@@ -957,9 +942,6 @@ public class UMLVisualIDRegistry {
 			}

 			break;

 		case OpaqueBehaviorCompositeCompartmentEditPartCN.VISUAL_ID:

-			if(UMLPackage.eINSTANCE.getPort().isSuperTypeOf(domainElement.eClass())) {

-				return PortEditPart.VISUAL_ID;

-			}

 			if(UMLPackage.eINSTANCE.getParameter().isSuperTypeOf(domainElement.eClass())) {

 				return ParameterEditPart.VISUAL_ID;

 			}

@@ -1055,9 +1037,6 @@ public class UMLVisualIDRegistry {
 			}

 			break;

 		case ComponentCompositeCompartmentEditPartCN.VISUAL_ID:

-			if(UMLPackage.eINSTANCE.getPort().isSuperTypeOf(domainElement.eClass())) {

-				return PortEditPart.VISUAL_ID;

-			}

 			if(UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass()) && isProperty_3070(containerView, (Property)domainElement)) {

 				return PropertyPartEditPartCN.VISUAL_ID;

 			}

@@ -1150,9 +1129,6 @@ public class UMLVisualIDRegistry {
 			}

 			break;

 		case DeviceCompositeCompartmentEditPartCN.VISUAL_ID:

-			if(UMLPackage.eINSTANCE.getPort().isSuperTypeOf(domainElement.eClass())) {

-				return PortEditPart.VISUAL_ID;

-			}

 			if(UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass()) && isProperty_3070(containerView, (Property)domainElement)) {

 				return PropertyPartEditPartCN.VISUAL_ID;

 			}

@@ -1245,9 +1221,6 @@ public class UMLVisualIDRegistry {
 			}

 			break;

 		case ExecutionEnvironmentCompositeCompartmentEditPartCN.VISUAL_ID:

-			if(UMLPackage.eINSTANCE.getPort().isSuperTypeOf(domainElement.eClass())) {

-				return PortEditPart.VISUAL_ID;

-			}

 			if(UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass()) && isProperty_3070(containerView, (Property)domainElement)) {

 				return PropertyPartEditPartCN.VISUAL_ID;

 			}

@@ -1340,9 +1313,6 @@ public class UMLVisualIDRegistry {
 			}

 			break;

 		case NodeCompositeCompartmentEditPartCN.VISUAL_ID:

-			if(UMLPackage.eINSTANCE.getPort().isSuperTypeOf(domainElement.eClass())) {

-				return PortEditPart.VISUAL_ID;

-			}

 			if(UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass()) && isProperty_3070(containerView, (Property)domainElement)) {

 				return PropertyPartEditPartCN.VISUAL_ID;

 			}

@@ -1435,9 +1405,6 @@ public class UMLVisualIDRegistry {
 			}

 			break;

 		case ClassCompositeCompartmentEditPartCN.VISUAL_ID:

-			if(UMLPackage.eINSTANCE.getPort().isSuperTypeOf(domainElement.eClass())) {

-				return PortEditPart.VISUAL_ID;

-			}

 			if(UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass()) && isProperty_3070(containerView, (Property)domainElement)) {

 				return PropertyPartEditPartCN.VISUAL_ID;

 			}

@@ -1559,9 +1526,6 @@ public class UMLVisualIDRegistry {
 			}

 			break;

 		case ActivityCompositeCompartmentEditPart.VISUAL_ID:

-			if(UMLPackage.eINSTANCE.getPort().isSuperTypeOf(domainElement.eClass())) {

-				return PortEditPart.VISUAL_ID;

-			}

 			if(UMLPackage.eINSTANCE.getParameter().isSuperTypeOf(domainElement.eClass())) {

 				return ParameterEditPart.VISUAL_ID;

 			}

@@ -1657,9 +1621,6 @@ public class UMLVisualIDRegistry {
 			}

 			break;

 		case InteractionCompositeCompartmentEditPart.VISUAL_ID:

-			if(UMLPackage.eINSTANCE.getPort().isSuperTypeOf(domainElement.eClass())) {

-				return PortEditPart.VISUAL_ID;

-			}

 			if(UMLPackage.eINSTANCE.getParameter().isSuperTypeOf(domainElement.eClass())) {

 				return ParameterEditPart.VISUAL_ID;

 			}

@@ -1755,9 +1716,6 @@ public class UMLVisualIDRegistry {
 			}

 			break;

 		case ProtocolStateMachineCompositeCompartmentEditPart.VISUAL_ID:

-			if(UMLPackage.eINSTANCE.getPort().isSuperTypeOf(domainElement.eClass())) {

-				return PortEditPart.VISUAL_ID;

-			}

 			if(UMLPackage.eINSTANCE.getParameter().isSuperTypeOf(domainElement.eClass())) {

 				return ParameterEditPart.VISUAL_ID;

 			}

@@ -1853,9 +1811,6 @@ public class UMLVisualIDRegistry {
 			}

 			break;

 		case StateMachineCompositeCompartmentEditPart.VISUAL_ID:

-			if(UMLPackage.eINSTANCE.getPort().isSuperTypeOf(domainElement.eClass())) {

-				return PortEditPart.VISUAL_ID;

-			}

 			if(UMLPackage.eINSTANCE.getParameter().isSuperTypeOf(domainElement.eClass())) {

 				return ParameterEditPart.VISUAL_ID;

 			}

@@ -1951,9 +1906,6 @@ public class UMLVisualIDRegistry {
 			}

 			break;

 		case FunctionBehaviorCompositeCompartmentEditPart.VISUAL_ID:

-			if(UMLPackage.eINSTANCE.getPort().isSuperTypeOf(domainElement.eClass())) {

-				return PortEditPart.VISUAL_ID;

-			}

 			if(UMLPackage.eINSTANCE.getParameter().isSuperTypeOf(domainElement.eClass())) {

 				return ParameterEditPart.VISUAL_ID;

 			}

@@ -2049,9 +2001,6 @@ public class UMLVisualIDRegistry {
 			}

 			break;

 		case OpaqueBehaviorCompositeCompartmentEditPart.VISUAL_ID:

-			if(UMLPackage.eINSTANCE.getPort().isSuperTypeOf(domainElement.eClass())) {

-				return PortEditPart.VISUAL_ID;

-			}

 			if(UMLPackage.eINSTANCE.getParameter().isSuperTypeOf(domainElement.eClass())) {

 				return ParameterEditPart.VISUAL_ID;

 			}

@@ -2147,9 +2096,6 @@ public class UMLVisualIDRegistry {
 			}

 			break;

 		case ComponentCompositeCompartmentEditPart.VISUAL_ID:

-			if(UMLPackage.eINSTANCE.getPort().isSuperTypeOf(domainElement.eClass())) {

-				return PortEditPart.VISUAL_ID;

-			}

 			if(UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass()) && isProperty_3070(containerView, (Property)domainElement)) {

 				return PropertyPartEditPartCN.VISUAL_ID;

 			}

@@ -2242,9 +2188,6 @@ public class UMLVisualIDRegistry {
 			}

 			break;

 		case DeviceCompositeCompartmentEditPart.VISUAL_ID:

-			if(UMLPackage.eINSTANCE.getPort().isSuperTypeOf(domainElement.eClass())) {

-				return PortEditPart.VISUAL_ID;

-			}

 			if(UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass()) && isProperty_3070(containerView, (Property)domainElement)) {

 				return PropertyPartEditPartCN.VISUAL_ID;

 			}

@@ -2337,9 +2280,6 @@ public class UMLVisualIDRegistry {
 			}

 			break;

 		case ExecutionEnvironmentCompositeCompartmentEditPart.VISUAL_ID:

-			if(UMLPackage.eINSTANCE.getPort().isSuperTypeOf(domainElement.eClass())) {

-				return PortEditPart.VISUAL_ID;

-			}

 			if(UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass()) && isProperty_3070(containerView, (Property)domainElement)) {

 				return PropertyPartEditPartCN.VISUAL_ID;

 			}

@@ -2432,9 +2372,6 @@ public class UMLVisualIDRegistry {
 			}

 			break;

 		case NodeCompositeCompartmentEditPart.VISUAL_ID:

-			if(UMLPackage.eINSTANCE.getPort().isSuperTypeOf(domainElement.eClass())) {

-				return PortEditPart.VISUAL_ID;

-			}

 			if(UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass()) && isProperty_3070(containerView, (Property)domainElement)) {

 				return PropertyPartEditPartCN.VISUAL_ID;

 			}

@@ -2527,9 +2464,6 @@ public class UMLVisualIDRegistry {
 			}

 			break;

 		case ClassCompositeCompartmentEditPart.VISUAL_ID:

-			if(UMLPackage.eINSTANCE.getPort().isSuperTypeOf(domainElement.eClass())) {

-				return PortEditPart.VISUAL_ID;

-			}

 			if(UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass()) && isProperty_3070(containerView, (Property)domainElement)) {

 				return PropertyPartEditPartCN.VISUAL_ID;

 			}

@@ -2651,9 +2585,6 @@ public class UMLVisualIDRegistry {
 			}

 			break;

 		case PropertyPartCompartmentEditPartCN.VISUAL_ID:

-			if(UMLPackage.eINSTANCE.getPort().isSuperTypeOf(domainElement.eClass())) {

-				return PortEditPart.VISUAL_ID;

-			}

 			if(UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass()) && isProperty_3070(containerView, (Property)domainElement)) {

 				return PropertyPartEditPartCN.VISUAL_ID;

 			}

@@ -3520,9 +3451,6 @@ public class UMLVisualIDRegistry {
 			}

 			break;

 		case ActivityCompositeCompartmentEditPartCN.VISUAL_ID:

-			if(PortEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

 			if(ParameterEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

@@ -3618,9 +3546,6 @@ public class UMLVisualIDRegistry {
 			}

 			break;

 		case InteractionCompositeCompartmentEditPartCN.VISUAL_ID:

-			if(PortEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

 			if(ParameterEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

@@ -3716,9 +3641,6 @@ public class UMLVisualIDRegistry {
 			}

 			break;

 		case ProtocolStateMachineCompositeCompartmentEditPartCN.VISUAL_ID:

-			if(PortEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

 			if(ParameterEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

@@ -3814,9 +3736,6 @@ public class UMLVisualIDRegistry {
 			}

 			break;

 		case StateMachineCompositeCompartmentEditPartCN.VISUAL_ID:

-			if(PortEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

 			if(ParameterEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

@@ -3912,9 +3831,6 @@ public class UMLVisualIDRegistry {
 			}

 			break;

 		case FunctionBehaviorCompositeCompartmentEditPartCN.VISUAL_ID:

-			if(PortEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

 			if(ParameterEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

@@ -4010,9 +3926,6 @@ public class UMLVisualIDRegistry {
 			}

 			break;

 		case OpaqueBehaviorCompositeCompartmentEditPartCN.VISUAL_ID:

-			if(PortEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

 			if(ParameterEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

@@ -4108,9 +4021,6 @@ public class UMLVisualIDRegistry {
 			}

 			break;

 		case ComponentCompositeCompartmentEditPartCN.VISUAL_ID:

-			if(PortEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

 			if(PropertyPartEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

@@ -4203,9 +4113,6 @@ public class UMLVisualIDRegistry {
 			}

 			break;

 		case DeviceCompositeCompartmentEditPartCN.VISUAL_ID:

-			if(PortEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

 			if(PropertyPartEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

@@ -4298,9 +4205,6 @@ public class UMLVisualIDRegistry {
 			}

 			break;

 		case ExecutionEnvironmentCompositeCompartmentEditPartCN.VISUAL_ID:

-			if(PortEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

 			if(PropertyPartEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

@@ -4393,9 +4297,6 @@ public class UMLVisualIDRegistry {
 			}

 			break;

 		case NodeCompositeCompartmentEditPartCN.VISUAL_ID:

-			if(PortEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

 			if(PropertyPartEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

@@ -4488,9 +4389,6 @@ public class UMLVisualIDRegistry {
 			}

 			break;

 		case ClassCompositeCompartmentEditPartCN.VISUAL_ID:

-			if(PortEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

 			if(PropertyPartEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

@@ -4615,9 +4513,6 @@ public class UMLVisualIDRegistry {
 			}

 			break;

 		case ActivityCompositeCompartmentEditPart.VISUAL_ID:

-			if(PortEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

 			if(ParameterEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

@@ -4713,9 +4608,6 @@ public class UMLVisualIDRegistry {
 			}

 			break;

 		case InteractionCompositeCompartmentEditPart.VISUAL_ID:

-			if(PortEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

 			if(ParameterEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

@@ -4811,9 +4703,6 @@ public class UMLVisualIDRegistry {
 			}

 			break;

 		case ProtocolStateMachineCompositeCompartmentEditPart.VISUAL_ID:

-			if(PortEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

 			if(ParameterEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

@@ -4909,9 +4798,6 @@ public class UMLVisualIDRegistry {
 			}

 			break;

 		case StateMachineCompositeCompartmentEditPart.VISUAL_ID:

-			if(PortEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

 			if(ParameterEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

@@ -5007,9 +4893,6 @@ public class UMLVisualIDRegistry {
 			}

 			break;

 		case FunctionBehaviorCompositeCompartmentEditPart.VISUAL_ID:

-			if(PortEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

 			if(ParameterEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

@@ -5105,9 +4988,6 @@ public class UMLVisualIDRegistry {
 			}

 			break;

 		case OpaqueBehaviorCompositeCompartmentEditPart.VISUAL_ID:

-			if(PortEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

 			if(ParameterEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

@@ -5203,9 +5083,6 @@ public class UMLVisualIDRegistry {
 			}

 			break;

 		case ComponentCompositeCompartmentEditPart.VISUAL_ID:

-			if(PortEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

 			if(PropertyPartEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

@@ -5298,9 +5175,6 @@ public class UMLVisualIDRegistry {
 			}

 			break;

 		case DeviceCompositeCompartmentEditPart.VISUAL_ID:

-			if(PortEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

 			if(PropertyPartEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

@@ -5393,9 +5267,6 @@ public class UMLVisualIDRegistry {
 			}

 			break;

 		case ExecutionEnvironmentCompositeCompartmentEditPart.VISUAL_ID:

-			if(PortEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

 			if(PropertyPartEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

@@ -5488,9 +5359,6 @@ public class UMLVisualIDRegistry {
 			}

 			break;

 		case NodeCompositeCompartmentEditPart.VISUAL_ID:

-			if(PortEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

 			if(PropertyPartEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

@@ -5583,9 +5451,6 @@ public class UMLVisualIDRegistry {
 			}

 			break;

 		case ClassCompositeCompartmentEditPart.VISUAL_ID:

-			if(PortEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

 			if(PropertyPartEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

@@ -5707,9 +5572,6 @@ public class UMLVisualIDRegistry {
 			}

 			break;

 		case PropertyPartCompartmentEditPartCN.VISUAL_ID:

-			if(PortEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

 			if(PropertyPartEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}