diff options
Diffstat (limited to 'plugins/org.eclipse.uml2.uml/src')
28 files changed, 623 insertions, 423 deletions
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/Action.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/Action.java index 5b5b31c1..69e0093a 100644 --- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/Action.java +++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/Action.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2007 IBM Corporation and others. + * Copyright (c) 2005, 2008 IBM Corporation, Embarcadero Technologies, and others. * 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 @@ -7,8 +7,9 @@ * * Contributors: * IBM - initial API and implementation + * Kenn Hussey (Embarcadero Technologies) - 205188 * - * $Id: Action.java,v 1.14 2007/10/23 15:54:20 jbruck Exp $ + * $Id: Action.java,v 1.15 2008/01/09 18:56:02 khussey Exp $ */ package org.eclipse.uml2.uml; @@ -54,7 +55,7 @@ public interface Action * <li>'{@link org.eclipse.uml2.uml.Element#getOwnedElements() <em>Owned Element</em>}'</li> * </ul> * </p> - * This feature is a derived union. + * This feature is a derived union. * <!-- begin-user-doc --> * <!-- end-user-doc --> * <!-- begin-model-doc --> @@ -101,7 +102,7 @@ public interface Action * <li>'{@link org.eclipse.uml2.uml.Element#getOwnedElements() <em>Owned Element</em>}'</li> * </ul> * </p> - * This feature is a derived union. + * This feature is a derived union. * <!-- begin-user-doc --> * <!-- end-user-doc --> * <!-- begin-model-doc --> diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/ActivityEdge.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/ActivityEdge.java index 9bbb4816..fd613aed 100644 --- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/ActivityEdge.java +++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/ActivityEdge.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2007 IBM Corporation and others. + * Copyright (c) 2005, 2008 IBM Corporation, Embarcadero Technologies, and others. * 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 @@ -7,8 +7,9 @@ * * Contributors: * IBM - initial API and implementation + * Kenn Hussey (Embarcadero Technologies) - 205188 * - * $Id: ActivityEdge.java,v 1.18 2007/10/23 15:54:21 jbruck Exp $ + * $Id: ActivityEdge.java,v 1.19 2008/01/09 18:56:02 khussey Exp $ */ package org.eclipse.uml2.uml; @@ -90,7 +91,7 @@ public interface ActivityEdge * Returns the value of the '<em><b>In Group</b></em>' reference list. * The list contents are of type {@link org.eclipse.uml2.uml.ActivityGroup}. * It is bidirectional and its opposite is '{@link org.eclipse.uml2.uml.ActivityGroup#getContainedEdges <em>Contained Edge</em>}'. - * This feature is a derived union. + * This feature is a derived union. * <!-- begin-user-doc --> * <!-- end-user-doc --> * <!-- begin-model-doc --> diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/ActivityGroup.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/ActivityGroup.java index bad04779..fb4b6d16 100644 --- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/ActivityGroup.java +++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/ActivityGroup.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2007 IBM Corporation and others. + * Copyright (c) 2005, 2008 IBM Corporation, Embarcadero Technologies, and others. * 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 @@ -7,8 +7,9 @@ * * Contributors: * IBM - initial API and implementation + * Kenn Hussey (Embarcadero Technologies) - 205188 * - * $Id: ActivityGroup.java,v 1.16 2007/10/23 15:54:21 jbruck Exp $ + * $Id: ActivityGroup.java,v 1.17 2008/01/09 18:56:03 khussey Exp $ */ package org.eclipse.uml2.uml; @@ -57,7 +58,7 @@ public interface ActivityGroup * <li>'{@link org.eclipse.uml2.uml.Element#getOwnedElements() <em>Owned Element</em>}'</li> * </ul> * </p> - * This feature is a derived union. + * This feature is a derived union. * <!-- begin-user-doc --> * <!-- end-user-doc --> * <!-- begin-model-doc --> @@ -80,7 +81,7 @@ public interface ActivityGroup * <li>'{@link org.eclipse.uml2.uml.Element#getOwner() <em>Owner</em>}'</li> * </ul> * </p> - * This feature is a derived union. + * This feature is a derived union. * <!-- begin-user-doc --> * <!-- end-user-doc --> * <!-- begin-model-doc --> @@ -98,7 +99,7 @@ public interface ActivityGroup * Returns the value of the '<em><b>Contained Node</b></em>' reference list. * The list contents are of type {@link org.eclipse.uml2.uml.ActivityNode}. * It is bidirectional and its opposite is '{@link org.eclipse.uml2.uml.ActivityNode#getInGroups <em>In Group</em>}'. - * This feature is a derived union. + * This feature is a derived union. * <!-- begin-user-doc --> * <!-- end-user-doc --> * <!-- begin-model-doc --> @@ -173,7 +174,7 @@ public interface ActivityGroup * Returns the value of the '<em><b>Contained Edge</b></em>' reference list. * The list contents are of type {@link org.eclipse.uml2.uml.ActivityEdge}. * It is bidirectional and its opposite is '{@link org.eclipse.uml2.uml.ActivityEdge#getInGroups <em>In Group</em>}'. - * This feature is a derived union. + * This feature is a derived union. * <!-- begin-user-doc --> * <!-- end-user-doc --> * <!-- begin-model-doc --> diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/ActivityNode.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/ActivityNode.java index 8f4b7c53..ee4ab2c2 100644 --- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/ActivityNode.java +++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/ActivityNode.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2007 IBM Corporation and others. + * Copyright (c) 2005, 2008 IBM Corporation, Embarcadero Technologies, and others. * 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 @@ -7,8 +7,9 @@ * * Contributors: * IBM - initial API and implementation + * Kenn Hussey (Embarcadero Technologies) - 205188 * - * $Id: ActivityNode.java,v 1.15 2007/10/23 15:54:22 jbruck Exp $ + * $Id: ActivityNode.java,v 1.16 2008/01/09 18:56:02 khussey Exp $ */ package org.eclipse.uml2.uml; @@ -95,7 +96,7 @@ public interface ActivityNode * Returns the value of the '<em><b>In Group</b></em>' reference list. * The list contents are of type {@link org.eclipse.uml2.uml.ActivityGroup}. * It is bidirectional and its opposite is '{@link org.eclipse.uml2.uml.ActivityGroup#getContainedNodes <em>Contained Node</em>}'. - * This feature is a derived union. + * This feature is a derived union. * <!-- begin-user-doc --> * <!-- end-user-doc --> * <!-- begin-model-doc --> diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/Class.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/Class.java index b936ac17..f74a186b 100644 --- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/Class.java +++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/Class.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2007 IBM Corporation and others. + * Copyright (c) 2005, 2008 IBM Corporation, Embarcadero Technologies, and others. * 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 @@ -7,8 +7,9 @@ * * Contributors: * IBM - initial API and implementation + * Kenn Hussey (Embarcadero Technologies) - 205188 * - * $Id: Class.java,v 1.17 2007/10/23 15:54:21 jbruck Exp $ + * $Id: Class.java,v 1.18 2008/01/09 18:56:03 khussey Exp $ */ package org.eclipse.uml2.uml; @@ -187,7 +188,7 @@ public interface Class * <ul> * <li>'{@link org.eclipse.uml2.uml.Classifier#getGenerals() <em>General</em>}'</li> * </ul> - * </p> + * </p> * <!-- begin-user-doc --> * <!-- end-user-doc --> * <!-- begin-model-doc --> diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/Classifier.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/Classifier.java index 42e36efb..57215a19 100644 --- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/Classifier.java +++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/Classifier.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2007 IBM Corporation and others. + * Copyright (c) 2005, 2008 IBM Corporation, Embarcadero Technologies, and others. * 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 @@ -7,8 +7,9 @@ * * Contributors: * IBM - initial API and implementation + * Kenn Hussey (Embarcadero Technologies) - 205188 * - * $Id: Classifier.java,v 1.23 2007/10/23 15:54:21 jbruck Exp $ + * $Id: Classifier.java,v 1.24 2008/01/09 18:56:02 khussey Exp $ */ package org.eclipse.uml2.uml; @@ -158,7 +159,7 @@ public interface Classifier * <li>'{@link org.eclipse.uml2.uml.Namespace#getMembers() <em>Member</em>}'</li> * </ul> * </p> - * This feature is a derived union. + * This feature is a derived union. * <!-- begin-user-doc --> * <!-- end-user-doc --> * <!-- begin-model-doc --> @@ -498,7 +499,7 @@ public interface Classifier * <li>'{@link org.eclipse.uml2.uml.Classifier#getFeatures() <em>Feature</em>}'</li> * </ul> * </p> - * This feature is a derived union. + * This feature is a derived union. * <!-- begin-user-doc --> * <!-- end-user-doc --> * <!-- begin-model-doc --> diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/Component.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/Component.java index 33f8582b..a0b05e54 100644 --- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/Component.java +++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/Component.java @@ -8,7 +8,7 @@ * Contributors: * IBM - initial API and implementation * - * $Id: Component.java,v 1.23 2007/10/23 15:54:21 jbruck Exp $ + * $Id: Component.java,v 1.24 2008/01/09 18:56:02 khussey Exp $ */ package org.eclipse.uml2.uml; @@ -42,7 +42,7 @@ import org.eclipse.emf.ecore.EClass; * @generated */ public interface Component - extends org.eclipse.uml2.uml.Class, Namespace { + extends org.eclipse.uml2.uml.Class { /** * Returns the value of the '<em><b>Is Indirectly Instantiated</b></em>' attribute. diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/DirectedRelationship.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/DirectedRelationship.java index 9e0a445a..098b0e52 100644 --- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/DirectedRelationship.java +++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/DirectedRelationship.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2007 IBM Corporation and others. + * Copyright (c) 2005, 2008 IBM Corporation, Embarcadero Technologies, and others. * 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 @@ -7,8 +7,9 @@ * * Contributors: * IBM - initial API and implementation + * Kenn Hussey (Embarcadero Technologies) - 205188 * - * $Id: DirectedRelationship.java,v 1.7 2007/10/23 15:54:22 jbruck Exp $ + * $Id: DirectedRelationship.java,v 1.8 2008/01/09 18:56:03 khussey Exp $ */ package org.eclipse.uml2.uml; @@ -47,7 +48,7 @@ public interface DirectedRelationship * <li>'{@link org.eclipse.uml2.uml.Relationship#getRelatedElements() <em>Related Element</em>}'</li> * </ul> * </p> - * This feature is a derived union. + * This feature is a derived union. * <!-- begin-user-doc --> * <!-- end-user-doc --> * <!-- begin-model-doc --> @@ -69,7 +70,7 @@ public interface DirectedRelationship * <li>'{@link org.eclipse.uml2.uml.Relationship#getRelatedElements() <em>Related Element</em>}'</li> * </ul> * </p> - * This feature is a derived union. + * This feature is a derived union. * <!-- begin-user-doc --> * <!-- end-user-doc --> * <!-- begin-model-doc --> diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/Element.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/Element.java index b2fc17b6..44fe8ef6 100644 --- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/Element.java +++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/Element.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2007 IBM Corporation and others. + * Copyright (c) 2005, 2008 IBM Corporation, Embarcadero Technologies, and others. * 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 @@ -7,8 +7,9 @@ * * Contributors: * IBM - initial API and implementation + * Kenn Hussey (Embarcadero Technologies) - 205188 * - * $Id: Element.java,v 1.19 2007/10/23 15:54:22 jbruck Exp $ + * $Id: Element.java,v 1.20 2008/01/09 18:56:03 khussey Exp $ */ package org.eclipse.uml2.uml; @@ -52,7 +53,7 @@ public interface Element * Returns the value of the '<em><b>Owned Element</b></em>' reference list. * The list contents are of type {@link org.eclipse.uml2.uml.Element}. * It is bidirectional and its opposite is '{@link org.eclipse.uml2.uml.Element#getOwner <em>Owner</em>}'. - * This feature is a derived union. + * This feature is a derived union. * <!-- begin-user-doc --> * <!-- end-user-doc --> * <!-- begin-model-doc --> @@ -69,7 +70,7 @@ public interface Element /** * Returns the value of the '<em><b>Owner</b></em>' reference. * It is bidirectional and its opposite is '{@link org.eclipse.uml2.uml.Element#getOwnedElements <em>Owned Element</em>}'. - * This feature is a derived union. + * This feature is a derived union. * <!-- begin-user-doc --> * <!-- end-user-doc --> * <!-- begin-model-doc --> diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/Feature.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/Feature.java index ed2dbea9..73e09e8c 100644 --- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/Feature.java +++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/Feature.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2007 IBM Corporation and others. + * Copyright (c) 2005, 2008 IBM Corporation, Embarcadero Technologies, and others. * 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 @@ -7,8 +7,9 @@ * * Contributors: * IBM - initial API and implementation + * Kenn Hussey (Embarcadero Technologies) - 205188 * - * $Id: Feature.java,v 1.11 2007/10/23 15:54:22 jbruck Exp $ + * $Id: Feature.java,v 1.12 2008/01/09 18:56:02 khussey Exp $ */ package org.eclipse.uml2.uml; @@ -70,7 +71,7 @@ public interface Feature * Returns the value of the '<em><b>Featuring Classifier</b></em>' reference list. * The list contents are of type {@link org.eclipse.uml2.uml.Classifier}. * It is bidirectional and its opposite is '{@link org.eclipse.uml2.uml.Classifier#getFeatures <em>Feature</em>}'. - * This feature is a derived union. + * This feature is a derived union. * <!-- begin-user-doc --> * <!-- end-user-doc --> * <!-- begin-model-doc --> diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/NamedElement.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/NamedElement.java index f0866820..9d340771 100644 --- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/NamedElement.java +++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/NamedElement.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2007 IBM Corporation and others. + * Copyright (c) 2005, 2008 IBM Corporation, Embarcadero Technologies, and others. * 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 @@ -7,8 +7,9 @@ * * Contributors: * IBM - initial API and implementation + * Kenn Hussey (Embarcadero Technologies) - 205188 * - * $Id: NamedElement.java,v 1.20 2007/10/23 15:54:22 jbruck Exp $ + * $Id: NamedElement.java,v 1.21 2008/01/09 18:56:03 khussey Exp $ */ package org.eclipse.uml2.uml; @@ -221,7 +222,7 @@ public interface NamedElement * <li>'{@link org.eclipse.uml2.uml.Element#getOwner() <em>Owner</em>}'</li> * </ul> * </p> - * This feature is a derived union. + * This feature is a derived union. * <!-- begin-user-doc --> * <!-- end-user-doc --> * <!-- begin-model-doc --> diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/Namespace.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/Namespace.java index 54f55e69..dc540cf5 100644 --- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/Namespace.java +++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/Namespace.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2007 IBM Corporation and others. + * Copyright (c) 2005, 2008 IBM Corporation, Embarcadero Technologies, and others. * 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 @@ -7,8 +7,9 @@ * * Contributors: * IBM - initial API and implementation + * Kenn Hussey (Embarcadero Technologies) - 205188 * - * $Id: Namespace.java,v 1.15 2007/10/23 15:54:22 jbruck Exp $ + * $Id: Namespace.java,v 1.16 2008/01/09 18:56:03 khussey Exp $ */ package org.eclipse.uml2.uml; @@ -240,7 +241,7 @@ public interface Namespace /** * Returns the value of the '<em><b>Member</b></em>' reference list. * The list contents are of type {@link org.eclipse.uml2.uml.NamedElement}. - * This feature is a derived union. + * This feature is a derived union. * <!-- begin-user-doc --> * <!-- end-user-doc --> * <!-- begin-model-doc --> @@ -334,7 +335,7 @@ public interface Namespace * <li>'{@link org.eclipse.uml2.uml.Element#getOwnedElements() <em>Owned Element</em>}'</li> * </ul> * </p> - * This feature is a derived union. + * This feature is a derived union. * <!-- begin-user-doc --> * <!-- end-user-doc --> * <!-- begin-model-doc --> diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/Node.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/Node.java index 9de51b83..7a99b519 100644 --- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/Node.java +++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/Node.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2007 IBM Corporation and others. + * Copyright (c) 2005, 2008 IBM Corporation, Embarcadero Technologies, and others. * 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 @@ -7,8 +7,9 @@ * * Contributors: * IBM - initial API and implementation + * Kenn Hussey (Embarcadero Technologies) - 205188 * - * $Id: Node.java,v 1.10 2007/10/23 15:54:21 jbruck Exp $ + * $Id: Node.java,v 1.11 2008/01/09 18:56:02 khussey Exp $ */ package org.eclipse.uml2.uml; @@ -129,4 +130,41 @@ public interface Node boolean validateInternalStructure(DiagnosticChain diagnostics, Map<Object, Object> context); + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * <!-- begin-model-doc --> + * Creates a (binary) communication path between this node and the specified other node, with the specified navigabilities, aggregations, names, lower bounds, and upper bounds, and owned by this node's nearest package. + * @param end1IsNavigable The navigability for the first end of the new communication path. + * @param end1Aggregation The aggregation for the first end of the new communication path. + * @param end1Name The name for the first end of the new communication path. + * @param end1Lower The lower bound for the first end of the new communication path. + * @param end1Upper The upper bound for the first end of the new communication path. + * @param end1Node The type for the first end of the new communication path. + * @param end2IsNavigable The navigability for the second end of the new communication path. + * @param end2Aggregation The aggregation for the second end of the new communication path. + * @param end2Name The name for the second end of the new communication path. + * @param end2Lower The lower bound for the second end of the new communication path. + * @param end2Upper The upper bound for the second end of the new communication path. + * <!-- end-model-doc --> + * @model required="true" ordered="false" end1IsNavigableDataType="org.eclipse.uml2.uml.Boolean" end1IsNavigableRequired="true" end1IsNavigableOrdered="false" end1AggregationRequired="true" end1AggregationOrdered="false" end1NameDataType="org.eclipse.uml2.uml.String" end1NameRequired="true" end1NameOrdered="false" end1LowerDataType="org.eclipse.uml2.uml.Integer" end1LowerRequired="true" end1LowerOrdered="false" end1UpperDataType="org.eclipse.uml2.uml.UnlimitedNatural" end1UpperRequired="true" end1UpperOrdered="false" end1NodeRequired="true" end1NodeOrdered="false" end2IsNavigableDataType="org.eclipse.uml2.uml.Boolean" end2IsNavigableRequired="true" end2IsNavigableOrdered="false" end2AggregationRequired="true" end2AggregationOrdered="false" end2NameDataType="org.eclipse.uml2.uml.String" end2NameRequired="true" end2NameOrdered="false" end2LowerDataType="org.eclipse.uml2.uml.Integer" end2LowerRequired="true" end2LowerOrdered="false" end2UpperDataType="org.eclipse.uml2.uml.UnlimitedNatural" end2UpperRequired="true" end2UpperOrdered="false" + * @generated + */ + CommunicationPath createCommunicationPath(boolean end1IsNavigable, + AggregationKind end1Aggregation, String end1Name, int end1Lower, + int end1Upper, Node end1Node, boolean end2IsNavigable, + AggregationKind end2Aggregation, String end2Name, int end2Lower, + int end2Upper); + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * <!-- begin-model-doc --> + * Retrieves the communication paths in which this node is involved. + * <!-- end-model-doc --> + * @model kind="operation" ordered="false" + * @generated + */ + EList<CommunicationPath> getCommunicationPaths(); + } // Node diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/RedefinableElement.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/RedefinableElement.java index df0890f2..69a9dc5f 100644 --- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/RedefinableElement.java +++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/RedefinableElement.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2007 IBM Corporation and others. + * Copyright (c) 2005, 2008 IBM Corporation, Embarcadero Technologies, and others. * 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 @@ -7,8 +7,9 @@ * * Contributors: * IBM - initial API and implementation + * Kenn Hussey (Embarcadero Technologies) - 205188 * - * $Id: RedefinableElement.java,v 1.14 2007/10/23 15:54:22 jbruck Exp $ + * $Id: RedefinableElement.java,v 1.15 2008/01/09 18:56:02 khussey Exp $ */ package org.eclipse.uml2.uml; @@ -74,7 +75,7 @@ public interface RedefinableElement /** * Returns the value of the '<em><b>Redefined Element</b></em>' reference list. * The list contents are of type {@link org.eclipse.uml2.uml.RedefinableElement}. - * This feature is a derived union. + * This feature is a derived union. * <!-- begin-user-doc --> * <!-- end-user-doc --> * <!-- begin-model-doc --> @@ -115,7 +116,7 @@ public interface RedefinableElement /** * Returns the value of the '<em><b>Redefinition Context</b></em>' reference list. * The list contents are of type {@link org.eclipse.uml2.uml.Classifier}. - * This feature is a derived union. + * This feature is a derived union. * <!-- begin-user-doc --> * <!-- end-user-doc --> * <!-- begin-model-doc --> diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/Relationship.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/Relationship.java index 825c6a1b..85ace691 100644 --- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/Relationship.java +++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/Relationship.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2007 IBM Corporation and others. + * Copyright (c) 2005, 2008 IBM Corporation, Embarcadero Technologies, and others. * 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 @@ -7,8 +7,9 @@ * * Contributors: * IBM - initial API and implementation + * Kenn Hussey (Embarcadero Technologies) - 205188 * - * $Id: Relationship.java,v 1.7 2007/10/23 15:54:22 jbruck Exp $ + * $Id: Relationship.java,v 1.8 2008/01/09 18:56:02 khussey Exp $ */ package org.eclipse.uml2.uml; @@ -40,7 +41,7 @@ public interface Relationship /** * Returns the value of the '<em><b>Related Element</b></em>' reference list. * The list contents are of type {@link org.eclipse.uml2.uml.Element}. - * This feature is a derived union. + * This feature is a derived union. * <!-- begin-user-doc --> * <!-- end-user-doc --> * <!-- begin-model-doc --> diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/SendObjectAction.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/SendObjectAction.java index b96231dc..f7e64caa 100644 --- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/SendObjectAction.java +++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/SendObjectAction.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2007 IBM Corporation and others. + * Copyright (c) 2005, 2008 IBM Corporation, Embarcadero Technologies, and others. * 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 @@ -7,8 +7,9 @@ * * Contributors: * IBM - initial API and implementation + * Kenn Hussey (Embarcadero Technologies) - 205188 * - * $Id: SendObjectAction.java,v 1.8 2007/10/23 16:12:31 jbruck Exp $ + * $Id: SendObjectAction.java,v 1.9 2008/01/09 18:56:02 khussey Exp $ */ package org.eclipse.uml2.uml; @@ -101,7 +102,7 @@ public interface SendObjectAction * <ul> * <li>'{@link org.eclipse.uml2.uml.InvocationAction#getArguments() <em>Argument</em>}'</li> * </ul> - * </p> + * </p> * <!-- begin-user-doc --> * <!-- end-user-doc --> * <!-- begin-model-doc --> diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/SequenceNode.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/SequenceNode.java index e198caf8..473b9be0 100644 --- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/SequenceNode.java +++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/SequenceNode.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2007 IBM Corporation and others. + * Copyright (c) 2005, 2008 IBM Corporation, Embarcadero Technologies, and others. * 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 @@ -7,8 +7,9 @@ * * Contributors: * IBM - initial API and implementation + * Kenn Hussey (Embarcadero Technologies) - 205188 * - * $Id: SequenceNode.java,v 1.8 2007/10/23 15:54:21 jbruck Exp $ + * $Id: SequenceNode.java,v 1.9 2008/01/09 18:56:02 khussey Exp $ */ package org.eclipse.uml2.uml; @@ -47,7 +48,7 @@ public interface SequenceNode * <ul> * <li>'{@link org.eclipse.uml2.uml.StructuredActivityNode#getNodes() <em>Node</em>}'</li> * </ul> - * </p> + * </p> * <!-- begin-user-doc --> * <!-- end-user-doc --> * <!-- begin-model-doc --> diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/StructuredClassifier.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/StructuredClassifier.java index 63aec0db..fc9b15bd 100644 --- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/StructuredClassifier.java +++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/StructuredClassifier.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2007 IBM Corporation and others. + * Copyright (c) 2005, 2008 IBM Corporation, Embarcadero Technologies, and others. * 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 @@ -7,8 +7,9 @@ * * Contributors: * IBM - initial API and implementation + * Kenn Hussey (Embarcadero Technologies) - 205188 * - * $Id: StructuredClassifier.java,v 1.11 2007/10/23 15:54:22 jbruck Exp $ + * $Id: StructuredClassifier.java,v 1.12 2008/01/09 18:56:03 khussey Exp $ */ package org.eclipse.uml2.uml; @@ -172,7 +173,7 @@ public interface StructuredClassifier * <li>'{@link org.eclipse.uml2.uml.Namespace#getMembers() <em>Member</em>}'</li> * </ul> * </p> - * This feature is a derived union. + * This feature is a derived union. * <!-- begin-user-doc --> * <!-- end-user-doc --> * <!-- begin-model-doc --> diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/UMLPackage.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/UMLPackage.java index 0528986d..6f334c41 100644 --- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/UMLPackage.java +++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/UMLPackage.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2007 IBM Corporation, Embarcadero Technologies and others. + * Copyright (c) 2005, 2008 IBM Corporation, Embarcadero Technologies and others. * 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 @@ -7,9 +7,9 @@ * * Contributors: * IBM - initial API and implementation - * Kenn Hussey (Embarcadero Technologies) - 208353 + * Kenn Hussey (Embarcadero Technologies) - 208353, 205188 * - * $Id: UMLPackage.java,v 1.28 2007/11/01 14:47:34 khussey Exp $ + * $Id: UMLPackage.java,v 1.29 2008/01/09 18:56:02 khussey Exp $ */ package org.eclipse.uml2.uml; @@ -39655,7 +39655,27 @@ public interface UMLPackage * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getDevice() * @generated */ - int DEVICE = 172; + int DEVICE = 173; + + /** + * The meta object id for the '{@link org.eclipse.uml2.uml.internal.impl.ExecutionEnvironmentImpl <em>Execution Environment</em>}' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see org.eclipse.uml2.uml.internal.impl.ExecutionEnvironmentImpl + * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getExecutionEnvironment() + * @generated + */ + int EXECUTION_ENVIRONMENT = 174; + + /** + * The meta object id for the '{@link org.eclipse.uml2.uml.internal.impl.CommunicationPathImpl <em>Communication Path</em>}' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see org.eclipse.uml2.uml.internal.impl.CommunicationPathImpl + * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getCommunicationPath() + * @generated + */ + int COMMUNICATION_PATH = 172; /** * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list. @@ -39664,7 +39684,7 @@ public interface UMLPackage * @generated * @ordered */ - int DEVICE__EANNOTATIONS = NODE__EANNOTATIONS; + int COMMUNICATION_PATH__EANNOTATIONS = ASSOCIATION__EANNOTATIONS; /** * The feature id for the '<em><b>Owned Element</b></em>' reference list. @@ -39673,7 +39693,7 @@ public interface UMLPackage * @generated * @ordered */ - int DEVICE__OWNED_ELEMENT = NODE__OWNED_ELEMENT; + int COMMUNICATION_PATH__OWNED_ELEMENT = ASSOCIATION__OWNED_ELEMENT; /** * The feature id for the '<em><b>Owner</b></em>' reference. @@ -39682,7 +39702,7 @@ public interface UMLPackage * @generated * @ordered */ - int DEVICE__OWNER = NODE__OWNER; + int COMMUNICATION_PATH__OWNER = ASSOCIATION__OWNER; /** * The feature id for the '<em><b>Owned Comment</b></em>' containment reference list. @@ -39691,7 +39711,7 @@ public interface UMLPackage * @generated * @ordered */ - int DEVICE__OWNED_COMMENT = NODE__OWNED_COMMENT; + int COMMUNICATION_PATH__OWNED_COMMENT = ASSOCIATION__OWNED_COMMENT; /** * The feature id for the '<em><b>Name</b></em>' attribute. @@ -39700,7 +39720,7 @@ public interface UMLPackage * @generated * @ordered */ - int DEVICE__NAME = NODE__NAME; + int COMMUNICATION_PATH__NAME = ASSOCIATION__NAME; /** * The feature id for the '<em><b>Visibility</b></em>' attribute. @@ -39709,7 +39729,7 @@ public interface UMLPackage * @generated * @ordered */ - int DEVICE__VISIBILITY = NODE__VISIBILITY; + int COMMUNICATION_PATH__VISIBILITY = ASSOCIATION__VISIBILITY; /** * The feature id for the '<em><b>Qualified Name</b></em>' attribute. @@ -39718,7 +39738,7 @@ public interface UMLPackage * @generated * @ordered */ - int DEVICE__QUALIFIED_NAME = NODE__QUALIFIED_NAME; + int COMMUNICATION_PATH__QUALIFIED_NAME = ASSOCIATION__QUALIFIED_NAME; /** * The feature id for the '<em><b>Client Dependency</b></em>' reference list. @@ -39727,7 +39747,7 @@ public interface UMLPackage * @generated * @ordered */ - int DEVICE__CLIENT_DEPENDENCY = NODE__CLIENT_DEPENDENCY; + int COMMUNICATION_PATH__CLIENT_DEPENDENCY = ASSOCIATION__CLIENT_DEPENDENCY; /** * The feature id for the '<em><b>Namespace</b></em>' reference. @@ -39736,7 +39756,7 @@ public interface UMLPackage * @generated * @ordered */ - int DEVICE__NAMESPACE = NODE__NAMESPACE; + int COMMUNICATION_PATH__NAMESPACE = ASSOCIATION__NAMESPACE; /** * The feature id for the '<em><b>Name Expression</b></em>' containment reference. @@ -39745,7 +39765,7 @@ public interface UMLPackage * @generated * @ordered */ - int DEVICE__NAME_EXPRESSION = NODE__NAME_EXPRESSION; + int COMMUNICATION_PATH__NAME_EXPRESSION = ASSOCIATION__NAME_EXPRESSION; /** * The feature id for the '<em><b>Element Import</b></em>' containment reference list. @@ -39754,7 +39774,7 @@ public interface UMLPackage * @generated * @ordered */ - int DEVICE__ELEMENT_IMPORT = NODE__ELEMENT_IMPORT; + int COMMUNICATION_PATH__ELEMENT_IMPORT = ASSOCIATION__ELEMENT_IMPORT; /** * The feature id for the '<em><b>Package Import</b></em>' containment reference list. @@ -39763,7 +39783,7 @@ public interface UMLPackage * @generated * @ordered */ - int DEVICE__PACKAGE_IMPORT = NODE__PACKAGE_IMPORT; + int COMMUNICATION_PATH__PACKAGE_IMPORT = ASSOCIATION__PACKAGE_IMPORT; /** * The feature id for the '<em><b>Owned Rule</b></em>' containment reference list. @@ -39772,7 +39792,7 @@ public interface UMLPackage * @generated * @ordered */ - int DEVICE__OWNED_RULE = NODE__OWNED_RULE; + int COMMUNICATION_PATH__OWNED_RULE = ASSOCIATION__OWNED_RULE; /** * The feature id for the '<em><b>Member</b></em>' reference list. @@ -39781,7 +39801,7 @@ public interface UMLPackage * @generated * @ordered */ - int DEVICE__MEMBER = NODE__MEMBER; + int COMMUNICATION_PATH__MEMBER = ASSOCIATION__MEMBER; /** * The feature id for the '<em><b>Imported Member</b></em>' reference list. @@ -39790,7 +39810,7 @@ public interface UMLPackage * @generated * @ordered */ - int DEVICE__IMPORTED_MEMBER = NODE__IMPORTED_MEMBER; + int COMMUNICATION_PATH__IMPORTED_MEMBER = ASSOCIATION__IMPORTED_MEMBER; /** * The feature id for the '<em><b>Owned Member</b></em>' reference list. @@ -39799,7 +39819,7 @@ public interface UMLPackage * @generated * @ordered */ - int DEVICE__OWNED_MEMBER = NODE__OWNED_MEMBER; + int COMMUNICATION_PATH__OWNED_MEMBER = ASSOCIATION__OWNED_MEMBER; /** * The feature id for the '<em><b>Is Leaf</b></em>' attribute. @@ -39808,7 +39828,7 @@ public interface UMLPackage * @generated * @ordered */ - int DEVICE__IS_LEAF = NODE__IS_LEAF; + int COMMUNICATION_PATH__IS_LEAF = ASSOCIATION__IS_LEAF; /** * The feature id for the '<em><b>Redefined Element</b></em>' reference list. @@ -39817,7 +39837,7 @@ public interface UMLPackage * @generated * @ordered */ - int DEVICE__REDEFINED_ELEMENT = NODE__REDEFINED_ELEMENT; + int COMMUNICATION_PATH__REDEFINED_ELEMENT = ASSOCIATION__REDEFINED_ELEMENT; /** * The feature id for the '<em><b>Redefinition Context</b></em>' reference list. @@ -39826,7 +39846,7 @@ public interface UMLPackage * @generated * @ordered */ - int DEVICE__REDEFINITION_CONTEXT = NODE__REDEFINITION_CONTEXT; + int COMMUNICATION_PATH__REDEFINITION_CONTEXT = ASSOCIATION__REDEFINITION_CONTEXT; /** * The feature id for the '<em><b>Owning Template Parameter</b></em>' container reference. @@ -39835,7 +39855,7 @@ public interface UMLPackage * @generated * @ordered */ - int DEVICE__OWNING_TEMPLATE_PARAMETER = NODE__OWNING_TEMPLATE_PARAMETER; + int COMMUNICATION_PATH__OWNING_TEMPLATE_PARAMETER = ASSOCIATION__OWNING_TEMPLATE_PARAMETER; /** * The feature id for the '<em><b>Template Parameter</b></em>' reference. @@ -39844,7 +39864,7 @@ public interface UMLPackage * @generated * @ordered */ - int DEVICE__TEMPLATE_PARAMETER = NODE__TEMPLATE_PARAMETER; + int COMMUNICATION_PATH__TEMPLATE_PARAMETER = ASSOCIATION__TEMPLATE_PARAMETER; /** * The feature id for the '<em><b>Package</b></em>' reference. @@ -39853,7 +39873,7 @@ public interface UMLPackage * @generated * @ordered */ - int DEVICE__PACKAGE = NODE__PACKAGE; + int COMMUNICATION_PATH__PACKAGE = ASSOCIATION__PACKAGE; /** * The feature id for the '<em><b>Template Binding</b></em>' containment reference list. @@ -39862,7 +39882,7 @@ public interface UMLPackage * @generated * @ordered */ - int DEVICE__TEMPLATE_BINDING = NODE__TEMPLATE_BINDING; + int COMMUNICATION_PATH__TEMPLATE_BINDING = ASSOCIATION__TEMPLATE_BINDING; /** * The feature id for the '<em><b>Owned Template Signature</b></em>' containment reference. @@ -39871,7 +39891,7 @@ public interface UMLPackage * @generated * @ordered */ - int DEVICE__OWNED_TEMPLATE_SIGNATURE = NODE__OWNED_TEMPLATE_SIGNATURE; + int COMMUNICATION_PATH__OWNED_TEMPLATE_SIGNATURE = ASSOCIATION__OWNED_TEMPLATE_SIGNATURE; /** * The feature id for the '<em><b>Is Abstract</b></em>' attribute. @@ -39880,7 +39900,7 @@ public interface UMLPackage * @generated * @ordered */ - int DEVICE__IS_ABSTRACT = NODE__IS_ABSTRACT; + int COMMUNICATION_PATH__IS_ABSTRACT = ASSOCIATION__IS_ABSTRACT; /** * The feature id for the '<em><b>Generalization</b></em>' containment reference list. @@ -39889,7 +39909,7 @@ public interface UMLPackage * @generated * @ordered */ - int DEVICE__GENERALIZATION = NODE__GENERALIZATION; + int COMMUNICATION_PATH__GENERALIZATION = ASSOCIATION__GENERALIZATION; /** * The feature id for the '<em><b>Powertype Extent</b></em>' reference list. @@ -39898,7 +39918,7 @@ public interface UMLPackage * @generated * @ordered */ - int DEVICE__POWERTYPE_EXTENT = NODE__POWERTYPE_EXTENT; + int COMMUNICATION_PATH__POWERTYPE_EXTENT = ASSOCIATION__POWERTYPE_EXTENT; /** * The feature id for the '<em><b>Feature</b></em>' reference list. @@ -39907,7 +39927,7 @@ public interface UMLPackage * @generated * @ordered */ - int DEVICE__FEATURE = NODE__FEATURE; + int COMMUNICATION_PATH__FEATURE = ASSOCIATION__FEATURE; /** * The feature id for the '<em><b>Inherited Member</b></em>' reference list. @@ -39916,7 +39936,7 @@ public interface UMLPackage * @generated * @ordered */ - int DEVICE__INHERITED_MEMBER = NODE__INHERITED_MEMBER; + int COMMUNICATION_PATH__INHERITED_MEMBER = ASSOCIATION__INHERITED_MEMBER; /** * The feature id for the '<em><b>Redefined Classifier</b></em>' reference list. @@ -39925,7 +39945,7 @@ public interface UMLPackage * @generated * @ordered */ - int DEVICE__REDEFINED_CLASSIFIER = NODE__REDEFINED_CLASSIFIER; + int COMMUNICATION_PATH__REDEFINED_CLASSIFIER = ASSOCIATION__REDEFINED_CLASSIFIER; /** * The feature id for the '<em><b>General</b></em>' reference list. @@ -39934,7 +39954,7 @@ public interface UMLPackage * @generated * @ordered */ - int DEVICE__GENERAL = NODE__GENERAL; + int COMMUNICATION_PATH__GENERAL = ASSOCIATION__GENERAL; /** * The feature id for the '<em><b>Substitution</b></em>' containment reference list. @@ -39943,7 +39963,7 @@ public interface UMLPackage * @generated * @ordered */ - int DEVICE__SUBSTITUTION = NODE__SUBSTITUTION; + int COMMUNICATION_PATH__SUBSTITUTION = ASSOCIATION__SUBSTITUTION; /** * The feature id for the '<em><b>Attribute</b></em>' reference list. @@ -39952,7 +39972,7 @@ public interface UMLPackage * @generated * @ordered */ - int DEVICE__ATTRIBUTE = NODE__ATTRIBUTE; + int COMMUNICATION_PATH__ATTRIBUTE = ASSOCIATION__ATTRIBUTE; /** * The feature id for the '<em><b>Representation</b></em>' reference. @@ -39961,7 +39981,7 @@ public interface UMLPackage * @generated * @ordered */ - int DEVICE__REPRESENTATION = NODE__REPRESENTATION; + int COMMUNICATION_PATH__REPRESENTATION = ASSOCIATION__REPRESENTATION; /** * The feature id for the '<em><b>Collaboration Use</b></em>' containment reference list. @@ -39970,7 +39990,7 @@ public interface UMLPackage * @generated * @ordered */ - int DEVICE__COLLABORATION_USE = NODE__COLLABORATION_USE; + int COMMUNICATION_PATH__COLLABORATION_USE = ASSOCIATION__COLLABORATION_USE; /** * The feature id for the '<em><b>Owned Use Case</b></em>' containment reference list. @@ -39979,7 +39999,7 @@ public interface UMLPackage * @generated * @ordered */ - int DEVICE__OWNED_USE_CASE = NODE__OWNED_USE_CASE; + int COMMUNICATION_PATH__OWNED_USE_CASE = ASSOCIATION__OWNED_USE_CASE; /** * The feature id for the '<em><b>Use Case</b></em>' reference list. @@ -39988,188 +40008,70 @@ public interface UMLPackage * @generated * @ordered */ - int DEVICE__USE_CASE = NODE__USE_CASE; - - /** - * The feature id for the '<em><b>Owned Attribute</b></em>' containment reference list. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int DEVICE__OWNED_ATTRIBUTE = NODE__OWNED_ATTRIBUTE; - - /** - * The feature id for the '<em><b>Part</b></em>' reference list. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int DEVICE__PART = NODE__PART; - - /** - * The feature id for the '<em><b>Role</b></em>' reference list. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int DEVICE__ROLE = NODE__ROLE; - - /** - * The feature id for the '<em><b>Owned Connector</b></em>' containment reference list. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int DEVICE__OWNED_CONNECTOR = NODE__OWNED_CONNECTOR; - - /** - * The feature id for the '<em><b>Owned Port</b></em>' reference list. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int DEVICE__OWNED_PORT = NODE__OWNED_PORT; - - /** - * The feature id for the '<em><b>Owned Behavior</b></em>' containment reference list. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int DEVICE__OWNED_BEHAVIOR = NODE__OWNED_BEHAVIOR; - - /** - * The feature id for the '<em><b>Classifier Behavior</b></em>' reference. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int DEVICE__CLASSIFIER_BEHAVIOR = NODE__CLASSIFIER_BEHAVIOR; - - /** - * The feature id for the '<em><b>Interface Realization</b></em>' containment reference list. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int DEVICE__INTERFACE_REALIZATION = NODE__INTERFACE_REALIZATION; - - /** - * The feature id for the '<em><b>Owned Trigger</b></em>' containment reference list. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int DEVICE__OWNED_TRIGGER = NODE__OWNED_TRIGGER; - - /** - * The feature id for the '<em><b>Nested Classifier</b></em>' containment reference list. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int DEVICE__NESTED_CLASSIFIER = NODE__NESTED_CLASSIFIER; - - /** - * The feature id for the '<em><b>Owned Operation</b></em>' containment reference list. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int DEVICE__OWNED_OPERATION = NODE__OWNED_OPERATION; - - /** - * The feature id for the '<em><b>Super Class</b></em>' reference list. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int DEVICE__SUPER_CLASS = NODE__SUPER_CLASS; + int COMMUNICATION_PATH__USE_CASE = ASSOCIATION__USE_CASE; /** - * The feature id for the '<em><b>Is Active</b></em>' attribute. + * The feature id for the '<em><b>Related Element</b></em>' reference list. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int DEVICE__IS_ACTIVE = NODE__IS_ACTIVE; + int COMMUNICATION_PATH__RELATED_ELEMENT = ASSOCIATION__RELATED_ELEMENT; /** - * The feature id for the '<em><b>Owned Reception</b></em>' containment reference list. + * The feature id for the '<em><b>Owned End</b></em>' containment reference list. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int DEVICE__OWNED_RECEPTION = NODE__OWNED_RECEPTION; + int COMMUNICATION_PATH__OWNED_END = ASSOCIATION__OWNED_END; /** - * The feature id for the '<em><b>Extension</b></em>' reference list. + * The feature id for the '<em><b>Member End</b></em>' reference list. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int DEVICE__EXTENSION = NODE__EXTENSION; + int COMMUNICATION_PATH__MEMBER_END = ASSOCIATION__MEMBER_END; /** - * The feature id for the '<em><b>Deployment</b></em>' containment reference list. + * The feature id for the '<em><b>Is Derived</b></em>' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int DEVICE__DEPLOYMENT = NODE__DEPLOYMENT; + int COMMUNICATION_PATH__IS_DERIVED = ASSOCIATION__IS_DERIVED; /** - * The feature id for the '<em><b>Deployed Element</b></em>' reference list. + * The feature id for the '<em><b>End Type</b></em>' reference list. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int DEVICE__DEPLOYED_ELEMENT = NODE__DEPLOYED_ELEMENT; + int COMMUNICATION_PATH__END_TYPE = ASSOCIATION__END_TYPE; /** - * The feature id for the '<em><b>Nested Node</b></em>' containment reference list. + * The feature id for the '<em><b>Navigable Owned End</b></em>' reference list. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int DEVICE__NESTED_NODE = NODE__NESTED_NODE; + int COMMUNICATION_PATH__NAVIGABLE_OWNED_END = ASSOCIATION__NAVIGABLE_OWNED_END; /** - * The number of structural features of the '<em>Device</em>' class. + * The number of structural features of the '<em>Communication Path</em>' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int DEVICE_FEATURE_COUNT = NODE_FEATURE_COUNT + 0; - - /** - * The meta object id for the '{@link org.eclipse.uml2.uml.internal.impl.ExecutionEnvironmentImpl <em>Execution Environment</em>}' class. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see org.eclipse.uml2.uml.internal.impl.ExecutionEnvironmentImpl - * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getExecutionEnvironment() - * @generated - */ - int EXECUTION_ENVIRONMENT = 173; + int COMMUNICATION_PATH_FEATURE_COUNT = ASSOCIATION_FEATURE_COUNT + 0; /** * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list. @@ -40178,7 +40080,7 @@ public interface UMLPackage * @generated * @ordered */ - int EXECUTION_ENVIRONMENT__EANNOTATIONS = NODE__EANNOTATIONS; + int DEVICE__EANNOTATIONS = NODE__EANNOTATIONS; /** * The feature id for the '<em><b>Owned Element</b></em>' reference list. @@ -40187,7 +40089,7 @@ public interface UMLPackage * @generated * @ordered */ - int EXECUTION_ENVIRONMENT__OWNED_ELEMENT = NODE__OWNED_ELEMENT; + int DEVICE__OWNED_ELEMENT = NODE__OWNED_ELEMENT; /** * The feature id for the '<em><b>Owner</b></em>' reference. @@ -40196,7 +40098,7 @@ public interface UMLPackage * @generated * @ordered */ - int EXECUTION_ENVIRONMENT__OWNER = NODE__OWNER; + int DEVICE__OWNER = NODE__OWNER; /** * The feature id for the '<em><b>Owned Comment</b></em>' containment reference list. @@ -40205,7 +40107,7 @@ public interface UMLPackage * @generated * @ordered */ - int EXECUTION_ENVIRONMENT__OWNED_COMMENT = NODE__OWNED_COMMENT; + int DEVICE__OWNED_COMMENT = NODE__OWNED_COMMENT; /** * The feature id for the '<em><b>Name</b></em>' attribute. @@ -40214,7 +40116,7 @@ public interface UMLPackage * @generated * @ordered */ - int EXECUTION_ENVIRONMENT__NAME = NODE__NAME; + int DEVICE__NAME = NODE__NAME; /** * The feature id for the '<em><b>Visibility</b></em>' attribute. @@ -40223,7 +40125,7 @@ public interface UMLPackage * @generated * @ordered */ - int EXECUTION_ENVIRONMENT__VISIBILITY = NODE__VISIBILITY; + int DEVICE__VISIBILITY = NODE__VISIBILITY; /** * The feature id for the '<em><b>Qualified Name</b></em>' attribute. @@ -40232,7 +40134,7 @@ public interface UMLPackage * @generated * @ordered */ - int EXECUTION_ENVIRONMENT__QUALIFIED_NAME = NODE__QUALIFIED_NAME; + int DEVICE__QUALIFIED_NAME = NODE__QUALIFIED_NAME; /** * The feature id for the '<em><b>Client Dependency</b></em>' reference list. @@ -40241,7 +40143,7 @@ public interface UMLPackage * @generated * @ordered */ - int EXECUTION_ENVIRONMENT__CLIENT_DEPENDENCY = NODE__CLIENT_DEPENDENCY; + int DEVICE__CLIENT_DEPENDENCY = NODE__CLIENT_DEPENDENCY; /** * The feature id for the '<em><b>Namespace</b></em>' reference. @@ -40250,7 +40152,7 @@ public interface UMLPackage * @generated * @ordered */ - int EXECUTION_ENVIRONMENT__NAMESPACE = NODE__NAMESPACE; + int DEVICE__NAMESPACE = NODE__NAMESPACE; /** * The feature id for the '<em><b>Name Expression</b></em>' containment reference. @@ -40259,7 +40161,7 @@ public interface UMLPackage * @generated * @ordered */ - int EXECUTION_ENVIRONMENT__NAME_EXPRESSION = NODE__NAME_EXPRESSION; + int DEVICE__NAME_EXPRESSION = NODE__NAME_EXPRESSION; /** * The feature id for the '<em><b>Element Import</b></em>' containment reference list. @@ -40268,7 +40170,7 @@ public interface UMLPackage * @generated * @ordered */ - int EXECUTION_ENVIRONMENT__ELEMENT_IMPORT = NODE__ELEMENT_IMPORT; + int DEVICE__ELEMENT_IMPORT = NODE__ELEMENT_IMPORT; /** * The feature id for the '<em><b>Package Import</b></em>' containment reference list. @@ -40277,7 +40179,7 @@ public interface UMLPackage * @generated * @ordered */ - int EXECUTION_ENVIRONMENT__PACKAGE_IMPORT = NODE__PACKAGE_IMPORT; + int DEVICE__PACKAGE_IMPORT = NODE__PACKAGE_IMPORT; /** * The feature id for the '<em><b>Owned Rule</b></em>' containment reference list. @@ -40286,7 +40188,7 @@ public interface UMLPackage * @generated * @ordered */ - int EXECUTION_ENVIRONMENT__OWNED_RULE = NODE__OWNED_RULE; + int DEVICE__OWNED_RULE = NODE__OWNED_RULE; /** * The feature id for the '<em><b>Member</b></em>' reference list. @@ -40295,7 +40197,7 @@ public interface UMLPackage * @generated * @ordered */ - int EXECUTION_ENVIRONMENT__MEMBER = NODE__MEMBER; + int DEVICE__MEMBER = NODE__MEMBER; /** * The feature id for the '<em><b>Imported Member</b></em>' reference list. @@ -40304,7 +40206,7 @@ public interface UMLPackage * @generated * @ordered */ - int EXECUTION_ENVIRONMENT__IMPORTED_MEMBER = NODE__IMPORTED_MEMBER; + int DEVICE__IMPORTED_MEMBER = NODE__IMPORTED_MEMBER; /** * The feature id for the '<em><b>Owned Member</b></em>' reference list. @@ -40313,7 +40215,7 @@ public interface UMLPackage * @generated * @ordered */ - int EXECUTION_ENVIRONMENT__OWNED_MEMBER = NODE__OWNED_MEMBER; + int DEVICE__OWNED_MEMBER = NODE__OWNED_MEMBER; /** * The feature id for the '<em><b>Is Leaf</b></em>' attribute. @@ -40322,7 +40224,7 @@ public interface UMLPackage * @generated * @ordered */ - int EXECUTION_ENVIRONMENT__IS_LEAF = NODE__IS_LEAF; + int DEVICE__IS_LEAF = NODE__IS_LEAF; /** * The feature id for the '<em><b>Redefined Element</b></em>' reference list. @@ -40331,7 +40233,7 @@ public interface UMLPackage * @generated * @ordered */ - int EXECUTION_ENVIRONMENT__REDEFINED_ELEMENT = NODE__REDEFINED_ELEMENT; + int DEVICE__REDEFINED_ELEMENT = NODE__REDEFINED_ELEMENT; /** * The feature id for the '<em><b>Redefinition Context</b></em>' reference list. @@ -40340,7 +40242,7 @@ public interface UMLPackage * @generated * @ordered */ - int EXECUTION_ENVIRONMENT__REDEFINITION_CONTEXT = NODE__REDEFINITION_CONTEXT; + int DEVICE__REDEFINITION_CONTEXT = NODE__REDEFINITION_CONTEXT; /** * The feature id for the '<em><b>Owning Template Parameter</b></em>' container reference. @@ -40349,7 +40251,7 @@ public interface UMLPackage * @generated * @ordered */ - int EXECUTION_ENVIRONMENT__OWNING_TEMPLATE_PARAMETER = NODE__OWNING_TEMPLATE_PARAMETER; + int DEVICE__OWNING_TEMPLATE_PARAMETER = NODE__OWNING_TEMPLATE_PARAMETER; /** * The feature id for the '<em><b>Template Parameter</b></em>' reference. @@ -40358,7 +40260,7 @@ public interface UMLPackage * @generated * @ordered */ - int EXECUTION_ENVIRONMENT__TEMPLATE_PARAMETER = NODE__TEMPLATE_PARAMETER; + int DEVICE__TEMPLATE_PARAMETER = NODE__TEMPLATE_PARAMETER; /** * The feature id for the '<em><b>Package</b></em>' reference. @@ -40367,7 +40269,7 @@ public interface UMLPackage * @generated * @ordered */ - int EXECUTION_ENVIRONMENT__PACKAGE = NODE__PACKAGE; + int DEVICE__PACKAGE = NODE__PACKAGE; /** * The feature id for the '<em><b>Template Binding</b></em>' containment reference list. @@ -40376,7 +40278,7 @@ public interface UMLPackage * @generated * @ordered */ - int EXECUTION_ENVIRONMENT__TEMPLATE_BINDING = NODE__TEMPLATE_BINDING; + int DEVICE__TEMPLATE_BINDING = NODE__TEMPLATE_BINDING; /** * The feature id for the '<em><b>Owned Template Signature</b></em>' containment reference. @@ -40385,7 +40287,7 @@ public interface UMLPackage * @generated * @ordered */ - int EXECUTION_ENVIRONMENT__OWNED_TEMPLATE_SIGNATURE = NODE__OWNED_TEMPLATE_SIGNATURE; + int DEVICE__OWNED_TEMPLATE_SIGNATURE = NODE__OWNED_TEMPLATE_SIGNATURE; /** * The feature id for the '<em><b>Is Abstract</b></em>' attribute. @@ -40394,7 +40296,7 @@ public interface UMLPackage * @generated * @ordered */ - int EXECUTION_ENVIRONMENT__IS_ABSTRACT = NODE__IS_ABSTRACT; + int DEVICE__IS_ABSTRACT = NODE__IS_ABSTRACT; /** * The feature id for the '<em><b>Generalization</b></em>' containment reference list. @@ -40403,7 +40305,7 @@ public interface UMLPackage * @generated * @ordered */ - int EXECUTION_ENVIRONMENT__GENERALIZATION = NODE__GENERALIZATION; + int DEVICE__GENERALIZATION = NODE__GENERALIZATION; /** * The feature id for the '<em><b>Powertype Extent</b></em>' reference list. @@ -40412,7 +40314,7 @@ public interface UMLPackage * @generated * @ordered */ - int EXECUTION_ENVIRONMENT__POWERTYPE_EXTENT = NODE__POWERTYPE_EXTENT; + int DEVICE__POWERTYPE_EXTENT = NODE__POWERTYPE_EXTENT; /** * The feature id for the '<em><b>Feature</b></em>' reference list. @@ -40421,7 +40323,7 @@ public interface UMLPackage * @generated * @ordered */ - int EXECUTION_ENVIRONMENT__FEATURE = NODE__FEATURE; + int DEVICE__FEATURE = NODE__FEATURE; /** * The feature id for the '<em><b>Inherited Member</b></em>' reference list. @@ -40430,7 +40332,7 @@ public interface UMLPackage * @generated * @ordered */ - int EXECUTION_ENVIRONMENT__INHERITED_MEMBER = NODE__INHERITED_MEMBER; + int DEVICE__INHERITED_MEMBER = NODE__INHERITED_MEMBER; /** * The feature id for the '<em><b>Redefined Classifier</b></em>' reference list. @@ -40439,7 +40341,7 @@ public interface UMLPackage * @generated * @ordered */ - int EXECUTION_ENVIRONMENT__REDEFINED_CLASSIFIER = NODE__REDEFINED_CLASSIFIER; + int DEVICE__REDEFINED_CLASSIFIER = NODE__REDEFINED_CLASSIFIER; /** * The feature id for the '<em><b>General</b></em>' reference list. @@ -40448,7 +40350,7 @@ public interface UMLPackage * @generated * @ordered */ - int EXECUTION_ENVIRONMENT__GENERAL = NODE__GENERAL; + int DEVICE__GENERAL = NODE__GENERAL; /** * The feature id for the '<em><b>Substitution</b></em>' containment reference list. @@ -40457,7 +40359,7 @@ public interface UMLPackage * @generated * @ordered */ - int EXECUTION_ENVIRONMENT__SUBSTITUTION = NODE__SUBSTITUTION; + int DEVICE__SUBSTITUTION = NODE__SUBSTITUTION; /** * The feature id for the '<em><b>Attribute</b></em>' reference list. @@ -40466,7 +40368,7 @@ public interface UMLPackage * @generated * @ordered */ - int EXECUTION_ENVIRONMENT__ATTRIBUTE = NODE__ATTRIBUTE; + int DEVICE__ATTRIBUTE = NODE__ATTRIBUTE; /** * The feature id for the '<em><b>Representation</b></em>' reference. @@ -40475,7 +40377,7 @@ public interface UMLPackage * @generated * @ordered */ - int EXECUTION_ENVIRONMENT__REPRESENTATION = NODE__REPRESENTATION; + int DEVICE__REPRESENTATION = NODE__REPRESENTATION; /** * The feature id for the '<em><b>Collaboration Use</b></em>' containment reference list. @@ -40484,7 +40386,7 @@ public interface UMLPackage * @generated * @ordered */ - int EXECUTION_ENVIRONMENT__COLLABORATION_USE = NODE__COLLABORATION_USE; + int DEVICE__COLLABORATION_USE = NODE__COLLABORATION_USE; /** * The feature id for the '<em><b>Owned Use Case</b></em>' containment reference list. @@ -40493,7 +40395,7 @@ public interface UMLPackage * @generated * @ordered */ - int EXECUTION_ENVIRONMENT__OWNED_USE_CASE = NODE__OWNED_USE_CASE; + int DEVICE__OWNED_USE_CASE = NODE__OWNED_USE_CASE; /** * The feature id for the '<em><b>Use Case</b></em>' reference list. @@ -40502,7 +40404,7 @@ public interface UMLPackage * @generated * @ordered */ - int EXECUTION_ENVIRONMENT__USE_CASE = NODE__USE_CASE; + int DEVICE__USE_CASE = NODE__USE_CASE; /** * The feature id for the '<em><b>Owned Attribute</b></em>' containment reference list. @@ -40511,7 +40413,7 @@ public interface UMLPackage * @generated * @ordered */ - int EXECUTION_ENVIRONMENT__OWNED_ATTRIBUTE = NODE__OWNED_ATTRIBUTE; + int DEVICE__OWNED_ATTRIBUTE = NODE__OWNED_ATTRIBUTE; /** * The feature id for the '<em><b>Part</b></em>' reference list. @@ -40520,7 +40422,7 @@ public interface UMLPackage * @generated * @ordered */ - int EXECUTION_ENVIRONMENT__PART = NODE__PART; + int DEVICE__PART = NODE__PART; /** * The feature id for the '<em><b>Role</b></em>' reference list. @@ -40529,7 +40431,7 @@ public interface UMLPackage * @generated * @ordered */ - int EXECUTION_ENVIRONMENT__ROLE = NODE__ROLE; + int DEVICE__ROLE = NODE__ROLE; /** * The feature id for the '<em><b>Owned Connector</b></em>' containment reference list. @@ -40538,7 +40440,7 @@ public interface UMLPackage * @generated * @ordered */ - int EXECUTION_ENVIRONMENT__OWNED_CONNECTOR = NODE__OWNED_CONNECTOR; + int DEVICE__OWNED_CONNECTOR = NODE__OWNED_CONNECTOR; /** * The feature id for the '<em><b>Owned Port</b></em>' reference list. @@ -40547,7 +40449,7 @@ public interface UMLPackage * @generated * @ordered */ - int EXECUTION_ENVIRONMENT__OWNED_PORT = NODE__OWNED_PORT; + int DEVICE__OWNED_PORT = NODE__OWNED_PORT; /** * The feature id for the '<em><b>Owned Behavior</b></em>' containment reference list. @@ -40556,7 +40458,7 @@ public interface UMLPackage * @generated * @ordered */ - int EXECUTION_ENVIRONMENT__OWNED_BEHAVIOR = NODE__OWNED_BEHAVIOR; + int DEVICE__OWNED_BEHAVIOR = NODE__OWNED_BEHAVIOR; /** * The feature id for the '<em><b>Classifier Behavior</b></em>' reference. @@ -40565,7 +40467,7 @@ public interface UMLPackage * @generated * @ordered */ - int EXECUTION_ENVIRONMENT__CLASSIFIER_BEHAVIOR = NODE__CLASSIFIER_BEHAVIOR; + int DEVICE__CLASSIFIER_BEHAVIOR = NODE__CLASSIFIER_BEHAVIOR; /** * The feature id for the '<em><b>Interface Realization</b></em>' containment reference list. @@ -40574,7 +40476,7 @@ public interface UMLPackage * @generated * @ordered */ - int EXECUTION_ENVIRONMENT__INTERFACE_REALIZATION = NODE__INTERFACE_REALIZATION; + int DEVICE__INTERFACE_REALIZATION = NODE__INTERFACE_REALIZATION; /** * The feature id for the '<em><b>Owned Trigger</b></em>' containment reference list. @@ -40583,7 +40485,7 @@ public interface UMLPackage * @generated * @ordered */ - int EXECUTION_ENVIRONMENT__OWNED_TRIGGER = NODE__OWNED_TRIGGER; + int DEVICE__OWNED_TRIGGER = NODE__OWNED_TRIGGER; /** * The feature id for the '<em><b>Nested Classifier</b></em>' containment reference list. @@ -40592,7 +40494,7 @@ public interface UMLPackage * @generated * @ordered */ - int EXECUTION_ENVIRONMENT__NESTED_CLASSIFIER = NODE__NESTED_CLASSIFIER; + int DEVICE__NESTED_CLASSIFIER = NODE__NESTED_CLASSIFIER; /** * The feature id for the '<em><b>Owned Operation</b></em>' containment reference list. @@ -40601,7 +40503,7 @@ public interface UMLPackage * @generated * @ordered */ - int EXECUTION_ENVIRONMENT__OWNED_OPERATION = NODE__OWNED_OPERATION; + int DEVICE__OWNED_OPERATION = NODE__OWNED_OPERATION; /** * The feature id for the '<em><b>Super Class</b></em>' reference list. @@ -40610,7 +40512,7 @@ public interface UMLPackage * @generated * @ordered */ - int EXECUTION_ENVIRONMENT__SUPER_CLASS = NODE__SUPER_CLASS; + int DEVICE__SUPER_CLASS = NODE__SUPER_CLASS; /** * The feature id for the '<em><b>Is Active</b></em>' attribute. @@ -40619,7 +40521,7 @@ public interface UMLPackage * @generated * @ordered */ - int EXECUTION_ENVIRONMENT__IS_ACTIVE = NODE__IS_ACTIVE; + int DEVICE__IS_ACTIVE = NODE__IS_ACTIVE; /** * The feature id for the '<em><b>Owned Reception</b></em>' containment reference list. @@ -40628,7 +40530,7 @@ public interface UMLPackage * @generated * @ordered */ - int EXECUTION_ENVIRONMENT__OWNED_RECEPTION = NODE__OWNED_RECEPTION; + int DEVICE__OWNED_RECEPTION = NODE__OWNED_RECEPTION; /** * The feature id for the '<em><b>Extension</b></em>' reference list. @@ -40637,7 +40539,7 @@ public interface UMLPackage * @generated * @ordered */ - int EXECUTION_ENVIRONMENT__EXTENSION = NODE__EXTENSION; + int DEVICE__EXTENSION = NODE__EXTENSION; /** * The feature id for the '<em><b>Deployment</b></em>' containment reference list. @@ -40646,7 +40548,7 @@ public interface UMLPackage * @generated * @ordered */ - int EXECUTION_ENVIRONMENT__DEPLOYMENT = NODE__DEPLOYMENT; + int DEVICE__DEPLOYMENT = NODE__DEPLOYMENT; /** * The feature id for the '<em><b>Deployed Element</b></em>' reference list. @@ -40655,7 +40557,7 @@ public interface UMLPackage * @generated * @ordered */ - int EXECUTION_ENVIRONMENT__DEPLOYED_ELEMENT = NODE__DEPLOYED_ELEMENT; + int DEVICE__DEPLOYED_ELEMENT = NODE__DEPLOYED_ELEMENT; /** * The feature id for the '<em><b>Nested Node</b></em>' containment reference list. @@ -40664,26 +40566,16 @@ public interface UMLPackage * @generated * @ordered */ - int EXECUTION_ENVIRONMENT__NESTED_NODE = NODE__NESTED_NODE; + int DEVICE__NESTED_NODE = NODE__NESTED_NODE; /** - * The number of structural features of the '<em>Execution Environment</em>' class. + * The number of structural features of the '<em>Device</em>' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int EXECUTION_ENVIRONMENT_FEATURE_COUNT = NODE_FEATURE_COUNT + 0; - - /** - * The meta object id for the '{@link org.eclipse.uml2.uml.internal.impl.CommunicationPathImpl <em>Communication Path</em>}' class. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see org.eclipse.uml2.uml.internal.impl.CommunicationPathImpl - * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getCommunicationPath() - * @generated - */ - int COMMUNICATION_PATH = 174; + int DEVICE_FEATURE_COUNT = NODE_FEATURE_COUNT + 0; /** * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list. @@ -40692,7 +40584,7 @@ public interface UMLPackage * @generated * @ordered */ - int COMMUNICATION_PATH__EANNOTATIONS = ASSOCIATION__EANNOTATIONS; + int EXECUTION_ENVIRONMENT__EANNOTATIONS = NODE__EANNOTATIONS; /** * The feature id for the '<em><b>Owned Element</b></em>' reference list. @@ -40701,7 +40593,7 @@ public interface UMLPackage * @generated * @ordered */ - int COMMUNICATION_PATH__OWNED_ELEMENT = ASSOCIATION__OWNED_ELEMENT; + int EXECUTION_ENVIRONMENT__OWNED_ELEMENT = NODE__OWNED_ELEMENT; /** * The feature id for the '<em><b>Owner</b></em>' reference. @@ -40710,7 +40602,7 @@ public interface UMLPackage * @generated * @ordered */ - int COMMUNICATION_PATH__OWNER = ASSOCIATION__OWNER; + int EXECUTION_ENVIRONMENT__OWNER = NODE__OWNER; /** * The feature id for the '<em><b>Owned Comment</b></em>' containment reference list. @@ -40719,7 +40611,7 @@ public interface UMLPackage * @generated * @ordered */ - int COMMUNICATION_PATH__OWNED_COMMENT = ASSOCIATION__OWNED_COMMENT; + int EXECUTION_ENVIRONMENT__OWNED_COMMENT = NODE__OWNED_COMMENT; /** * The feature id for the '<em><b>Name</b></em>' attribute. @@ -40728,7 +40620,7 @@ public interface UMLPackage * @generated * @ordered */ - int COMMUNICATION_PATH__NAME = ASSOCIATION__NAME; + int EXECUTION_ENVIRONMENT__NAME = NODE__NAME; /** * The feature id for the '<em><b>Visibility</b></em>' attribute. @@ -40737,7 +40629,7 @@ public interface UMLPackage * @generated * @ordered */ - int COMMUNICATION_PATH__VISIBILITY = ASSOCIATION__VISIBILITY; + int EXECUTION_ENVIRONMENT__VISIBILITY = NODE__VISIBILITY; /** * The feature id for the '<em><b>Qualified Name</b></em>' attribute. @@ -40746,7 +40638,7 @@ public interface UMLPackage * @generated * @ordered */ - int COMMUNICATION_PATH__QUALIFIED_NAME = ASSOCIATION__QUALIFIED_NAME; + int EXECUTION_ENVIRONMENT__QUALIFIED_NAME = NODE__QUALIFIED_NAME; /** * The feature id for the '<em><b>Client Dependency</b></em>' reference list. @@ -40755,7 +40647,7 @@ public interface UMLPackage * @generated * @ordered */ - int COMMUNICATION_PATH__CLIENT_DEPENDENCY = ASSOCIATION__CLIENT_DEPENDENCY; + int EXECUTION_ENVIRONMENT__CLIENT_DEPENDENCY = NODE__CLIENT_DEPENDENCY; /** * The feature id for the '<em><b>Namespace</b></em>' reference. @@ -40764,7 +40656,7 @@ public interface UMLPackage * @generated * @ordered */ - int COMMUNICATION_PATH__NAMESPACE = ASSOCIATION__NAMESPACE; + int EXECUTION_ENVIRONMENT__NAMESPACE = NODE__NAMESPACE; /** * The feature id for the '<em><b>Name Expression</b></em>' containment reference. @@ -40773,7 +40665,7 @@ public interface UMLPackage * @generated * @ordered */ - int COMMUNICATION_PATH__NAME_EXPRESSION = ASSOCIATION__NAME_EXPRESSION; + int EXECUTION_ENVIRONMENT__NAME_EXPRESSION = NODE__NAME_EXPRESSION; /** * The feature id for the '<em><b>Element Import</b></em>' containment reference list. @@ -40782,7 +40674,7 @@ public interface UMLPackage * @generated * @ordered */ - int COMMUNICATION_PATH__ELEMENT_IMPORT = ASSOCIATION__ELEMENT_IMPORT; + int EXECUTION_ENVIRONMENT__ELEMENT_IMPORT = NODE__ELEMENT_IMPORT; /** * The feature id for the '<em><b>Package Import</b></em>' containment reference list. @@ -40791,7 +40683,7 @@ public interface UMLPackage * @generated * @ordered */ - int COMMUNICATION_PATH__PACKAGE_IMPORT = ASSOCIATION__PACKAGE_IMPORT; + int EXECUTION_ENVIRONMENT__PACKAGE_IMPORT = NODE__PACKAGE_IMPORT; /** * The feature id for the '<em><b>Owned Rule</b></em>' containment reference list. @@ -40800,7 +40692,7 @@ public interface UMLPackage * @generated * @ordered */ - int COMMUNICATION_PATH__OWNED_RULE = ASSOCIATION__OWNED_RULE; + int EXECUTION_ENVIRONMENT__OWNED_RULE = NODE__OWNED_RULE; /** * The feature id for the '<em><b>Member</b></em>' reference list. @@ -40809,7 +40701,7 @@ public interface UMLPackage * @generated * @ordered */ - int COMMUNICATION_PATH__MEMBER = ASSOCIATION__MEMBER; + int EXECUTION_ENVIRONMENT__MEMBER = NODE__MEMBER; /** * The feature id for the '<em><b>Imported Member</b></em>' reference list. @@ -40818,7 +40710,7 @@ public interface UMLPackage * @generated * @ordered */ - int COMMUNICATION_PATH__IMPORTED_MEMBER = ASSOCIATION__IMPORTED_MEMBER; + int EXECUTION_ENVIRONMENT__IMPORTED_MEMBER = NODE__IMPORTED_MEMBER; /** * The feature id for the '<em><b>Owned Member</b></em>' reference list. @@ -40827,7 +40719,7 @@ public interface UMLPackage * @generated * @ordered */ - int COMMUNICATION_PATH__OWNED_MEMBER = ASSOCIATION__OWNED_MEMBER; + int EXECUTION_ENVIRONMENT__OWNED_MEMBER = NODE__OWNED_MEMBER; /** * The feature id for the '<em><b>Is Leaf</b></em>' attribute. @@ -40836,7 +40728,7 @@ public interface UMLPackage * @generated * @ordered */ - int COMMUNICATION_PATH__IS_LEAF = ASSOCIATION__IS_LEAF; + int EXECUTION_ENVIRONMENT__IS_LEAF = NODE__IS_LEAF; /** * The feature id for the '<em><b>Redefined Element</b></em>' reference list. @@ -40845,7 +40737,7 @@ public interface UMLPackage * @generated * @ordered */ - int COMMUNICATION_PATH__REDEFINED_ELEMENT = ASSOCIATION__REDEFINED_ELEMENT; + int EXECUTION_ENVIRONMENT__REDEFINED_ELEMENT = NODE__REDEFINED_ELEMENT; /** * The feature id for the '<em><b>Redefinition Context</b></em>' reference list. @@ -40854,7 +40746,7 @@ public interface UMLPackage * @generated * @ordered */ - int COMMUNICATION_PATH__REDEFINITION_CONTEXT = ASSOCIATION__REDEFINITION_CONTEXT; + int EXECUTION_ENVIRONMENT__REDEFINITION_CONTEXT = NODE__REDEFINITION_CONTEXT; /** * The feature id for the '<em><b>Owning Template Parameter</b></em>' container reference. @@ -40863,7 +40755,7 @@ public interface UMLPackage * @generated * @ordered */ - int COMMUNICATION_PATH__OWNING_TEMPLATE_PARAMETER = ASSOCIATION__OWNING_TEMPLATE_PARAMETER; + int EXECUTION_ENVIRONMENT__OWNING_TEMPLATE_PARAMETER = NODE__OWNING_TEMPLATE_PARAMETER; /** * The feature id for the '<em><b>Template Parameter</b></em>' reference. @@ -40872,7 +40764,7 @@ public interface UMLPackage * @generated * @ordered */ - int COMMUNICATION_PATH__TEMPLATE_PARAMETER = ASSOCIATION__TEMPLATE_PARAMETER; + int EXECUTION_ENVIRONMENT__TEMPLATE_PARAMETER = NODE__TEMPLATE_PARAMETER; /** * The feature id for the '<em><b>Package</b></em>' reference. @@ -40881,7 +40773,7 @@ public interface UMLPackage * @generated * @ordered */ - int COMMUNICATION_PATH__PACKAGE = ASSOCIATION__PACKAGE; + int EXECUTION_ENVIRONMENT__PACKAGE = NODE__PACKAGE; /** * The feature id for the '<em><b>Template Binding</b></em>' containment reference list. @@ -40890,7 +40782,7 @@ public interface UMLPackage * @generated * @ordered */ - int COMMUNICATION_PATH__TEMPLATE_BINDING = ASSOCIATION__TEMPLATE_BINDING; + int EXECUTION_ENVIRONMENT__TEMPLATE_BINDING = NODE__TEMPLATE_BINDING; /** * The feature id for the '<em><b>Owned Template Signature</b></em>' containment reference. @@ -40899,7 +40791,7 @@ public interface UMLPackage * @generated * @ordered */ - int COMMUNICATION_PATH__OWNED_TEMPLATE_SIGNATURE = ASSOCIATION__OWNED_TEMPLATE_SIGNATURE; + int EXECUTION_ENVIRONMENT__OWNED_TEMPLATE_SIGNATURE = NODE__OWNED_TEMPLATE_SIGNATURE; /** * The feature id for the '<em><b>Is Abstract</b></em>' attribute. @@ -40908,7 +40800,7 @@ public interface UMLPackage * @generated * @ordered */ - int COMMUNICATION_PATH__IS_ABSTRACT = ASSOCIATION__IS_ABSTRACT; + int EXECUTION_ENVIRONMENT__IS_ABSTRACT = NODE__IS_ABSTRACT; /** * The feature id for the '<em><b>Generalization</b></em>' containment reference list. @@ -40917,7 +40809,7 @@ public interface UMLPackage * @generated * @ordered */ - int COMMUNICATION_PATH__GENERALIZATION = ASSOCIATION__GENERALIZATION; + int EXECUTION_ENVIRONMENT__GENERALIZATION = NODE__GENERALIZATION; /** * The feature id for the '<em><b>Powertype Extent</b></em>' reference list. @@ -40926,7 +40818,7 @@ public interface UMLPackage * @generated * @ordered */ - int COMMUNICATION_PATH__POWERTYPE_EXTENT = ASSOCIATION__POWERTYPE_EXTENT; + int EXECUTION_ENVIRONMENT__POWERTYPE_EXTENT = NODE__POWERTYPE_EXTENT; /** * The feature id for the '<em><b>Feature</b></em>' reference list. @@ -40935,7 +40827,7 @@ public interface UMLPackage * @generated * @ordered */ - int COMMUNICATION_PATH__FEATURE = ASSOCIATION__FEATURE; + int EXECUTION_ENVIRONMENT__FEATURE = NODE__FEATURE; /** * The feature id for the '<em><b>Inherited Member</b></em>' reference list. @@ -40944,7 +40836,7 @@ public interface UMLPackage * @generated * @ordered */ - int COMMUNICATION_PATH__INHERITED_MEMBER = ASSOCIATION__INHERITED_MEMBER; + int EXECUTION_ENVIRONMENT__INHERITED_MEMBER = NODE__INHERITED_MEMBER; /** * The feature id for the '<em><b>Redefined Classifier</b></em>' reference list. @@ -40953,7 +40845,7 @@ public interface UMLPackage * @generated * @ordered */ - int COMMUNICATION_PATH__REDEFINED_CLASSIFIER = ASSOCIATION__REDEFINED_CLASSIFIER; + int EXECUTION_ENVIRONMENT__REDEFINED_CLASSIFIER = NODE__REDEFINED_CLASSIFIER; /** * The feature id for the '<em><b>General</b></em>' reference list. @@ -40962,7 +40854,7 @@ public interface UMLPackage * @generated * @ordered */ - int COMMUNICATION_PATH__GENERAL = ASSOCIATION__GENERAL; + int EXECUTION_ENVIRONMENT__GENERAL = NODE__GENERAL; /** * The feature id for the '<em><b>Substitution</b></em>' containment reference list. @@ -40971,7 +40863,7 @@ public interface UMLPackage * @generated * @ordered */ - int COMMUNICATION_PATH__SUBSTITUTION = ASSOCIATION__SUBSTITUTION; + int EXECUTION_ENVIRONMENT__SUBSTITUTION = NODE__SUBSTITUTION; /** * The feature id for the '<em><b>Attribute</b></em>' reference list. @@ -40980,7 +40872,7 @@ public interface UMLPackage * @generated * @ordered */ - int COMMUNICATION_PATH__ATTRIBUTE = ASSOCIATION__ATTRIBUTE; + int EXECUTION_ENVIRONMENT__ATTRIBUTE = NODE__ATTRIBUTE; /** * The feature id for the '<em><b>Representation</b></em>' reference. @@ -40989,7 +40881,7 @@ public interface UMLPackage * @generated * @ordered */ - int COMMUNICATION_PATH__REPRESENTATION = ASSOCIATION__REPRESENTATION; + int EXECUTION_ENVIRONMENT__REPRESENTATION = NODE__REPRESENTATION; /** * The feature id for the '<em><b>Collaboration Use</b></em>' containment reference list. @@ -40998,7 +40890,7 @@ public interface UMLPackage * @generated * @ordered */ - int COMMUNICATION_PATH__COLLABORATION_USE = ASSOCIATION__COLLABORATION_USE; + int EXECUTION_ENVIRONMENT__COLLABORATION_USE = NODE__COLLABORATION_USE; /** * The feature id for the '<em><b>Owned Use Case</b></em>' containment reference list. @@ -41007,7 +40899,7 @@ public interface UMLPackage * @generated * @ordered */ - int COMMUNICATION_PATH__OWNED_USE_CASE = ASSOCIATION__OWNED_USE_CASE; + int EXECUTION_ENVIRONMENT__OWNED_USE_CASE = NODE__OWNED_USE_CASE; /** * The feature id for the '<em><b>Use Case</b></em>' reference list. @@ -41016,70 +40908,178 @@ public interface UMLPackage * @generated * @ordered */ - int COMMUNICATION_PATH__USE_CASE = ASSOCIATION__USE_CASE; + int EXECUTION_ENVIRONMENT__USE_CASE = NODE__USE_CASE; /** - * The feature id for the '<em><b>Related Element</b></em>' reference list. + * The feature id for the '<em><b>Owned Attribute</b></em>' containment reference list. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int COMMUNICATION_PATH__RELATED_ELEMENT = ASSOCIATION__RELATED_ELEMENT; + int EXECUTION_ENVIRONMENT__OWNED_ATTRIBUTE = NODE__OWNED_ATTRIBUTE; /** - * The feature id for the '<em><b>Owned End</b></em>' containment reference list. + * The feature id for the '<em><b>Part</b></em>' reference list. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int COMMUNICATION_PATH__OWNED_END = ASSOCIATION__OWNED_END; + int EXECUTION_ENVIRONMENT__PART = NODE__PART; /** - * The feature id for the '<em><b>Member End</b></em>' reference list. + * The feature id for the '<em><b>Role</b></em>' reference list. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int COMMUNICATION_PATH__MEMBER_END = ASSOCIATION__MEMBER_END; + int EXECUTION_ENVIRONMENT__ROLE = NODE__ROLE; /** - * The feature id for the '<em><b>Is Derived</b></em>' attribute. + * The feature id for the '<em><b>Owned Connector</b></em>' containment reference list. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int COMMUNICATION_PATH__IS_DERIVED = ASSOCIATION__IS_DERIVED; + int EXECUTION_ENVIRONMENT__OWNED_CONNECTOR = NODE__OWNED_CONNECTOR; /** - * The feature id for the '<em><b>End Type</b></em>' reference list. + * The feature id for the '<em><b>Owned Port</b></em>' reference list. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int COMMUNICATION_PATH__END_TYPE = ASSOCIATION__END_TYPE; + int EXECUTION_ENVIRONMENT__OWNED_PORT = NODE__OWNED_PORT; /** - * The feature id for the '<em><b>Navigable Owned End</b></em>' reference list. + * The feature id for the '<em><b>Owned Behavior</b></em>' containment reference list. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int COMMUNICATION_PATH__NAVIGABLE_OWNED_END = ASSOCIATION__NAVIGABLE_OWNED_END; + int EXECUTION_ENVIRONMENT__OWNED_BEHAVIOR = NODE__OWNED_BEHAVIOR; /** - * The number of structural features of the '<em>Communication Path</em>' class. + * The feature id for the '<em><b>Classifier Behavior</b></em>' reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int COMMUNICATION_PATH_FEATURE_COUNT = ASSOCIATION_FEATURE_COUNT + 0; + int EXECUTION_ENVIRONMENT__CLASSIFIER_BEHAVIOR = NODE__CLASSIFIER_BEHAVIOR; + + /** + * The feature id for the '<em><b>Interface Realization</b></em>' containment reference list. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int EXECUTION_ENVIRONMENT__INTERFACE_REALIZATION = NODE__INTERFACE_REALIZATION; + + /** + * The feature id for the '<em><b>Owned Trigger</b></em>' containment reference list. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int EXECUTION_ENVIRONMENT__OWNED_TRIGGER = NODE__OWNED_TRIGGER; + + /** + * The feature id for the '<em><b>Nested Classifier</b></em>' containment reference list. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int EXECUTION_ENVIRONMENT__NESTED_CLASSIFIER = NODE__NESTED_CLASSIFIER; + + /** + * The feature id for the '<em><b>Owned Operation</b></em>' containment reference list. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int EXECUTION_ENVIRONMENT__OWNED_OPERATION = NODE__OWNED_OPERATION; + + /** + * The feature id for the '<em><b>Super Class</b></em>' reference list. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int EXECUTION_ENVIRONMENT__SUPER_CLASS = NODE__SUPER_CLASS; + + /** + * The feature id for the '<em><b>Is Active</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int EXECUTION_ENVIRONMENT__IS_ACTIVE = NODE__IS_ACTIVE; + + /** + * The feature id for the '<em><b>Owned Reception</b></em>' containment reference list. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int EXECUTION_ENVIRONMENT__OWNED_RECEPTION = NODE__OWNED_RECEPTION; + + /** + * The feature id for the '<em><b>Extension</b></em>' reference list. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int EXECUTION_ENVIRONMENT__EXTENSION = NODE__EXTENSION; + + /** + * The feature id for the '<em><b>Deployment</b></em>' containment reference list. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int EXECUTION_ENVIRONMENT__DEPLOYMENT = NODE__DEPLOYMENT; + + /** + * The feature id for the '<em><b>Deployed Element</b></em>' reference list. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int EXECUTION_ENVIRONMENT__DEPLOYED_ELEMENT = NODE__DEPLOYED_ELEMENT; + + /** + * The feature id for the '<em><b>Nested Node</b></em>' containment reference list. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int EXECUTION_ENVIRONMENT__NESTED_NODE = NODE__NESTED_NODE; + + /** + * The number of structural features of the '<em>Execution Environment</em>' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int EXECUTION_ENVIRONMENT_FEATURE_COUNT = NODE_FEATURE_COUNT + 0; /** * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list. diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/NodeImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/NodeImpl.java index 6e890713..bb6b9b99 100644 --- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/NodeImpl.java +++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/NodeImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2007 IBM Corporation and others. + * Copyright (c) 2005, 2008 IBM Corporation, Embarcadero Technologies, and others. * 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 @@ -7,8 +7,9 @@ * * Contributors: * IBM - initial API and implementation + * Kenn Hussey (Embarcadero Technologies) - 205188 * - * $Id: NodeImpl.java,v 1.30 2007/04/25 17:47:03 khussey Exp $ + * $Id: NodeImpl.java,v 1.31 2008/01/09 18:56:03 khussey Exp $ */ package org.eclipse.uml2.uml.internal.impl; @@ -35,10 +36,12 @@ import org.eclipse.uml2.common.util.DerivedUnionEObjectEList; import org.eclipse.uml2.common.util.SubsetSupersetEObjectContainmentWithInverseEList; import org.eclipse.uml2.common.util.SubsetSupersetEObjectWithInverseResolvingEList; +import org.eclipse.uml2.uml.AggregationKind; import org.eclipse.uml2.uml.Behavior; import org.eclipse.uml2.uml.Classifier; import org.eclipse.uml2.uml.CollaborationUse; import org.eclipse.uml2.uml.Comment; +import org.eclipse.uml2.uml.CommunicationPath; import org.eclipse.uml2.uml.Connector; import org.eclipse.uml2.uml.Constraint; import org.eclipse.uml2.uml.Dependency; @@ -385,6 +388,42 @@ public class NodeImpl * <!-- end-user-doc --> * @generated */ + public CommunicationPath createCommunicationPath(boolean end1IsNavigable, + AggregationKind end1Aggregation, String end1Name, int end1Lower, + int end1Upper, Node end1Node, boolean end2IsNavigable, + AggregationKind end2Aggregation, String end2Name, int end2Lower, + int end2Upper) { + return NodeOperations.createCommunicationPath(this, end1IsNavigable, + end1Aggregation, end1Name, end1Lower, end1Upper, end1Node, + end2IsNavigable, end2Aggregation, end2Name, end2Lower, end2Upper); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public EList<CommunicationPath> getCommunicationPaths() { + CacheAdapter cache = getCacheAdapter(); + if (cache != null) { + @SuppressWarnings("unchecked") + EList<CommunicationPath> result = (EList<CommunicationPath>) cache + .get(this, UMLPackage.Literals.NODE.getEOperations().get(2)); + if (result == null) { + cache.put(this, UMLPackage.Literals.NODE.getEOperations() + .get(2), result = NodeOperations + .getCommunicationPaths(this)); + } + return result; + } + return NodeOperations.getCommunicationPaths(this); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ @SuppressWarnings("unchecked") @Override public NotificationChain eInverseAdd(InternalEObject otherEnd, diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/UMLFactoryImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/UMLFactoryImpl.java index 4c8a2092..7ad749cc 100644 --- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/UMLFactoryImpl.java +++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/UMLFactoryImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2007 IBM Corporation and others. + * Copyright (c) 2005, 2008 IBM Corporation, Embarcadero Technologies, and others. * 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 @@ -7,8 +7,9 @@ * * Contributors: * IBM - initial API and implementation + * Kenn Hussey (Embarcadero Technologies) - 205188 * - * $Id: UMLFactoryImpl.java,v 1.18 2007/05/04 20:35:34 khussey Exp $ + * $Id: UMLFactoryImpl.java,v 1.19 2008/01/09 18:56:03 khussey Exp $ */ package org.eclipse.uml2.uml.internal.impl; @@ -542,12 +543,12 @@ public class UMLFactoryImpl return createComponent(); case UMLPackage.NODE : return createNode(); + case UMLPackage.COMMUNICATION_PATH : + return createCommunicationPath(); case UMLPackage.DEVICE : return createDevice(); case UMLPackage.EXECUTION_ENVIRONMENT : return createExecutionEnvironment(); - case UMLPackage.COMMUNICATION_PATH : - return createCommunicationPath(); case UMLPackage.COMBINED_FRAGMENT : return createCombinedFragment(); case UMLPackage.CONTINUATION : diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/UMLPackageImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/UMLPackageImpl.java index ee49dd02..bcc2d3b4 100644 --- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/UMLPackageImpl.java +++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/UMLPackageImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2007 IBM Corporation and others. + * Copyright (c) 2005, 2008 IBM Corporation, Embarcadero Technologies, and others. * 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 @@ -7,8 +7,9 @@ * * Contributors: * IBM - initial API and implementation + * Kenn Hussey (Embarcadero Technologies) - 205188 * - * $Id: UMLPackageImpl.java,v 1.20 2007/05/04 20:35:34 khussey Exp $ + * $Id: UMLPackageImpl.java,v 1.21 2008/01/09 18:56:03 khussey Exp $ */ package org.eclipse.uml2.uml.internal.impl; @@ -10517,7 +10518,7 @@ public class UMLPackageImpl public EClass getDevice() { if (deviceEClass == null) { deviceEClass = (EClass) EPackage.Registry.INSTANCE.getEPackage( - UMLPackage.eNS_URI).getEClassifiers().get(187); + UMLPackage.eNS_URI).getEClassifiers().get(188); } return deviceEClass; } @@ -10530,7 +10531,7 @@ public class UMLPackageImpl public EClass getExecutionEnvironment() { if (executionEnvironmentEClass == null) { executionEnvironmentEClass = (EClass) EPackage.Registry.INSTANCE - .getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(188); + .getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(189); } return executionEnvironmentEClass; } @@ -10543,7 +10544,7 @@ public class UMLPackageImpl public EClass getCommunicationPath() { if (communicationPathEClass == null) { communicationPathEClass = (EClass) EPackage.Registry.INSTANCE - .getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(189); + .getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(187); } return communicationPathEClass; } diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/uml.ecore b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/uml.ecore index c204cbe9..9af533d3 100644 --- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/uml.ecore +++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/uml.ecore @@ -4923,7 +4923,7 @@ <eAnnotations source="subsets" references="#//Dependency/supplier"/> </eStructuralFeatures> </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="Component" eSuperTypes="#//Class #//Namespace"> + <eClassifiers xsi:type="ecore:EClass" name="Component" eSuperTypes="#//Class"> <eOperations name="createOwnedClass" ordered="false" lowerBound="1" eType="#//Class"> <eParameters name="name" ordered="false" lowerBound="1" eType="#//String"/> <eParameters name="isAbstract" ordered="false" lowerBound="1" eType="#//Boolean"/> @@ -4972,13 +4972,25 @@ </eGenericType> </eParameters> </eOperations> + <eOperations name="createCommunicationPath" ordered="false" lowerBound="1" eType="#//CommunicationPath"> + <eParameters name="end1IsNavigable" ordered="false" lowerBound="1" eType="#//Boolean"/> + <eParameters name="end1Aggregation" ordered="false" lowerBound="1" eType="#//AggregationKind"/> + <eParameters name="end1Name" ordered="false" lowerBound="1" eType="#//String"/> + <eParameters name="end1Lower" ordered="false" lowerBound="1" eType="#//Integer"/> + <eParameters name="end1Upper" ordered="false" lowerBound="1" eType="#//UnlimitedNatural"/> + <eParameters name="end1Node" ordered="false" lowerBound="1" eType="#//Node"/> + <eParameters name="end2IsNavigable" ordered="false" lowerBound="1" eType="#//Boolean"/> + <eParameters name="end2Aggregation" ordered="false" lowerBound="1" eType="#//AggregationKind"/> + <eParameters name="end2Name" ordered="false" lowerBound="1" eType="#//String"/> + <eParameters name="end2Lower" ordered="false" lowerBound="1" eType="#//Integer"/> + <eParameters name="end2Upper" ordered="false" lowerBound="1" eType="#//UnlimitedNatural"/> + </eOperations> + <eOperations name="getCommunicationPaths" ordered="false" upperBound="-1" eType="#//CommunicationPath"/> <eStructuralFeatures xsi:type="ecore:EReference" name="nestedNode" ordered="false" upperBound="-1" eType="#//Node" containment="true"> <eAnnotations source="subsets" references="#//Namespace/ownedMember"/> </eStructuralFeatures> </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="Device" eSuperTypes="#//Node"/> - <eClassifiers xsi:type="ecore:EClass" name="ExecutionEnvironment" eSuperTypes="#//Node"/> <eClassifiers xsi:type="ecore:EClass" name="CommunicationPath" eSuperTypes="#//Association"> <eAnnotations source="duplicates"> <contents xsi:type="ecore:EOperation" name="association_ends" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"> @@ -4993,6 +5005,8 @@ </contents> </eAnnotations> </eClassifiers> + <eClassifiers xsi:type="ecore:EClass" name="Device" eSuperTypes="#//Node"/> + <eClassifiers xsi:type="ecore:EClass" name="ExecutionEnvironment" eSuperTypes="#//Node"/> <eClassifiers xsi:type="ecore:EClass" name="CombinedFragment" eSuperTypes="#//InteractionFragment"> <eOperations name="opt_loop_break_neg" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"> <eParameters name="diagnostics" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/> diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/NodeOperations.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/NodeOperations.java index 6c32c357..961c4336 100644 --- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/NodeOperations.java +++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/NodeOperations.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2007 IBM Corporation and others. + * Copyright (c) 2005, 2008 IBM Corporation, Embarcadero Technologies, and others. * 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 @@ -7,8 +7,9 @@ * * Contributors: * IBM - initial API and implementation + * Kenn Hussey (Embarcadero Technologies) - 205188 * - * $Id: NodeOperations.java,v 1.6 2007/05/03 21:11:51 khussey Exp $ + * $Id: NodeOperations.java,v 1.7 2008/01/09 18:56:10 khussey Exp $ */ package org.eclipse.uml2.uml.internal.operations; @@ -17,8 +18,18 @@ import java.util.Map; import org.eclipse.emf.common.util.BasicDiagnostic; import org.eclipse.emf.common.util.Diagnostic; import org.eclipse.emf.common.util.DiagnosticChain; +import org.eclipse.emf.common.util.ECollections; +import org.eclipse.emf.common.util.UniqueEList; +import org.eclipse.emf.common.util.EList; +import org.eclipse.emf.ecore.EObject; +import org.eclipse.emf.ecore.EStructuralFeature; +import org.eclipse.uml2.uml.AggregationKind; +import org.eclipse.uml2.uml.Association; +import org.eclipse.uml2.uml.CommunicationPath; import org.eclipse.uml2.uml.Node; +import org.eclipse.uml2.uml.Property; +import org.eclipse.uml2.uml.UMLPackage; import org.eclipse.uml2.uml.util.UMLValidator; @@ -31,6 +42,8 @@ import org.eclipse.uml2.uml.util.UMLValidator; * The following operations are supported: * <ul> * <li>{@link org.eclipse.uml2.uml.Node#validateInternalStructure(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Internal Structure</em>}</li> + * <li>{@link org.eclipse.uml2.uml.Node#createCommunicationPath(boolean, org.eclipse.uml2.uml.AggregationKind, java.lang.String, int, int, org.eclipse.uml2.uml.Node, boolean, org.eclipse.uml2.uml.AggregationKind, java.lang.String, int, int) <em>Create Communication Path</em>}</li> + * <li>{@link org.eclipse.uml2.uml.Node#getCommunicationPaths() <em>Get Communication Paths</em>}</li> * </ul> * </p> * @@ -83,4 +96,66 @@ public class NodeOperations return true; } + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * <!-- begin-model-doc --> + * Creates a (binary) communication path between this node and the specified other node, with the specified navigabilities, aggregations, names, lower bounds, and upper bounds, and owned by this node's nearest package. + * @param node The receiving '<em><b>Node</b></em>' model object. + * @param end1IsNavigable The navigability for the first end of the new communication path. + * @param end1Aggregation The aggregation for the first end of the new communication path. + * @param end1Name The name for the first end of the new communication path. + * @param end1Lower The lower bound for the first end of the new communication path. + * @param end1Upper The upper bound for the first end of the new communication path. + * @param end1Node The type for the first end of the new communication path. + * @param end2IsNavigable The navigability for the second end of the new communication path. + * @param end2Aggregation The aggregation for the second end of the new communication path. + * @param end2Name The name for the second end of the new communication path. + * @param end2Lower The lower bound for the second end of the new communication path. + * @param end2Upper The upper bound for the second end of the new communication path. + * <!-- end-model-doc --> + * @generated NOT + */ + public static CommunicationPath createCommunicationPath(Node node, + boolean end1IsNavigable, AggregationKind end1Aggregation, + String end1Name, int end1Lower, int end1Upper, Node end1Node, + boolean end2IsNavigable, AggregationKind end2Aggregation, + String end2Name, int end2Lower, int end2Upper) { + return (CommunicationPath) TypeOperations.createAssociation(node, + end1IsNavigable, end1Aggregation, end1Name, end1Lower, end1Upper, + end1Node, end2IsNavigable, end2Aggregation, end2Name, end2Lower, + end2Upper, UMLPackage.Literals.COMMUNICATION_PATH); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * <!-- begin-model-doc --> + * Retrieves the communication paths in which this node is involved. + * @param node The receiving '<em><b>Node</b></em>' model object. + * <!-- end-model-doc --> + * @generated NOT + */ + public static EList<CommunicationPath> getCommunicationPaths(Node node) { + EList<CommunicationPath> communicationPaths = new UniqueEList.FastCompare<CommunicationPath>(); + + for (EStructuralFeature.Setting nonNavigableInverseReference : getNonNavigableInverseReferences(node)) { + + if (nonNavigableInverseReference.getEStructuralFeature() == UMLPackage.Literals.TYPED_ELEMENT__TYPE) { + EObject eObject = nonNavigableInverseReference.getEObject(); + + if (eObject instanceof Property) { + Association association = ((Property) eObject) + .getAssociation(); + + if (association instanceof CommunicationPath) { + communicationPaths.add((CommunicationPath) association); + } + } + } + } + + return ECollections.unmodifiableEList(communicationPaths); + } + } // NodeOperations
\ No newline at end of file diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/TypeOperations.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/TypeOperations.java index c9324811..e2e62b58 100644 --- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/TypeOperations.java +++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/TypeOperations.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2007 IBM Corporation and others. + * Copyright (c) 2005, 2008 IBM Corporation, Embarcadero Technologies, and others. * 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 @@ -7,8 +7,9 @@ * * Contributors: * IBM - initial API and implementation + * Kenn Hussey (Embarcadero Technologies) - 205188 * - * $Id: TypeOperations.java,v 1.16 2007/05/03 21:11:52 khussey Exp $ + * $Id: TypeOperations.java,v 1.17 2008/01/09 18:56:10 khussey Exp $ */ package org.eclipse.uml2.uml.internal.operations; @@ -16,6 +17,7 @@ import org.eclipse.emf.common.util.ECollections; import org.eclipse.emf.common.util.EList; import org.eclipse.emf.common.util.UniqueEList; +import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EStructuralFeature; @@ -195,6 +197,17 @@ public class TypeOperations String end1Name, int end1Lower, int end1Upper, Type end1Type, boolean end2IsNavigable, AggregationKind end2Aggregation, String end2Name, int end2Lower, int end2Upper) { + return createAssociation(type, end1IsNavigable, end1Aggregation, + end1Name, end1Lower, end1Upper, end1Type, end2IsNavigable, + end2Aggregation, end2Name, end2Lower, end2Upper, + UMLPackage.Literals.ASSOCIATION); + } + + protected static Association createAssociation(Type type, + boolean end1IsNavigable, AggregationKind end1Aggregation, + String end1Name, int end1Lower, int end1Upper, Type end1Type, + boolean end2IsNavigable, AggregationKind end2Aggregation, + String end2Name, int end2Lower, int end2Upper, EClass eClass) { validateTypeAndBounds(end1Type, end1Lower, end1Upper); validateTypeAndBounds(type, end2Lower, end2Upper); @@ -214,7 +227,7 @@ public class TypeOperations } Association association = (Association) package_.createOwnedType(null, - UMLPackage.Literals.ASSOCIATION); + eClass); createAssociationEnd(type, association, end1IsNavigable, end1Aggregation, end1Name, end1Lower, end1Upper, end1Type); diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/util/UMLAdapterFactory.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/util/UMLAdapterFactory.java index 7db3c49d..46dd4c46 100644 --- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/util/UMLAdapterFactory.java +++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/util/UMLAdapterFactory.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2007 IBM Corporation and others. + * Copyright (c) 2005, 2008 IBM Corporation, Embarcadero Technologies, and others. * 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 @@ -7,8 +7,9 @@ * * Contributors: * IBM - initial API and implementation + * Kenn Hussey (Embarcadero Technologies) - 205188 * - * $Id: UMLAdapterFactory.java,v 1.11 2007/05/04 20:35:33 khussey Exp $ + * $Id: UMLAdapterFactory.java,v 1.12 2008/01/09 18:56:03 khussey Exp $ */ package org.eclipse.uml2.uml.util; @@ -317,7 +318,7 @@ public class UMLAdapterFactory } /** - * The switch the delegates to the <code>createXXX</code> methods. + * The switch that delegates to the <code>createXXX</code> methods. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated @@ -1199,6 +1200,11 @@ public class UMLAdapterFactory } @Override + public Adapter caseCommunicationPath(CommunicationPath object) { + return createCommunicationPathAdapter(); + } + + @Override public Adapter caseDevice(Device object) { return createDeviceAdapter(); } @@ -1209,11 +1215,6 @@ public class UMLAdapterFactory } @Override - public Adapter caseCommunicationPath(CommunicationPath object) { - return createCommunicationPathAdapter(); - } - - @Override public Adapter caseCombinedFragment(CombinedFragment object) { return createCombinedFragmentAdapter(); } diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/util/UMLSwitch.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/util/UMLSwitch.java index fb2d3d88..675e4ce3 100644 --- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/util/UMLSwitch.java +++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/util/UMLSwitch.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2007 IBM Corporation and others. + * Copyright (c) 2005, 2008 IBM Corporation, Embarcadero Technologies, and others. * 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 @@ -7,8 +7,9 @@ * * Contributors: * IBM - initial API and implementation + * Kenn Hussey (Embarcadero Technologies) - 205188 * - * $Id: UMLSwitch.java,v 1.16 2007/06/12 21:35:17 khussey Exp $ + * $Id: UMLSwitch.java,v 1.17 2008/01/09 18:56:03 khussey Exp $ */ package org.eclipse.uml2.uml.util; @@ -3771,19 +3772,15 @@ public class UMLSwitch<T> { if (result == null) result = caseClass(component); if (result == null) - result = caseNamespace(component); - if (result == null) result = caseEncapsulatedClassifier(component); if (result == null) result = caseBehavioredClassifier(component); if (result == null) - result = caseNamedElement(component); - if (result == null) result = caseStructuredClassifier(component); if (result == null) result = caseClassifier(component); if (result == null) - result = caseElement(component); + result = caseNamespace(component); if (result == null) result = caseRedefinableElement(component); if (result == null) @@ -3791,12 +3788,16 @@ public class UMLSwitch<T> { if (result == null) result = caseTemplateableElement(component); if (result == null) - result = caseEModelElement(component); + result = caseNamedElement(component); if (result == null) result = casePackageableElement(component); if (result == null) + result = caseElement(component); + if (result == null) result = caseParameterableElement(component); if (result == null) + result = caseEModelElement(component); + if (result == null) result = defaultCase(theEObject); return result; } @@ -3837,6 +3838,37 @@ public class UMLSwitch<T> { result = defaultCase(theEObject); return result; } + case UMLPackage.COMMUNICATION_PATH : { + CommunicationPath communicationPath = (CommunicationPath) theEObject; + T result = caseCommunicationPath(communicationPath); + if (result == null) + result = caseAssociation(communicationPath); + if (result == null) + result = caseClassifier(communicationPath); + if (result == null) + result = caseRelationship(communicationPath); + if (result == null) + result = caseNamespace(communicationPath); + if (result == null) + result = caseRedefinableElement(communicationPath); + if (result == null) + result = caseType(communicationPath); + if (result == null) + result = caseTemplateableElement(communicationPath); + if (result == null) + result = caseElement(communicationPath); + if (result == null) + result = caseNamedElement(communicationPath); + if (result == null) + result = casePackageableElement(communicationPath); + if (result == null) + result = caseEModelElement(communicationPath); + if (result == null) + result = caseParameterableElement(communicationPath); + if (result == null) + result = defaultCase(theEObject); + return result; + } case UMLPackage.DEVICE : { Device device = (Device) theEObject; T result = caseDevice(device); @@ -3915,37 +3947,6 @@ public class UMLSwitch<T> { result = defaultCase(theEObject); return result; } - case UMLPackage.COMMUNICATION_PATH : { - CommunicationPath communicationPath = (CommunicationPath) theEObject; - T result = caseCommunicationPath(communicationPath); - if (result == null) - result = caseAssociation(communicationPath); - if (result == null) - result = caseClassifier(communicationPath); - if (result == null) - result = caseRelationship(communicationPath); - if (result == null) - result = caseNamespace(communicationPath); - if (result == null) - result = caseRedefinableElement(communicationPath); - if (result == null) - result = caseType(communicationPath); - if (result == null) - result = caseTemplateableElement(communicationPath); - if (result == null) - result = caseElement(communicationPath); - if (result == null) - result = caseNamedElement(communicationPath); - if (result == null) - result = casePackageableElement(communicationPath); - if (result == null) - result = caseEModelElement(communicationPath); - if (result == null) - result = caseParameterableElement(communicationPath); - if (result == null) - result = defaultCase(theEObject); - return result; - } case UMLPackage.COMBINED_FRAGMENT : { CombinedFragment combinedFragment = (CombinedFragment) theEObject; T result = caseCombinedFragment(combinedFragment); diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/util/UMLValidator.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/util/UMLValidator.java index a9929f15..896a0068 100644 --- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/util/UMLValidator.java +++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/util/UMLValidator.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2007 IBM Corporation and others. + * Copyright (c) 2005, 2008 IBM Corporation, Embarcadero Technologies, and others. * 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 @@ -7,8 +7,9 @@ * * Contributors: * IBM - initial API and implementation + * Kenn Hussey (Embarcadero Technologies) - 205188 * - * $Id: UMLValidator.java,v 1.22 2007/06/07 15:18:40 khussey Exp $ + * $Id: UMLValidator.java,v 1.23 2008/01/09 18:56:03 khussey Exp $ */ package org.eclipse.uml2.uml.util; @@ -4059,14 +4060,14 @@ public class UMLValidator context); case UMLPackage.NODE : return validateNode((Node) value, diagnostics, context); + case UMLPackage.COMMUNICATION_PATH : + return validateCommunicationPath((CommunicationPath) value, + diagnostics, context); case UMLPackage.DEVICE : return validateDevice((Device) value, diagnostics, context); case UMLPackage.EXECUTION_ENVIRONMENT : return validateExecutionEnvironment( (ExecutionEnvironment) value, diagnostics, context); - case UMLPackage.COMMUNICATION_PATH : - return validateCommunicationPath((CommunicationPath) value, - diagnostics, context); case UMLPackage.COMBINED_FRAGMENT : return validateCombinedFragment((CombinedFragment) value, diagnostics, context); |