*** empty log message ***
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/icons/full/ctool16/CreateNamedElement_nameExpression_StringExpression.gif b/deprecated/plugins/org.eclipse.uml2.edit/icons/full/ctool16/CreateNamedElement_nameExpression_StringExpression.gif
index 44f0110..2b1ee54 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/icons/full/ctool16/CreateNamedElement_nameExpression_StringExpression.gif
+++ b/deprecated/plugins/org.eclipse.uml2.edit/icons/full/ctool16/CreateNamedElement_nameExpression_StringExpression.gif
Binary files differ
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/icons/full/ctool16/CreateNamespace_elementImport_ElementImport.gif b/deprecated/plugins/org.eclipse.uml2.edit/icons/full/ctool16/CreateNamespace_elementImport_ElementImport.gif
index 9802cd8..108f9ef 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/icons/full/ctool16/CreateNamespace_elementImport_ElementImport.gif
+++ b/deprecated/plugins/org.eclipse.uml2.edit/icons/full/ctool16/CreateNamespace_elementImport_ElementImport.gif
Binary files differ
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/icons/full/ctool16/CreateNamespace_ownedRule_Constraint.gif b/deprecated/plugins/org.eclipse.uml2.edit/icons/full/ctool16/CreateNamespace_ownedRule_Constraint.gif
index f4ede70..5088a75 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/icons/full/ctool16/CreateNamespace_ownedRule_Constraint.gif
+++ b/deprecated/plugins/org.eclipse.uml2.edit/icons/full/ctool16/CreateNamespace_ownedRule_Constraint.gif
Binary files differ
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/icons/full/ctool16/CreateNamespace_ownedRule_DurationConstraint.gif b/deprecated/plugins/org.eclipse.uml2.edit/icons/full/ctool16/CreateNamespace_ownedRule_DurationConstraint.gif
index 11e5060..782de4d 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/icons/full/ctool16/CreateNamespace_ownedRule_DurationConstraint.gif
+++ b/deprecated/plugins/org.eclipse.uml2.edit/icons/full/ctool16/CreateNamespace_ownedRule_DurationConstraint.gif
Binary files differ
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/icons/full/ctool16/CreateNamespace_ownedRule_InteractionConstraint.gif b/deprecated/plugins/org.eclipse.uml2.edit/icons/full/ctool16/CreateNamespace_ownedRule_InteractionConstraint.gif
index 23a06fe..be45fa2 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/icons/full/ctool16/CreateNamespace_ownedRule_InteractionConstraint.gif
+++ b/deprecated/plugins/org.eclipse.uml2.edit/icons/full/ctool16/CreateNamespace_ownedRule_InteractionConstraint.gif
Binary files differ
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/icons/full/ctool16/CreateNamespace_ownedRule_IntervalConstraint.gif b/deprecated/plugins/org.eclipse.uml2.edit/icons/full/ctool16/CreateNamespace_ownedRule_IntervalConstraint.gif
index 767ee93..016d7b2 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/icons/full/ctool16/CreateNamespace_ownedRule_IntervalConstraint.gif
+++ b/deprecated/plugins/org.eclipse.uml2.edit/icons/full/ctool16/CreateNamespace_ownedRule_IntervalConstraint.gif
Binary files differ
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/icons/full/ctool16/CreateNamespace_ownedRule_TimeConstraint.gif b/deprecated/plugins/org.eclipse.uml2.edit/icons/full/ctool16/CreateNamespace_ownedRule_TimeConstraint.gif
index 7de015c..08dc2cf 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/icons/full/ctool16/CreateNamespace_ownedRule_TimeConstraint.gif
+++ b/deprecated/plugins/org.eclipse.uml2.edit/icons/full/ctool16/CreateNamespace_ownedRule_TimeConstraint.gif
Binary files differ
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/icons/full/ctool16/CreateNamespace_packageImport_PackageImport.gif b/deprecated/plugins/org.eclipse.uml2.edit/icons/full/ctool16/CreateNamespace_packageImport_PackageImport.gif
index 7c274c1..9ea9362 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/icons/full/ctool16/CreateNamespace_packageImport_PackageImport.gif
+++ b/deprecated/plugins/org.eclipse.uml2.edit/icons/full/ctool16/CreateNamespace_packageImport_PackageImport.gif
Binary files differ
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/icons/full/ctool16/CreateNamespace_packageImport_ProfileApplication.gif b/deprecated/plugins/org.eclipse.uml2.edit/icons/full/ctool16/CreateNamespace_packageImport_ProfileApplication.gif
index 9d35f86..d22ab85 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/icons/full/ctool16/CreateNamespace_packageImport_ProfileApplication.gif
+++ b/deprecated/plugins/org.eclipse.uml2.edit/icons/full/ctool16/CreateNamespace_packageImport_ProfileApplication.gif
Binary files differ
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/icons/full/ctool16/CreateTemplateableElement_ownedTemplateSignature_RedefinableTemplateSignature.gif b/deprecated/plugins/org.eclipse.uml2.edit/icons/full/ctool16/CreateTemplateableElement_ownedTemplateSignature_RedefinableTemplateSignature.gif
index dd62060..d650810 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/icons/full/ctool16/CreateTemplateableElement_ownedTemplateSignature_RedefinableTemplateSignature.gif
+++ b/deprecated/plugins/org.eclipse.uml2.edit/icons/full/ctool16/CreateTemplateableElement_ownedTemplateSignature_RedefinableTemplateSignature.gif
Binary files differ
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/icons/full/ctool16/CreateTemplateableElement_ownedTemplateSignature_TemplateSignature.gif b/deprecated/plugins/org.eclipse.uml2.edit/icons/full/ctool16/CreateTemplateableElement_ownedTemplateSignature_TemplateSignature.gif
index 0f88251..6e55e2f 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/icons/full/ctool16/CreateTemplateableElement_ownedTemplateSignature_TemplateSignature.gif
+++ b/deprecated/plugins/org.eclipse.uml2.edit/icons/full/ctool16/CreateTemplateableElement_ownedTemplateSignature_TemplateSignature.gif
Binary files differ
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/icons/full/ctool16/CreateTemplateableElement_templateBinding_TemplateBinding.gif b/deprecated/plugins/org.eclipse.uml2.edit/icons/full/ctool16/CreateTemplateableElement_templateBinding_TemplateBinding.gif
index 0f88251..6e55e2f 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/icons/full/ctool16/CreateTemplateableElement_templateBinding_TemplateBinding.gif
+++ b/deprecated/plugins/org.eclipse.uml2.edit/icons/full/ctool16/CreateTemplateableElement_templateBinding_TemplateBinding.gif
Binary files differ
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/AbstractionItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/AbstractionItemProvider.java
index 0e52c17..981434a 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/AbstractionItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/AbstractionItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: AbstractionItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: AbstractionItemProvider.java,v 1.4 2004/04/30 17:20:11 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -138,8 +138,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/AcceptCallActionItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/AcceptCallActionItemProvider.java
index 9ee7388..396af35 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/AcceptCallActionItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/AcceptCallActionItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: AcceptCallActionItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: AcceptCallActionItemProvider.java,v 1.4 2004/04/30 17:20:12 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -116,8 +116,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/AcceptEventActionItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/AcceptEventActionItemProvider.java
index a798532..daf165b 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/AcceptEventActionItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/AcceptEventActionItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: AcceptEventActionItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: AcceptEventActionItemProvider.java,v 1.4 2004/04/30 17:20:12 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -133,8 +133,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ActionItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ActionItemProvider.java
index aa8ee9e..e75e1ee 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ActionItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ActionItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: ActionItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: ActionItemProvider.java,v 1.4 2004/04/30 17:20:12 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -240,8 +240,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ActivityEdgeItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ActivityEdgeItemProvider.java
index 74dd453..f1b3694 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ActivityEdgeItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ActivityEdgeItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: ActivityEdgeItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: ActivityEdgeItemProvider.java,v 1.4 2004/04/30 17:20:11 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -272,8 +272,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ActivityFinalNodeItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ActivityFinalNodeItemProvider.java
index 3cf9047..4935b11 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ActivityFinalNodeItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ActivityFinalNodeItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: ActivityFinalNodeItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: ActivityFinalNodeItemProvider.java,v 1.4 2004/04/30 17:20:12 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -96,8 +96,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ActivityGroupItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ActivityGroupItemProvider.java
index a21034a..dc1f478 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ActivityGroupItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ActivityGroupItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: ActivityGroupItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: ActivityGroupItemProvider.java,v 1.4 2004/04/30 17:20:12 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -112,8 +112,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ActivityItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ActivityItemProvider.java
index 0805f7c..85185b5 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ActivityItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ActivityItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: ActivityItemProvider.java,v 1.4 2004/04/23 02:26:00 khussey Exp $
+ * $Id: ActivityItemProvider.java,v 1.5 2004/04/30 17:20:11 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -302,8 +302,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -460,16 +460,6 @@
 		newChildDescriptors.add
 			(createChildParameter
 				(UML2Package.eINSTANCE.getActivity_Node(),
-				 UML2Factory.eINSTANCE.createExpansionNode()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(UML2Package.eINSTANCE.getActivity_Node(),
-				 UML2Factory.eINSTANCE.createExpansionRegion()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(UML2Package.eINSTANCE.getActivity_Node(),
 				 UML2Factory.eINSTANCE.createCreateObjectAction()));
 
 		newChildDescriptors.add
@@ -580,7 +570,22 @@
 		newChildDescriptors.add
 			(createChildParameter
 				(UML2Package.eINSTANCE.getActivity_Node(),
-				 UML2Factory.eINSTANCE.createDataStoreNode()));
+				 UML2Factory.eINSTANCE.createExpansionNode()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(UML2Package.eINSTANCE.getActivity_Node(),
+				 UML2Factory.eINSTANCE.createExpansionRegion()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(UML2Package.eINSTANCE.getActivity_Node(),
+				 UML2Factory.eINSTANCE.createTimeObservationAction()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(UML2Package.eINSTANCE.getActivity_Node(),
+				 UML2Factory.eINSTANCE.createDurationObservationAction()));
 
 		newChildDescriptors.add
 			(createChildParameter
@@ -640,12 +645,7 @@
 		newChildDescriptors.add
 			(createChildParameter
 				(UML2Package.eINSTANCE.getActivity_Node(),
-				 UML2Factory.eINSTANCE.createTimeObservationAction()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(UML2Package.eINSTANCE.getActivity_Node(),
-				 UML2Factory.eINSTANCE.createDurationObservationAction()));
+				 UML2Factory.eINSTANCE.createDataStoreNode()));
 	}
 
 	/**
@@ -658,10 +658,10 @@
 		boolean qualify =
 			feature == UML2Package.eINSTANCE.getActivity_Group() ||
 			feature == UML2Package.eINSTANCE.getActivity_Node() ||
-			feature == UML2Package.eINSTANCE.getStructuredClassifier_OwnedAttribute() ||
-			feature == UML2Package.eINSTANCE.getEncapsulatedClassifier_OwnedPort() ||
 			feature == UML2Package.eINSTANCE.getBehavioredClassifier_OwnedBehavior() ||
 			feature == UML2Package.eINSTANCE.getClass_NestedClassifier() ||
+			feature == UML2Package.eINSTANCE.getStructuredClassifier_OwnedAttribute() ||
+			feature == UML2Package.eINSTANCE.getEncapsulatedClassifier_OwnedPort() ||
 			feature == UML2Package.eINSTANCE.getBehavioredClassifier_OwnedStateMachine() ||
 			feature == UML2Package.eINSTANCE.getClassifier_OwnedUseCase();
 		return getString(
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ActivityNodeItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ActivityNodeItemProvider.java
index 9597c3f..cb1da90 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ActivityNodeItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ActivityNodeItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: ActivityNodeItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: ActivityNodeItemProvider.java,v 1.4 2004/04/30 17:20:12 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -200,8 +200,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ActivityParameterNodeItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ActivityParameterNodeItemProvider.java
index 2e98322..935bb95 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ActivityParameterNodeItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ActivityParameterNodeItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: ActivityParameterNodeItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: ActivityParameterNodeItemProvider.java,v 1.4 2004/04/30 17:20:12 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -116,8 +116,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ActivityPartitionItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ActivityPartitionItemProvider.java
index 152cd0c..18fa57d 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ActivityPartitionItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ActivityPartitionItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: ActivityPartitionItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: ActivityPartitionItemProvider.java,v 1.4 2004/04/30 17:20:11 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -241,8 +241,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ActorItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ActorItemProvider.java
index 0e89a93..dd38cb6 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ActorItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ActorItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: ActorItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: ActorItemProvider.java,v 1.4 2004/04/30 17:20:11 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -96,8 +96,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/AddStructuralFeatureValueActionItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/AddStructuralFeatureValueActionItemProvider.java
index 72e5be2..5b03ea5 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/AddStructuralFeatureValueActionItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/AddStructuralFeatureValueActionItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: AddStructuralFeatureValueActionItemProvider.java,v 1.4 2004/04/23 02:26:00 khussey Exp $
+ * $Id: AddStructuralFeatureValueActionItemProvider.java,v 1.5 2004/04/30 17:20:11 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -155,8 +155,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/AddVariableValueActionItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/AddVariableValueActionItemProvider.java
index 99d6ce7..93a0b6d 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/AddVariableValueActionItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/AddVariableValueActionItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: AddVariableValueActionItemProvider.java,v 1.4 2004/04/23 02:26:00 khussey Exp $
+ * $Id: AddVariableValueActionItemProvider.java,v 1.5 2004/04/30 17:20:12 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -155,8 +155,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/AnyTriggerItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/AnyTriggerItemProvider.java
index f59ffc8..8cbca41 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/AnyTriggerItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/AnyTriggerItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: AnyTriggerItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: AnyTriggerItemProvider.java,v 1.4 2004/04/30 17:20:12 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -97,8 +97,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ApplyFunctionActionItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ApplyFunctionActionItemProvider.java
index ca57d34..7c595e3 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ApplyFunctionActionItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ApplyFunctionActionItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: ApplyFunctionActionItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: ApplyFunctionActionItemProvider.java,v 1.4 2004/04/30 17:20:11 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -188,8 +188,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ArtifactItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ArtifactItemProvider.java
index 22537d6..1ee0144 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ArtifactItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ArtifactItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: ArtifactItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: ArtifactItemProvider.java,v 1.4 2004/04/30 17:20:12 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -234,8 +234,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/AssociationClassItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/AssociationClassItemProvider.java
index a4fee91..1c9a7a6 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/AssociationClassItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/AssociationClassItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: AssociationClassItemProvider.java,v 1.4 2004/04/23 02:26:00 khussey Exp $
+ * $Id: AssociationClassItemProvider.java,v 1.5 2004/04/30 17:20:11 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -213,8 +213,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -267,12 +267,12 @@
 	 */
 	public String getCreateChildText(Object owner, Object feature, Object child, Collection selection) {
 		boolean qualify =
+			feature == UML2Package.eINSTANCE.getBehavioredClassifier_OwnedBehavior() ||
+			feature == UML2Package.eINSTANCE.getClass_NestedClassifier() ||
 			feature == UML2Package.eINSTANCE.getStructuredClassifier_OwnedAttribute() ||
 			feature == UML2Package.eINSTANCE.getEncapsulatedClassifier_OwnedPort() ||
 			feature == UML2Package.eINSTANCE.getAssociation_OwnedEnd() ||
-			feature == UML2Package.eINSTANCE.getBehavioredClassifier_OwnedBehavior() ||
 			feature == UML2Package.eINSTANCE.getBehavioredClassifier_OwnedStateMachine() ||
-			feature == UML2Package.eINSTANCE.getClass_NestedClassifier() ||
 			feature == UML2Package.eINSTANCE.getClassifier_OwnedUseCase();
 		return getString(
 			qualify ? "_UI_CreateChild_text2" : "_UI_CreateChild_text", //$NON-NLS-1$ //$NON-NLS-2$
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/AssociationItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/AssociationItemProvider.java
index 56e7112..4826ff3 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/AssociationItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/AssociationItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: AssociationItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: AssociationItemProvider.java,v 1.4 2004/04/30 17:20:12 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -213,8 +213,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/BehaviorItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/BehaviorItemProvider.java
index e446cce..61e2c87 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/BehaviorItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/BehaviorItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: BehaviorItemProvider.java,v 1.4 2004/04/23 02:26:00 khussey Exp $
+ * $Id: BehaviorItemProvider.java,v 1.5 2004/04/30 17:20:11 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -264,8 +264,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -308,11 +308,11 @@
 	 */
 	public String getCreateChildText(Object owner, Object feature, Object child, Collection selection) {
 		boolean qualify =
+			feature == UML2Package.eINSTANCE.getBehavioredClassifier_OwnedBehavior() ||
+			feature == UML2Package.eINSTANCE.getClass_NestedClassifier() ||
 			feature == UML2Package.eINSTANCE.getStructuredClassifier_OwnedAttribute() ||
 			feature == UML2Package.eINSTANCE.getEncapsulatedClassifier_OwnedPort() ||
-			feature == UML2Package.eINSTANCE.getBehavioredClassifier_OwnedBehavior() ||
 			feature == UML2Package.eINSTANCE.getBehavioredClassifier_OwnedStateMachine() ||
-			feature == UML2Package.eINSTANCE.getClass_NestedClassifier() ||
 			feature == UML2Package.eINSTANCE.getClassifier_OwnedUseCase();
 		return getString(
 			qualify ? "_UI_CreateChild_text2" : "_UI_CreateChild_text", //$NON-NLS-1$ //$NON-NLS-2$
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/BehavioralFeatureItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/BehavioralFeatureItemProvider.java
index a74ec21..8e6890c 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/BehavioralFeatureItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/BehavioralFeatureItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: BehavioralFeatureItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: BehavioralFeatureItemProvider.java,v 1.4 2004/04/30 17:20:11 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -328,8 +328,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/BehavioredClassifierItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/BehavioredClassifierItemProvider.java
index 634e888..7403ade 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/BehavioredClassifierItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/BehavioredClassifierItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: BehavioredClassifierItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: BehavioredClassifierItemProvider.java,v 1.4 2004/04/30 17:20:11 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -214,8 +214,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/BroadcastSignalActionItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/BroadcastSignalActionItemProvider.java
index e3c9a9f..06f15f7 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/BroadcastSignalActionItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/BroadcastSignalActionItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: BroadcastSignalActionItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: BroadcastSignalActionItemProvider.java,v 1.4 2004/04/30 17:20:12 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -116,8 +116,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/CallActionItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/CallActionItemProvider.java
index cfbd6ed..ab0952d 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/CallActionItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/CallActionItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: CallActionItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: CallActionItemProvider.java,v 1.4 2004/04/30 17:20:12 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -155,8 +155,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/CallBehaviorActionItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/CallBehaviorActionItemProvider.java
index c16457e..7f4c01a 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/CallBehaviorActionItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/CallBehaviorActionItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: CallBehaviorActionItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: CallBehaviorActionItemProvider.java,v 1.4 2004/04/30 17:20:11 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -116,8 +116,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/CallOperationActionItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/CallOperationActionItemProvider.java
index d299e1a..71fa653 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/CallOperationActionItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/CallOperationActionItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: CallOperationActionItemProvider.java,v 1.4 2004/04/23 02:26:00 khussey Exp $
+ * $Id: CallOperationActionItemProvider.java,v 1.5 2004/04/30 17:20:11 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -154,8 +154,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/CallTriggerItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/CallTriggerItemProvider.java
index 1021503..e224dbc 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/CallTriggerItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/CallTriggerItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: CallTriggerItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: CallTriggerItemProvider.java,v 1.4 2004/04/30 17:20:12 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -116,8 +116,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/CentralBufferNodeItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/CentralBufferNodeItemProvider.java
index 0707ea2..201cf59 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/CentralBufferNodeItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/CentralBufferNodeItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: CentralBufferNodeItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: CentralBufferNodeItemProvider.java,v 1.4 2004/04/30 17:20:12 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -96,8 +96,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ChangeTriggerItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ChangeTriggerItemProvider.java
index 7dcf0bf..dd937ae 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ChangeTriggerItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ChangeTriggerItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: ChangeTriggerItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: ChangeTriggerItemProvider.java,v 1.4 2004/04/30 17:20:12 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -138,8 +138,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ClassItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ClassItemProvider.java
index ab6eefe..9245c62 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ClassItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ClassItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: ClassItemProvider.java,v 1.4 2004/04/23 02:26:00 khussey Exp $
+ * $Id: ClassItemProvider.java,v 1.5 2004/04/30 17:20:11 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -325,8 +325,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -438,7 +438,7 @@
 		newChildDescriptors.add
 			(createChildParameter
 				(UML2Package.eINSTANCE.getClass_NestedClassifier(),
-				 UML2Factory.eINSTANCE.createInformationItem()));
+				 UML2Factory.eINSTANCE.createActivity()));
 
 		newChildDescriptors.add
 			(createChildParameter
@@ -448,12 +448,12 @@
 		newChildDescriptors.add
 			(createChildParameter
 				(UML2Package.eINSTANCE.getClass_NestedClassifier(),
-				 UML2Factory.eINSTANCE.createActivity()));
+				 UML2Factory.eINSTANCE.createInformationItem()));
 
 		newChildDescriptors.add
 			(createChildParameter
 				(UML2Package.eINSTANCE.getClass_NestedClassifier(),
-				 UML2Factory.eINSTANCE.createArtifact()));
+				 UML2Factory.eINSTANCE.createInterface()));
 
 		newChildDescriptors.add
 			(createChildParameter
@@ -468,7 +468,7 @@
 		newChildDescriptors.add
 			(createChildParameter
 				(UML2Package.eINSTANCE.getClass_NestedClassifier(),
-				 UML2Factory.eINSTANCE.createInterface()));
+				 UML2Factory.eINSTANCE.createArtifact()));
 
 		newChildDescriptors.add
 			(createChildParameter
@@ -493,6 +493,11 @@
 		newChildDescriptors.add
 			(createChildParameter
 				(UML2Package.eINSTANCE.getClass_NestedClassifier(),
+				 UML2Factory.eINSTANCE.createProtocolStateMachine()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(UML2Package.eINSTANCE.getClass_NestedClassifier(),
 				 UML2Factory.eINSTANCE.createComponent()));
 
 		newChildDescriptors.add
@@ -518,11 +523,6 @@
 		newChildDescriptors.add
 			(createChildParameter
 				(UML2Package.eINSTANCE.getClass_NestedClassifier(),
-				 UML2Factory.eINSTANCE.createProtocolStateMachine()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(UML2Package.eINSTANCE.getClass_NestedClassifier(),
 				 UML2Factory.eINSTANCE.createDeploymentSpecification()));
 
 		newChildDescriptors.add
@@ -539,11 +539,11 @@
 	 */
 	public String getCreateChildText(Object owner, Object feature, Object child, Collection selection) {
 		boolean qualify =
+			feature == UML2Package.eINSTANCE.getBehavioredClassifier_OwnedBehavior() ||
+			feature == UML2Package.eINSTANCE.getClass_NestedClassifier() ||
 			feature == UML2Package.eINSTANCE.getStructuredClassifier_OwnedAttribute() ||
 			feature == UML2Package.eINSTANCE.getEncapsulatedClassifier_OwnedPort() ||
-			feature == UML2Package.eINSTANCE.getBehavioredClassifier_OwnedBehavior() ||
 			feature == UML2Package.eINSTANCE.getBehavioredClassifier_OwnedStateMachine() ||
-			feature == UML2Package.eINSTANCE.getClass_NestedClassifier() ||
 			feature == UML2Package.eINSTANCE.getClassifier_OwnedUseCase();
 		return getString(
 			qualify ? "_UI_CreateChild_text2" : "_UI_CreateChild_text", //$NON-NLS-1$ //$NON-NLS-2$
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ClassifierItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ClassifierItemProvider.java
index 76e0d30..9e4d0ff 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ClassifierItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ClassifierItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: ClassifierItemProvider.java,v 1.4 2004/04/23 02:26:00 khussey Exp $
+ * $Id: ClassifierItemProvider.java,v 1.5 2004/04/30 17:20:12 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -443,8 +443,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ClassifierTemplateParameterItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ClassifierTemplateParameterItemProvider.java
index bf16c39..ecb0138 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ClassifierTemplateParameterItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ClassifierTemplateParameterItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: ClassifierTemplateParameterItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: ClassifierTemplateParameterItemProvider.java,v 1.4 2004/04/30 17:20:11 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -117,8 +117,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ClauseItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ClauseItemProvider.java
index 8c70e15..cef6945 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ClauseItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ClauseItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: ClauseItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: ClauseItemProvider.java,v 1.4 2004/04/30 17:20:11 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -197,8 +197,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ClearAssociationActionItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ClearAssociationActionItemProvider.java
index 914fdf4..892e59e 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ClearAssociationActionItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ClearAssociationActionItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: ClearAssociationActionItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: ClearAssociationActionItemProvider.java,v 1.4 2004/04/30 17:20:11 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -154,8 +154,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ClearStructuralFeatureActionItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ClearStructuralFeatureActionItemProvider.java
index 398ced9..812abaa 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ClearStructuralFeatureActionItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ClearStructuralFeatureActionItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: ClearStructuralFeatureActionItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: ClearStructuralFeatureActionItemProvider.java,v 1.4 2004/04/30 17:20:12 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -97,8 +97,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ClearVariableActionItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ClearVariableActionItemProvider.java
index f5b5747..e1d75b1 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ClearVariableActionItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ClearVariableActionItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: ClearVariableActionItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: ClearVariableActionItemProvider.java,v 1.4 2004/04/30 17:20:11 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -97,8 +97,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/CollaborationItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/CollaborationItemProvider.java
index 123fdc4..ae0cd19 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/CollaborationItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/CollaborationItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: CollaborationItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: CollaborationItemProvider.java,v 1.4 2004/04/30 17:20:11 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -222,8 +222,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/CollaborationOccurrenceItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/CollaborationOccurrenceItemProvider.java
index 54415e3..8a9f368 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/CollaborationOccurrenceItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/CollaborationOccurrenceItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: CollaborationOccurrenceItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: CollaborationOccurrenceItemProvider.java,v 1.4 2004/04/30 17:20:11 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -154,8 +154,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -214,12 +214,12 @@
 		newChildDescriptors.add
 			(createChildParameter
 				(UML2Package.eINSTANCE.getCollaborationOccurrence_RoleBinding(),
-				 UML2Factory.eINSTANCE.createManifestation()));
+				 UML2Factory.eINSTANCE.createImplementation()));
 
 		newChildDescriptors.add
 			(createChildParameter
 				(UML2Package.eINSTANCE.getCollaborationOccurrence_RoleBinding(),
-				 UML2Factory.eINSTANCE.createImplementation()));
+				 UML2Factory.eINSTANCE.createManifestation()));
 
 		newChildDescriptors.add
 			(createChildParameter
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/CombinedFragmentItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/CombinedFragmentItemProvider.java
index 5183dc4..c6430bb 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/CombinedFragmentItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/CombinedFragmentItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: CombinedFragmentItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: CombinedFragmentItemProvider.java,v 1.4 2004/04/30 17:20:11 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -189,8 +189,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/CommentItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/CommentItemProvider.java
index 2b8a694..1df6699 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/CommentItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/CommentItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: CommentItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: CommentItemProvider.java,v 1.4 2004/04/30 17:20:12 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -172,8 +172,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/CommunicationPathItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/CommunicationPathItemProvider.java
index 3ec94a4..5cda8ff 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/CommunicationPathItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/CommunicationPathItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: CommunicationPathItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: CommunicationPathItemProvider.java,v 1.4 2004/04/30 17:20:11 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -96,8 +96,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ComponentItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ComponentItemProvider.java
index 93c0b6c..2942b0d 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ComponentItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ComponentItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: ComponentItemProvider.java,v 1.4 2004/04/23 02:26:00 khussey Exp $
+ * $Id: ComponentItemProvider.java,v 1.5 2004/04/30 17:20:11 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -228,8 +228,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -337,11 +337,6 @@
 		newChildDescriptors.add
 			(createChildParameter
 				(UML2Package.eINSTANCE.getComponent_OwnedMember(),
-				 UML2Factory.eINSTANCE.createModel()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(UML2Package.eINSTANCE.getComponent_OwnedMember(),
 				 UML2Factory.eINSTANCE.createDependency()));
 
 		newChildDescriptors.add
@@ -372,12 +367,7 @@
 		newChildDescriptors.add
 			(createChildParameter
 				(UML2Package.eINSTANCE.getComponent_OwnedMember(),
-				 UML2Factory.eINSTANCE.createGeneralizationSet()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(UML2Package.eINSTANCE.getComponent_OwnedMember(),
-				 UML2Factory.eINSTANCE.createInformationItem()));
+				 UML2Factory.eINSTANCE.createActivity()));
 
 		newChildDescriptors.add
 			(createChildParameter
@@ -387,17 +377,27 @@
 		newChildDescriptors.add
 			(createChildParameter
 				(UML2Package.eINSTANCE.getComponent_OwnedMember(),
-				 UML2Factory.eINSTANCE.createActivity()));
+				 UML2Factory.eINSTANCE.createModel()));
 
 		newChildDescriptors.add
 			(createChildParameter
 				(UML2Package.eINSTANCE.getComponent_OwnedMember(),
-				 UML2Factory.eINSTANCE.createArtifact()));
+				 UML2Factory.eINSTANCE.createInformationItem()));
 
 		newChildDescriptors.add
 			(createChildParameter
 				(UML2Package.eINSTANCE.getComponent_OwnedMember(),
-				 UML2Factory.eINSTANCE.createManifestation()));
+				 UML2Factory.eINSTANCE.createGeneralizationSet()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(UML2Package.eINSTANCE.getComponent_OwnedMember(),
+				 UML2Factory.eINSTANCE.createInterface()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(UML2Package.eINSTANCE.getComponent_OwnedMember(),
+				 UML2Factory.eINSTANCE.createImplementation()));
 
 		newChildDescriptors.add
 			(createChildParameter
@@ -412,12 +412,12 @@
 		newChildDescriptors.add
 			(createChildParameter
 				(UML2Package.eINSTANCE.getComponent_OwnedMember(),
-				 UML2Factory.eINSTANCE.createInterface()));
+				 UML2Factory.eINSTANCE.createArtifact()));
 
 		newChildDescriptors.add
 			(createChildParameter
 				(UML2Package.eINSTANCE.getComponent_OwnedMember(),
-				 UML2Factory.eINSTANCE.createImplementation()));
+				 UML2Factory.eINSTANCE.createManifestation()));
 
 		newChildDescriptors.add
 			(createChildParameter
@@ -462,21 +462,41 @@
 		newChildDescriptors.add
 			(createChildParameter
 				(UML2Package.eINSTANCE.getComponent_OwnedMember(),
-				 UML2Factory.eINSTANCE.createInteractionConstraint()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(UML2Package.eINSTANCE.getComponent_OwnedMember(),
 				 UML2Factory.eINSTANCE.createStateMachine()));
 
 		newChildDescriptors.add
 			(createChildParameter
 				(UML2Package.eINSTANCE.getComponent_OwnedMember(),
+				 UML2Factory.eINSTANCE.createInteractionConstraint()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(UML2Package.eINSTANCE.getComponent_OwnedMember(),
+				 UML2Factory.eINSTANCE.createProtocolStateMachine()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(UML2Package.eINSTANCE.getComponent_OwnedMember(),
 				 UML2Factory.eINSTANCE.createComponent()));
 
 		newChildDescriptors.add
 			(createChildParameter
 				(UML2Package.eINSTANCE.getComponent_OwnedMember(),
+				 UML2Factory.eINSTANCE.createIntervalConstraint()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(UML2Package.eINSTANCE.getComponent_OwnedMember(),
+				 UML2Factory.eINSTANCE.createTimeConstraint()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(UML2Package.eINSTANCE.getComponent_OwnedMember(),
+				 UML2Factory.eINSTANCE.createDurationConstraint()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(UML2Package.eINSTANCE.getComponent_OwnedMember(),
 				 UML2Factory.eINSTANCE.createDeployment()));
 
 		newChildDescriptors.add
@@ -502,26 +522,6 @@
 		newChildDescriptors.add
 			(createChildParameter
 				(UML2Package.eINSTANCE.getComponent_OwnedMember(),
-				 UML2Factory.eINSTANCE.createProtocolStateMachine()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(UML2Package.eINSTANCE.getComponent_OwnedMember(),
-				 UML2Factory.eINSTANCE.createIntervalConstraint()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(UML2Package.eINSTANCE.getComponent_OwnedMember(),
-				 UML2Factory.eINSTANCE.createTimeConstraint()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(UML2Package.eINSTANCE.getComponent_OwnedMember(),
-				 UML2Factory.eINSTANCE.createDurationConstraint()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(UML2Package.eINSTANCE.getComponent_OwnedMember(),
 				 UML2Factory.eINSTANCE.createDeploymentSpecification()));
 	}
 
@@ -533,17 +533,17 @@
 	 */
 	public String getCreateChildText(Object owner, Object feature, Object child, Collection selection) {
 		boolean qualify =
-			feature == UML2Package.eINSTANCE.getClass_NestedClassifier() ||
+			feature == UML2Package.eINSTANCE.getNamespace_OwnedRule() ||
 			feature == UML2Package.eINSTANCE.getComponent_OwnedMember() ||
+			feature == UML2Package.eINSTANCE.getBehavioredClassifier_OwnedBehavior() ||
+			feature == UML2Package.eINSTANCE.getClass_NestedClassifier() ||
 			feature == UML2Package.eINSTANCE.getStructuredClassifier_OwnedAttribute() ||
 			feature == UML2Package.eINSTANCE.getEncapsulatedClassifier_OwnedPort() ||
-			feature == UML2Package.eINSTANCE.getNamespace_OwnedRule() ||
-			feature == UML2Package.eINSTANCE.getComponent_Realization() ||
-			feature == UML2Package.eINSTANCE.getBehavioredClassifier_OwnedBehavior() ||
 			feature == UML2Package.eINSTANCE.getBehavioredClassifier_OwnedStateMachine() ||
 			feature == UML2Package.eINSTANCE.getClassifier_Substitution() ||
-			feature == UML2Package.eINSTANCE.getClassifier_OwnedUseCase() ||
-			feature == UML2Package.eINSTANCE.getBehavioredClassifier_Implementation();
+			feature == UML2Package.eINSTANCE.getComponent_Realization() ||
+			feature == UML2Package.eINSTANCE.getBehavioredClassifier_Implementation() ||
+			feature == UML2Package.eINSTANCE.getClassifier_OwnedUseCase();
 		return getString(
 			qualify ? "_UI_CreateChild_text2" : "_UI_CreateChild_text", //$NON-NLS-1$ //$NON-NLS-2$
 			new Object[] { getTypeText(child), getFeatureText(feature), getTypeText(owner) });
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ConditionalNodeItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ConditionalNodeItemProvider.java
index a991b56..85e9048 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ConditionalNodeItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ConditionalNodeItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: ConditionalNodeItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: ConditionalNodeItemProvider.java,v 1.4 2004/04/30 17:20:12 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -207,8 +207,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ConnectableElementItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ConnectableElementItemProvider.java
index faf1f75..a4b185e 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ConnectableElementItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ConnectableElementItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: ConnectableElementItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: ConnectableElementItemProvider.java,v 1.4 2004/04/30 17:20:12 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -143,8 +143,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ConnectableElementTemplateParameterItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ConnectableElementTemplateParameterItemProvider.java
index 604b05c..3f03d46 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ConnectableElementTemplateParameterItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ConnectableElementTemplateParameterItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: ConnectableElementTemplateParameterItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: ConnectableElementTemplateParameterItemProvider.java,v 1.4 2004/04/30 17:20:12 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -93,8 +93,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ConnectionPointReferenceItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ConnectionPointReferenceItemProvider.java
index 4c9c07b..bfd8652 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ConnectionPointReferenceItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ConnectionPointReferenceItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: ConnectionPointReferenceItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: ConnectionPointReferenceItemProvider.java,v 1.4 2004/04/30 17:20:12 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -133,8 +133,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ConnectorEndItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ConnectorEndItemProvider.java
index 31bdda4..3a2664f 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ConnectorEndItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ConnectorEndItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: ConnectorEndItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: ConnectorEndItemProvider.java,v 1.4 2004/04/30 17:20:11 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -148,8 +148,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ConnectorItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ConnectorItemProvider.java
index 8f45219..4e557e5 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ConnectorItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ConnectorItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: ConnectorItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: ConnectorItemProvider.java,v 1.4 2004/04/30 17:20:12 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -206,8 +206,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ConstraintItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ConstraintItemProvider.java
index 4d7e77b..1792d81 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ConstraintItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ConstraintItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: ConstraintItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: ConstraintItemProvider.java,v 1.4 2004/04/30 17:20:12 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -171,8 +171,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ContinuationItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ContinuationItemProvider.java
index 7c59b9a..e5d605d 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ContinuationItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ContinuationItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: ContinuationItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: ContinuationItemProvider.java,v 1.4 2004/04/30 17:20:11 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -119,8 +119,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ControlFlowItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ControlFlowItemProvider.java
index a390c03..3413e3a 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ControlFlowItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ControlFlowItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: ControlFlowItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: ControlFlowItemProvider.java,v 1.4 2004/04/30 17:20:12 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -97,8 +97,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ControlNodeItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ControlNodeItemProvider.java
index 4cdb423..2007d9a 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ControlNodeItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ControlNodeItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: ControlNodeItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: ControlNodeItemProvider.java,v 1.4 2004/04/30 17:20:11 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -96,8 +96,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/CreateLinkActionItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/CreateLinkActionItemProvider.java
index 193b497..c94a870 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/CreateLinkActionItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/CreateLinkActionItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: CreateLinkActionItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: CreateLinkActionItemProvider.java,v 1.4 2004/04/30 17:20:11 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -97,8 +97,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/CreateLinkObjectActionItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/CreateLinkObjectActionItemProvider.java
index 34eb566..8e6899d 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/CreateLinkObjectActionItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/CreateLinkObjectActionItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: CreateLinkObjectActionItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: CreateLinkObjectActionItemProvider.java,v 1.4 2004/04/30 17:20:11 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -138,8 +138,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/CreateObjectActionItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/CreateObjectActionItemProvider.java
index cdb6c32..b7206f4 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/CreateObjectActionItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/CreateObjectActionItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: CreateObjectActionItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: CreateObjectActionItemProvider.java,v 1.4 2004/04/30 17:20:11 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -154,8 +154,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/DataStoreNodeItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/DataStoreNodeItemProvider.java
index a8b2312..5ac6e64 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/DataStoreNodeItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/DataStoreNodeItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: DataStoreNodeItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: DataStoreNodeItemProvider.java,v 1.4 2004/04/30 17:20:12 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -96,8 +96,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/DataTypeItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/DataTypeItemProvider.java
index 8341296..cc05e1c 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/DataTypeItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/DataTypeItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: DataTypeItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: DataTypeItemProvider.java,v 1.4 2004/04/30 17:20:12 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -172,8 +172,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/DecisionNodeItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/DecisionNodeItemProvider.java
index 683ec51..f07cbe2 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/DecisionNodeItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/DecisionNodeItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: DecisionNodeItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: DecisionNodeItemProvider.java,v 1.4 2004/04/30 17:20:12 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -116,8 +116,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/DependencyItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/DependencyItemProvider.java
index 33191ad..3e07b74 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/DependencyItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/DependencyItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: DependencyItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: DependencyItemProvider.java,v 1.4 2004/04/30 17:20:11 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -184,8 +184,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/DeployedArtifactItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/DeployedArtifactItemProvider.java
index 91a8bee..dad559a 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/DeployedArtifactItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/DeployedArtifactItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: DeployedArtifactItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: DeployedArtifactItemProvider.java,v 1.4 2004/04/30 17:20:12 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -96,8 +96,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/DeploymentItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/DeploymentItemProvider.java
index 0b0b4dd..01bf6da 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/DeploymentItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/DeploymentItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: DeploymentItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: DeploymentItemProvider.java,v 1.4 2004/04/30 17:20:11 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -162,8 +162,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/DeploymentSpecificationItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/DeploymentSpecificationItemProvider.java
index da4b681..1f85ae6 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/DeploymentSpecificationItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/DeploymentSpecificationItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: DeploymentSpecificationItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: DeploymentSpecificationItemProvider.java,v 1.4 2004/04/30 17:20:12 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -137,8 +137,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/DeploymentTargetItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/DeploymentTargetItemProvider.java
index a819d0f..980c581 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/DeploymentTargetItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/DeploymentTargetItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: DeploymentTargetItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: DeploymentTargetItemProvider.java,v 1.4 2004/04/30 17:20:12 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -161,8 +161,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/DestroyLinkActionItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/DestroyLinkActionItemProvider.java
index 248a1e3..e0de194 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/DestroyLinkActionItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/DestroyLinkActionItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: DestroyLinkActionItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: DestroyLinkActionItemProvider.java,v 1.4 2004/04/30 17:20:12 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -97,8 +97,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/DestroyObjectActionItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/DestroyObjectActionItemProvider.java
index 3d448a0..62825f4 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/DestroyObjectActionItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/DestroyObjectActionItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: DestroyObjectActionItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: DestroyObjectActionItemProvider.java,v 1.4 2004/04/30 17:20:11 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -138,8 +138,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/DeviceItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/DeviceItemProvider.java
index 1446bb6..58ab15e 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/DeviceItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/DeviceItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: DeviceItemProvider.java,v 1.4 2004/04/23 02:26:00 khussey Exp $
+ * $Id: DeviceItemProvider.java,v 1.5 2004/04/30 17:20:11 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -97,8 +97,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -127,12 +127,12 @@
 	 */
 	public String getCreateChildText(Object owner, Object feature, Object child, Collection selection) {
 		boolean qualify =
+			feature == UML2Package.eINSTANCE.getBehavioredClassifier_OwnedBehavior() ||
+			feature == UML2Package.eINSTANCE.getClass_NestedClassifier() ||
 			feature == UML2Package.eINSTANCE.getStructuredClassifier_OwnedAttribute() ||
 			feature == UML2Package.eINSTANCE.getEncapsulatedClassifier_OwnedPort() ||
-			feature == UML2Package.eINSTANCE.getClass_NestedClassifier() ||
-			feature == UML2Package.eINSTANCE.getNode_NestedNode() ||
-			feature == UML2Package.eINSTANCE.getBehavioredClassifier_OwnedBehavior() ||
 			feature == UML2Package.eINSTANCE.getBehavioredClassifier_OwnedStateMachine() ||
+			feature == UML2Package.eINSTANCE.getNode_NestedNode() ||
 			feature == UML2Package.eINSTANCE.getClassifier_OwnedUseCase();
 		return getString(
 			qualify ? "_UI_CreateChild_text2" : "_UI_CreateChild_text", //$NON-NLS-1$ //$NON-NLS-2$
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/DirectedRelationshipItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/DirectedRelationshipItemProvider.java
index 9ef6877..12524b3 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/DirectedRelationshipItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/DirectedRelationshipItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: DirectedRelationshipItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: DirectedRelationshipItemProvider.java,v 1.4 2004/04/30 17:20:12 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -129,8 +129,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/DurationConstraintItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/DurationConstraintItemProvider.java
index 6b4c9f6..f9e0293 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/DurationConstraintItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/DurationConstraintItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: DurationConstraintItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: DurationConstraintItemProvider.java,v 1.4 2004/04/30 17:20:12 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -96,8 +96,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/DurationIntervalItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/DurationIntervalItemProvider.java
index eec5d21..99de93a 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/DurationIntervalItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/DurationIntervalItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: DurationIntervalItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: DurationIntervalItemProvider.java,v 1.4 2004/04/30 17:20:11 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -96,8 +96,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/DurationItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/DurationItemProvider.java
index 341fe0b..e6d70df 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/DurationItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/DurationItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: DurationItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: DurationItemProvider.java,v 1.4 2004/04/30 17:20:12 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -136,8 +136,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/DurationObservationActionItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/DurationObservationActionItemProvider.java
index ab18af6..9975326 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/DurationObservationActionItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/DurationObservationActionItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: DurationObservationActionItemProvider.java,v 1.4 2004/04/23 02:26:00 khussey Exp $
+ * $Id: DurationObservationActionItemProvider.java,v 1.5 2004/04/30 17:20:12 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -138,8 +138,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ElementImportItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ElementImportItemProvider.java
index 398b09f..7ec8793 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ElementImportItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ElementImportItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: ElementImportItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: ElementImportItemProvider.java,v 1.4 2004/04/30 17:20:11 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -156,8 +156,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ElementItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ElementItemProvider.java
index 3cda47f..6c992df 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ElementItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ElementItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: ElementItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: ElementItemProvider.java,v 1.4 2004/04/30 17:20:11 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -170,8 +170,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/EncapsulatedClassifierItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/EncapsulatedClassifierItemProvider.java
index f9c005d..41f8317 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/EncapsulatedClassifierItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/EncapsulatedClassifierItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: EncapsulatedClassifierItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: EncapsulatedClassifierItemProvider.java,v 1.4 2004/04/30 17:20:11 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -138,8 +138,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/EnumerationItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/EnumerationItemProvider.java
index 4e775c2..423f561 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/EnumerationItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/EnumerationItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: EnumerationItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: EnumerationItemProvider.java,v 1.4 2004/04/30 17:20:11 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -138,8 +138,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/EnumerationLiteralItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/EnumerationLiteralItemProvider.java
index a2a8629..b4db227 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/EnumerationLiteralItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/EnumerationLiteralItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: EnumerationLiteralItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: EnumerationLiteralItemProvider.java,v 1.4 2004/04/30 17:20:12 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -96,8 +96,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/EventOccurrenceItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/EventOccurrenceItemProvider.java
index e6cb875..8e4824b 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/EventOccurrenceItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/EventOccurrenceItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: EventOccurrenceItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: EventOccurrenceItemProvider.java,v 1.4 2004/04/30 17:20:12 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -201,8 +201,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ExceptionHandlerItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ExceptionHandlerItemProvider.java
index e9b8056..dc7a977 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ExceptionHandlerItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ExceptionHandlerItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: ExceptionHandlerItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: ExceptionHandlerItemProvider.java,v 1.4 2004/04/30 17:20:12 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -146,8 +146,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ExecutableNodeItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ExecutableNodeItemProvider.java
index c465ffb..35e1068 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ExecutableNodeItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ExecutableNodeItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: ExecutableNodeItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: ExecutableNodeItemProvider.java,v 1.4 2004/04/30 17:20:11 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -138,8 +138,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ExecutionEnvironmentItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ExecutionEnvironmentItemProvider.java
index 9a50eb3..102424c 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ExecutionEnvironmentItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ExecutionEnvironmentItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: ExecutionEnvironmentItemProvider.java,v 1.4 2004/04/23 02:26:00 khussey Exp $
+ * $Id: ExecutionEnvironmentItemProvider.java,v 1.5 2004/04/30 17:20:11 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -97,8 +97,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -127,12 +127,12 @@
 	 */
 	public String getCreateChildText(Object owner, Object feature, Object child, Collection selection) {
 		boolean qualify =
+			feature == UML2Package.eINSTANCE.getBehavioredClassifier_OwnedBehavior() ||
+			feature == UML2Package.eINSTANCE.getClass_NestedClassifier() ||
 			feature == UML2Package.eINSTANCE.getStructuredClassifier_OwnedAttribute() ||
 			feature == UML2Package.eINSTANCE.getEncapsulatedClassifier_OwnedPort() ||
-			feature == UML2Package.eINSTANCE.getClass_NestedClassifier() ||
-			feature == UML2Package.eINSTANCE.getNode_NestedNode() ||
-			feature == UML2Package.eINSTANCE.getBehavioredClassifier_OwnedBehavior() ||
 			feature == UML2Package.eINSTANCE.getBehavioredClassifier_OwnedStateMachine() ||
+			feature == UML2Package.eINSTANCE.getNode_NestedNode() ||
 			feature == UML2Package.eINSTANCE.getClassifier_OwnedUseCase();
 		return getString(
 			qualify ? "_UI_CreateChild_text2" : "_UI_CreateChild_text", //$NON-NLS-1$ //$NON-NLS-2$
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ExecutionOccurrenceItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ExecutionOccurrenceItemProvider.java
index 9284e46..cc9b9dd 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ExecutionOccurrenceItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ExecutionOccurrenceItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: ExecutionOccurrenceItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: ExecutionOccurrenceItemProvider.java,v 1.4 2004/04/30 17:20:11 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -150,8 +150,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ExpansionNodeItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ExpansionNodeItemProvider.java
index 0a909aa..f54802a 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ExpansionNodeItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ExpansionNodeItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: ExpansionNodeItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: ExpansionNodeItemProvider.java,v 1.4 2004/04/30 17:20:11 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -133,8 +133,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ExpansionRegionItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ExpansionRegionItemProvider.java
index dee3e87..6dd8dad 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ExpansionRegionItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ExpansionRegionItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: ExpansionRegionItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: ExpansionRegionItemProvider.java,v 1.4 2004/04/30 17:20:12 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -153,8 +153,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ExpressionItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ExpressionItemProvider.java
index 068a1ac..4de1bcb 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ExpressionItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ExpressionItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: ExpressionItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: ExpressionItemProvider.java,v 1.4 2004/04/30 17:20:12 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -155,8 +155,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ExtendItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ExtendItemProvider.java
index bdfe1ed..5a76f54 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ExtendItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ExtendItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: ExtendItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: ExtendItemProvider.java,v 1.4 2004/04/30 17:20:11 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -222,8 +222,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ExtensionEndItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ExtensionEndItemProvider.java
index e3dc440..325e189 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ExtensionEndItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ExtensionEndItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: ExtensionEndItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: ExtensionEndItemProvider.java,v 1.4 2004/04/30 17:20:11 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -97,8 +97,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ExtensionItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ExtensionItemProvider.java
index 1d00206..d5c8ceb 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ExtensionItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ExtensionItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: ExtensionItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: ExtensionItemProvider.java,v 1.4 2004/04/30 17:20:12 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -136,8 +136,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ExtensionPointItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ExtensionPointItemProvider.java
index 32fef22..8bed407 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ExtensionPointItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ExtensionPointItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: ExtensionPointItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: ExtensionPointItemProvider.java,v 1.4 2004/04/30 17:20:11 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -97,8 +97,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/FeatureItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/FeatureItemProvider.java
index c302ee3..e3c3a20 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/FeatureItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/FeatureItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: FeatureItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: FeatureItemProvider.java,v 1.4 2004/04/30 17:20:12 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -136,8 +136,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/FinalNodeItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/FinalNodeItemProvider.java
index 3132516..5714ea4 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/FinalNodeItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/FinalNodeItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: FinalNodeItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: FinalNodeItemProvider.java,v 1.4 2004/04/30 17:20:11 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -96,8 +96,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/FinalStateItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/FinalStateItemProvider.java
index 993844f..7b0cb1d 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/FinalStateItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/FinalStateItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: FinalStateItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: FinalStateItemProvider.java,v 1.4 2004/04/30 17:20:11 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -97,8 +97,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/FlowFinalNodeItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/FlowFinalNodeItemProvider.java
index e51a096..c1eb266 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/FlowFinalNodeItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/FlowFinalNodeItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: FlowFinalNodeItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: FlowFinalNodeItemProvider.java,v 1.4 2004/04/30 17:20:12 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -96,8 +96,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ForkNodeItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ForkNodeItemProvider.java
index c721bcb..88624b2 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ForkNodeItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ForkNodeItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: ForkNodeItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: ForkNodeItemProvider.java,v 1.4 2004/04/30 17:20:11 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -96,8 +96,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/GateItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/GateItemProvider.java
index 8ea92df..f763c0c 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/GateItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/GateItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: GateItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: GateItemProvider.java,v 1.4 2004/04/30 17:20:11 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -96,8 +96,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/GeneralOrderingItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/GeneralOrderingItemProvider.java
index a32c38a..1099f54 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/GeneralOrderingItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/GeneralOrderingItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: GeneralOrderingItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: GeneralOrderingItemProvider.java,v 1.4 2004/04/30 17:20:11 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -133,8 +133,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/GeneralizationItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/GeneralizationItemProvider.java
index d24ef9b..7b4eace 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/GeneralizationItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/GeneralizationItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: GeneralizationItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: GeneralizationItemProvider.java,v 1.4 2004/04/30 17:20:12 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -151,8 +151,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/GeneralizationSetItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/GeneralizationSetItemProvider.java
index 3fd0e18..c93853e 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/GeneralizationSetItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/GeneralizationSetItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: GeneralizationSetItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: GeneralizationSetItemProvider.java,v 1.4 2004/04/30 17:20:11 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -171,8 +171,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ImplementationItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ImplementationItemProvider.java
index 145d05f..7385d48 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ImplementationItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ImplementationItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: ImplementationItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: ImplementationItemProvider.java,v 1.4 2004/04/30 17:20:12 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -122,8 +122,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/IncludeItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/IncludeItemProvider.java
index 990a4cb..fd0b16b 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/IncludeItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/IncludeItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: IncludeItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: IncludeItemProvider.java,v 1.4 2004/04/30 17:20:12 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -167,8 +167,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/InformationFlowItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/InformationFlowItemProvider.java
index 4d52ce3..d39f135 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/InformationFlowItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/InformationFlowItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: InformationFlowItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: InformationFlowItemProvider.java,v 1.4 2004/04/30 17:20:11 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -129,8 +129,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/InformationItemItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/InformationItemItemProvider.java
index 2fb2c1f..1c86ae0 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/InformationItemItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/InformationItemItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: InformationItemItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: InformationItemItemProvider.java,v 1.4 2004/04/30 17:20:12 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -116,8 +116,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/InitialNodeItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/InitialNodeItemProvider.java
index 9481fbf..27378f8 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/InitialNodeItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/InitialNodeItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: InitialNodeItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: InitialNodeItemProvider.java,v 1.4 2004/04/30 17:20:11 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -96,8 +96,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/InputPinItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/InputPinItemProvider.java
index 9923a84..e57621a 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/InputPinItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/InputPinItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: InputPinItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: InputPinItemProvider.java,v 1.4 2004/04/30 17:20:12 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -96,8 +96,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/InstanceSpecificationItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/InstanceSpecificationItemProvider.java
index f68404d..543457e 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/InstanceSpecificationItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/InstanceSpecificationItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: InstanceSpecificationItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: InstanceSpecificationItemProvider.java,v 1.4 2004/04/30 17:20:12 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -230,8 +230,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/InstanceValueItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/InstanceValueItemProvider.java
index 5d4deb1..7a6ec23 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/InstanceValueItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/InstanceValueItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: InstanceValueItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: InstanceValueItemProvider.java,v 1.4 2004/04/30 17:20:11 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -116,8 +116,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/InteractionConstraintItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/InteractionConstraintItemProvider.java
index da7583c..717c9e6 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/InteractionConstraintItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/InteractionConstraintItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: InteractionConstraintItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: InteractionConstraintItemProvider.java,v 1.4 2004/04/30 17:20:12 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -172,8 +172,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/InteractionFragmentItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/InteractionFragmentItemProvider.java
index 01c46f5..dc8a7fd 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/InteractionFragmentItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/InteractionFragmentItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: InteractionFragmentItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: InteractionFragmentItemProvider.java,v 1.4 2004/04/30 17:20:11 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -154,8 +154,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/InteractionItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/InteractionItemProvider.java
index 9fac828..2c3a9c0 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/InteractionItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/InteractionItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: InteractionItemProvider.java,v 1.4 2004/04/23 02:26:00 khussey Exp $
+ * $Id: InteractionItemProvider.java,v 1.5 2004/04/30 17:20:11 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -248,8 +248,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -358,13 +358,13 @@
 	 */
 	public String getCreateChildText(Object owner, Object feature, Object child, Collection selection) {
 		boolean qualify =
+			feature == UML2Package.eINSTANCE.getBehavioredClassifier_OwnedBehavior() ||
+			feature == UML2Package.eINSTANCE.getClass_NestedClassifier() ||
+			feature == UML2Package.eINSTANCE.getInteraction_Fragment() ||
 			feature == UML2Package.eINSTANCE.getStructuredClassifier_OwnedAttribute() ||
 			feature == UML2Package.eINSTANCE.getEncapsulatedClassifier_OwnedPort() ||
-			feature == UML2Package.eINSTANCE.getBehavioredClassifier_OwnedBehavior() ||
 			feature == UML2Package.eINSTANCE.getBehavioredClassifier_OwnedStateMachine() ||
-			feature == UML2Package.eINSTANCE.getClass_NestedClassifier() ||
-			feature == UML2Package.eINSTANCE.getClassifier_OwnedUseCase() ||
-			feature == UML2Package.eINSTANCE.getInteraction_Fragment();
+			feature == UML2Package.eINSTANCE.getClassifier_OwnedUseCase();
 		return getString(
 			qualify ? "_UI_CreateChild_text2" : "_UI_CreateChild_text", //$NON-NLS-1$ //$NON-NLS-2$
 			new Object[] { getTypeText(child), getFeatureText(feature), getTypeText(owner) });
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/InteractionOccurrenceItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/InteractionOccurrenceItemProvider.java
index fe40eab..af952b4 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/InteractionOccurrenceItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/InteractionOccurrenceItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: InteractionOccurrenceItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: InteractionOccurrenceItemProvider.java,v 1.4 2004/04/30 17:20:11 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -188,8 +188,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/InteractionOperandItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/InteractionOperandItemProvider.java
index 5e57956..31968e1 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/InteractionOperandItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/InteractionOperandItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: InteractionOperandItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: InteractionOperandItemProvider.java,v 1.4 2004/04/30 17:20:11 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -210,8 +210,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/InterfaceItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/InterfaceItemProvider.java
index aa348da..94bd867 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/InterfaceItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/InterfaceItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: InterfaceItemProvider.java,v 1.4 2004/04/23 02:26:00 khussey Exp $
+ * $Id: InterfaceItemProvider.java,v 1.5 2004/04/30 17:20:12 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -248,8 +248,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -337,7 +337,7 @@
 		newChildDescriptors.add
 			(createChildParameter
 				(UML2Package.eINSTANCE.getInterface_NestedClassifier(),
-				 UML2Factory.eINSTANCE.createInformationItem()));
+				 UML2Factory.eINSTANCE.createActivity()));
 
 		newChildDescriptors.add
 			(createChildParameter
@@ -347,12 +347,12 @@
 		newChildDescriptors.add
 			(createChildParameter
 				(UML2Package.eINSTANCE.getInterface_NestedClassifier(),
-				 UML2Factory.eINSTANCE.createActivity()));
+				 UML2Factory.eINSTANCE.createInformationItem()));
 
 		newChildDescriptors.add
 			(createChildParameter
 				(UML2Package.eINSTANCE.getInterface_NestedClassifier(),
-				 UML2Factory.eINSTANCE.createArtifact()));
+				 UML2Factory.eINSTANCE.createInterface()));
 
 		newChildDescriptors.add
 			(createChildParameter
@@ -367,7 +367,7 @@
 		newChildDescriptors.add
 			(createChildParameter
 				(UML2Package.eINSTANCE.getInterface_NestedClassifier(),
-				 UML2Factory.eINSTANCE.createInterface()));
+				 UML2Factory.eINSTANCE.createArtifact()));
 
 		newChildDescriptors.add
 			(createChildParameter
@@ -392,6 +392,11 @@
 		newChildDescriptors.add
 			(createChildParameter
 				(UML2Package.eINSTANCE.getInterface_NestedClassifier(),
+				 UML2Factory.eINSTANCE.createProtocolStateMachine()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(UML2Package.eINSTANCE.getInterface_NestedClassifier(),
 				 UML2Factory.eINSTANCE.createComponent()));
 
 		newChildDescriptors.add
@@ -417,11 +422,6 @@
 		newChildDescriptors.add
 			(createChildParameter
 				(UML2Package.eINSTANCE.getInterface_NestedClassifier(),
-				 UML2Factory.eINSTANCE.createProtocolStateMachine()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(UML2Package.eINSTANCE.getInterface_NestedClassifier(),
 				 UML2Factory.eINSTANCE.createDeploymentSpecification()));
 
 		newChildDescriptors.add
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/InterruptibleActivityRegionItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/InterruptibleActivityRegionItemProvider.java
index 56ea4cc..3ed7c9f 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/InterruptibleActivityRegionItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/InterruptibleActivityRegionItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: InterruptibleActivityRegionItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: InterruptibleActivityRegionItemProvider.java,v 1.4 2004/04/30 17:20:11 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -129,8 +129,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/IntervalConstraintItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/IntervalConstraintItemProvider.java
index 8d6c681..47d81ff 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/IntervalConstraintItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/IntervalConstraintItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: IntervalConstraintItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: IntervalConstraintItemProvider.java,v 1.4 2004/04/30 17:20:11 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -96,8 +96,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/IntervalItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/IntervalItemProvider.java
index 4f44f3c..6a858b2 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/IntervalItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/IntervalItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: IntervalItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: IntervalItemProvider.java,v 1.4 2004/04/30 17:20:11 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -133,8 +133,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/InvocationActionItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/InvocationActionItemProvider.java
index 673dd79..9ab9d98 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/InvocationActionItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/InvocationActionItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: InvocationActionItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: InvocationActionItemProvider.java,v 1.4 2004/04/30 17:20:11 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -154,8 +154,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/JoinNodeItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/JoinNodeItemProvider.java
index 9da155c..4a32e6b 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/JoinNodeItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/JoinNodeItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: JoinNodeItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: JoinNodeItemProvider.java,v 1.4 2004/04/30 17:20:12 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -156,8 +156,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/LifelineItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/LifelineItemProvider.java
index efbdb67..e79b0f0 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/LifelineItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/LifelineItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: LifelineItemProvider.java,v 1.4 2004/04/23 02:26:00 khussey Exp $
+ * $Id: LifelineItemProvider.java,v 1.5 2004/04/30 17:20:11 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -188,8 +188,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/LinkActionItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/LinkActionItemProvider.java
index 84ebabc..3aaaeb6 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/LinkActionItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/LinkActionItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: LinkActionItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: LinkActionItemProvider.java,v 1.4 2004/04/30 17:20:11 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -138,8 +138,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/LinkEndCreationDataItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/LinkEndCreationDataItemProvider.java
index a385f20..1cc224f 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/LinkEndCreationDataItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/LinkEndCreationDataItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: LinkEndCreationDataItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: LinkEndCreationDataItemProvider.java,v 1.4 2004/04/30 17:20:12 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -134,8 +134,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/LinkEndDataItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/LinkEndDataItemProvider.java
index 2877bc4..74881d1 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/LinkEndDataItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/LinkEndDataItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: LinkEndDataItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: LinkEndDataItemProvider.java,v 1.4 2004/04/30 17:20:11 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -168,8 +168,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/LiteralBooleanItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/LiteralBooleanItemProvider.java
index e0678cc..c349cf8 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/LiteralBooleanItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/LiteralBooleanItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: LiteralBooleanItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: LiteralBooleanItemProvider.java,v 1.4 2004/04/30 17:20:12 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -119,8 +119,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/LiteralIntegerItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/LiteralIntegerItemProvider.java
index 72185e0..ffdeab6 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/LiteralIntegerItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/LiteralIntegerItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: LiteralIntegerItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: LiteralIntegerItemProvider.java,v 1.4 2004/04/30 17:20:12 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -119,8 +119,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/LiteralNullItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/LiteralNullItemProvider.java
index 7231c0d..7e6b79a 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/LiteralNullItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/LiteralNullItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: LiteralNullItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: LiteralNullItemProvider.java,v 1.4 2004/04/30 17:20:12 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -96,8 +96,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/LiteralSpecificationItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/LiteralSpecificationItemProvider.java
index d09d983..c31ecaa 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/LiteralSpecificationItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/LiteralSpecificationItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: LiteralSpecificationItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: LiteralSpecificationItemProvider.java,v 1.4 2004/04/30 17:20:11 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -96,8 +96,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/LiteralStringItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/LiteralStringItemProvider.java
index 2f9fc5c..3a3aa3c 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/LiteralStringItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/LiteralStringItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: LiteralStringItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: LiteralStringItemProvider.java,v 1.4 2004/04/30 17:20:11 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -119,8 +119,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/LiteralUnlimitedNaturalItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/LiteralUnlimitedNaturalItemProvider.java
index 95e3f6e..863ee8a 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/LiteralUnlimitedNaturalItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/LiteralUnlimitedNaturalItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: LiteralUnlimitedNaturalItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: LiteralUnlimitedNaturalItemProvider.java,v 1.4 2004/04/30 17:20:11 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -119,8 +119,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/LoopNodeItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/LoopNodeItemProvider.java
index 2914165..34f53a2 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/LoopNodeItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/LoopNodeItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: LoopNodeItemProvider.java,v 1.4 2004/04/23 02:26:00 khussey Exp $
+ * $Id: LoopNodeItemProvider.java,v 1.5 2004/04/30 17:20:12 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -294,8 +294,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -355,11 +355,11 @@
 	 */
 	public String getCreateChildText(Object owner, Object feature, Object child, Collection selection) {
 		boolean qualify =
-			feature == UML2Package.eINSTANCE.getStructuredActivityNode_ContainedNode() ||
-			feature == UML2Package.eINSTANCE.getLoopNode_LoopVariableInput() ||
 			feature == UML2Package.eINSTANCE.getAction_LocalPrecondition() ||
 			feature == UML2Package.eINSTANCE.getAction_LocalPostcondition() ||
 			feature == UML2Package.eINSTANCE.getNamespace_OwnedRule() ||
+			feature == UML2Package.eINSTANCE.getStructuredActivityNode_ContainedNode() ||
+			feature == UML2Package.eINSTANCE.getLoopNode_LoopVariableInput() ||
 			feature == UML2Package.eINSTANCE.getLoopNode_Result() ||
 			feature == UML2Package.eINSTANCE.getLoopNode_LoopVariable();
 		return getString(
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ManifestationItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ManifestationItemProvider.java
index 02af1ed..51ee968 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ManifestationItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ManifestationItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: ManifestationItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: ManifestationItemProvider.java,v 1.4 2004/04/30 17:20:11 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -122,8 +122,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/MergeNodeItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/MergeNodeItemProvider.java
index cfbe0cd..555807c 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/MergeNodeItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/MergeNodeItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: MergeNodeItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: MergeNodeItemProvider.java,v 1.4 2004/04/30 17:20:11 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -96,8 +96,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/MessageEndItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/MessageEndItemProvider.java
index 77c95ee..ab8ac52 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/MessageEndItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/MessageEndItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: MessageEndItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: MessageEndItemProvider.java,v 1.4 2004/04/30 17:20:12 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -133,8 +133,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/MessageItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/MessageItemProvider.java
index 9645e10..df729cc 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/MessageItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/MessageItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: MessageItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: MessageItemProvider.java,v 1.4 2004/04/30 17:20:12 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -241,8 +241,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/MessageTriggerItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/MessageTriggerItemProvider.java
index df916e9..fb7e5e0 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/MessageTriggerItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/MessageTriggerItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: MessageTriggerItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: MessageTriggerItemProvider.java,v 1.4 2004/04/30 17:20:12 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -97,8 +97,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ModelItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ModelItemProvider.java
index 831322d..7b99667 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ModelItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ModelItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: ModelItemProvider.java,v 1.4 2004/04/23 02:26:00 khussey Exp $
+ * $Id: ModelItemProvider.java,v 1.5 2004/04/30 17:20:11 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -119,8 +119,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -155,10 +155,10 @@
 	 */
 	public String getCreateChildText(Object owner, Object feature, Object child, Collection selection) {
 		boolean qualify =
-			feature == UML2Package.eINSTANCE.getPackage_PackageMerge() ||
-			feature == UML2Package.eINSTANCE.getPackage_PackageExtension() ||
 			feature == UML2Package.eINSTANCE.getNamespace_OwnedRule() ||
-			feature == UML2Package.eINSTANCE.getPackage_OwnedMember();
+			feature == UML2Package.eINSTANCE.getPackage_OwnedMember() ||
+			feature == UML2Package.eINSTANCE.getPackage_PackageMerge() ||
+			feature == UML2Package.eINSTANCE.getPackage_PackageExtension();
 		return getString(
 			qualify ? "_UI_CreateChild_text2" : "_UI_CreateChild_text", //$NON-NLS-1$ //$NON-NLS-2$
 			new Object[] { getTypeText(child), getFeatureText(feature), getTypeText(owner) });
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/MultiplicityElementItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/MultiplicityElementItemProvider.java
index 0fda547..148378f 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/MultiplicityElementItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/MultiplicityElementItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: MultiplicityElementItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: MultiplicityElementItemProvider.java,v 1.4 2004/04/30 17:20:11 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -241,8 +241,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/NamedElementItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/NamedElementItemProvider.java
index 1778595..ff1e9eb 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/NamedElementItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/NamedElementItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: NamedElementItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: NamedElementItemProvider.java,v 1.4 2004/04/30 17:20:12 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -208,8 +208,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/NamespaceItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/NamespaceItemProvider.java
index 3357710..ffdd012 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/NamespaceItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/NamespaceItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: NamespaceItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: NamespaceItemProvider.java,v 1.4 2004/04/30 17:20:11 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -225,8 +225,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/NodeItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/NodeItemProvider.java
index 45c07c2..4d98779 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/NodeItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/NodeItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: NodeItemProvider.java,v 1.4 2004/04/23 02:26:00 khussey Exp $
+ * $Id: NodeItemProvider.java,v 1.5 2004/04/30 17:20:11 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -193,8 +193,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -250,12 +250,12 @@
 	 */
 	public String getCreateChildText(Object owner, Object feature, Object child, Collection selection) {
 		boolean qualify =
+			feature == UML2Package.eINSTANCE.getBehavioredClassifier_OwnedBehavior() ||
+			feature == UML2Package.eINSTANCE.getClass_NestedClassifier() ||
 			feature == UML2Package.eINSTANCE.getStructuredClassifier_OwnedAttribute() ||
 			feature == UML2Package.eINSTANCE.getEncapsulatedClassifier_OwnedPort() ||
-			feature == UML2Package.eINSTANCE.getClass_NestedClassifier() ||
-			feature == UML2Package.eINSTANCE.getNode_NestedNode() ||
-			feature == UML2Package.eINSTANCE.getBehavioredClassifier_OwnedBehavior() ||
 			feature == UML2Package.eINSTANCE.getBehavioredClassifier_OwnedStateMachine() ||
+			feature == UML2Package.eINSTANCE.getNode_NestedNode() ||
 			feature == UML2Package.eINSTANCE.getClassifier_OwnedUseCase();
 		return getString(
 			qualify ? "_UI_CreateChild_text2" : "_UI_CreateChild_text", //$NON-NLS-1$ //$NON-NLS-2$
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ObjectFlowItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ObjectFlowItemProvider.java
index 73cb0d2..98a76df 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ObjectFlowItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ObjectFlowItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: ObjectFlowItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: ObjectFlowItemProvider.java,v 1.4 2004/04/30 17:20:11 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -171,8 +171,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ObjectNodeItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ObjectNodeItemProvider.java
index 5ba7206..626793e 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ObjectNodeItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ObjectNodeItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: ObjectNodeItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: ObjectNodeItemProvider.java,v 1.4 2004/04/30 17:20:11 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -206,8 +206,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/OpaqueExpressionItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/OpaqueExpressionItemProvider.java
index 66a1ca6..d297dd6 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/OpaqueExpressionItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/OpaqueExpressionItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: OpaqueExpressionItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: OpaqueExpressionItemProvider.java,v 1.4 2004/04/30 17:20:11 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -171,8 +171,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/OperationItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/OperationItemProvider.java
index f1b1f28..95c5328 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/OperationItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/OperationItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: OperationItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: OperationItemProvider.java,v 1.4 2004/04/30 17:20:12 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -400,8 +400,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/OperationTemplateParameterItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/OperationTemplateParameterItemProvider.java
index dac8213..c0a174b 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/OperationTemplateParameterItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/OperationTemplateParameterItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: OperationTemplateParameterItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: OperationTemplateParameterItemProvider.java,v 1.4 2004/04/30 17:20:12 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -93,8 +93,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/OutputPinItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/OutputPinItemProvider.java
index 5a6deed..4127dda 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/OutputPinItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/OutputPinItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: OutputPinItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: OutputPinItemProvider.java,v 1.4 2004/04/30 17:20:11 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -96,8 +96,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/PackageImportItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/PackageImportItemProvider.java
index e82f858..a810413 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/PackageImportItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/PackageImportItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: PackageImportItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: PackageImportItemProvider.java,v 1.4 2004/04/30 17:20:12 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -138,8 +138,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/PackageItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/PackageItemProvider.java
index f1fc0b6..baf6e3e 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/PackageItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/PackageItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: PackageItemProvider.java,v 1.4 2004/04/23 02:26:00 khussey Exp $
+ * $Id: PackageItemProvider.java,v 1.5 2004/04/30 17:20:11 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -301,8 +301,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -396,11 +396,6 @@
 		newChildDescriptors.add
 			(createChildParameter
 				(UML2Package.eINSTANCE.getPackage_OwnedMember(),
-				 UML2Factory.eINSTANCE.createModel()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(UML2Package.eINSTANCE.getPackage_OwnedMember(),
 				 UML2Factory.eINSTANCE.createDependency()));
 
 		newChildDescriptors.add
@@ -431,12 +426,7 @@
 		newChildDescriptors.add
 			(createChildParameter
 				(UML2Package.eINSTANCE.getPackage_OwnedMember(),
-				 UML2Factory.eINSTANCE.createGeneralizationSet()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(UML2Package.eINSTANCE.getPackage_OwnedMember(),
-				 UML2Factory.eINSTANCE.createInformationItem()));
+				 UML2Factory.eINSTANCE.createActivity()));
 
 		newChildDescriptors.add
 			(createChildParameter
@@ -446,17 +436,27 @@
 		newChildDescriptors.add
 			(createChildParameter
 				(UML2Package.eINSTANCE.getPackage_OwnedMember(),
-				 UML2Factory.eINSTANCE.createActivity()));
+				 UML2Factory.eINSTANCE.createModel()));
 
 		newChildDescriptors.add
 			(createChildParameter
 				(UML2Package.eINSTANCE.getPackage_OwnedMember(),
-				 UML2Factory.eINSTANCE.createArtifact()));
+				 UML2Factory.eINSTANCE.createInformationItem()));
 
 		newChildDescriptors.add
 			(createChildParameter
 				(UML2Package.eINSTANCE.getPackage_OwnedMember(),
-				 UML2Factory.eINSTANCE.createManifestation()));
+				 UML2Factory.eINSTANCE.createGeneralizationSet()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(UML2Package.eINSTANCE.getPackage_OwnedMember(),
+				 UML2Factory.eINSTANCE.createInterface()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(UML2Package.eINSTANCE.getPackage_OwnedMember(),
+				 UML2Factory.eINSTANCE.createImplementation()));
 
 		newChildDescriptors.add
 			(createChildParameter
@@ -471,12 +471,12 @@
 		newChildDescriptors.add
 			(createChildParameter
 				(UML2Package.eINSTANCE.getPackage_OwnedMember(),
-				 UML2Factory.eINSTANCE.createInterface()));
+				 UML2Factory.eINSTANCE.createArtifact()));
 
 		newChildDescriptors.add
 			(createChildParameter
 				(UML2Package.eINSTANCE.getPackage_OwnedMember(),
-				 UML2Factory.eINSTANCE.createImplementation()));
+				 UML2Factory.eINSTANCE.createManifestation()));
 
 		newChildDescriptors.add
 			(createChildParameter
@@ -521,21 +521,41 @@
 		newChildDescriptors.add
 			(createChildParameter
 				(UML2Package.eINSTANCE.getPackage_OwnedMember(),
-				 UML2Factory.eINSTANCE.createInteractionConstraint()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(UML2Package.eINSTANCE.getPackage_OwnedMember(),
 				 UML2Factory.eINSTANCE.createStateMachine()));
 
 		newChildDescriptors.add
 			(createChildParameter
 				(UML2Package.eINSTANCE.getPackage_OwnedMember(),
+				 UML2Factory.eINSTANCE.createInteractionConstraint()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(UML2Package.eINSTANCE.getPackage_OwnedMember(),
+				 UML2Factory.eINSTANCE.createProtocolStateMachine()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(UML2Package.eINSTANCE.getPackage_OwnedMember(),
 				 UML2Factory.eINSTANCE.createComponent()));
 
 		newChildDescriptors.add
 			(createChildParameter
 				(UML2Package.eINSTANCE.getPackage_OwnedMember(),
+				 UML2Factory.eINSTANCE.createIntervalConstraint()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(UML2Package.eINSTANCE.getPackage_OwnedMember(),
+				 UML2Factory.eINSTANCE.createTimeConstraint()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(UML2Package.eINSTANCE.getPackage_OwnedMember(),
+				 UML2Factory.eINSTANCE.createDurationConstraint()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(UML2Package.eINSTANCE.getPackage_OwnedMember(),
 				 UML2Factory.eINSTANCE.createDeployment()));
 
 		newChildDescriptors.add
@@ -561,26 +581,6 @@
 		newChildDescriptors.add
 			(createChildParameter
 				(UML2Package.eINSTANCE.getPackage_OwnedMember(),
-				 UML2Factory.eINSTANCE.createProtocolStateMachine()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(UML2Package.eINSTANCE.getPackage_OwnedMember(),
-				 UML2Factory.eINSTANCE.createIntervalConstraint()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(UML2Package.eINSTANCE.getPackage_OwnedMember(),
-				 UML2Factory.eINSTANCE.createTimeConstraint()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(UML2Package.eINSTANCE.getPackage_OwnedMember(),
-				 UML2Factory.eINSTANCE.createDurationConstraint()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(UML2Package.eINSTANCE.getPackage_OwnedMember(),
 				 UML2Factory.eINSTANCE.createDeploymentSpecification()));
 
 		newChildDescriptors.add
@@ -602,10 +602,10 @@
 	 */
 	public String getCreateChildText(Object owner, Object feature, Object child, Collection selection) {
 		boolean qualify =
-			feature == UML2Package.eINSTANCE.getPackage_PackageMerge() ||
-			feature == UML2Package.eINSTANCE.getPackage_PackageExtension() ||
 			feature == UML2Package.eINSTANCE.getNamespace_OwnedRule() ||
-			feature == UML2Package.eINSTANCE.getPackage_OwnedMember();
+			feature == UML2Package.eINSTANCE.getPackage_OwnedMember() ||
+			feature == UML2Package.eINSTANCE.getPackage_PackageMerge() ||
+			feature == UML2Package.eINSTANCE.getPackage_PackageExtension();
 		return getString(
 			qualify ? "_UI_CreateChild_text2" : "_UI_CreateChild_text", //$NON-NLS-1$ //$NON-NLS-2$
 			new Object[] { getTypeText(child), getFeatureText(feature), getTypeText(owner) });
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/PackageMergeItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/PackageMergeItemProvider.java
index 5b32eb0..a111e51 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/PackageMergeItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/PackageMergeItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: PackageMergeItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: PackageMergeItemProvider.java,v 1.4 2004/04/30 17:20:12 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -112,8 +112,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/PackageableElementItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/PackageableElementItemProvider.java
index d96fa02..2b5c72e 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/PackageableElementItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/PackageableElementItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: PackageableElementItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: PackageableElementItemProvider.java,v 1.4 2004/04/30 17:20:12 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -146,8 +146,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ParameterItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ParameterItemProvider.java
index 683d85c..0bde5fb 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ParameterItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ParameterItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: ParameterItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: ParameterItemProvider.java,v 1.4 2004/04/30 17:20:11 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -387,8 +387,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ParameterSetItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ParameterSetItemProvider.java
index 2d42341..6a4ba11 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ParameterSetItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ParameterSetItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: ParameterSetItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: ParameterSetItemProvider.java,v 1.4 2004/04/30 17:20:12 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -154,8 +154,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ParameterableClassifierItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ParameterableClassifierItemProvider.java
index 2c229c4..57692d2 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ParameterableClassifierItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ParameterableClassifierItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: ParameterableClassifierItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: ParameterableClassifierItemProvider.java,v 1.4 2004/04/30 17:20:11 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -96,8 +96,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ParameterableElementItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ParameterableElementItemProvider.java
index ba9df20..f7bf100 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ParameterableElementItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ParameterableElementItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: ParameterableElementItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: ParameterableElementItemProvider.java,v 1.4 2004/04/30 17:20:12 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -122,8 +122,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/PartDecompositionItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/PartDecompositionItemProvider.java
index 2bf2ff7..50899b5 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/PartDecompositionItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/PartDecompositionItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: PartDecompositionItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: PartDecompositionItemProvider.java,v 1.4 2004/04/30 17:20:11 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -96,8 +96,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/PermissionItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/PermissionItemProvider.java
index 73eaac0..1034761 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/PermissionItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/PermissionItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: PermissionItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: PermissionItemProvider.java,v 1.4 2004/04/30 17:20:11 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -96,8 +96,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/PinItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/PinItemProvider.java
index 9a34a4d..1c38f42 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/PinItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/PinItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: PinItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: PinItemProvider.java,v 1.4 2004/04/30 17:20:12 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -96,8 +96,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/PortItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/PortItemProvider.java
index bbeea38..3973ee7 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/PortItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/PortItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: PortItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: PortItemProvider.java,v 1.4 2004/04/30 17:20:11 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -205,8 +205,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/PrimitiveFunctionItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/PrimitiveFunctionItemProvider.java
index 9f54375..b130307 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/PrimitiveFunctionItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/PrimitiveFunctionItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: PrimitiveFunctionItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: PrimitiveFunctionItemProvider.java,v 1.4 2004/04/30 17:20:11 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -137,8 +137,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/PrimitiveTypeItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/PrimitiveTypeItemProvider.java
index b1cf715..b0b3b0f 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/PrimitiveTypeItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/PrimitiveTypeItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: PrimitiveTypeItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: PrimitiveTypeItemProvider.java,v 1.4 2004/04/30 17:20:12 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -96,8 +96,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ProfileApplicationItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ProfileApplicationItemProvider.java
index 3138964..2c9ffb1 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ProfileApplicationItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ProfileApplicationItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: ProfileApplicationItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: ProfileApplicationItemProvider.java,v 1.4 2004/04/30 17:20:11 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -124,8 +124,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ProfileItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ProfileItemProvider.java
index 60a6295..1d4db87 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ProfileItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ProfileItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: ProfileItemProvider.java,v 1.4 2004/04/23 02:26:00 khussey Exp $
+ * $Id: ProfileItemProvider.java,v 1.5 2004/04/30 17:20:12 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -157,8 +157,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -187,10 +187,10 @@
 	 */
 	public String getCreateChildText(Object owner, Object feature, Object child, Collection selection) {
 		boolean qualify =
-			feature == UML2Package.eINSTANCE.getPackage_PackageMerge() ||
-			feature == UML2Package.eINSTANCE.getPackage_PackageExtension() ||
 			feature == UML2Package.eINSTANCE.getNamespace_OwnedRule() ||
-			feature == UML2Package.eINSTANCE.getPackage_OwnedMember();
+			feature == UML2Package.eINSTANCE.getPackage_OwnedMember() ||
+			feature == UML2Package.eINSTANCE.getPackage_PackageMerge() ||
+			feature == UML2Package.eINSTANCE.getPackage_PackageExtension();
 		return getString(
 			qualify ? "_UI_CreateChild_text2" : "_UI_CreateChild_text", //$NON-NLS-1$ //$NON-NLS-2$
 			new Object[] { getTypeText(child), getFeatureText(feature), getTypeText(owner) });
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/PropertyItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/PropertyItemProvider.java
index 0effd5e..519ed74 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/PropertyItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/PropertyItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: PropertyItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: PropertyItemProvider.java,v 1.4 2004/04/30 17:20:12 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -430,8 +430,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ProtocolConformanceItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ProtocolConformanceItemProvider.java
index 164338c..992c243 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ProtocolConformanceItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ProtocolConformanceItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: ProtocolConformanceItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: ProtocolConformanceItemProvider.java,v 1.4 2004/04/30 17:20:12 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -112,8 +112,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ProtocolStateMachineItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ProtocolStateMachineItemProvider.java
index eed046b..ebbd22b 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ProtocolStateMachineItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ProtocolStateMachineItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: ProtocolStateMachineItemProvider.java,v 1.4 2004/04/23 02:26:00 khussey Exp $
+ * $Id: ProtocolStateMachineItemProvider.java,v 1.5 2004/04/30 17:20:12 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -138,8 +138,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -179,11 +179,11 @@
 	 */
 	public String getCreateChildText(Object owner, Object feature, Object child, Collection selection) {
 		boolean qualify =
+			feature == UML2Package.eINSTANCE.getBehavioredClassifier_OwnedBehavior() ||
+			feature == UML2Package.eINSTANCE.getClass_NestedClassifier() ||
 			feature == UML2Package.eINSTANCE.getStructuredClassifier_OwnedAttribute() ||
 			feature == UML2Package.eINSTANCE.getEncapsulatedClassifier_OwnedPort() ||
-			feature == UML2Package.eINSTANCE.getBehavioredClassifier_OwnedBehavior() ||
 			feature == UML2Package.eINSTANCE.getBehavioredClassifier_OwnedStateMachine() ||
-			feature == UML2Package.eINSTANCE.getClass_NestedClassifier() ||
 			feature == UML2Package.eINSTANCE.getClassifier_OwnedUseCase();
 		return getString(
 			qualify ? "_UI_CreateChild_text2" : "_UI_CreateChild_text", //$NON-NLS-1$ //$NON-NLS-2$
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ProtocolTransitionItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ProtocolTransitionItemProvider.java
index dd29ced..1777329 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ProtocolTransitionItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ProtocolTransitionItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: ProtocolTransitionItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: ProtocolTransitionItemProvider.java,v 1.4 2004/04/30 17:20:12 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -177,8 +177,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/PseudostateItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/PseudostateItemProvider.java
index 620fdaa..4264c73 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/PseudostateItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/PseudostateItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: PseudostateItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: PseudostateItemProvider.java,v 1.4 2004/04/30 17:20:11 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -119,8 +119,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/QualifierValueItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/QualifierValueItemProvider.java
index f3a6645..01028e2 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/QualifierValueItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/QualifierValueItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: QualifierValueItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: QualifierValueItemProvider.java,v 1.4 2004/04/30 17:20:12 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -129,8 +129,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/RaiseExceptionActionItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/RaiseExceptionActionItemProvider.java
index 694335c..e4eb349 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/RaiseExceptionActionItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/RaiseExceptionActionItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: RaiseExceptionActionItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: RaiseExceptionActionItemProvider.java,v 1.4 2004/04/30 17:20:11 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -116,8 +116,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ReadExtentActionItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ReadExtentActionItemProvider.java
index 930ab12..6f18517 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ReadExtentActionItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ReadExtentActionItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: ReadExtentActionItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: ReadExtentActionItemProvider.java,v 1.4 2004/04/30 17:20:11 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -154,8 +154,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ReadIsClassifiedObjectActionItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ReadIsClassifiedObjectActionItemProvider.java
index 3402234..0d366dd 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ReadIsClassifiedObjectActionItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ReadIsClassifiedObjectActionItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: ReadIsClassifiedObjectActionItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: ReadIsClassifiedObjectActionItemProvider.java,v 1.4 2004/04/30 17:20:12 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -206,8 +206,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ReadLinkActionItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ReadLinkActionItemProvider.java
index 4ea993e..8b08737 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ReadLinkActionItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ReadLinkActionItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: ReadLinkActionItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: ReadLinkActionItemProvider.java,v 1.4 2004/04/30 17:20:12 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -138,8 +138,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ReadLinkObjectEndActionItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ReadLinkObjectEndActionItemProvider.java
index 49e3287..31e4f77 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ReadLinkObjectEndActionItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ReadLinkObjectEndActionItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: ReadLinkObjectEndActionItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: ReadLinkObjectEndActionItemProvider.java,v 1.4 2004/04/30 17:20:11 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -188,8 +188,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ReadLinkObjectEndQualifierActionItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ReadLinkObjectEndQualifierActionItemProvider.java
index 2aafc5e..8ae2536 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ReadLinkObjectEndQualifierActionItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ReadLinkObjectEndQualifierActionItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: ReadLinkObjectEndQualifierActionItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: ReadLinkObjectEndQualifierActionItemProvider.java,v 1.4 2004/04/30 17:20:12 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -188,8 +188,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ReadSelfActionItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ReadSelfActionItemProvider.java
index 6cbfc92..b63ddb5 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ReadSelfActionItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ReadSelfActionItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: ReadSelfActionItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: ReadSelfActionItemProvider.java,v 1.4 2004/04/30 17:20:12 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -138,8 +138,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ReadStructuralFeatureActionItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ReadStructuralFeatureActionItemProvider.java
index 54e322a..df52b62 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ReadStructuralFeatureActionItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ReadStructuralFeatureActionItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: ReadStructuralFeatureActionItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: ReadStructuralFeatureActionItemProvider.java,v 1.4 2004/04/30 17:20:12 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -138,8 +138,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ReadVariableActionItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ReadVariableActionItemProvider.java
index 33decf5..3fee11f 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ReadVariableActionItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ReadVariableActionItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: ReadVariableActionItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: ReadVariableActionItemProvider.java,v 1.4 2004/04/30 17:20:12 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -138,8 +138,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/RealizationItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/RealizationItemProvider.java
index 12b20b2..ef8171d 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/RealizationItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/RealizationItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: RealizationItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: RealizationItemProvider.java,v 1.4 2004/04/30 17:20:11 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -122,8 +122,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ReceptionItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ReceptionItemProvider.java
index 8a3eb2f..7099e78 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ReceptionItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ReceptionItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: ReceptionItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: ReceptionItemProvider.java,v 1.4 2004/04/30 17:20:11 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -116,8 +116,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ReclassifyObjectActionItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ReclassifyObjectActionItemProvider.java
index d730156..a29d951 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ReclassifyObjectActionItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ReclassifyObjectActionItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: ReclassifyObjectActionItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: ReclassifyObjectActionItemProvider.java,v 1.4 2004/04/30 17:20:12 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -189,8 +189,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/RedefinableElementItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/RedefinableElementItemProvider.java
index aacbe13..240de54 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/RedefinableElementItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/RedefinableElementItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: RedefinableElementItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: RedefinableElementItemProvider.java,v 1.4 2004/04/30 17:20:11 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -136,8 +136,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/RedefinableTemplateSignatureItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/RedefinableTemplateSignatureItemProvider.java
index 08b7866..86048d7 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/RedefinableTemplateSignatureItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/RedefinableTemplateSignatureItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: RedefinableTemplateSignatureItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: RedefinableTemplateSignatureItemProvider.java,v 1.4 2004/04/30 17:20:11 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -195,8 +195,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/RegionItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/RegionItemProvider.java
index 17d141e..ff121d4 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/RegionItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/RegionItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: RegionItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: RegionItemProvider.java,v 1.4 2004/04/30 17:20:12 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -188,8 +188,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/RelationshipItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/RelationshipItemProvider.java
index 75952c8..0275bd7 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/RelationshipItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/RelationshipItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: RelationshipItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: RelationshipItemProvider.java,v 1.4 2004/04/30 17:20:12 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -112,8 +112,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/RemoveStructuralFeatureValueActionItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/RemoveStructuralFeatureValueActionItemProvider.java
index 61e9042..0eeddfb 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/RemoveStructuralFeatureValueActionItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/RemoveStructuralFeatureValueActionItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: RemoveStructuralFeatureValueActionItemProvider.java,v 1.4 2004/04/23 02:26:00 khussey Exp $
+ * $Id: RemoveStructuralFeatureValueActionItemProvider.java,v 1.5 2004/04/30 17:20:11 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -97,8 +97,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/RemoveVariableValueActionItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/RemoveVariableValueActionItemProvider.java
index c2a387e..698c5dd 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/RemoveVariableValueActionItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/RemoveVariableValueActionItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: RemoveVariableValueActionItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: RemoveVariableValueActionItemProvider.java,v 1.4 2004/04/30 17:20:11 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -97,8 +97,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ReplyActionItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ReplyActionItemProvider.java
index 108616b..5d6298e 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ReplyActionItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ReplyActionItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: ReplyActionItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: ReplyActionItemProvider.java,v 1.4 2004/04/30 17:20:11 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -150,8 +150,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/SendObjectActionItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/SendObjectActionItemProvider.java
index c37ecdb..1d4742f 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/SendObjectActionItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/SendObjectActionItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: SendObjectActionItemProvider.java,v 1.4 2004/04/23 02:26:00 khussey Exp $
+ * $Id: SendObjectActionItemProvider.java,v 1.5 2004/04/30 17:20:11 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -172,8 +172,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/SendSignalActionItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/SendSignalActionItemProvider.java
index 0736143..017f01f 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/SendSignalActionItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/SendSignalActionItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: SendSignalActionItemProvider.java,v 1.4 2004/04/23 02:26:00 khussey Exp $
+ * $Id: SendSignalActionItemProvider.java,v 1.5 2004/04/30 17:20:12 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -154,8 +154,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/SignalItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/SignalItemProvider.java
index cafc24a..bf267f8 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/SignalItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/SignalItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: SignalItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: SignalItemProvider.java,v 1.4 2004/04/30 17:20:12 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -138,8 +138,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/SignalTriggerItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/SignalTriggerItemProvider.java
index e18f3ed..80a83ca 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/SignalTriggerItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/SignalTriggerItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: SignalTriggerItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: SignalTriggerItemProvider.java,v 1.4 2004/04/30 17:20:11 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -116,8 +116,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/SlotItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/SlotItemProvider.java
index 8e4adea..efb2f7f 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/SlotItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/SlotItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: SlotItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: SlotItemProvider.java,v 1.4 2004/04/30 17:20:12 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -151,8 +151,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/StartOwnedBehaviorActionItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/StartOwnedBehaviorActionItemProvider.java
index 52a5bfd..3987cc3 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/StartOwnedBehaviorActionItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/StartOwnedBehaviorActionItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: StartOwnedBehaviorActionItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: StartOwnedBehaviorActionItemProvider.java,v 1.4 2004/04/30 17:20:11 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -138,8 +138,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/StateInvariantItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/StateInvariantItemProvider.java
index b5919ee..db52d9d 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/StateInvariantItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/StateInvariantItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: StateInvariantItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: StateInvariantItemProvider.java,v 1.4 2004/04/30 17:20:12 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -138,8 +138,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/StateItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/StateItemProvider.java
index b0cb0ee..6dc3324 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/StateItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/StateItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: StateItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: StateItemProvider.java,v 1.4 2004/04/30 17:20:11 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -408,8 +408,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/StateMachineItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/StateMachineItemProvider.java
index ea733cc..d458059 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/StateMachineItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/StateMachineItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: StateMachineItemProvider.java,v 1.4 2004/04/23 02:26:00 khussey Exp $
+ * $Id: StateMachineItemProvider.java,v 1.5 2004/04/30 17:20:11 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -188,8 +188,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -235,11 +235,11 @@
 	 */
 	public String getCreateChildText(Object owner, Object feature, Object child, Collection selection) {
 		boolean qualify =
+			feature == UML2Package.eINSTANCE.getBehavioredClassifier_OwnedBehavior() ||
+			feature == UML2Package.eINSTANCE.getClass_NestedClassifier() ||
 			feature == UML2Package.eINSTANCE.getStructuredClassifier_OwnedAttribute() ||
 			feature == UML2Package.eINSTANCE.getEncapsulatedClassifier_OwnedPort() ||
-			feature == UML2Package.eINSTANCE.getBehavioredClassifier_OwnedBehavior() ||
 			feature == UML2Package.eINSTANCE.getBehavioredClassifier_OwnedStateMachine() ||
-			feature == UML2Package.eINSTANCE.getClass_NestedClassifier() ||
 			feature == UML2Package.eINSTANCE.getClassifier_OwnedUseCase();
 		return getString(
 			qualify ? "_UI_CreateChild_text2" : "_UI_CreateChild_text", //$NON-NLS-1$ //$NON-NLS-2$
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/StereotypeItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/StereotypeItemProvider.java
index 8db2651..c439d74 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/StereotypeItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/StereotypeItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: StereotypeItemProvider.java,v 1.4 2004/04/23 02:26:00 khussey Exp $
+ * $Id: StereotypeItemProvider.java,v 1.5 2004/04/30 17:20:11 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -97,8 +97,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -127,11 +127,11 @@
 	 */
 	public String getCreateChildText(Object owner, Object feature, Object child, Collection selection) {
 		boolean qualify =
+			feature == UML2Package.eINSTANCE.getBehavioredClassifier_OwnedBehavior() ||
+			feature == UML2Package.eINSTANCE.getClass_NestedClassifier() ||
 			feature == UML2Package.eINSTANCE.getStructuredClassifier_OwnedAttribute() ||
 			feature == UML2Package.eINSTANCE.getEncapsulatedClassifier_OwnedPort() ||
-			feature == UML2Package.eINSTANCE.getBehavioredClassifier_OwnedBehavior() ||
 			feature == UML2Package.eINSTANCE.getBehavioredClassifier_OwnedStateMachine() ||
-			feature == UML2Package.eINSTANCE.getClass_NestedClassifier() ||
 			feature == UML2Package.eINSTANCE.getClassifier_OwnedUseCase();
 		return getString(
 			qualify ? "_UI_CreateChild_text2" : "_UI_CreateChild_text", //$NON-NLS-1$ //$NON-NLS-2$
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/StopItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/StopItemProvider.java
index 684ecfa..fcc3357 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/StopItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/StopItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: StopItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: StopItemProvider.java,v 1.4 2004/04/30 17:20:12 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -96,8 +96,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/StringExpressionItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/StringExpressionItemProvider.java
index 4cd3e98..646b735 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/StringExpressionItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/StringExpressionItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: StringExpressionItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: StringExpressionItemProvider.java,v 1.4 2004/04/30 17:20:12 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -135,8 +135,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/StructuralFeatureActionItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/StructuralFeatureActionItemProvider.java
index e72bdb4..543bcae 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/StructuralFeatureActionItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/StructuralFeatureActionItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: StructuralFeatureActionItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: StructuralFeatureActionItemProvider.java,v 1.4 2004/04/30 17:20:11 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -154,8 +154,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/StructuralFeatureItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/StructuralFeatureItemProvider.java
index 7b3061c..f939e68 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/StructuralFeatureItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/StructuralFeatureItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: StructuralFeatureItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: StructuralFeatureItemProvider.java,v 1.4 2004/04/30 17:20:12 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -278,8 +278,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/StructuredActivityNodeItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/StructuredActivityNodeItemProvider.java
index 78af35b..9111ef3 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/StructuredActivityNodeItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/StructuredActivityNodeItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: StructuredActivityNodeItemProvider.java,v 1.4 2004/04/23 02:26:00 khussey Exp $
+ * $Id: StructuredActivityNodeItemProvider.java,v 1.5 2004/04/30 17:20:11 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -320,8 +320,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -483,16 +483,6 @@
 		newChildDescriptors.add
 			(createChildParameter
 				(UML2Package.eINSTANCE.getStructuredActivityNode_ContainedNode(),
-				 UML2Factory.eINSTANCE.createExpansionNode()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(UML2Package.eINSTANCE.getStructuredActivityNode_ContainedNode(),
-				 UML2Factory.eINSTANCE.createExpansionRegion()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(UML2Package.eINSTANCE.getStructuredActivityNode_ContainedNode(),
 				 UML2Factory.eINSTANCE.createCreateObjectAction()));
 
 		newChildDescriptors.add
@@ -603,7 +593,22 @@
 		newChildDescriptors.add
 			(createChildParameter
 				(UML2Package.eINSTANCE.getStructuredActivityNode_ContainedNode(),
-				 UML2Factory.eINSTANCE.createDataStoreNode()));
+				 UML2Factory.eINSTANCE.createExpansionNode()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(UML2Package.eINSTANCE.getStructuredActivityNode_ContainedNode(),
+				 UML2Factory.eINSTANCE.createExpansionRegion()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(UML2Package.eINSTANCE.getStructuredActivityNode_ContainedNode(),
+				 UML2Factory.eINSTANCE.createTimeObservationAction()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(UML2Package.eINSTANCE.getStructuredActivityNode_ContainedNode(),
+				 UML2Factory.eINSTANCE.createDurationObservationAction()));
 
 		newChildDescriptors.add
 			(createChildParameter
@@ -663,12 +668,7 @@
 		newChildDescriptors.add
 			(createChildParameter
 				(UML2Package.eINSTANCE.getStructuredActivityNode_ContainedNode(),
-				 UML2Factory.eINSTANCE.createTimeObservationAction()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(UML2Package.eINSTANCE.getStructuredActivityNode_ContainedNode(),
-				 UML2Factory.eINSTANCE.createDurationObservationAction()));
+				 UML2Factory.eINSTANCE.createDataStoreNode()));
 
 		newChildDescriptors.add
 			(createChildParameter
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/StructuredClassifierItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/StructuredClassifierItemProvider.java
index ddf27d5..d917e2d 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/StructuredClassifierItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/StructuredClassifierItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: StructuredClassifierItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: StructuredClassifierItemProvider.java,v 1.4 2004/04/30 17:20:11 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -205,8 +205,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/SubstitutionItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/SubstitutionItemProvider.java
index 4214324..eb97587 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/SubstitutionItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/SubstitutionItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: SubstitutionItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: SubstitutionItemProvider.java,v 1.4 2004/04/30 17:20:12 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -122,8 +122,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/TemplateBindingItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/TemplateBindingItemProvider.java
index a5e858f..6896de7 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/TemplateBindingItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/TemplateBindingItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: TemplateBindingItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: TemplateBindingItemProvider.java,v 1.4 2004/04/30 17:20:11 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -151,8 +151,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/TemplateParameterItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/TemplateParameterItemProvider.java
index fdaa6fb..af4fbd6 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/TemplateParameterItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/TemplateParameterItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: TemplateParameterItemProvider.java,v 1.4 2004/04/23 02:26:00 khussey Exp $
+ * $Id: TemplateParameterItemProvider.java,v 1.5 2004/04/30 17:20:11 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -206,8 +206,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -237,6 +237,16 @@
 		newChildDescriptors.add
 			(createChildParameter
 				(UML2Package.eINSTANCE.getTemplateParameter_OwnedParameteredElement(),
+				 UML2Factory.eINSTANCE.createOpaqueExpression()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(UML2Package.eINSTANCE.getTemplateParameter_OwnedParameteredElement(),
+				 UML2Factory.eINSTANCE.createExpression()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(UML2Package.eINSTANCE.getTemplateParameter_OwnedParameteredElement(),
 				 UML2Factory.eINSTANCE.createClass()));
 
 		newChildDescriptors.add
@@ -287,12 +297,7 @@
 		newChildDescriptors.add
 			(createChildParameter
 				(UML2Package.eINSTANCE.getTemplateParameter_OwnedParameteredElement(),
-				 UML2Factory.eINSTANCE.createOpaqueExpression()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(UML2Package.eINSTANCE.getTemplateParameter_OwnedParameteredElement(),
-				 UML2Factory.eINSTANCE.createExpression()));
+				 UML2Factory.eINSTANCE.createConstraint()));
 
 		newChildDescriptors.add
 			(createChildParameter
@@ -322,11 +327,6 @@
 		newChildDescriptors.add
 			(createChildParameter
 				(UML2Package.eINSTANCE.getTemplateParameter_OwnedParameteredElement(),
-				 UML2Factory.eINSTANCE.createConstraint()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(UML2Package.eINSTANCE.getTemplateParameter_OwnedParameteredElement(),
 				 UML2Factory.eINSTANCE.createInstanceValue()));
 
 		newChildDescriptors.add
@@ -357,11 +357,6 @@
 		newChildDescriptors.add
 			(createChildParameter
 				(UML2Package.eINSTANCE.getTemplateParameter_OwnedParameteredElement(),
-				 UML2Factory.eINSTANCE.createModel()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(UML2Package.eINSTANCE.getTemplateParameter_OwnedParameteredElement(),
 				 UML2Factory.eINSTANCE.createDependency()));
 
 		newChildDescriptors.add
@@ -392,12 +387,7 @@
 		newChildDescriptors.add
 			(createChildParameter
 				(UML2Package.eINSTANCE.getTemplateParameter_OwnedParameteredElement(),
-				 UML2Factory.eINSTANCE.createGeneralizationSet()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(UML2Package.eINSTANCE.getTemplateParameter_OwnedParameteredElement(),
-				 UML2Factory.eINSTANCE.createInformationItem()));
+				 UML2Factory.eINSTANCE.createActivity()));
 
 		newChildDescriptors.add
 			(createChildParameter
@@ -407,27 +397,17 @@
 		newChildDescriptors.add
 			(createChildParameter
 				(UML2Package.eINSTANCE.getTemplateParameter_OwnedParameteredElement(),
-				 UML2Factory.eINSTANCE.createActivity()));
+				 UML2Factory.eINSTANCE.createModel()));
 
 		newChildDescriptors.add
 			(createChildParameter
 				(UML2Package.eINSTANCE.getTemplateParameter_OwnedParameteredElement(),
-				 UML2Factory.eINSTANCE.createArtifact()));
+				 UML2Factory.eINSTANCE.createInformationItem()));
 
 		newChildDescriptors.add
 			(createChildParameter
 				(UML2Package.eINSTANCE.getTemplateParameter_OwnedParameteredElement(),
-				 UML2Factory.eINSTANCE.createManifestation()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(UML2Package.eINSTANCE.getTemplateParameter_OwnedParameteredElement(),
-				 UML2Factory.eINSTANCE.createActor()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(UML2Package.eINSTANCE.getTemplateParameter_OwnedParameteredElement(),
-				 UML2Factory.eINSTANCE.createUseCase()));
+				 UML2Factory.eINSTANCE.createGeneralizationSet()));
 
 		newChildDescriptors.add
 			(createChildParameter
@@ -442,12 +422,32 @@
 		newChildDescriptors.add
 			(createChildParameter
 				(UML2Package.eINSTANCE.getTemplateParameter_OwnedParameteredElement(),
+				 UML2Factory.eINSTANCE.createActor()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(UML2Package.eINSTANCE.getTemplateParameter_OwnedParameteredElement(),
+				 UML2Factory.eINSTANCE.createUseCase()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(UML2Package.eINSTANCE.getTemplateParameter_OwnedParameteredElement(),
+				 UML2Factory.eINSTANCE.createArtifact()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(UML2Package.eINSTANCE.getTemplateParameter_OwnedParameteredElement(),
+				 UML2Factory.eINSTANCE.createManifestation()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(UML2Package.eINSTANCE.getTemplateParameter_OwnedParameteredElement(),
 				 UML2Factory.eINSTANCE.createCollaboration()));
 
 		newChildDescriptors.add
 			(createChildParameter
 				(UML2Package.eINSTANCE.getTemplateParameter_OwnedParameteredElement(),
-				 UML2Factory.eINSTANCE.createVariable()));
+				 UML2Factory.eINSTANCE.createInteraction()));
 
 		newChildDescriptors.add
 			(createChildParameter
@@ -457,11 +457,6 @@
 		newChildDescriptors.add
 			(createChildParameter
 				(UML2Package.eINSTANCE.getTemplateParameter_OwnedParameteredElement(),
-				 UML2Factory.eINSTANCE.createInteraction()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(UML2Package.eINSTANCE.getTemplateParameter_OwnedParameteredElement(),
 				 UML2Factory.eINSTANCE.createCallTrigger()));
 
 		newChildDescriptors.add
@@ -492,7 +487,7 @@
 		newChildDescriptors.add
 			(createChildParameter
 				(UML2Package.eINSTANCE.getTemplateParameter_OwnedParameteredElement(),
-				 UML2Factory.eINSTANCE.createInteractionConstraint()));
+				 UML2Factory.eINSTANCE.createVariable()));
 
 		newChildDescriptors.add
 			(createChildParameter
@@ -502,32 +497,7 @@
 		newChildDescriptors.add
 			(createChildParameter
 				(UML2Package.eINSTANCE.getTemplateParameter_OwnedParameteredElement(),
-				 UML2Factory.eINSTANCE.createComponent()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(UML2Package.eINSTANCE.getTemplateParameter_OwnedParameteredElement(),
-				 UML2Factory.eINSTANCE.createDeployment()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(UML2Package.eINSTANCE.getTemplateParameter_OwnedParameteredElement(),
-				 UML2Factory.eINSTANCE.createNode()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(UML2Package.eINSTANCE.getTemplateParameter_OwnedParameteredElement(),
-				 UML2Factory.eINSTANCE.createDevice()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(UML2Package.eINSTANCE.getTemplateParameter_OwnedParameteredElement(),
-				 UML2Factory.eINSTANCE.createExecutionEnvironment()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(UML2Package.eINSTANCE.getTemplateParameter_OwnedParameteredElement(),
-				 UML2Factory.eINSTANCE.createCommunicationPath()));
+				 UML2Factory.eINSTANCE.createInteractionConstraint()));
 
 		newChildDescriptors.add
 			(createChildParameter
@@ -537,6 +507,11 @@
 		newChildDescriptors.add
 			(createChildParameter
 				(UML2Package.eINSTANCE.getTemplateParameter_OwnedParameteredElement(),
+				 UML2Factory.eINSTANCE.createComponent()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(UML2Package.eINSTANCE.getTemplateParameter_OwnedParameteredElement(),
 				 UML2Factory.eINSTANCE.createTimeExpression()));
 
 		newChildDescriptors.add
@@ -577,11 +552,46 @@
 		newChildDescriptors.add
 			(createChildParameter
 				(UML2Package.eINSTANCE.getTemplateParameter_OwnedParameteredElement(),
+				 UML2Factory.eINSTANCE.createDeployment()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(UML2Package.eINSTANCE.getTemplateParameter_OwnedParameteredElement(),
+				 UML2Factory.eINSTANCE.createNode()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(UML2Package.eINSTANCE.getTemplateParameter_OwnedParameteredElement(),
+				 UML2Factory.eINSTANCE.createDevice()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(UML2Package.eINSTANCE.getTemplateParameter_OwnedParameteredElement(),
+				 UML2Factory.eINSTANCE.createExecutionEnvironment()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(UML2Package.eINSTANCE.getTemplateParameter_OwnedParameteredElement(),
+				 UML2Factory.eINSTANCE.createCommunicationPath()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(UML2Package.eINSTANCE.getTemplateParameter_OwnedParameteredElement(),
 				 UML2Factory.eINSTANCE.createDeploymentSpecification()));
 
 		newChildDescriptors.add
 			(createChildParameter
 				(UML2Package.eINSTANCE.getTemplateParameter_OwnedDefault(),
+				 UML2Factory.eINSTANCE.createOpaqueExpression()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(UML2Package.eINSTANCE.getTemplateParameter_OwnedDefault(),
+				 UML2Factory.eINSTANCE.createExpression()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(UML2Package.eINSTANCE.getTemplateParameter_OwnedDefault(),
 				 UML2Factory.eINSTANCE.createClass()));
 
 		newChildDescriptors.add
@@ -632,12 +642,7 @@
 		newChildDescriptors.add
 			(createChildParameter
 				(UML2Package.eINSTANCE.getTemplateParameter_OwnedDefault(),
-				 UML2Factory.eINSTANCE.createOpaqueExpression()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(UML2Package.eINSTANCE.getTemplateParameter_OwnedDefault(),
-				 UML2Factory.eINSTANCE.createExpression()));
+				 UML2Factory.eINSTANCE.createConstraint()));
 
 		newChildDescriptors.add
 			(createChildParameter
@@ -667,11 +672,6 @@
 		newChildDescriptors.add
 			(createChildParameter
 				(UML2Package.eINSTANCE.getTemplateParameter_OwnedDefault(),
-				 UML2Factory.eINSTANCE.createConstraint()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(UML2Package.eINSTANCE.getTemplateParameter_OwnedDefault(),
 				 UML2Factory.eINSTANCE.createInstanceValue()));
 
 		newChildDescriptors.add
@@ -702,11 +702,6 @@
 		newChildDescriptors.add
 			(createChildParameter
 				(UML2Package.eINSTANCE.getTemplateParameter_OwnedDefault(),
-				 UML2Factory.eINSTANCE.createModel()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(UML2Package.eINSTANCE.getTemplateParameter_OwnedDefault(),
 				 UML2Factory.eINSTANCE.createDependency()));
 
 		newChildDescriptors.add
@@ -737,12 +732,7 @@
 		newChildDescriptors.add
 			(createChildParameter
 				(UML2Package.eINSTANCE.getTemplateParameter_OwnedDefault(),
-				 UML2Factory.eINSTANCE.createGeneralizationSet()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(UML2Package.eINSTANCE.getTemplateParameter_OwnedDefault(),
-				 UML2Factory.eINSTANCE.createInformationItem()));
+				 UML2Factory.eINSTANCE.createActivity()));
 
 		newChildDescriptors.add
 			(createChildParameter
@@ -752,27 +742,17 @@
 		newChildDescriptors.add
 			(createChildParameter
 				(UML2Package.eINSTANCE.getTemplateParameter_OwnedDefault(),
-				 UML2Factory.eINSTANCE.createActivity()));
+				 UML2Factory.eINSTANCE.createModel()));
 
 		newChildDescriptors.add
 			(createChildParameter
 				(UML2Package.eINSTANCE.getTemplateParameter_OwnedDefault(),
-				 UML2Factory.eINSTANCE.createArtifact()));
+				 UML2Factory.eINSTANCE.createInformationItem()));
 
 		newChildDescriptors.add
 			(createChildParameter
 				(UML2Package.eINSTANCE.getTemplateParameter_OwnedDefault(),
-				 UML2Factory.eINSTANCE.createManifestation()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(UML2Package.eINSTANCE.getTemplateParameter_OwnedDefault(),
-				 UML2Factory.eINSTANCE.createActor()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(UML2Package.eINSTANCE.getTemplateParameter_OwnedDefault(),
-				 UML2Factory.eINSTANCE.createUseCase()));
+				 UML2Factory.eINSTANCE.createGeneralizationSet()));
 
 		newChildDescriptors.add
 			(createChildParameter
@@ -787,12 +767,32 @@
 		newChildDescriptors.add
 			(createChildParameter
 				(UML2Package.eINSTANCE.getTemplateParameter_OwnedDefault(),
+				 UML2Factory.eINSTANCE.createActor()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(UML2Package.eINSTANCE.getTemplateParameter_OwnedDefault(),
+				 UML2Factory.eINSTANCE.createUseCase()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(UML2Package.eINSTANCE.getTemplateParameter_OwnedDefault(),
+				 UML2Factory.eINSTANCE.createArtifact()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(UML2Package.eINSTANCE.getTemplateParameter_OwnedDefault(),
+				 UML2Factory.eINSTANCE.createManifestation()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(UML2Package.eINSTANCE.getTemplateParameter_OwnedDefault(),
 				 UML2Factory.eINSTANCE.createCollaboration()));
 
 		newChildDescriptors.add
 			(createChildParameter
 				(UML2Package.eINSTANCE.getTemplateParameter_OwnedDefault(),
-				 UML2Factory.eINSTANCE.createVariable()));
+				 UML2Factory.eINSTANCE.createInteraction()));
 
 		newChildDescriptors.add
 			(createChildParameter
@@ -802,11 +802,6 @@
 		newChildDescriptors.add
 			(createChildParameter
 				(UML2Package.eINSTANCE.getTemplateParameter_OwnedDefault(),
-				 UML2Factory.eINSTANCE.createInteraction()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(UML2Package.eINSTANCE.getTemplateParameter_OwnedDefault(),
 				 UML2Factory.eINSTANCE.createCallTrigger()));
 
 		newChildDescriptors.add
@@ -837,7 +832,7 @@
 		newChildDescriptors.add
 			(createChildParameter
 				(UML2Package.eINSTANCE.getTemplateParameter_OwnedDefault(),
-				 UML2Factory.eINSTANCE.createInteractionConstraint()));
+				 UML2Factory.eINSTANCE.createVariable()));
 
 		newChildDescriptors.add
 			(createChildParameter
@@ -847,32 +842,7 @@
 		newChildDescriptors.add
 			(createChildParameter
 				(UML2Package.eINSTANCE.getTemplateParameter_OwnedDefault(),
-				 UML2Factory.eINSTANCE.createComponent()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(UML2Package.eINSTANCE.getTemplateParameter_OwnedDefault(),
-				 UML2Factory.eINSTANCE.createDeployment()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(UML2Package.eINSTANCE.getTemplateParameter_OwnedDefault(),
-				 UML2Factory.eINSTANCE.createNode()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(UML2Package.eINSTANCE.getTemplateParameter_OwnedDefault(),
-				 UML2Factory.eINSTANCE.createDevice()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(UML2Package.eINSTANCE.getTemplateParameter_OwnedDefault(),
-				 UML2Factory.eINSTANCE.createExecutionEnvironment()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(UML2Package.eINSTANCE.getTemplateParameter_OwnedDefault(),
-				 UML2Factory.eINSTANCE.createCommunicationPath()));
+				 UML2Factory.eINSTANCE.createInteractionConstraint()));
 
 		newChildDescriptors.add
 			(createChildParameter
@@ -882,6 +852,11 @@
 		newChildDescriptors.add
 			(createChildParameter
 				(UML2Package.eINSTANCE.getTemplateParameter_OwnedDefault(),
+				 UML2Factory.eINSTANCE.createComponent()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(UML2Package.eINSTANCE.getTemplateParameter_OwnedDefault(),
 				 UML2Factory.eINSTANCE.createTimeExpression()));
 
 		newChildDescriptors.add
@@ -922,6 +897,31 @@
 		newChildDescriptors.add
 			(createChildParameter
 				(UML2Package.eINSTANCE.getTemplateParameter_OwnedDefault(),
+				 UML2Factory.eINSTANCE.createDeployment()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(UML2Package.eINSTANCE.getTemplateParameter_OwnedDefault(),
+				 UML2Factory.eINSTANCE.createNode()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(UML2Package.eINSTANCE.getTemplateParameter_OwnedDefault(),
+				 UML2Factory.eINSTANCE.createDevice()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(UML2Package.eINSTANCE.getTemplateParameter_OwnedDefault(),
+				 UML2Factory.eINSTANCE.createExecutionEnvironment()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(UML2Package.eINSTANCE.getTemplateParameter_OwnedDefault(),
+				 UML2Factory.eINSTANCE.createCommunicationPath()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(UML2Package.eINSTANCE.getTemplateParameter_OwnedDefault(),
 				 UML2Factory.eINSTANCE.createDeploymentSpecification()));
 	}
 
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/TemplateParameterSubstitutionItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/TemplateParameterSubstitutionItemProvider.java
index f2df7c7..f6a9bdf 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/TemplateParameterSubstitutionItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/TemplateParameterSubstitutionItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: TemplateParameterSubstitutionItemProvider.java,v 1.4 2004/04/23 02:26:00 khussey Exp $
+ * $Id: TemplateParameterSubstitutionItemProvider.java,v 1.5 2004/04/30 17:20:12 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -34,6 +34,8 @@
 import org.eclipse.uml2.TemplateParameterSubstitution;
 import org.eclipse.uml2.UML2Factory;
 import org.eclipse.uml2.UML2Package;
+import org.eclipse.uml2.edit.internal.command.SubsetAddCommand;
+import org.eclipse.uml2.edit.internal.command.SubsetReplaceCommand;
 import org.eclipse.uml2.edit.internal.command.SubsetSetCommand;
 import org.eclipse.uml2.edit.internal.command.SupersetRemoveCommand;
 import org.eclipse.uml2.edit.internal.command.SupersetReplaceCommand;
@@ -174,8 +176,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -204,6 +206,16 @@
 		newChildDescriptors.add
 			(createChildParameter
 				(UML2Package.eINSTANCE.getTemplateParameterSubstitution_OwnedActual(),
+				 UML2Factory.eINSTANCE.createOpaqueExpression()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(UML2Package.eINSTANCE.getTemplateParameterSubstitution_OwnedActual(),
+				 UML2Factory.eINSTANCE.createExpression()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(UML2Package.eINSTANCE.getTemplateParameterSubstitution_OwnedActual(),
 				 UML2Factory.eINSTANCE.createClass()));
 
 		newChildDescriptors.add
@@ -254,12 +266,7 @@
 		newChildDescriptors.add
 			(createChildParameter
 				(UML2Package.eINSTANCE.getTemplateParameterSubstitution_OwnedActual(),
-				 UML2Factory.eINSTANCE.createOpaqueExpression()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(UML2Package.eINSTANCE.getTemplateParameterSubstitution_OwnedActual(),
-				 UML2Factory.eINSTANCE.createExpression()));
+				 UML2Factory.eINSTANCE.createConstraint()));
 
 		newChildDescriptors.add
 			(createChildParameter
@@ -289,11 +296,6 @@
 		newChildDescriptors.add
 			(createChildParameter
 				(UML2Package.eINSTANCE.getTemplateParameterSubstitution_OwnedActual(),
-				 UML2Factory.eINSTANCE.createConstraint()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(UML2Package.eINSTANCE.getTemplateParameterSubstitution_OwnedActual(),
 				 UML2Factory.eINSTANCE.createInstanceValue()));
 
 		newChildDescriptors.add
@@ -324,11 +326,6 @@
 		newChildDescriptors.add
 			(createChildParameter
 				(UML2Package.eINSTANCE.getTemplateParameterSubstitution_OwnedActual(),
-				 UML2Factory.eINSTANCE.createModel()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(UML2Package.eINSTANCE.getTemplateParameterSubstitution_OwnedActual(),
 				 UML2Factory.eINSTANCE.createDependency()));
 
 		newChildDescriptors.add
@@ -359,12 +356,7 @@
 		newChildDescriptors.add
 			(createChildParameter
 				(UML2Package.eINSTANCE.getTemplateParameterSubstitution_OwnedActual(),
-				 UML2Factory.eINSTANCE.createGeneralizationSet()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(UML2Package.eINSTANCE.getTemplateParameterSubstitution_OwnedActual(),
-				 UML2Factory.eINSTANCE.createInformationItem()));
+				 UML2Factory.eINSTANCE.createActivity()));
 
 		newChildDescriptors.add
 			(createChildParameter
@@ -374,27 +366,17 @@
 		newChildDescriptors.add
 			(createChildParameter
 				(UML2Package.eINSTANCE.getTemplateParameterSubstitution_OwnedActual(),
-				 UML2Factory.eINSTANCE.createActivity()));
+				 UML2Factory.eINSTANCE.createModel()));
 
 		newChildDescriptors.add
 			(createChildParameter
 				(UML2Package.eINSTANCE.getTemplateParameterSubstitution_OwnedActual(),
-				 UML2Factory.eINSTANCE.createArtifact()));
+				 UML2Factory.eINSTANCE.createInformationItem()));
 
 		newChildDescriptors.add
 			(createChildParameter
 				(UML2Package.eINSTANCE.getTemplateParameterSubstitution_OwnedActual(),
-				 UML2Factory.eINSTANCE.createManifestation()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(UML2Package.eINSTANCE.getTemplateParameterSubstitution_OwnedActual(),
-				 UML2Factory.eINSTANCE.createActor()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(UML2Package.eINSTANCE.getTemplateParameterSubstitution_OwnedActual(),
-				 UML2Factory.eINSTANCE.createUseCase()));
+				 UML2Factory.eINSTANCE.createGeneralizationSet()));
 
 		newChildDescriptors.add
 			(createChildParameter
@@ -409,12 +391,32 @@
 		newChildDescriptors.add
 			(createChildParameter
 				(UML2Package.eINSTANCE.getTemplateParameterSubstitution_OwnedActual(),
+				 UML2Factory.eINSTANCE.createActor()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(UML2Package.eINSTANCE.getTemplateParameterSubstitution_OwnedActual(),
+				 UML2Factory.eINSTANCE.createUseCase()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(UML2Package.eINSTANCE.getTemplateParameterSubstitution_OwnedActual(),
+				 UML2Factory.eINSTANCE.createArtifact()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(UML2Package.eINSTANCE.getTemplateParameterSubstitution_OwnedActual(),
+				 UML2Factory.eINSTANCE.createManifestation()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(UML2Package.eINSTANCE.getTemplateParameterSubstitution_OwnedActual(),
 				 UML2Factory.eINSTANCE.createCollaboration()));
 
 		newChildDescriptors.add
 			(createChildParameter
 				(UML2Package.eINSTANCE.getTemplateParameterSubstitution_OwnedActual(),
-				 UML2Factory.eINSTANCE.createVariable()));
+				 UML2Factory.eINSTANCE.createInteraction()));
 
 		newChildDescriptors.add
 			(createChildParameter
@@ -424,11 +426,6 @@
 		newChildDescriptors.add
 			(createChildParameter
 				(UML2Package.eINSTANCE.getTemplateParameterSubstitution_OwnedActual(),
-				 UML2Factory.eINSTANCE.createInteraction()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(UML2Package.eINSTANCE.getTemplateParameterSubstitution_OwnedActual(),
 				 UML2Factory.eINSTANCE.createCallTrigger()));
 
 		newChildDescriptors.add
@@ -459,7 +456,7 @@
 		newChildDescriptors.add
 			(createChildParameter
 				(UML2Package.eINSTANCE.getTemplateParameterSubstitution_OwnedActual(),
-				 UML2Factory.eINSTANCE.createInteractionConstraint()));
+				 UML2Factory.eINSTANCE.createVariable()));
 
 		newChildDescriptors.add
 			(createChildParameter
@@ -469,32 +466,7 @@
 		newChildDescriptors.add
 			(createChildParameter
 				(UML2Package.eINSTANCE.getTemplateParameterSubstitution_OwnedActual(),
-				 UML2Factory.eINSTANCE.createComponent()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(UML2Package.eINSTANCE.getTemplateParameterSubstitution_OwnedActual(),
-				 UML2Factory.eINSTANCE.createDeployment()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(UML2Package.eINSTANCE.getTemplateParameterSubstitution_OwnedActual(),
-				 UML2Factory.eINSTANCE.createNode()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(UML2Package.eINSTANCE.getTemplateParameterSubstitution_OwnedActual(),
-				 UML2Factory.eINSTANCE.createDevice()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(UML2Package.eINSTANCE.getTemplateParameterSubstitution_OwnedActual(),
-				 UML2Factory.eINSTANCE.createExecutionEnvironment()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(UML2Package.eINSTANCE.getTemplateParameterSubstitution_OwnedActual(),
-				 UML2Factory.eINSTANCE.createCommunicationPath()));
+				 UML2Factory.eINSTANCE.createInteractionConstraint()));
 
 		newChildDescriptors.add
 			(createChildParameter
@@ -504,6 +476,11 @@
 		newChildDescriptors.add
 			(createChildParameter
 				(UML2Package.eINSTANCE.getTemplateParameterSubstitution_OwnedActual(),
+				 UML2Factory.eINSTANCE.createComponent()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(UML2Package.eINSTANCE.getTemplateParameterSubstitution_OwnedActual(),
 				 UML2Factory.eINSTANCE.createTimeExpression()));
 
 		newChildDescriptors.add
@@ -544,6 +521,31 @@
 		newChildDescriptors.add
 			(createChildParameter
 				(UML2Package.eINSTANCE.getTemplateParameterSubstitution_OwnedActual(),
+				 UML2Factory.eINSTANCE.createDeployment()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(UML2Package.eINSTANCE.getTemplateParameterSubstitution_OwnedActual(),
+				 UML2Factory.eINSTANCE.createNode()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(UML2Package.eINSTANCE.getTemplateParameterSubstitution_OwnedActual(),
+				 UML2Factory.eINSTANCE.createDevice()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(UML2Package.eINSTANCE.getTemplateParameterSubstitution_OwnedActual(),
+				 UML2Factory.eINSTANCE.createExecutionEnvironment()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(UML2Package.eINSTANCE.getTemplateParameterSubstitution_OwnedActual(),
+				 UML2Factory.eINSTANCE.createCommunicationPath()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(UML2Package.eINSTANCE.getTemplateParameterSubstitution_OwnedActual(),
 				 UML2Factory.eINSTANCE.createDeploymentSpecification()));
 	}
 
@@ -558,6 +560,19 @@
 	}
 
 	/**
+	 * @see org.eclipse.emf.edit.provider.ItemProviderAdapter#createAddCommand(org.eclipse.emf.edit.domain.EditingDomain, org.eclipse.emf.ecore.EObject, org.eclipse.emf.ecore.EStructuralFeature, java.util.Collection, int)
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Command createAddCommand(EditingDomain domain, EObject owner, EStructuralFeature feature, Collection collection, int index) {
+		if (feature == UML2Package.eINSTANCE.getTemplateParameterSubstitution_OwnedActual()) {
+			return new SubsetAddCommand(domain, owner, feature, new EStructuralFeature[] {UML2Package.eINSTANCE.getTemplateParameterSubstitution_Actual()}, collection, index);
+		}
+		return super.createAddCommand(domain, owner, feature, collection, index);
+	}
+
+	/**
 	 * @see org.eclipse.emf.edit.provider.ItemProviderAdapter#createRemoveCommand(org.eclipse.emf.edit.domain.EditingDomain, org.eclipse.emf.ecore.EObject, org.eclipse.emf.ecore.EStructuralFeature, java.util.Collection)
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -577,22 +592,12 @@
 	 * @generated
 	 */
 	protected Command createReplaceCommand(EditingDomain domain, EObject owner, EStructuralFeature feature, EObject value, Collection collection) {
+		if (feature == UML2Package.eINSTANCE.getTemplateParameterSubstitution_OwnedActual()) {
+			return new SubsetReplaceCommand(domain, owner, feature, new EStructuralFeature[] {UML2Package.eINSTANCE.getTemplateParameterSubstitution_Actual()}, value, collection);
+		}
 		if (feature == UML2Package.eINSTANCE.getTemplateParameterSubstitution_Actual()) {
 			return new SupersetReplaceCommand(domain, owner, feature, new EStructuralFeature[] {UML2Package.eINSTANCE.getTemplateParameterSubstitution_OwnedActual()}, value, collection);
 		}
 		return super.createReplaceCommand(domain, owner, feature, value, collection);
 	}
-
-	/**
-	 * @see org.eclipse.emf.edit.provider.ItemProviderAdapter#createSetCommand(org.eclipse.emf.edit.domain.EditingDomain, org.eclipse.emf.ecore.EObject, org.eclipse.emf.ecore.EStructuralFeature, java.lang.Object)
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected Command createSetCommand(EditingDomain domain, EObject owner, EStructuralFeature feature, Object value) {
-		if (feature == UML2Package.eINSTANCE.getTemplateParameterSubstitution_OwnedActual()) {
-			return new SubsetSetCommand(domain, owner, feature, new EStructuralFeature[] {UML2Package.eINSTANCE.getTemplateParameterSubstitution_Actual()}, value);
-		}
-		return super.createSetCommand(domain, owner, feature, value);
-	}
 }
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/TemplateSignatureItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/TemplateSignatureItemProvider.java
index aa5a21b..6045d98 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/TemplateSignatureItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/TemplateSignatureItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: TemplateSignatureItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: TemplateSignatureItemProvider.java,v 1.4 2004/04/30 17:20:12 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -192,8 +192,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/TemplateableClassifierItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/TemplateableClassifierItemProvider.java
index af7965f..0d6a14e 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/TemplateableClassifierItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/TemplateableClassifierItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: TemplateableClassifierItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: TemplateableClassifierItemProvider.java,v 1.4 2004/04/30 17:20:12 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -96,8 +96,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/TemplateableElementItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/TemplateableElementItemProvider.java
index ebd4d26..5827521 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/TemplateableElementItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/TemplateableElementItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: TemplateableElementItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: TemplateableElementItemProvider.java,v 1.4 2004/04/30 17:20:12 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -169,8 +169,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/TestIdentityActionItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/TestIdentityActionItemProvider.java
index d8dfc6a..19f29fa 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/TestIdentityActionItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/TestIdentityActionItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: TestIdentityActionItemProvider.java,v 1.4 2004/04/23 02:26:00 khussey Exp $
+ * $Id: TestIdentityActionItemProvider.java,v 1.5 2004/04/30 17:20:11 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -192,8 +192,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/TimeConstraintItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/TimeConstraintItemProvider.java
index 2753c83..03e93d8 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/TimeConstraintItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/TimeConstraintItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: TimeConstraintItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: TimeConstraintItemProvider.java,v 1.4 2004/04/30 17:20:11 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -96,8 +96,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/TimeExpressionItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/TimeExpressionItemProvider.java
index d580556..809453f 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/TimeExpressionItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/TimeExpressionItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: TimeExpressionItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: TimeExpressionItemProvider.java,v 1.4 2004/04/30 17:20:12 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -136,8 +136,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/TimeIntervalItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/TimeIntervalItemProvider.java
index 03d0abd..e79ea1e 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/TimeIntervalItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/TimeIntervalItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: TimeIntervalItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: TimeIntervalItemProvider.java,v 1.4 2004/04/30 17:20:11 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -96,8 +96,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/TimeObservationActionItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/TimeObservationActionItemProvider.java
index 4bb980e..2b7a4cb 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/TimeObservationActionItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/TimeObservationActionItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: TimeObservationActionItemProvider.java,v 1.4 2004/04/23 02:26:00 khussey Exp $
+ * $Id: TimeObservationActionItemProvider.java,v 1.5 2004/04/30 17:20:11 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -138,8 +138,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/TimeTriggerItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/TimeTriggerItemProvider.java
index e9de890..3ff5ba2 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/TimeTriggerItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/TimeTriggerItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: TimeTriggerItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: TimeTriggerItemProvider.java,v 1.4 2004/04/30 17:20:12 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -155,8 +155,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/TransitionItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/TransitionItemProvider.java
index 9a417e6..e167136 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/TransitionItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/TransitionItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: TransitionItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: TransitionItemProvider.java,v 1.4 2004/04/30 17:20:12 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -257,8 +257,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/TriggerItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/TriggerItemProvider.java
index 142c24a..826ba13 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/TriggerItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/TriggerItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: TriggerItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: TriggerItemProvider.java,v 1.4 2004/04/30 17:20:11 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -116,8 +116,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/TypeItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/TypeItemProvider.java
index 7f4555a..6f52c01 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/TypeItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/TypeItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: TypeItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: TypeItemProvider.java,v 1.4 2004/04/30 17:20:12 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -116,8 +116,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/TypedElementItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/TypedElementItemProvider.java
index 683a58b..cf82751 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/TypedElementItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/TypedElementItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: TypedElementItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: TypedElementItemProvider.java,v 1.4 2004/04/30 17:20:11 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -116,8 +116,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/UsageItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/UsageItemProvider.java
index 35c607b..e290911 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/UsageItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/UsageItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: UsageItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: UsageItemProvider.java,v 1.4 2004/04/30 17:20:11 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -96,8 +96,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/UseCaseItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/UseCaseItemProvider.java
index cb755bc..35146b8 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/UseCaseItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/UseCaseItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: UseCaseItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: UseCaseItemProvider.java,v 1.4 2004/04/30 17:20:12 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -208,8 +208,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ValuePinItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ValuePinItemProvider.java
index b7600bd..91e8101 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ValuePinItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ValuePinItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: ValuePinItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: ValuePinItemProvider.java,v 1.4 2004/04/30 17:20:11 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -138,8 +138,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ValueSpecificationItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ValueSpecificationItemProvider.java
index 3deb01f..10d9d54 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ValueSpecificationItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ValueSpecificationItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: ValueSpecificationItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: ValueSpecificationItemProvider.java,v 1.4 2004/04/30 17:20:11 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -126,8 +126,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/VariableActionItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/VariableActionItemProvider.java
index 3d0f1ba..1fdd8d4 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/VariableActionItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/VariableActionItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: VariableActionItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: VariableActionItemProvider.java,v 1.4 2004/04/30 17:20:11 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -116,8 +116,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/VariableItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/VariableItemProvider.java
index 955429b..826661c 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/VariableItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/VariableItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: VariableItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: VariableItemProvider.java,v 1.4 2004/04/30 17:20:12 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -116,8 +116,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/VertexItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/VertexItemProvider.java
index 56a00e0..c39a930 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/VertexItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/VertexItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: VertexItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: VertexItemProvider.java,v 1.4 2004/04/30 17:20:12 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -133,8 +133,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/WriteLinkActionItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/WriteLinkActionItemProvider.java
index 7b40797..d1a4786 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/WriteLinkActionItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/WriteLinkActionItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: WriteLinkActionItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: WriteLinkActionItemProvider.java,v 1.4 2004/04/30 17:20:11 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -97,8 +97,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/WriteStructuralFeatureActionItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/WriteStructuralFeatureActionItemProvider.java
index 32bc43a..7a22d30 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/WriteStructuralFeatureActionItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/WriteStructuralFeatureActionItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: WriteStructuralFeatureActionItemProvider.java,v 1.4 2004/04/23 02:26:00 khussey Exp $
+ * $Id: WriteStructuralFeatureActionItemProvider.java,v 1.5 2004/04/30 17:20:12 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -138,8 +138,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/WriteVariableActionItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/WriteVariableActionItemProvider.java
index 4c219c5..1961795 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/WriteVariableActionItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/WriteVariableActionItemProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: WriteVariableActionItemProvider.java,v 1.3 2004/04/14 20:45:54 khussey Exp $
+ * $Id: WriteVariableActionItemProvider.java,v 1.4 2004/04/30 17:20:11 khussey Exp $
  */
 package org.eclipse.uml2.provider;
 
@@ -138,8 +138,8 @@
 	}
 
 	/**
-	 * This handles model notifications by updating any cached children and by
-	 * creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2.editor/src/org/eclipse/uml2/presentation/UML2ActionBarContributor.java b/deprecated/plugins/org.eclipse.uml2.editor/src/org/eclipse/uml2/presentation/UML2ActionBarContributor.java
index 1423ae7..a715070 100644
--- a/deprecated/plugins/org.eclipse.uml2.editor/src/org/eclipse/uml2/presentation/UML2ActionBarContributor.java
+++ b/deprecated/plugins/org.eclipse.uml2.editor/src/org/eclipse/uml2/presentation/UML2ActionBarContributor.java
@@ -8,16 +8,19 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: UML2ActionBarContributor.java,v 1.3 2004/04/14 20:45:21 khussey Exp $
+ * $Id: UML2ActionBarContributor.java,v 1.4 2004/04/30 17:18:18 khussey Exp $
  */
 package org.eclipse.uml2.presentation;
 
 
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.LinkedList;
 
 import org.eclipse.emf.edit.ui.action.EditingDomainActionBarContributor;
+import org.eclipse.emf.edit.ui.action.LoadResourceAction;
+
 import org.eclipse.emf.edit.ui.action.CreateChildAction;
 import org.eclipse.emf.edit.ui.action.CreateSiblingAction;
 
@@ -91,14 +94,14 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	protected IAction showPropertiesViewAction = 
+	protected IAction showPropertiesViewAction =
 		new Action(UML2EditorPlugin.INSTANCE.getString("_UI_ShowPropertiesView_menu_item")) //$NON-NLS-1$
 		{
 			public void run() {
 				try {
 					getPage().showView("org.eclipse.ui.views.PropertySheet"); //$NON-NLS-1$
 				}
-				catch(PartInitException exception) {
+				catch (PartInitException exception) {
 					UML2EditorPlugin.INSTANCE.log(exception);
 				}
 			}
@@ -106,18 +109,18 @@
 
 	/**
 	 * This action refreshes the viewer of the current editor if the editor
-	 * implements {@link IViewerProvider}.
+	 * implements {@link org.eclipse.emf.common.ui.viewer.IViewerProvider}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	protected IAction refreshViewerAction = 
+	protected IAction refreshViewerAction =
 		new Action(UML2EditorPlugin.INSTANCE.getString("_UI_RefreshViewer_menu_item")) //$NON-NLS-1$
 		{
 			public boolean isEnabled() {
 				return activeEditorPart instanceof IViewerProvider;
 			}
-			
+
 			public void run() {
 				if (activeEditorPart instanceof IViewerProvider) {
 					Viewer viewer = ((IViewerProvider)activeEditorPart).getViewer();
@@ -129,7 +132,7 @@
 		};
 
 	/**
-	 * This will contain one {@link CreateChildAction} corresponding to each descriptor
+	 * This will contain one {@link org.eclipse.emf.edit.ui.action.CreateChildAction} corresponding to each descriptor
 	 * generated for the current selection by the item provider.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -146,7 +149,7 @@
 	protected IMenuManager createChildMenuManager;
 
 	/**
-	 * This will contain one {@link CreateSiblingAction} corresponding to each descriptor
+	 * This will contain one {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction} corresponding to each descriptor
 	 * generated for the current selection by the item provider.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -169,7 +172,7 @@
 	 * @generated
 	 */
 	public UML2ActionBarContributor() {
-		super();
+		loadResourceAction = new LoadResourceAction();
 	}
 
 	/**
@@ -212,9 +215,7 @@
 	}
 
 	/**
-	 * When the active editor changes,
-	 * this remembers the change,
-	 * and registers with it as a selection provider.
+	 * When the active editor changes, this remembers the change and registers with it as a selection provider.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -244,8 +245,8 @@
 	}
 
 	/**
-	 * This implements {@link ISelectionChangedListener},
-	 * handling {@link SelectionChangedEvent}s by querying for the children and siblings
+	 * This implements {@link org.eclipse.jface.viewers.ISelectionChangedListener},
+	 * handling {@link org.eclipse.jface.viewers.SelectionChangedEvent}s by querying for the children and siblings
 	 * that can be added to the selected object and updating the menus accordingly.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -270,8 +271,7 @@
 		if (selection instanceof IStructuredSelection && ((IStructuredSelection)selection).size() == 1) {
 			Object object = ((IStructuredSelection)selection).getFirstElement();
 
-			EditingDomain domain =
-				((IEditingDomainProvider) activeEditorPart).getEditingDomain();
+			EditingDomain domain = ((IEditingDomainProvider)activeEditorPart).getEditingDomain();
 
 			newChildDescriptors = domain.getNewChildDescriptors(object, null);
 			newSiblingDescriptors = domain.getNewChildDescriptors(null, object);
@@ -293,14 +293,14 @@
 	}
 
 	/**
-	 * This generates a {@link CreateChildAction} for each object in <code>descriptors</code>,
+	 * This generates a {@link org.eclipse.emf.edit.ui.action.CreateChildAction} for each object in <code>descriptors</code>,
 	 * and returns the collection of these actions.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
 	protected Collection generateCreateChildActions(Collection descriptors, ISelection selection) {
-		Collection actions = new LinkedList();
+		Collection actions = new ArrayList();
 		if (descriptors != null) {
 			for (Iterator i = descriptors.iterator(); i.hasNext(); ) {
 				actions.add(new CreateChildAction(activeEditorPart, selection, i.next()));
@@ -310,14 +310,14 @@
 	}
 
 	/**
-	 * This generates a {@link CreateSiblingAction} for each object in <code>descriptors</code>,
+	 * This generates a {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction} for each object in <code>descriptors</code>,
 	 * and returns the collection of these actions.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
 	protected Collection generateCreateSiblingActions(Collection descriptors, ISelection selection) {
-		Collection actions = new LinkedList();
+		Collection actions = new ArrayList();
 		if (descriptors != null) {
 			for (Iterator i = descriptors.iterator(); i.hasNext(); ) {
 				actions.add(new CreateSiblingAction(activeEditorPart, selection, i.next()));
@@ -327,8 +327,8 @@
 	}
 
 	/**
-	 * This populates the specified <code>manager</code> with {@link ActionContributionItem}s
-	 * based on the {@link IAction}s contained in the <code>actions</code> collection,
+	 * This populates the specified <code>manager</code> with {@link org.eclipse.jface.action.ActionContributionItem}s
+	 * based on the {@link org.eclipse.jface.action.IAction}s contained in the <code>actions</code> collection,
 	 * by inserting them before the specified contribution item <code>contributionID</code>.
 	 * If <code>ID</code> is <code>null</code>, they are simply added.
 	 * <!-- begin-user-doc -->
@@ -338,7 +338,7 @@
 	protected void populateManager(IContributionManager manager, Collection actions, String contributionID) {
 		if (actions != null) {
 			for (Iterator i = actions.iterator(); i.hasNext(); ) {
-				IAction action = (IAction) i.next();
+				IAction action = (IAction)i.next();
 				if (contributionID != null) {
 					manager.insertBefore(contributionID, action);
 				}
@@ -350,8 +350,8 @@
 	}
 		
 	/**
-	 * This removes from the specified <code>manager</code> all {@link ActionContributionItem}s
-	 * based on the {@link IAction}s contained in the <code>actions</code> collection.
+	 * This removes from the specified <code>manager</code> all {@link org.eclipse.jface.action.ActionContributionItem}s
+	 * based on the {@link org.eclipse.jface.action.IAction}s contained in the <code>actions</code> collection.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -370,7 +370,7 @@
 				// Delete the ActionContributionItems with matching action.
 				//
 				if (contributionItem instanceof ActionContributionItem) {
-					IAction action = ((ActionContributionItem) contributionItem).getAction();
+					IAction action = ((ActionContributionItem)contributionItem).getAction();
 					if (actions.contains(action)) {
 						manager.remove(contributionItem);
 					}
@@ -386,8 +386,6 @@
 	 * @generated
 	 */
 	public void menuAboutToShow(IMenuManager menuManager) {
-		refreshViewerAction.setEnabled(refreshViewerAction.isEnabled());
-		
 		super.menuAboutToShow(menuManager);
 		MenuManager submenuManager = null;
 
@@ -398,9 +396,11 @@
 		submenuManager = new MenuManager(UML2EditorPlugin.INSTANCE.getString("_UI_CreateSibling_menu_item")); //$NON-NLS-1$
 		populateManager(submenuManager, createSiblingActions, null);
 		menuManager.insertBefore("additions", submenuManager); //$NON-NLS-1$
-		
-		menuManager.insertAfter("additions-end", new Separator("ui-actions")); //$NON-NLS-2$
+
+		menuManager.insertAfter("additions-end", new Separator("ui-actions")); //$NON-NLS-1$ //$NON-NLS-2$
 		menuManager.insertAfter("ui-actions", showPropertiesViewAction); //$NON-NLS-1$
+
+		refreshViewerAction.setEnabled(refreshViewerAction.isEnabled());		
 		menuManager.insertAfter("ui-actions", refreshViewerAction); //$NON-NLS-1$
 	}
 }
diff --git a/deprecated/plugins/org.eclipse.uml2/model/UML2.ecore b/deprecated/plugins/org.eclipse.uml2/model/UML2.ecore
index 9a14b30..6e1e045 100644
--- a/deprecated/plugins/org.eclipse.uml2/model/UML2.ecore
+++ b/deprecated/plugins/org.eclipse.uml2/model/UML2.ecore
@@ -170,6 +170,284 @@
       </eAnnotations>

     </eStructuralFeatures>

   </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="NamedElement" abstract="true" eSuperTypes="#//TemplateableElement">

+    <eOperations name="validateNoName" eType="#//Boolean">

+      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

+        <details key="body" value="// TODO: test this OCL constraint&#xD;&#xA;return org.eclipse.uml2.internal.operation.NamedElementOperations.validateNoName(this, diagnostics, context);"/>

+        <details key="documentation" value="An invariant constraint based on the following OCL expression:&#xD;&#xA;&lt;code>&#xD;&#xA;self.name->isEmpty() or self.allNamespaces()->select(ns | ns.name->isEmpty())->notEmpty()&#xD;&#xA;&#x9;implies self.qualifiedName->isEmpty()&#xD;&#xA;&lt;/code>"/>

+      </eAnnotations>

+      <eAnnotations source="constraint"/>

+    </eOperations>

+    <eOperations name="validateQualifiedName" eType="#//Boolean">

+      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

+        <details key="body" value="// TODO: test this OCL constraint&#xD;&#xA;return org.eclipse.uml2.internal.operation.NamedElementOperations.validateQualifiedName(this, diagnostics, context);"/>

+        <details key="documentation" value="An invariant constraint based on the following OCL expression:&#xD;&#xA;&lt;code>&#xD;&#xA;(self.name->notEmpty() and self.allNamespaces()->select(ns | ns.name->isEmpty())->isEmpty()) implies&#xD;&#xA;self.qualifiedName =&#xD;&#xA; self.allNamespaces()->iterate( ns : Namespace; result: String = self.name |&#xD;&#xA;&#x9;&#x9;ns.name->union(self.separator())->union(result))&#xD;&#xA;&lt;/code>"/>

+      </eAnnotations>

+      <eAnnotations source="constraint"/>

+    </eOperations>

+    <eOperations name="allNamespaces" unique="false" upperBound="-1" eType="#//Sequence">

+      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

+        <details key="body" value="// TODO: test this OCL operation&#xD;&#xA;try {&#xD;&#xA;&#x9;java.lang.reflect.Method method = getClass().getMethod(&quot;allNamespaces&quot;, new Class[] {}); //$NON-NLS-1$&#xD;&#xA;&#x9;if (!getCacheAdapter().containsKey(this, method)) {&#xD;&#xA;&#x9;&#x9;getCacheAdapter().put(this,&#xD;&#xA;&#x9;&#x9;&#x9;method,&#xD;&#xA;&#x9;&#x9;&#x9;java.util.Collections.unmodifiableList(org.eclipse.uml2.internal.operation.NamedElementOperations.allNamespaces(this)));&#xD;&#xA;&#x9;}&#xD;&#xA;&#x9;return (List) getCacheAdapter().get(this, method);&#xD;&#xA;} catch (Exception e) {&#xD;&#xA;&#x9;return org.eclipse.uml2.internal.operation.NamedElementOperations.allNamespaces(this);&#xD;&#xA;}"/>

+        <details key="documentation" value="A query based on the following OCL expression:&#xD;&#xA;&lt;code>&#xD;&#xA;if self.namespace->isEmpty()&#xD;&#xA;then Sequence{}&#xD;&#xA;else self.namespace.allNamespaces()->prepend(self.namespace)&#xD;&#xA;endif&#xD;&#xA;&lt;/code>"/>

+      </eAnnotations>

+    </eOperations>

+    <eOperations name="isDistinguishableFrom" eType="#//Boolean">

+      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

+        <details key="body" value="// TODO: test this OCL operation&#xD;&#xA;return org.eclipse.uml2.internal.operation.NamedElementOperations.isDistinguishableFrom(this, n, ns);"/>

+        <details key="documentation" value="A query based on the following OCL expression:&#xD;&#xA;&lt;code>&#xD;&#xA;if self.oclIsKindOf(n.oclType) or n.oclIsKindOf(self.oclType)&#xD;&#xA;then ns.getNamesOfMember(self)->intersection(ns.getNamesOfMember(n))->isEmpty()&#xD;&#xA;else true&#xD;&#xA;endif&#xD;&#xA;&lt;/code>"/>

+      </eAnnotations>

+      <eParameters name="n" eType="#//NamedElement"/>

+      <eParameters name="ns" eType="#//Namespace"/>

+    </eOperations>

+    <eOperations name="separator" eType="#//String">

+      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

+        <details key="body" value="// TODO: test this OCL operation&#xD;&#xA;return org.eclipse.uml2.internal.operation.NamedElementOperations.separator(this);"/>

+        <details key="documentation" value="A query based on the following OCL expression:&#xD;&#xA;&lt;code>&#xD;&#xA;'::'&#xD;&#xA;&lt;/code>"/>

+      </eAnnotations>

+    </eOperations>

+    <eOperations name="qualifiedName" eType="#//String">

+      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

+        <details key="body" value="// TODO: test this OCL operation&#xD;&#xA;return org.eclipse.uml2.internal.operation.NamedElementOperations.qualifiedName(this);"/>

+        <details key="documentation" value="A query based on the following OCL expression:&#xD;&#xA;&lt;code>&#xD;&#xA;if self.name->notEmpty() and self.allNamespaces()->select(ns | ns.name->isEmpty())->isEmpty()&#xD;&#xA;then &#xD;&#xA;    self.allNamespaces()->iterate( ns : Namespace; result: String = self.name | ns.name->union(self.separator())->union(result))&#xD;&#xA;else&#xD;&#xA;    Set{}&#xD;&#xA;endif&#xD;&#xA;&lt;/code>"/>

+      </eAnnotations>

+    </eOperations>

+    <eOperations name="validateVisibilityNeedsOwnership" eType="#//Boolean">

+      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

+        <details key="body" value="// TODO: test this OCL constraint&#xD;&#xA;return org.eclipse.uml2.internal.operation.NamedElementOperations.validateVisibilityNeedsOwnership(this, diagnostics, context);"/>

+        <details key="documentation" value="An invariant constraint based on the following OCL expression:&#xD;&#xA;&lt;code>&#xD;&#xA;namespace->isEmpty() implies visibility->isEmpty()&#xD;&#xA;&lt;/code>"/>

+      </eAnnotations>

+      <eAnnotations source="constraint"/>

+    </eOperations>

+    <eOperations name="getNamespace" ordered="false" eType="#//Namespace">

+      <eAnnotations source="feature">

+        <details key="derived" value="true"/>

+        <details key="containment" value="false"/>

+        <details key="name" value="namespace"/>

+        <details key="eType" value="org.eclipse.uml2.Namespace"/>

+        <details key="eOpposite" value="ownedMember"/>

+        <details key="eOpposite.containment" value="false"/>

+        <details key="eOpposite.lowerBound" value="0"/>

+        <details key="eOpposite.upperBound" value="-1"/>

+      </eAnnotations>

+      <eAnnotations source="subsets">

+        <details key="org.eclipse.uml2.Element#getOwner" value=""/>

+      </eAnnotations>

+      <eAnnotations source="union"/>

+    </eOperations>

+    <eOperations name="getOwner" ordered="false" eType="#//Element">

+      <eAnnotations source="feature">

+        <details key="derived" value="true"/>

+        <details key="eOpposite.upperBound" value="-1"/>

+        <details key="name" value="owner"/>

+        <details key="eType" value="org.eclipse.uml2.Element"/>

+        <details key="eOpposite" value="ownedElement"/>

+        <details key="eOpposite.containment" value="false"/>

+        <details key="containment" value="false"/>

+        <details key="eOpposite.lowerBound" value="0"/>

+      </eAnnotations>

+      <eAnnotations source="union" references="#//NamedElement/getNamespace"/>

+    </eOperations>

+    <eOperations name="getOwnedElements" ordered="false" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

+      <eAnnotations source="feature">

+        <details key="derived" value="true"/>

+        <details key="eOpposite.upperBound" value="1"/>

+        <details key="name" value="ownedElement"/>

+        <details key="eType" value="org.eclipse.uml2.Element"/>

+        <details key="eOpposite" value="owner"/>

+        <details key="eOpposite.containment" value="false"/>

+        <details key="containment" value="false"/>

+        <details key="eOpposite.lowerBound" value="0"/>

+      </eAnnotations>

+      <eAnnotations source="union" references="#//NamedElement/nameExpression"/>

+    </eOperations>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" ordered="false" eType="#//String"

+        defaultValueLiteral=""/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="qualifiedName" ordered="false"

+        eType="#//String" changeable="false" volatile="true" transient="true" defaultValueLiteral=""

+        derived="true"/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="visibility" ordered="false"

+        eType="#//VisibilityKind"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="clientDependency" ordered="false"

+        upperBound="-1" eType="#//Dependency" volatile="true" eOpposite="#//Dependency/client"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="nameExpression" ordered="false"

+        eType="#//StringExpression" containment="true">

+      <eAnnotations source="subsets">

+        <details key="org.eclipse.uml2.Element#getOwnedElements" value=""/>

+      </eAnnotations>

+    </eStructuralFeatures>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="Namespace" abstract="true" eSuperTypes="#//NamedElement">

+    <eOperations name="validateMembersAreDistinguishable" eType="#//Boolean">

+      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

+        <details key="body" value="// TODO: test this OCL constraint&#xD;&#xA;return org.eclipse.uml2.internal.operation.NamespaceOperations.validateMembersAreDistinguishable(this, diagnostics, context);"/>

+        <details key="documentation" value="An invariant constraint based on the following OCL expression:&#xD;&#xA;&lt;code>&#xD;&#xA;membersAreDistinguishable()&#xD;&#xA;&lt;/code>"/>

+      </eAnnotations>

+      <eAnnotations source="constraint"/>

+    </eOperations>

+    <eOperations name="getNamesOfMember" ordered="false" upperBound="-1" eType="#//Set">

+      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

+        <details key="body" value="// TODO: test this OCL operation&#xD;&#xA;return org.eclipse.uml2.internal.operation.NamespaceOperations.getNamesOfMember(this, element);"/>

+        <details key="documentation" value="A query based on the following OCL expression:&#xD;&#xA;&lt;code>&#xD;&#xA;if self.ownedMember->includes(element)&#xD;&#xA;then Set{}->include(element.name)&#xD;&#xA;else let elementImports: ElementImport = self.elementImport->select(ei | ei.importedElement = element) in&#xD;&#xA;    if elementImports->notEmpty()&#xD;&#xA;    then elementImports->collect(el | el.getName())&#xD;&#xA;    else &#xD;&#xA;        self.packageImport->select(pi | pi.importedPackage.visibleMembers()->includes(element))->collect(pi | pi.importedPackage.getNamesOfMember(element))&#xD;&#xA;    endif&#xD;&#xA;endif&#xD;&#xA;&lt;/code>"/>

+      </eAnnotations>

+      <eParameters name="element" eType="#//NamedElement"/>

+    </eOperations>

+    <eOperations name="membersAreDistinguishable" eType="#//Boolean">

+      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

+        <details key="body" value="// TODO: test this OCL operation&#xD;&#xA;return org.eclipse.uml2.internal.operation.NamespaceOperations.membersAreDistinguishable(this);"/>

+        <details key="documentation" value="A query based on the following OCL expression:&#xD;&#xA;&lt;code>&#xD;&#xA;self.member->forAll( memb |&#xD;&#xA;&#x9;self.member->excluding(memb)->forAll(other |&#xD;&#xA;&#x9;&#x9;memb.isDistinguishableFrom(other, self)))&#xD;&#xA;&lt;/code>"/>

+      </eAnnotations>

+    </eOperations>

+    <eOperations name="validateImportedMemberDerived" eType="#//Boolean">

+      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

+        <details key="body" value="// TODO: test this OCL constraint&#xD;&#xA;return org.eclipse.uml2.internal.operation.NamespaceOperations.validateImportedMemberDerived(this, diagnostics, context);"/>

+        <details key="documentation" value="An invariant constraint based on the following OCL expression:&#xD;&#xA;&lt;code>&#xD;&#xA;self.importedMember->includesAll(self.importedMembers(self.elementImport.importedElement.asSet()->union(self.packageImport.importedPackage->collect(p | p.visibleMembers()))))&#xD;&#xA;&lt;/code>"/>

+      </eAnnotations>

+      <eAnnotations source="constraint"/>

+    </eOperations>

+    <eOperations name="importedMember" ordered="false" upperBound="-1" eType="#//Set">

+      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

+        <details key="body" value="// TODO: test this OCL operation&#xD;&#xA;try {&#xD;&#xA;&#x9;java.lang.reflect.Method method = getClass().getMethod(&quot;importedMember&quot;, new Class[] {}); //$NON-NLS-1$&#xD;&#xA;&#x9;if (!getCacheAdapter().containsKey(this, method)) {&#xD;&#xA;&#x9;&#x9;getCacheAdapter().put(this,&#xD;&#xA;&#x9;&#x9;&#x9;method,&#xD;&#xA;&#x9;&#x9;&#x9;java.util.Collections.unmodifiableSet(org.eclipse.uml2.internal.operation.NamespaceOperations.importedMember(this)));&#xD;&#xA;&#x9;}&#xD;&#xA;&#x9;return (Set) getCacheAdapter().get(this, method);&#xD;&#xA;} catch (Exception e) {&#xD;&#xA;&#x9;return org.eclipse.uml2.internal.operation.NamespaceOperations.importedMember(this);&#xD;&#xA;}"/>

+        <details key="documentation" value="A query based on the following OCL expression:&#xD;&#xA;&lt;code>&#xD;&#xA;self.importedMembers(self.elementImport.importedElement.asSet()->union(self.packageImport.importedPackage->collect(p | p.visibleMembers())))&#xD;&#xA;&lt;/code>"/>

+      </eAnnotations>

+    </eOperations>

+    <eOperations name="importMembers" ordered="false" upperBound="-1" eType="#//Set">

+      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

+        <details key="body" value="// TODO: test this OCL operation&#xD;&#xA;return org.eclipse.uml2.internal.operation.NamespaceOperations.importMembers(this, imps);"/>

+        <details key="documentation" value="A query based on the following OCL expression:&#xD;&#xA;&lt;code>&#xD;&#xA;self.excludeCollisions(imps)->select(imp | self.ownedMember->forAll(mem | mem.imp.isDistinguishableFrom(mem, self)))&#xD;&#xA;&lt;/code>"/>

+      </eAnnotations>

+      <eParameters name="imps" eType="#//Set"/>

+    </eOperations>

+    <eOperations name="excludeCollisions" ordered="false" upperBound="-1" eType="#//Set">

+      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

+        <details key="body" value="// TODO: test this OCL operation&#xD;&#xA;return org.eclipse.uml2.internal.operation.NamespaceOperations.excludeCollisions(this, imps);"/>

+        <details key="documentation" value="A query based on the following OCL expression:&#xD;&#xA;&lt;code>&#xD;&#xA;imps->reject(imp1 | imps.exists(imp2 | not imp1.isDistinguishableFrom(imp2, self)))&#xD;&#xA;&lt;/code>"/>

+      </eAnnotations>

+      <eParameters name="imps" eType="#//Set"/>

+    </eOperations>

+    <eOperations name="getOwnedMembers" ordered="false" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

+      <eAnnotations source="feature">

+        <details key="derived" value="true"/>

+        <details key="eOpposite.upperBound" value="1"/>

+        <details key="name" value="ownedMember"/>

+        <details key="eType" value="org.eclipse.uml2.NamedElement"/>

+        <details key="eOpposite" value="namespace"/>

+        <details key="eOpposite.containment" value="false"/>

+        <details key="containment" value="false"/>

+        <details key="eOpposite.lowerBound" value="0"/>

+      </eAnnotations>

+      <eAnnotations source="subsets">

+        <details key="org.eclipse.uml2.Element#getOwnedElements" value=""/>

+        <details key="org.eclipse.uml2.Namespace#getMembers" value=""/>

+      </eAnnotations>

+      <eAnnotations source="union" references="#//Namespace/ownedRule"/>

+    </eOperations>

+    <eOperations name="getOwnedElements" ordered="false" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

+      <eAnnotations source="feature">

+        <details key="derived" value="true"/>

+        <details key="eOpposite.upperBound" value="1"/>

+        <details key="name" value="ownedElement"/>

+        <details key="eType" value="org.eclipse.uml2.Element"/>

+        <details key="eOpposite" value="owner"/>

+        <details key="eOpposite.containment" value="false"/>

+        <details key="containment" value="false"/>

+        <details key="eOpposite.lowerBound" value="0"/>

+      </eAnnotations>

+      <eAnnotations source="union" references="#//Namespace/getOwnedMembers #//Namespace/elementImport #//Namespace/packageImport"/>

+    </eOperations>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="member" ordered="false"

+        upperBound="-1" eType="#//NamedElement" changeable="false" volatile="true"

+        transient="true" derived="true">

+      <eAnnotations source="union" references="#//Namespace/getOwnedMembers #//Namespace/importedMember.1"/>

+    </eStructuralFeatures>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="ownedRule" ordered="false"

+        upperBound="-1" eType="#//Constraint" volatile="true" containment="true" eOpposite="#//Constraint/namespace">

+      <eAnnotations source="subsets">

+        <details key="org.eclipse.uml2.Namespace#getOwnedMembers" value=""/>

+      </eAnnotations>

+    </eStructuralFeatures>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="importedMember" ordered="false"

+        upperBound="-1" eType="#//PackageableElement" changeable="false" volatile="true"

+        transient="true" derived="true">

+      <eAnnotations source="subsets">

+        <details key="org.eclipse.uml2.Namespace#getMembers" value=""/>

+      </eAnnotations>

+    </eStructuralFeatures>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="elementImport" ordered="false"

+        upperBound="-1" eType="#//ElementImport" volatile="true" containment="true"

+        eOpposite="#//ElementImport/importingNamespace">

+      <eAnnotations source="subsets">

+        <details key="org.eclipse.uml2.Element#getOwnedElements" value=""/>

+      </eAnnotations>

+    </eStructuralFeatures>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="packageImport" ordered="false"

+        upperBound="-1" eType="#//PackageImport" volatile="true" containment="true"

+        eOpposite="#//PackageImport/importingNamespace">

+      <eAnnotations source="subsets">

+        <details key="org.eclipse.uml2.Element#getOwnedElements" value=""/>

+      </eAnnotations>

+    </eStructuralFeatures>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="Comment" eSuperTypes="#//TemplateableElement">

+    <eOperations name="getOwnedElements" ordered="false" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

+      <eAnnotations source="feature">

+        <details key="derived" value="true"/>

+        <details key="eOpposite.upperBound" value="1"/>

+        <details key="name" value="ownedElement"/>

+        <details key="eType" value="org.eclipse.uml2.Element"/>

+        <details key="eOpposite" value="owner"/>

+        <details key="eOpposite.containment" value="false"/>

+        <details key="containment" value="false"/>

+        <details key="eOpposite.lowerBound" value="0"/>

+      </eAnnotations>

+      <eAnnotations source="union" references="#//Comment/bodyExpression"/>

+    </eOperations>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="body" ordered="false" eType="#//String"

+        defaultValueLiteral=""/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="annotatedElement" ordered="false"

+        upperBound="-1" eType="#//Element"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="bodyExpression" ordered="false"

+        eType="#//StringExpression" containment="true">

+      <eAnnotations source="subsets">

+        <details key="org.eclipse.uml2.Element#getOwnedElements" value=""/>

+      </eAnnotations>

+    </eStructuralFeatures>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="DirectedRelationship" abstract="true"

+      eSuperTypes="#//Relationship">

+    <eOperations name="getRelatedElements" ordered="false" lowerBound="1" upperBound="-1"

+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

+      <eAnnotations source="feature">

+        <details key="derived" value="true"/>

+        <details key="containment" value="false"/>

+        <details key="name" value="relatedElement"/>

+        <details key="eType" value="org.eclipse.uml2.Element"/>

+      </eAnnotations>

+      <eAnnotations source="union" references="#//DirectedRelationship/source #//DirectedRelationship/target"/>

+    </eOperations>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="source" ordered="false"

+        lowerBound="1" upperBound="-1" eType="#//Element" changeable="false" volatile="true"

+        transient="true" derived="true">

+      <eAnnotations source="union"/>

+      <eAnnotations source="subsets">

+        <details key="org.eclipse.uml2.Relationship#getRelatedElements" value=""/>

+      </eAnnotations>

+    </eStructuralFeatures>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="target" ordered="false"

+        lowerBound="1" upperBound="-1" eType="#//Element" changeable="false" volatile="true"

+        transient="true" derived="true">

+      <eAnnotations source="union"/>

+      <eAnnotations source="subsets">

+        <details key="org.eclipse.uml2.Relationship#getRelatedElements" value=""/>

+      </eAnnotations>

+    </eStructuralFeatures>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="Relationship" abstract="true" eSuperTypes="#//Element">

+    <eStructuralFeatures xsi:type="ecore:EReference" name="relatedElement" ordered="false"

+        lowerBound="1" upperBound="-1" eType="#//Element" changeable="false" volatile="true"

+        transient="true" derived="true">

+      <eAnnotations source="union"/>

+    </eStructuralFeatures>

+  </eClassifiers>

   <eClassifiers xsi:type="ecore:EClass" name="OpaqueExpression" eSuperTypes="#//ValueSpecification">

     <eStructuralFeatures xsi:type="ecore:EAttribute" name="body" ordered="false" eType="#//String"

         defaultValueLiteral=""/>

@@ -242,31 +520,6 @@
       </eAnnotations>

     </eStructuralFeatures>

   </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="Comment" eSuperTypes="#//TemplateableElement">

-    <eOperations name="getOwnedElements" ordered="false" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

-      <eAnnotations source="feature">

-        <details key="derived" value="true"/>

-        <details key="eOpposite.upperBound" value="1"/>

-        <details key="name" value="ownedElement"/>

-        <details key="eType" value="org.eclipse.uml2.Element"/>

-        <details key="eOpposite" value="owner"/>

-        <details key="eOpposite.containment" value="false"/>

-        <details key="containment" value="false"/>

-        <details key="eOpposite.lowerBound" value="0"/>

-      </eAnnotations>

-      <eAnnotations source="union" references="#//Comment/bodyExpression"/>

-    </eOperations>

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="body" ordered="false" eType="#//String"

-        defaultValueLiteral=""/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="annotatedElement" ordered="false"

-        upperBound="-1" eType="#//Element"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="bodyExpression" ordered="false"

-        eType="#//StringExpression" containment="true">

-      <eAnnotations source="subsets">

-        <details key="org.eclipse.uml2.Element#getOwnedElements" value=""/>

-      </eAnnotations>

-    </eStructuralFeatures>

-  </eClassifiers>

   <eClassifiers xsi:type="ecore:EClass" name="Class" eSuperTypes="#//EncapsulatedClassifier #//BehavioredClassifier">

     <eOperations name="inherit" ordered="false" upperBound="-1" eType="#//Set">

       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

@@ -950,112 +1203,6 @@
     <eStructuralFeatures xsi:type="ecore:EReference" name="parameterSet" ordered="false"

         upperBound="-1" eType="#//ParameterSet" eOpposite="#//ParameterSet/parameter"/>

   </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="NamedElement" abstract="true" eSuperTypes="#//TemplateableElement">

-    <eOperations name="validateNoName" eType="#//Boolean">

-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-        <details key="body" value="// TODO: test this OCL constraint&#xD;&#xA;return org.eclipse.uml2.internal.operation.NamedElementOperations.validateNoName(this, diagnostics, context);"/>

-        <details key="documentation" value="An invariant constraint based on the following OCL expression:&#xD;&#xA;&lt;code>&#xD;&#xA;self.name->isEmpty() or self.allNamespaces()->select(ns | ns.name->isEmpty())->notEmpty()&#xD;&#xA;&#x9;implies self.qualifiedName->isEmpty()&#xD;&#xA;&lt;/code>"/>

-      </eAnnotations>

-      <eAnnotations source="constraint"/>

-    </eOperations>

-    <eOperations name="validateQualifiedName" eType="#//Boolean">

-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-        <details key="body" value="// TODO: test this OCL constraint&#xD;&#xA;return org.eclipse.uml2.internal.operation.NamedElementOperations.validateQualifiedName(this, diagnostics, context);"/>

-        <details key="documentation" value="An invariant constraint based on the following OCL expression:&#xD;&#xA;&lt;code>&#xD;&#xA;(self.name->notEmpty() and self.allNamespaces()->select(ns | ns.name->isEmpty())->isEmpty()) implies&#xD;&#xA;self.qualifiedName =&#xD;&#xA; self.allNamespaces()->iterate( ns : Namespace; result: String = self.name |&#xD;&#xA;&#x9;&#x9;ns.name->union(self.separator())->union(result))&#xD;&#xA;&lt;/code>"/>

-      </eAnnotations>

-      <eAnnotations source="constraint"/>

-    </eOperations>

-    <eOperations name="allNamespaces" unique="false" upperBound="-1" eType="#//Sequence">

-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-        <details key="body" value="// TODO: test this OCL operation&#xD;&#xA;try {&#xD;&#xA;&#x9;java.lang.reflect.Method method = getClass().getMethod(&quot;allNamespaces&quot;, new Class[] {}); //$NON-NLS-1$&#xD;&#xA;&#x9;if (!getCacheAdapter().containsKey(this, method)) {&#xD;&#xA;&#x9;&#x9;getCacheAdapter().put(this,&#xD;&#xA;&#x9;&#x9;&#x9;method,&#xD;&#xA;&#x9;&#x9;&#x9;java.util.Collections.unmodifiableList(org.eclipse.uml2.internal.operation.NamedElementOperations.allNamespaces(this)));&#xD;&#xA;&#x9;}&#xD;&#xA;&#x9;return (List) getCacheAdapter().get(this, method);&#xD;&#xA;} catch (Exception e) {&#xD;&#xA;&#x9;return org.eclipse.uml2.internal.operation.NamedElementOperations.allNamespaces(this);&#xD;&#xA;}"/>

-        <details key="documentation" value="A query based on the following OCL expression:&#xD;&#xA;&lt;code>&#xD;&#xA;if self.namespace->isEmpty()&#xD;&#xA;then Sequence{}&#xD;&#xA;else self.namespace.allNamespaces()->prepend(self.namespace)&#xD;&#xA;endif&#xD;&#xA;&lt;/code>"/>

-      </eAnnotations>

-    </eOperations>

-    <eOperations name="isDistinguishableFrom" eType="#//Boolean">

-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-        <details key="body" value="// TODO: test this OCL operation&#xD;&#xA;return org.eclipse.uml2.internal.operation.NamedElementOperations.isDistinguishableFrom(this, n, ns);"/>

-        <details key="documentation" value="A query based on the following OCL expression:&#xD;&#xA;&lt;code>&#xD;&#xA;if self.oclIsKindOf(n.oclType) or n.oclIsKindOf(self.oclType)&#xD;&#xA;then ns.getNamesOfMember(self)->intersection(ns.getNamesOfMember(n))->isEmpty()&#xD;&#xA;else true&#xD;&#xA;endif&#xD;&#xA;&lt;/code>"/>

-      </eAnnotations>

-      <eParameters name="n" eType="#//NamedElement"/>

-      <eParameters name="ns" eType="#//Namespace"/>

-    </eOperations>

-    <eOperations name="separator" eType="#//String">

-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-        <details key="body" value="// TODO: test this OCL operation&#xD;&#xA;return org.eclipse.uml2.internal.operation.NamedElementOperations.separator(this);"/>

-        <details key="documentation" value="A query based on the following OCL expression:&#xD;&#xA;&lt;code>&#xD;&#xA;'::'&#xD;&#xA;&lt;/code>"/>

-      </eAnnotations>

-    </eOperations>

-    <eOperations name="qualifiedName" eType="#//String">

-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-        <details key="body" value="// TODO: test this OCL operation&#xD;&#xA;return org.eclipse.uml2.internal.operation.NamedElementOperations.qualifiedName(this);"/>

-        <details key="documentation" value="A query based on the following OCL expression:&#xD;&#xA;&lt;code>&#xD;&#xA;if self.name->notEmpty() and self.allNamespaces()->select(ns | ns.name->isEmpty())->isEmpty()&#xD;&#xA;then &#xD;&#xA;    self.allNamespaces()->iterate( ns : Namespace; result: String = self.name | ns.name->union(self.separator())->union(result))&#xD;&#xA;else&#xD;&#xA;    Set{}&#xD;&#xA;endif&#xD;&#xA;&lt;/code>"/>

-      </eAnnotations>

-    </eOperations>

-    <eOperations name="validateVisibilityNeedsOwnership" eType="#//Boolean">

-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-        <details key="body" value="// TODO: test this OCL constraint&#xD;&#xA;return org.eclipse.uml2.internal.operation.NamedElementOperations.validateVisibilityNeedsOwnership(this, diagnostics, context);"/>

-        <details key="documentation" value="An invariant constraint based on the following OCL expression:&#xD;&#xA;&lt;code>&#xD;&#xA;namespace->isEmpty() implies visibility->isEmpty()&#xD;&#xA;&lt;/code>"/>

-      </eAnnotations>

-      <eAnnotations source="constraint"/>

-    </eOperations>

-    <eOperations name="getNamespace" ordered="false" eType="#//Namespace">

-      <eAnnotations source="feature">

-        <details key="derived" value="true"/>

-        <details key="containment" value="false"/>

-        <details key="name" value="namespace"/>

-        <details key="eType" value="org.eclipse.uml2.Namespace"/>

-        <details key="eOpposite" value="ownedMember"/>

-        <details key="eOpposite.containment" value="false"/>

-        <details key="eOpposite.lowerBound" value="0"/>

-        <details key="eOpposite.upperBound" value="-1"/>

-      </eAnnotations>

-      <eAnnotations source="subsets">

-        <details key="org.eclipse.uml2.Element#getOwner" value=""/>

-      </eAnnotations>

-      <eAnnotations source="union"/>

-    </eOperations>

-    <eOperations name="getOwner" ordered="false" eType="#//Element">

-      <eAnnotations source="feature">

-        <details key="derived" value="true"/>

-        <details key="eOpposite.upperBound" value="-1"/>

-        <details key="name" value="owner"/>

-        <details key="eType" value="org.eclipse.uml2.Element"/>

-        <details key="eOpposite" value="ownedElement"/>

-        <details key="eOpposite.containment" value="false"/>

-        <details key="containment" value="false"/>

-        <details key="eOpposite.lowerBound" value="0"/>

-      </eAnnotations>

-      <eAnnotations source="union" references="#//NamedElement/getNamespace"/>

-    </eOperations>

-    <eOperations name="getOwnedElements" ordered="false" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

-      <eAnnotations source="feature">

-        <details key="derived" value="true"/>

-        <details key="eOpposite.upperBound" value="1"/>

-        <details key="name" value="ownedElement"/>

-        <details key="eType" value="org.eclipse.uml2.Element"/>

-        <details key="eOpposite" value="owner"/>

-        <details key="eOpposite.containment" value="false"/>

-        <details key="containment" value="false"/>

-        <details key="eOpposite.lowerBound" value="0"/>

-      </eAnnotations>

-      <eAnnotations source="union" references="#//NamedElement/nameExpression"/>

-    </eOperations>

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" ordered="false" eType="#//String"

-        defaultValueLiteral=""/>

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="qualifiedName" ordered="false"

-        eType="#//String" changeable="false" volatile="true" transient="true" defaultValueLiteral=""

-        derived="true"/>

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="visibility" ordered="false"

-        eType="#//VisibilityKind"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="clientDependency" ordered="false"

-        upperBound="-1" eType="#//Dependency" volatile="true" eOpposite="#//Dependency/client"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="nameExpression" ordered="false"

-        eType="#//StringExpression" containment="true">

-      <eAnnotations source="subsets">

-        <details key="org.eclipse.uml2.Element#getOwnedElements" value=""/>

-      </eAnnotations>

-    </eStructuralFeatures>

-  </eClassifiers>

   <eClassifiers xsi:type="ecore:EClass" name="Package" eSuperTypes="#//Namespace #//PackageableElement">

     <eOperations name="validateElementsPublicOrPrivate" eType="#//Boolean">

       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

@@ -1269,153 +1416,6 @@
     </eStructuralFeatures>

   </eClassifiers>

   <eClassifiers xsi:type="ecore:EClass" name="PrimitiveType" eSuperTypes="#//DataType"/>

-  <eClassifiers xsi:type="ecore:EClass" name="Namespace" abstract="true" eSuperTypes="#//NamedElement">

-    <eOperations name="validateMembersAreDistinguishable" eType="#//Boolean">

-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-        <details key="body" value="// TODO: test this OCL constraint&#xD;&#xA;return org.eclipse.uml2.internal.operation.NamespaceOperations.validateMembersAreDistinguishable(this, diagnostics, context);"/>

-        <details key="documentation" value="An invariant constraint based on the following OCL expression:&#xD;&#xA;&lt;code>&#xD;&#xA;membersAreDistinguishable()&#xD;&#xA;&lt;/code>"/>

-      </eAnnotations>

-      <eAnnotations source="constraint"/>

-    </eOperations>

-    <eOperations name="getNamesOfMember" ordered="false" upperBound="-1" eType="#//Set">

-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-        <details key="body" value="// TODO: test this OCL operation&#xD;&#xA;return org.eclipse.uml2.internal.operation.NamespaceOperations.getNamesOfMember(this, element);"/>

-        <details key="documentation" value="A query based on the following OCL expression:&#xD;&#xA;&lt;code>&#xD;&#xA;if self.ownedMember->includes(element)&#xD;&#xA;then Set{}->include(element.name)&#xD;&#xA;else let elementImports: ElementImport = self.elementImport->select(ei | ei.importedElement = element) in&#xD;&#xA;    if elementImports->notEmpty()&#xD;&#xA;    then elementImports->collect(el | el.getName())&#xD;&#xA;    else &#xD;&#xA;        self.packageImport->select(pi | pi.importedPackage.visibleMembers()->includes(element))->collect(pi | pi.importedPackage.getNamesOfMember(element))&#xD;&#xA;    endif&#xD;&#xA;endif&#xD;&#xA;&lt;/code>"/>

-      </eAnnotations>

-      <eParameters name="element" eType="#//NamedElement"/>

-    </eOperations>

-    <eOperations name="membersAreDistinguishable" eType="#//Boolean">

-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-        <details key="body" value="// TODO: test this OCL operation&#xD;&#xA;return org.eclipse.uml2.internal.operation.NamespaceOperations.membersAreDistinguishable(this);"/>

-        <details key="documentation" value="A query based on the following OCL expression:&#xD;&#xA;&lt;code>&#xD;&#xA;self.member->forAll( memb |&#xD;&#xA;&#x9;self.member->excluding(memb)->forAll(other |&#xD;&#xA;&#x9;&#x9;memb.isDistinguishableFrom(other, self)))&#xD;&#xA;&lt;/code>"/>

-      </eAnnotations>

-    </eOperations>

-    <eOperations name="validateImportedMemberDerived" eType="#//Boolean">

-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-        <details key="body" value="// TODO: test this OCL constraint&#xD;&#xA;return org.eclipse.uml2.internal.operation.NamespaceOperations.validateImportedMemberDerived(this, diagnostics, context);"/>

-        <details key="documentation" value="An invariant constraint based on the following OCL expression:&#xD;&#xA;&lt;code>&#xD;&#xA;self.importedMember->includesAll(self.importedMembers(self.elementImport.importedElement.asSet()->union(self.packageImport.importedPackage->collect(p | p.visibleMembers()))))&#xD;&#xA;&lt;/code>"/>

-      </eAnnotations>

-      <eAnnotations source="constraint"/>

-    </eOperations>

-    <eOperations name="importedMember" ordered="false" upperBound="-1" eType="#//Set">

-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-        <details key="body" value="// TODO: test this OCL operation&#xD;&#xA;try {&#xD;&#xA;&#x9;java.lang.reflect.Method method = getClass().getMethod(&quot;importedMember&quot;, new Class[] {}); //$NON-NLS-1$&#xD;&#xA;&#x9;if (!getCacheAdapter().containsKey(this, method)) {&#xD;&#xA;&#x9;&#x9;getCacheAdapter().put(this,&#xD;&#xA;&#x9;&#x9;&#x9;method,&#xD;&#xA;&#x9;&#x9;&#x9;java.util.Collections.unmodifiableSet(org.eclipse.uml2.internal.operation.NamespaceOperations.importedMember(this)));&#xD;&#xA;&#x9;}&#xD;&#xA;&#x9;return (Set) getCacheAdapter().get(this, method);&#xD;&#xA;} catch (Exception e) {&#xD;&#xA;&#x9;return org.eclipse.uml2.internal.operation.NamespaceOperations.importedMember(this);&#xD;&#xA;}"/>

-        <details key="documentation" value="A query based on the following OCL expression:&#xD;&#xA;&lt;code>&#xD;&#xA;self.importedMembers(self.elementImport.importedElement.asSet()->union(self.packageImport.importedPackage->collect(p | p.visibleMembers())))&#xD;&#xA;&lt;/code>"/>

-      </eAnnotations>

-    </eOperations>

-    <eOperations name="importMembers" ordered="false" upperBound="-1" eType="#//Set">

-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-        <details key="body" value="// TODO: test this OCL operation&#xD;&#xA;return org.eclipse.uml2.internal.operation.NamespaceOperations.importMembers(this, imps);"/>

-        <details key="documentation" value="A query based on the following OCL expression:&#xD;&#xA;&lt;code>&#xD;&#xA;self.excludeCollisions(imps)->select(imp | self.ownedMember->forAll(mem | mem.imp.isDistinguishableFrom(mem, self)))&#xD;&#xA;&lt;/code>"/>

-      </eAnnotations>

-      <eParameters name="imps" eType="#//Set"/>

-    </eOperations>

-    <eOperations name="excludeCollisions" ordered="false" upperBound="-1" eType="#//Set">

-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-        <details key="body" value="// TODO: test this OCL operation&#xD;&#xA;return org.eclipse.uml2.internal.operation.NamespaceOperations.excludeCollisions(this, imps);"/>

-        <details key="documentation" value="A query based on the following OCL expression:&#xD;&#xA;&lt;code>&#xD;&#xA;imps->reject(imp1 | imps.exists(imp2 | not imp1.isDistinguishableFrom(imp2, self)))&#xD;&#xA;&lt;/code>"/>

-      </eAnnotations>

-      <eParameters name="imps" eType="#//Set"/>

-    </eOperations>

-    <eOperations name="getOwnedMembers" ordered="false" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

-      <eAnnotations source="feature">

-        <details key="derived" value="true"/>

-        <details key="eOpposite.upperBound" value="1"/>

-        <details key="name" value="ownedMember"/>

-        <details key="eType" value="org.eclipse.uml2.NamedElement"/>

-        <details key="eOpposite" value="namespace"/>

-        <details key="eOpposite.containment" value="false"/>

-        <details key="containment" value="false"/>

-        <details key="eOpposite.lowerBound" value="0"/>

-      </eAnnotations>

-      <eAnnotations source="subsets">

-        <details key="org.eclipse.uml2.Element#getOwnedElements" value=""/>

-        <details key="org.eclipse.uml2.Namespace#getMembers" value=""/>

-      </eAnnotations>

-      <eAnnotations source="union" references="#//Namespace/ownedRule"/>

-    </eOperations>

-    <eOperations name="getOwnedElements" ordered="false" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

-      <eAnnotations source="feature">

-        <details key="derived" value="true"/>

-        <details key="eOpposite.upperBound" value="1"/>

-        <details key="name" value="ownedElement"/>

-        <details key="eType" value="org.eclipse.uml2.Element"/>

-        <details key="eOpposite" value="owner"/>

-        <details key="eOpposite.containment" value="false"/>

-        <details key="containment" value="false"/>

-        <details key="eOpposite.lowerBound" value="0"/>

-      </eAnnotations>

-      <eAnnotations source="union" references="#//Namespace/getOwnedMembers #//Namespace/elementImport #//Namespace/packageImport"/>

-    </eOperations>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="member" ordered="false"

-        upperBound="-1" eType="#//NamedElement" changeable="false" volatile="true"

-        transient="true" derived="true">

-      <eAnnotations source="union" references="#//Namespace/getOwnedMembers #//Namespace/importedMember.1"/>

-    </eStructuralFeatures>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="ownedRule" ordered="false"

-        upperBound="-1" eType="#//Constraint" volatile="true" containment="true" eOpposite="#//Constraint/namespace">

-      <eAnnotations source="subsets">

-        <details key="org.eclipse.uml2.Namespace#getOwnedMembers" value=""/>

-      </eAnnotations>

-    </eStructuralFeatures>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="importedMember" ordered="false"

-        upperBound="-1" eType="#//PackageableElement" changeable="false" volatile="true"

-        transient="true" derived="true">

-      <eAnnotations source="subsets">

-        <details key="org.eclipse.uml2.Namespace#getMembers" value=""/>

-      </eAnnotations>

-    </eStructuralFeatures>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="elementImport" ordered="false"

-        upperBound="-1" eType="#//ElementImport" volatile="true" containment="true"

-        eOpposite="#//ElementImport/importingNamespace">

-      <eAnnotations source="subsets">

-        <details key="org.eclipse.uml2.Element#getOwnedElements" value=""/>

-      </eAnnotations>

-    </eStructuralFeatures>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="packageImport" ordered="false"

-        upperBound="-1" eType="#//PackageImport" volatile="true" containment="true"

-        eOpposite="#//PackageImport/importingNamespace">

-      <eAnnotations source="subsets">

-        <details key="org.eclipse.uml2.Element#getOwnedElements" value=""/>

-      </eAnnotations>

-    </eStructuralFeatures>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="DirectedRelationship" abstract="true"

-      eSuperTypes="#//Relationship">

-    <eOperations name="getRelatedElements" ordered="false" lowerBound="1" upperBound="-1"

-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

-      <eAnnotations source="feature">

-        <details key="derived" value="true"/>

-        <details key="containment" value="false"/>

-        <details key="name" value="relatedElement"/>

-        <details key="eType" value="org.eclipse.uml2.Element"/>

-      </eAnnotations>

-      <eAnnotations source="union" references="#//DirectedRelationship/source #//DirectedRelationship/target"/>

-    </eOperations>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="source" ordered="false"

-        lowerBound="1" upperBound="-1" eType="#//Element" changeable="false" volatile="true"

-        transient="true" derived="true">

-      <eAnnotations source="union"/>

-      <eAnnotations source="subsets">

-        <details key="org.eclipse.uml2.Relationship#getRelatedElements" value=""/>

-      </eAnnotations>

-    </eStructuralFeatures>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="target" ordered="false"

-        lowerBound="1" upperBound="-1" eType="#//Element" changeable="false" volatile="true"

-        transient="true" derived="true">

-      <eAnnotations source="union"/>

-      <eAnnotations source="subsets">

-        <details key="org.eclipse.uml2.Relationship#getRelatedElements" value=""/>

-      </eAnnotations>

-    </eStructuralFeatures>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="Relationship" abstract="true" eSuperTypes="#//Element">

-    <eStructuralFeatures xsi:type="ecore:EReference" name="relatedElement" ordered="false"

-        lowerBound="1" upperBound="-1" eType="#//Element" changeable="false" volatile="true"

-        transient="true" derived="true">

-      <eAnnotations source="union"/>

-    </eStructuralFeatures>

-  </eClassifiers>

   <eClassifiers xsi:type="ecore:EClass" name="Constraint" eSuperTypes="#//PackageableElement">

     <eOperations name="validateNotApplyToSelf" eType="#//Boolean">

       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

@@ -1459,6 +1459,12 @@
     <eStructuralFeatures xsi:type="ecore:EReference" name="constrainedElement" upperBound="-1"

         eType="#//Element"/>

   </eClassifiers>

+  <eClassifiers xsi:type="ecore:EEnum" name="VisibilityKind">

+    <eLiterals name="public"/>

+    <eLiterals name="private" value="1"/>

+    <eLiterals name="protected" value="2"/>

+    <eLiterals name="package" value="3"/>

+  </eClassifiers>

   <eClassifiers xsi:type="ecore:EClass" name="LiteralBoolean" eSuperTypes="#//LiteralSpecification">

     <eOperations name="isComputable" eType="#//Boolean">

       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

@@ -1539,12 +1545,6 @@
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" ordered="false"

         eType="#//UnlimitedNatural"/>

   </eClassifiers>

-  <eClassifiers xsi:type="ecore:EEnum" name="VisibilityKind">

-    <eLiterals name="public"/>

-    <eLiterals name="private" value="1"/>

-    <eLiterals name="protected" value="2"/>

-    <eLiterals name="package" value="3"/>

-  </eClassifiers>

   <eClassifiers xsi:type="ecore:EClass" name="Classifier" abstract="true" eSuperTypes="#//Namespace #//Type #//RedefinableElement">

     <eOperations name="allFeatures" ordered="false" upperBound="-1" eType="#//Set">

       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

@@ -1736,8 +1736,6 @@
         <details key="org.eclipse.uml2.RedefinableElement#getRedefinedElements" value=""/>

       </eAnnotations>

     </eStructuralFeatures>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="powertypeExtent" ordered="false"

-        upperBound="-1" eType="#//GeneralizationSet" eOpposite="#//GeneralizationSet/powertype"/>

     <eStructuralFeatures xsi:type="ecore:EReference" name="substitution" ordered="false"

         upperBound="-1" eType="#//Substitution" volatile="true" containment="true"

         eOpposite="#//Substitution/substitutingClassifier">

@@ -1746,6 +1744,8 @@
         <details key="org.eclipse.uml2.NamedElement#getClientDependencies" value=""/>

       </eAnnotations>

     </eStructuralFeatures>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="powertypeExtent" ordered="false"

+        upperBound="-1" eType="#//GeneralizationSet" eOpposite="#//GeneralizationSet/powertype"/>

     <eStructuralFeatures xsi:type="ecore:EReference" name="ownedUseCase" ordered="false"

         upperBound="-1" eType="#//UseCase" containment="true">

       <eAnnotations source="subsets">

@@ -1892,6 +1892,53 @@
     <eStructuralFeatures xsi:type="ecore:EReference" name="generalizationSet" ordered="false"

         upperBound="-1" eType="#//GeneralizationSet" eOpposite="#//GeneralizationSet/generalization"/>

   </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="RedefinableElement" abstract="true"

+      eSuperTypes="#//NamedElement">

+    <eOperations name="validateRedefinitionContextValid" eType="#//Boolean">

+      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

+        <details key="body" value="// TODO: test this OCL constraint&#xD;&#xA;return org.eclipse.uml2.internal.operation.RedefinableElementOperations.validateRedefinitionContextValid(this, diagnostics, context);"/>

+        <details key="documentation" value="An invariant constraint based on the following OCL expression:&#xD;&#xA;&lt;code>&#xD;&#xA;self.redefinedElement->forAll(e | self.isRedefinitionContextValid(e))&#xD;&#xA;&lt;/code>"/>

+      </eAnnotations>

+      <eAnnotations source="constraint"/>

+    </eOperations>

+    <eOperations name="validateRedefinitionConsistent" eType="#//Boolean">

+      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

+        <details key="body" value="// TODO: test this OCL constraint&#xD;&#xA;return org.eclipse.uml2.internal.operation.RedefinableElementOperations.validateRedefinitionConsistent(this, diagnostics, context);"/>

+        <details key="documentation" value="An invariant constraint based on the following OCL expression:&#xD;&#xA;&lt;code>&#xD;&#xA;self.redefinedElement->forAll(re | re.isConsistentWith(self))&#xD;&#xA;&lt;/code>"/>

+      </eAnnotations>

+      <eAnnotations source="constraint"/>

+    </eOperations>

+    <eOperations name="isConsistentWith" eType="#//Boolean">

+      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

+        <details key="body" value="// TODO: test this OCL operation&#xD;&#xA;return org.eclipse.uml2.internal.operation.RedefinableElementOperations.isConsistentWith(this, redefinee);"/>

+        <details key="documentation" value="A query based on the following OCL expression:&#xD;&#xA;&lt;code>&#xD;&#xA;false&#xD;&#xA;&lt;/code>"/>

+      </eAnnotations>

+      <eParameters name="redefinee" eType="#//RedefinableElement"/>

+    </eOperations>

+    <eOperations name="isRedefinitionContextValid" eType="#//Boolean">

+      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

+        <details key="body" value="// TODO: test this OCL operation&#xD;&#xA;return org.eclipse.uml2.internal.operation.RedefinableElementOperations.isRedefinitionContextValid(this, redefinable);"/>

+        <details key="documentation" value="A query based on the following OCL expression:&#xD;&#xA;&lt;code>&#xD;&#xA;self.redefinitionContext->exists(c | redefinable.redefinitionContext->exists(r | c.allParents()->includes(r)))&#xD;&#xA;&lt;/code>"/>

+      </eAnnotations>

+      <eParameters name="redefinable" eType="#//RedefinableElement"/>

+    </eOperations>

+    <eOperations name="getRedefinedElements" ordered="false" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

+      <eAnnotations source="feature">

+        <details key="derived" value="true"/>

+        <details key="containment" value="false"/>

+        <details key="name" value="redefinedElement"/>

+        <details key="eType" value="org.eclipse.uml2.RedefinableElement"/>

+      </eAnnotations>

+      <eAnnotations source="union"/>

+    </eOperations>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="redefinitionContext" ordered="false"

+        upperBound="-1" eType="#//Classifier" changeable="false" volatile="true" transient="true"

+        derived="true">

+      <eAnnotations source="union"/>

+    </eStructuralFeatures>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="isLeaf" ordered="false"

+        eType="#//Boolean" defaultValueLiteral="false"/>

+  </eClassifiers>

   <eClassifiers xsi:type="ecore:EClass" name="InstanceSpecification" eSuperTypes="#//PackageableElement #//DeploymentTarget #//DeployedArtifact">

     <eOperations name="validateSlotsAreDefined" eType="#//Boolean">

       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

@@ -1981,53 +2028,6 @@
     <eStructuralFeatures xsi:type="ecore:EReference" name="instance" ordered="false"

         lowerBound="1" eType="#//InstanceSpecification"/>

   </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="RedefinableElement" abstract="true"

-      eSuperTypes="#//NamedElement">

-    <eOperations name="validateRedefinitionContextValid" eType="#//Boolean">

-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-        <details key="body" value="// TODO: test this OCL constraint&#xD;&#xA;return org.eclipse.uml2.internal.operation.RedefinableElementOperations.validateRedefinitionContextValid(this, diagnostics, context);"/>

-        <details key="documentation" value="An invariant constraint based on the following OCL expression:&#xD;&#xA;&lt;code>&#xD;&#xA;self.redefinedElement->forAll(e | self.isRedefinitionContextValid(e))&#xD;&#xA;&lt;/code>"/>

-      </eAnnotations>

-      <eAnnotations source="constraint"/>

-    </eOperations>

-    <eOperations name="validateRedefinitionConsistent" eType="#//Boolean">

-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-        <details key="body" value="// TODO: test this OCL constraint&#xD;&#xA;return org.eclipse.uml2.internal.operation.RedefinableElementOperations.validateRedefinitionConsistent(this, diagnostics, context);"/>

-        <details key="documentation" value="An invariant constraint based on the following OCL expression:&#xD;&#xA;&lt;code>&#xD;&#xA;self.redefinedElement->forAll(re | re.isConsistentWith(self))&#xD;&#xA;&lt;/code>"/>

-      </eAnnotations>

-      <eAnnotations source="constraint"/>

-    </eOperations>

-    <eOperations name="isConsistentWith" eType="#//Boolean">

-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-        <details key="body" value="// TODO: test this OCL operation&#xD;&#xA;return org.eclipse.uml2.internal.operation.RedefinableElementOperations.isConsistentWith(this, redefinee);"/>

-        <details key="documentation" value="A query based on the following OCL expression:&#xD;&#xA;&lt;code>&#xD;&#xA;false&#xD;&#xA;&lt;/code>"/>

-      </eAnnotations>

-      <eParameters name="redefinee" eType="#//RedefinableElement"/>

-    </eOperations>

-    <eOperations name="isRedefinitionContextValid" eType="#//Boolean">

-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-        <details key="body" value="// TODO: test this OCL operation&#xD;&#xA;return org.eclipse.uml2.internal.operation.RedefinableElementOperations.isRedefinitionContextValid(this, redefinable);"/>

-        <details key="documentation" value="A query based on the following OCL expression:&#xD;&#xA;&lt;code>&#xD;&#xA;self.redefinitionContext->exists(c | redefinable.redefinitionContext->exists(r | c.allParents()->includes(r)))&#xD;&#xA;&lt;/code>"/>

-      </eAnnotations>

-      <eParameters name="redefinable" eType="#//RedefinableElement"/>

-    </eOperations>

-    <eOperations name="getRedefinedElements" ordered="false" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

-      <eAnnotations source="feature">

-        <details key="derived" value="true"/>

-        <details key="containment" value="false"/>

-        <details key="name" value="redefinedElement"/>

-        <details key="eType" value="org.eclipse.uml2.RedefinableElement"/>

-      </eAnnotations>

-      <eAnnotations source="union"/>

-    </eOperations>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="redefinitionContext" ordered="false"

-        upperBound="-1" eType="#//Classifier" changeable="false" volatile="true" transient="true"

-        derived="true">

-      <eAnnotations source="union"/>

-    </eStructuralFeatures>

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="isLeaf" ordered="false"

-        eType="#//Boolean" defaultValueLiteral="false"/>

-  </eClassifiers>

   <eClassifiers xsi:type="ecore:EClass" name="PackageableElement" abstract="true"

       eSuperTypes="#//NamedElement #//ParameterableElement">

     <eOperations name="getVisibility" ordered="false" eType="#//VisibilityKind">

@@ -2422,31 +2422,6 @@
     <eLiterals name="shared" value="1"/>

     <eLiterals name="composite" value="2"/>

   </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="AssociationClass" eSuperTypes="#//Class #//Association"/>

-  <eClassifiers xsi:type="ecore:EClass" name="GeneralizationSet" eSuperTypes="#//PackageableElement">

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="isCovering" ordered="false"

-        eType="#//Boolean"/>

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="isDisjoint" ordered="false"

-        eType="#//Boolean"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="powertype" ordered="false"

-        eType="#//Classifier" eOpposite="#//Classifier/powertypeExtent"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="generalization" ordered="false"

-        upperBound="-1" eType="#//Generalization" eOpposite="#//Generalization/generalizationSet"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="InformationItem" eSuperTypes="#//Classifier">

-    <eStructuralFeatures xsi:type="ecore:EReference" name="represented" ordered="false"

-        upperBound="-1" eType="#//Classifier"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="InformationFlow" eSuperTypes="#//DirectedRelationship">

-    <eStructuralFeatures xsi:type="ecore:EReference" name="realization" ordered="false"

-        upperBound="-1" eType="#//Relationship"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="conveyed" ordered="false"

-        lowerBound="1" upperBound="-1" eType="#//Classifier"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="Model" eSuperTypes="#//Package">

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="viewpoint" ordered="false"

-        eType="#//String" defaultValueLiteral=""/>

-  </eClassifiers>

   <eClassifiers xsi:type="ecore:EClass" name="Permission" eSuperTypes="#//Dependency"/>

   <eClassifiers xsi:type="ecore:EClass" name="Dependency" eSuperTypes="#//PackageableElement #//DirectedRelationship">

     <eStructuralFeatures xsi:type="ecore:EReference" name="client" ordered="false"

@@ -2815,312 +2790,54 @@
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="isReadOnly" ordered="false"

         eType="#//Boolean" defaultValueLiteral="false"/>

   </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="ActivityEdge" abstract="true" eSuperTypes="#//RedefinableElement">

-    <eOperations name="getOwner" ordered="false" eType="#//Element">

-      <eAnnotations source="feature">

-        <details key="derived" value="true"/>

-        <details key="eOpposite.upperBound" value="-1"/>

-        <details key="name" value="owner"/>

-        <details key="eType" value="org.eclipse.uml2.Element"/>

-        <details key="eOpposite" value="ownedElement"/>

-        <details key="eOpposite.containment" value="false"/>

-        <details key="containment" value="false"/>

-        <details key="eOpposite.lowerBound" value="0"/>

-      </eAnnotations>

-      <eAnnotations source="union" references="#//ActivityEdge/activity"/>

-    </eOperations>

-    <eOperations name="getOwnedElements" ordered="false" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

-      <eAnnotations source="feature">

-        <details key="derived" value="true"/>

-        <details key="eOpposite.upperBound" value="1"/>

-        <details key="name" value="ownedElement"/>

-        <details key="eType" value="org.eclipse.uml2.Element"/>

-        <details key="eOpposite" value="owner"/>

-        <details key="eOpposite.containment" value="false"/>

-        <details key="containment" value="false"/>

-        <details key="eOpposite.lowerBound" value="0"/>

-      </eAnnotations>

-      <eAnnotations source="union" references="#//ActivityEdge/guard #//ActivityEdge/weight"/>

-    </eOperations>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="activity" ordered="false"

-        eType="#//Activity" transient="true" eOpposite="#//Activity/edge">

-      <eAnnotations source="subsets">

-        <details key="org.eclipse.uml2.Element#getOwner" value=""/>

-      </eAnnotations>

-    </eStructuralFeatures>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="source" ordered="false"

-        lowerBound="1" eType="#//ActivityNode" eOpposite="#//ActivityNode/outgoing"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="target" ordered="false"

-        lowerBound="1" eType="#//ActivityNode" eOpposite="#//ActivityNode/incoming"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="inGroup" ordered="false"

-        upperBound="-1" eType="#//ActivityGroup" changeable="false" volatile="true"

-        transient="true" derived="true">

-      <eAnnotations source="union" references="#//ActivityEdge/inStructuredNode #//ActivityEdge/inPartition"/>

-      <eAnnotations source="redefined">

-        <details key="eOpposite" value="containedEdge"/>

-        <details key="eOpposite.containment" value="false"/>

-        <details key="eOpposite.lowerBound" value="0"/>

-        <details key="eOpposite.upperBound" value="-1"/>

-      </eAnnotations>

-    </eStructuralFeatures>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="guard" ordered="false"

-        lowerBound="1" eType="#//ValueSpecification" containment="true">

-      <eAnnotations source="subsets">

-        <details key="org.eclipse.uml2.Element#getOwnedElements" value=""/>

-      </eAnnotations>

-    </eStructuralFeatures>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="redefinedElement" ordered="false"

-        upperBound="-1" eType="#//ActivityEdge">

-      <eAnnotations source="redefines" references="#//RedefinableElement/getRedefinedElements">

-        <details key="org.eclipse.uml2.RedefinableElement#getRedefinedElements" value=""/>

-      </eAnnotations>

-    </eStructuralFeatures>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="inStructuredNode" ordered="false"

-        eType="#//StructuredActivityNode" transient="true" eOpposite="#//StructuredActivityNode/containedEdge">

-      <eAnnotations source="subsets">

-        <details key="org.eclipse.uml2.ActivityEdge#getInGroups" value=""/>

-      </eAnnotations>

-    </eStructuralFeatures>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="inPartition" ordered="false"

-        upperBound="-1" eType="#//ActivityPartition" eOpposite="#//ActivityPartition/containedEdge">

-      <eAnnotations source="subsets">

-        <details key="org.eclipse.uml2.ActivityEdge#getInGroups" value=""/>

-      </eAnnotations>

-    </eStructuralFeatures>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="weight" ordered="false"

-        lowerBound="1" eType="#//ValueSpecification" containment="true">

-      <eAnnotations source="subsets">

-        <details key="org.eclipse.uml2.Element#getOwnedElements" value=""/>

-      </eAnnotations>

-    </eStructuralFeatures>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="interrupts" ordered="false"

-        eType="#//InterruptibleActivityRegion" eOpposite="#//InterruptibleActivityRegion/interruptingEdge"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="ActivityGroup" abstract="true" eSuperTypes="#//Element">

-    <eOperations name="getSubgroups" ordered="false" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

-      <eAnnotations source="feature">

-        <details key="derived" value="true"/>

-        <details key="eOpposite.upperBound" value="1"/>

-        <details key="name" value="subgroup"/>

-        <details key="eType" value="org.eclipse.uml2.ActivityGroup"/>

-        <details key="eOpposite" value="superGroup"/>

-        <details key="eOpposite.containment" value="false"/>

-        <details key="containment" value="false"/>

-        <details key="eOpposite.lowerBound" value="0"/>

-      </eAnnotations>

-      <eAnnotations source="subsets">

-        <details key="org.eclipse.uml2.Element#getOwnedElements" value=""/>

-      </eAnnotations>

-      <eAnnotations source="union"/>

-    </eOperations>

-    <eOperations name="getContainedEdges" ordered="false" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

-      <eAnnotations source="feature">

-        <details key="derived" value="true"/>

-        <details key="eOpposite.upperBound" value="-1"/>

-        <details key="name" value="containedEdge"/>

-        <details key="eType" value="org.eclipse.uml2.ActivityEdge"/>

-        <details key="eOpposite" value="inGroup"/>

-        <details key="eOpposite.containment" value="false"/>

-        <details key="containment" value="false"/>

-        <details key="eOpposite.lowerBound" value="0"/>

-      </eAnnotations>

-    </eOperations>

-    <eOperations name="getContainedNodes" ordered="false" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

-      <eAnnotations source="feature">

-        <details key="derived" value="true"/>

-        <details key="eOpposite.upperBound" value="-1"/>

-        <details key="name" value="containedNode"/>

-        <details key="eType" value="org.eclipse.uml2.ActivityNode"/>

-        <details key="eOpposite" value="inGroup"/>

-        <details key="eOpposite.containment" value="false"/>

-        <details key="containment" value="false"/>

-        <details key="eOpposite.lowerBound" value="0"/>

-      </eAnnotations>

-    </eOperations>

-    <eOperations name="getActivity" ordered="false" eType="#//Activity">

-      <eAnnotations source="feature">

-        <details key="derived" value="false"/>

-        <details key="eOpposite.upperBound" value="-1"/>

-        <details key="name" value="activity"/>

-        <details key="eType" value="org.eclipse.uml2.Activity"/>

-        <details key="eOpposite" value="node"/>

-        <details key="eOpposite.containment" value="true"/>

-        <details key="containment" value="false"/>

-        <details key="eOpposite.lowerBound" value="0"/>

-      </eAnnotations>

-      <eAnnotations source="redefined" references="#//ActivityGroup/activityGroup_activity"/>

-    </eOperations>

-    <eOperations name="setActivity" ordered="false">

-      <eAnnotations source="feature">

-        <details key="derived" value="false"/>

-        <details key="eOpposite.upperBound" value="-1"/>

-        <details key="name" value="activity"/>

-        <details key="eType" value="org.eclipse.uml2.Activity"/>

-        <details key="eOpposite" value="node"/>

-        <details key="eOpposite.containment" value="true"/>

-        <details key="containment" value="false"/>

-        <details key="eOpposite.lowerBound" value="0"/>

-      </eAnnotations>

-      <eAnnotations source="redefined" references="#//ActivityGroup/activityGroup_activity"/>

-      <eParameters name="newActivity" eType="#//Activity"/>

-    </eOperations>

-    <eOperations name="getOwnedElements" ordered="false" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

-      <eAnnotations source="feature">

-        <details key="derived" value="true"/>

-        <details key="eOpposite.upperBound" value="1"/>

-        <details key="name" value="ownedElement"/>

-        <details key="eType" value="org.eclipse.uml2.Element"/>

-        <details key="eOpposite" value="owner"/>

-        <details key="eOpposite.containment" value="false"/>

-        <details key="containment" value="false"/>

-        <details key="eOpposite.lowerBound" value="0"/>

-      </eAnnotations>

-      <eAnnotations source="union" references="#//ActivityGroup/getSubgroups"/>

-    </eOperations>

-    <eOperations name="getOwner" ordered="false" eType="#//Element">

-      <eAnnotations source="feature">

-        <details key="derived" value="true"/>

-        <details key="eOpposite.upperBound" value="-1"/>

-        <details key="name" value="owner"/>

-        <details key="eType" value="org.eclipse.uml2.Element"/>

-        <details key="eOpposite" value="ownedElement"/>

-        <details key="eOpposite.containment" value="false"/>

-        <details key="containment" value="false"/>

-        <details key="eOpposite.lowerBound" value="0"/>

-      </eAnnotations>

-      <eAnnotations source="union" references="#//ActivityGroup/superGroup #//ActivityGroup/activityGroup_activity"/>

-    </eOperations>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="superGroup" ordered="false"

-        eType="#//ActivityGroup" changeable="false" volatile="true" transient="true"

-        derived="true">

-      <eAnnotations source="union"/>

-      <eAnnotations source="subsets">

-        <details key="org.eclipse.uml2.Element#getOwner" value=""/>

-      </eAnnotations>

-      <eAnnotations source="redefined">

-        <details key="eOpposite" value="subgroup"/>

-        <details key="eOpposite.containment" value="false"/>

-        <details key="eOpposite.lowerBound" value="0"/>

-        <details key="eOpposite.upperBound" value="-1"/>

-      </eAnnotations>

-    </eStructuralFeatures>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="activityGroup_activity"

-        ordered="false" eType="#//Activity" volatile="true" transient="true" eOpposite="#//Activity/group">

-      <eAnnotations source="subsets">

-        <details key="org.eclipse.uml2.Element#getOwner" value=""/>

-      </eAnnotations>

-      <eAnnotations source="redefines">

-        <details key="org.eclipse.uml2.ActivityNode#getActivity" value=""/>

-      </eAnnotations>

-    </eStructuralFeatures>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="ActivityNode" abstract="true" eSuperTypes="#//RedefinableElement">

-    <eOperations name="getOwner" ordered="false" eType="#//Element">

-      <eAnnotations source="feature">

-        <details key="derived" value="true"/>

-        <details key="eOpposite.upperBound" value="-1"/>

-        <details key="name" value="owner"/>

-        <details key="eType" value="org.eclipse.uml2.Element"/>

-        <details key="eOpposite" value="ownedElement"/>

-        <details key="eOpposite.containment" value="false"/>

-        <details key="containment" value="false"/>

-        <details key="eOpposite.lowerBound" value="0"/>

-      </eAnnotations>

-      <eAnnotations source="union" references="#//ActivityNode/activity"/>

-    </eOperations>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="outgoing" ordered="false"

-        upperBound="-1" eType="#//ActivityEdge" eOpposite="#//ActivityEdge/source"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="incoming" ordered="false"

-        upperBound="-1" eType="#//ActivityEdge" eOpposite="#//ActivityEdge/target"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="inGroup" ordered="false"

-        upperBound="-1" eType="#//ActivityGroup" changeable="false" volatile="true"

-        transient="true" derived="true">

-      <eAnnotations source="union" references="#//ActivityNode/inStructuredNode #//ActivityNode/inPartition #//ActivityNode/inInterruptibleRegion"/>

-      <eAnnotations source="redefined">

-        <details key="eOpposite" value="containedNode"/>

-        <details key="eOpposite.containment" value="false"/>

-        <details key="eOpposite.lowerBound" value="0"/>

-        <details key="eOpposite.upperBound" value="-1"/>

-      </eAnnotations>

-    </eStructuralFeatures>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="activity" ordered="false"

-        eType="#//Activity" volatile="true" transient="true" eOpposite="#//Activity/node">

-      <eAnnotations source="subsets">

-        <details key="org.eclipse.uml2.Element#getOwner" value=""/>

-      </eAnnotations>

-    </eStructuralFeatures>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="redefinedElement" ordered="false"

-        upperBound="-1" eType="#//ActivityNode">

-      <eAnnotations source="redefines" references="#//RedefinableElement/getRedefinedElements">

-        <details key="org.eclipse.uml2.RedefinableElement#getRedefinedElements" value=""/>

-      </eAnnotations>

-    </eStructuralFeatures>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="inStructuredNode" ordered="false"

-        eType="#//StructuredActivityNode" transient="true" eOpposite="#//StructuredActivityNode/containedNode">

-      <eAnnotations source="subsets">

-        <details key="org.eclipse.uml2.ActivityNode#getInGroups" value=""/>

-      </eAnnotations>

-    </eStructuralFeatures>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="inPartition" ordered="false"

-        upperBound="-1" eType="#//ActivityPartition" eOpposite="#//ActivityPartition/containedNode">

-      <eAnnotations source="subsets">

-        <details key="org.eclipse.uml2.ActivityNode#getInGroups" value=""/>

-      </eAnnotations>

-    </eStructuralFeatures>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="inInterruptibleRegion"

-        ordered="false" upperBound="-1" eType="#//InterruptibleActivityRegion" eOpposite="#//InterruptibleActivityRegion/containedNode">

-      <eAnnotations source="subsets">

-        <details key="org.eclipse.uml2.ActivityNode#getInGroups" value=""/>

-      </eAnnotations>

-    </eStructuralFeatures>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="Action" eSuperTypes="#//ExecutableNode">

-    <eOperations name="getOwnedElements" ordered="false" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

-      <eAnnotations source="feature">

-        <details key="derived" value="true"/>

-        <details key="eOpposite.upperBound" value="1"/>

-        <details key="name" value="ownedElement"/>

-        <details key="eType" value="org.eclipse.uml2.Element"/>

-        <details key="eOpposite" value="owner"/>

-        <details key="eOpposite.containment" value="false"/>

-        <details key="containment" value="false"/>

-        <details key="eOpposite.lowerBound" value="0"/>

-      </eAnnotations>

-      <eAnnotations source="union" references="#//Action/output #//Action/input #//Action/localPrecondition #//Action/localPostcondition"/>

-    </eOperations>

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="effect" ordered="false"

+  <eClassifiers xsi:type="ecore:EClass" name="AssociationClass" eSuperTypes="#//Class #//Association"/>

+  <eClassifiers xsi:type="ecore:EClass" name="Model" eSuperTypes="#//Package">

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="viewpoint" ordered="false"

         eType="#//String" defaultValueLiteral=""/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="output" upperBound="-1"

-        eType="#//OutputPin" changeable="false" volatile="true" transient="true" derived="true">

-      <eAnnotations source="union"/>

-      <eAnnotations source="subsets">

-        <details key="org.eclipse.uml2.Element#getOwnedElements" value=""/>

-      </eAnnotations>

-    </eStructuralFeatures>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="input" upperBound="-1"

-        eType="#//InputPin" changeable="false" volatile="true" transient="true" derived="true">

-      <eAnnotations source="union"/>

-      <eAnnotations source="subsets">

-        <details key="org.eclipse.uml2.Element#getOwnedElements" value=""/>

-      </eAnnotations>

-    </eStructuralFeatures>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="context" ordered="false"

-        eType="#//Classifier" changeable="false" volatile="true" transient="true"

-        derived="true"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="localPrecondition" ordered="false"

-        upperBound="-1" eType="#//Constraint" containment="true">

-      <eAnnotations source="subsets">

-        <details key="org.eclipse.uml2.Element#getOwnedElements" value=""/>

-      </eAnnotations>

-    </eStructuralFeatures>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="localPostcondition" ordered="false"

-        upperBound="-1" eType="#//Constraint" containment="true">

-      <eAnnotations source="subsets">

-        <details key="org.eclipse.uml2.Element#getOwnedElements" value=""/>

-      </eAnnotations>

-    </eStructuralFeatures>

   </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="ObjectNode" abstract="true" eSuperTypes="#//ActivityNode #//TypedElement">

+  <eClassifiers xsi:type="ecore:EClass" name="InformationItem" eSuperTypes="#//Classifier">

+    <eStructuralFeatures xsi:type="ecore:EReference" name="represented" ordered="false"

+        upperBound="-1" eType="#//Classifier"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="InformationFlow" eSuperTypes="#//DirectedRelationship">

+    <eStructuralFeatures xsi:type="ecore:EReference" name="realization" ordered="false"

+        upperBound="-1" eType="#//Relationship"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="conveyed" ordered="false"

+        lowerBound="1" upperBound="-1" eType="#//Classifier"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="GeneralizationSet" eSuperTypes="#//PackageableElement">

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="isCovering" ordered="false"

+        eType="#//Boolean"/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="isDisjoint" ordered="false"

+        eType="#//Boolean"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="powertype" ordered="false"

+        eType="#//Classifier" eOpposite="#//Classifier/powertypeExtent"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="generalization" ordered="false"

+        upperBound="-1" eType="#//Generalization" eOpposite="#//Generalization/generalizationSet"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="ConnectorEnd" eSuperTypes="#//MultiplicityElement">

+    <eStructuralFeatures xsi:type="ecore:EReference" name="definingEnd" ordered="false"

+        eType="#//Property" changeable="false" volatile="true" transient="true" derived="true"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="role" ordered="false" eType="#//ConnectableElement"

+        eOpposite="#//ConnectableElement/end"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="partWithPort" ordered="false"

+        eType="#//Property"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="ConnectableElement" abstract="true"

+      eSuperTypes="#//NamedElement #//ParameterableElement">

+    <eStructuralFeatures xsi:type="ecore:EReference" name="end" ordered="false" upperBound="-1"

+        eType="#//ConnectorEnd" eOpposite="#//ConnectorEnd/role"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="Connector" eSuperTypes="#//Feature">

+    <eOperations name="getRedefinedElements" ordered="false" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

+      <eAnnotations source="feature">

+        <details key="derived" value="true"/>

+        <details key="containment" value="false"/>

+        <details key="name" value="redefinedElement"/>

+        <details key="eType" value="org.eclipse.uml2.RedefinableElement"/>

+      </eAnnotations>

+      <eAnnotations source="union" references="#//Connector/redefinedConnector"/>

+    </eOperations>

     <eOperations name="getOwnedElements" ordered="false" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

       <eAnnotations source="feature">

         <details key="derived" value="true"/>

@@ -3132,72 +2849,96 @@
         <details key="containment" value="false"/>

         <details key="eOpposite.lowerBound" value="0"/>

       </eAnnotations>

-      <eAnnotations source="union" references="#//ObjectNode/upperBound"/>

+      <eAnnotations source="union" references="#//Connector/end"/>

     </eOperations>

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="ordering" ordered="false"

-        eType="#//ObjectNodeOrderingKind" defaultValueLiteral="FIFO"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="upperBound" ordered="false"

-        lowerBound="1" eType="#//ValueSpecification" containment="true">

+    <eStructuralFeatures xsi:type="ecore:EReference" name="type" ordered="false" eType="#//Association"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="redefinedConnector" ordered="false"

+        upperBound="-1" eType="#//Connector">

+      <eAnnotations source="subsets">

+        <details key="org.eclipse.uml2.RedefinableElement#getRedefinedElements" value=""/>

+      </eAnnotations>

+    </eStructuralFeatures>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="end" lowerBound="2" upperBound="-1"

+        eType="#//ConnectorEnd" containment="true">

       <eAnnotations source="subsets">

         <details key="org.eclipse.uml2.Element#getOwnedElements" value=""/>

       </eAnnotations>

     </eStructuralFeatures>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="inState" ordered="false"

-        upperBound="-1" eType="#//State"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="selection" ordered="false"

-        eType="#//Behavior"/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="kind" ordered="false" eType="#//ConnectorKind"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="contract" ordered="false"

+        upperBound="-1" eType="#//Behavior"/>

   </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="ControlNode" abstract="true" eSuperTypes="#//ActivityNode"/>

-  <eClassifiers xsi:type="ecore:EClass" name="ControlFlow" eSuperTypes="#//ActivityEdge"/>

-  <eClassifiers xsi:type="ecore:EClass" name="ObjectFlow" eSuperTypes="#//ActivityEdge">

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="isMulticast" ordered="false"

-        eType="#//Boolean" defaultValueLiteral="false"/>

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="isMultireceive" ordered="false"

-        eType="#//Boolean" defaultValueLiteral="false"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="transformation" ordered="false"

-        eType="#//Behavior"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="selection" ordered="false"

-        eType="#//Behavior"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="InitialNode" eSuperTypes="#//ControlNode"/>

-  <eClassifiers xsi:type="ecore:EClass" name="FinalNode" abstract="true" eSuperTypes="#//ControlNode"/>

-  <eClassifiers xsi:type="ecore:EClass" name="ActivityFinalNode" eSuperTypes="#//FinalNode"/>

-  <eClassifiers xsi:type="ecore:EClass" name="DecisionNode" eSuperTypes="#//ControlNode">

-    <eStructuralFeatures xsi:type="ecore:EReference" name="decisionInput" ordered="false"

-        eType="#//Behavior"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="MergeNode" eSuperTypes="#//ControlNode"/>

-  <eClassifiers xsi:type="ecore:EClass" name="ExecutableNode" abstract="true" eSuperTypes="#//ActivityNode">

-    <eOperations name="getOwnedElements" ordered="false" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

+  <eClassifiers xsi:type="ecore:EClass" name="StructuredClassifier" abstract="true"

+      eSuperTypes="#//Classifier">

+    <eOperations name="getAttributes" ordered="false" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

+      <eAnnotations source="feature">

+        <details key="derived" value="true"/>

+        <details key="containment" value="false"/>

+        <details key="name" value="attribute"/>

+        <details key="eType" value="org.eclipse.uml2.Property"/>

+      </eAnnotations>

+      <eAnnotations source="union" references="#//StructuredClassifier/ownedAttribute"/>

+    </eOperations>

+    <eOperations name="getOwnedMembers" ordered="false" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

       <eAnnotations source="feature">

         <details key="derived" value="true"/>

         <details key="eOpposite.upperBound" value="1"/>

-        <details key="name" value="ownedElement"/>

-        <details key="eType" value="org.eclipse.uml2.Element"/>

-        <details key="eOpposite" value="owner"/>

+        <details key="name" value="ownedMember"/>

+        <details key="eType" value="org.eclipse.uml2.NamedElement"/>

+        <details key="eOpposite" value="namespace"/>

         <details key="eOpposite.containment" value="false"/>

         <details key="containment" value="false"/>

         <details key="eOpposite.lowerBound" value="0"/>

       </eAnnotations>

-      <eAnnotations source="union" references="#//ExecutableNode/handler"/>

+      <eAnnotations source="union" references="#//StructuredClassifier/ownedAttribute #//StructuredClassifier/ownedConnector"/>

     </eOperations>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="handler" ordered="false"

-        upperBound="-1" eType="#//ExceptionHandler" containment="true" eOpposite="#//ExceptionHandler/protectedNode">

+    <eOperations name="getMembers" ordered="false" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

+      <eAnnotations source="feature">

+        <details key="derived" value="true"/>

+        <details key="containment" value="false"/>

+        <details key="name" value="member"/>

+        <details key="eType" value="org.eclipse.uml2.NamedElement"/>

+      </eAnnotations>

+      <eAnnotations source="union" references="#//StructuredClassifier/role"/>

+    </eOperations>

+    <eOperations name="getFeatures" ordered="false" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

+      <eAnnotations source="feature">

+        <details key="derived" value="true"/>

+        <details key="eOpposite.upperBound" value="-1"/>

+        <details key="name" value="feature"/>

+        <details key="eType" value="org.eclipse.uml2.Feature"/>

+        <details key="eOpposite" value="featuringClassifier"/>

+        <details key="eOpposite.containment" value="false"/>

+        <details key="containment" value="false"/>

+        <details key="eOpposite.lowerBound" value="0"/>

+      </eAnnotations>

+      <eAnnotations source="union" references="#//StructuredClassifier/ownedConnector"/>

+    </eOperations>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="ownedAttribute" ordered="false"

+        upperBound="-1" eType="#//Property" volatile="true" containment="true">

       <eAnnotations source="subsets">

-        <details key="org.eclipse.uml2.Element#getOwnedElements" value=""/>

+        <details key="org.eclipse.uml2.StructuredClassifier#getRoles" value=""/>

+        <details key="org.eclipse.uml2.Classifier#getAttributes" value=""/>

+        <details key="org.eclipse.uml2.Namespace#getOwnedMembers" value=""/>

       </eAnnotations>

     </eStructuralFeatures>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="OutputPin" eSuperTypes="#//Pin"/>

-  <eClassifiers xsi:type="ecore:EClass" name="InputPin" eSuperTypes="#//Pin"/>

-  <eClassifiers xsi:type="ecore:EClass" name="Pin" abstract="true" eSuperTypes="#//ObjectNode"/>

-  <eClassifiers xsi:type="ecore:EClass" name="ActivityParameterNode" eSuperTypes="#//ObjectNode">

-    <eStructuralFeatures xsi:type="ecore:EReference" name="parameter" ordered="false"

-        lowerBound="1" eType="#//Parameter"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="ValuePin" eSuperTypes="#//InputPin">

-    <eStructuralFeatures xsi:type="ecore:EReference" name="value" ordered="false"

-        lowerBound="1" eType="#//ValueSpecification" containment="true"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="part" ordered="false" upperBound="-1"

+        eType="#//Property" changeable="false" volatile="true" transient="true" derived="true"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="role" ordered="false" upperBound="-1"

+        eType="#//ConnectableElement" changeable="false" volatile="true" transient="true"

+        derived="true">

+      <eAnnotations source="union" references="#//StructuredClassifier/ownedAttribute"/>

+      <eAnnotations source="subsets">

+        <details key="org.eclipse.uml2.Namespace#getMembers" value=""/>

+      </eAnnotations>

+    </eStructuralFeatures>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="ownedConnector" ordered="false"

+        upperBound="-1" eType="#//Connector" containment="true">

+      <eAnnotations source="subsets">

+        <details key="org.eclipse.uml2.Classifier#getFeatures" value=""/>

+        <details key="org.eclipse.uml2.Namespace#getOwnedMembers" value=""/>

+      </eAnnotations>

+    </eStructuralFeatures>

   </eClassifiers>

   <eClassifiers xsi:type="ecore:EClass" name="Interface" eSuperTypes="#//Classifier">

     <eOperations name="getAttributes" ordered="false" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

@@ -3591,28 +3332,19 @@
       </eAnnotations>

     </eStructuralFeatures>

   </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="ConnectorEnd" eSuperTypes="#//MultiplicityElement">

-    <eStructuralFeatures xsi:type="ecore:EReference" name="definingEnd" ordered="false"

-        eType="#//Property" changeable="false" volatile="true" transient="true" derived="true"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="role" ordered="false" eType="#//ConnectableElement"

-        eOpposite="#//ConnectableElement/end"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="partWithPort" ordered="false"

-        eType="#//Property"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="ConnectableElement" abstract="true"

-      eSuperTypes="#//NamedElement #//ParameterableElement">

-    <eStructuralFeatures xsi:type="ecore:EReference" name="end" ordered="false" upperBound="-1"

-        eType="#//ConnectorEnd" eOpposite="#//ConnectorEnd/role"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="Connector" eSuperTypes="#//Feature">

-    <eOperations name="getRedefinedElements" ordered="false" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

+  <eClassifiers xsi:type="ecore:EClass" name="ActivityEdge" abstract="true" eSuperTypes="#//RedefinableElement">

+    <eOperations name="getOwner" ordered="false" eType="#//Element">

       <eAnnotations source="feature">

         <details key="derived" value="true"/>

+        <details key="eOpposite.upperBound" value="-1"/>

+        <details key="name" value="owner"/>

+        <details key="eType" value="org.eclipse.uml2.Element"/>

+        <details key="eOpposite" value="ownedElement"/>

+        <details key="eOpposite.containment" value="false"/>

         <details key="containment" value="false"/>

-        <details key="name" value="redefinedElement"/>

-        <details key="eType" value="org.eclipse.uml2.RedefinableElement"/>

+        <details key="eOpposite.lowerBound" value="0"/>

       </eAnnotations>

-      <eAnnotations source="union" references="#//Connector/redefinedConnector"/>

+      <eAnnotations source="union" references="#//ActivityEdge/activity"/>

     </eOperations>

     <eOperations name="getOwnedElements" ordered="false" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

       <eAnnotations source="feature">

@@ -3625,97 +3357,365 @@
         <details key="containment" value="false"/>

         <details key="eOpposite.lowerBound" value="0"/>

       </eAnnotations>

-      <eAnnotations source="union" references="#//Connector/end"/>

+      <eAnnotations source="union" references="#//ActivityEdge/guard #//ActivityEdge/weight"/>

     </eOperations>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="type" ordered="false" eType="#//Association"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="redefinedConnector" ordered="false"

-        upperBound="-1" eType="#//Connector">

+    <eStructuralFeatures xsi:type="ecore:EReference" name="activity" ordered="false"

+        eType="#//Activity" transient="true" eOpposite="#//Activity/edge">

       <eAnnotations source="subsets">

-        <details key="org.eclipse.uml2.RedefinableElement#getRedefinedElements" value=""/>

+        <details key="org.eclipse.uml2.Element#getOwner" value=""/>

       </eAnnotations>

     </eStructuralFeatures>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="end" lowerBound="2" upperBound="-1"

-        eType="#//ConnectorEnd" containment="true">

+    <eStructuralFeatures xsi:type="ecore:EReference" name="source" ordered="false"

+        lowerBound="1" eType="#//ActivityNode" eOpposite="#//ActivityNode/outgoing"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="target" ordered="false"

+        lowerBound="1" eType="#//ActivityNode" eOpposite="#//ActivityNode/incoming"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="inGroup" ordered="false"

+        upperBound="-1" eType="#//ActivityGroup" changeable="false" volatile="true"

+        transient="true" derived="true">

+      <eAnnotations source="union" references="#//ActivityEdge/inStructuredNode #//ActivityEdge/inPartition"/>

+      <eAnnotations source="redefined">

+        <details key="eOpposite" value="containedEdge"/>

+        <details key="eOpposite.containment" value="false"/>

+        <details key="eOpposite.lowerBound" value="0"/>

+        <details key="eOpposite.upperBound" value="-1"/>

+      </eAnnotations>

+    </eStructuralFeatures>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="guard" ordered="false"

+        lowerBound="1" eType="#//ValueSpecification" containment="true">

       <eAnnotations source="subsets">

         <details key="org.eclipse.uml2.Element#getOwnedElements" value=""/>

       </eAnnotations>

     </eStructuralFeatures>

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="kind" ordered="false" eType="#//ConnectorKind"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="contract" ordered="false"

-        upperBound="-1" eType="#//Behavior"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="StructuredClassifier" abstract="true"

-      eSuperTypes="#//Classifier">

-    <eOperations name="getAttributes" ordered="false" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

-      <eAnnotations source="feature">

-        <details key="derived" value="true"/>

-        <details key="containment" value="false"/>

-        <details key="name" value="attribute"/>

-        <details key="eType" value="org.eclipse.uml2.Property"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="redefinedElement" ordered="false"

+        upperBound="-1" eType="#//ActivityEdge">

+      <eAnnotations source="redefines" references="#//RedefinableElement/getRedefinedElements">

+        <details key="org.eclipse.uml2.RedefinableElement#getRedefinedElements" value=""/>

       </eAnnotations>

-      <eAnnotations source="union" references="#//StructuredClassifier/ownedAttribute"/>

-    </eOperations>

-    <eOperations name="getOwnedMembers" ordered="false" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

+    </eStructuralFeatures>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="inStructuredNode" ordered="false"

+        eType="#//StructuredActivityNode" transient="true" eOpposite="#//StructuredActivityNode/containedEdge">

+      <eAnnotations source="subsets">

+        <details key="org.eclipse.uml2.ActivityEdge#getInGroups" value=""/>

+      </eAnnotations>

+    </eStructuralFeatures>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="inPartition" ordered="false"

+        upperBound="-1" eType="#//ActivityPartition" eOpposite="#//ActivityPartition/containedEdge">

+      <eAnnotations source="subsets">

+        <details key="org.eclipse.uml2.ActivityEdge#getInGroups" value=""/>

+      </eAnnotations>

+    </eStructuralFeatures>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="weight" ordered="false"

+        lowerBound="1" eType="#//ValueSpecification" containment="true">

+      <eAnnotations source="subsets">

+        <details key="org.eclipse.uml2.Element#getOwnedElements" value=""/>

+      </eAnnotations>

+    </eStructuralFeatures>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="interrupts" ordered="false"

+        eType="#//InterruptibleActivityRegion" eOpposite="#//InterruptibleActivityRegion/interruptingEdge"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="ActivityGroup" abstract="true" eSuperTypes="#//Element">

+    <eOperations name="getSubgroups" ordered="false" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

       <eAnnotations source="feature">

         <details key="derived" value="true"/>

         <details key="eOpposite.upperBound" value="1"/>

-        <details key="name" value="ownedMember"/>

-        <details key="eType" value="org.eclipse.uml2.NamedElement"/>

-        <details key="eOpposite" value="namespace"/>

+        <details key="name" value="subgroup"/>

+        <details key="eType" value="org.eclipse.uml2.ActivityGroup"/>

+        <details key="eOpposite" value="superGroup"/>

         <details key="eOpposite.containment" value="false"/>

         <details key="containment" value="false"/>

         <details key="eOpposite.lowerBound" value="0"/>

       </eAnnotations>

-      <eAnnotations source="union" references="#//StructuredClassifier/ownedAttribute #//StructuredClassifier/ownedConnector"/>

-    </eOperations>

-    <eOperations name="getMembers" ordered="false" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

-      <eAnnotations source="feature">

-        <details key="derived" value="true"/>

-        <details key="containment" value="false"/>

-        <details key="name" value="member"/>

-        <details key="eType" value="org.eclipse.uml2.NamedElement"/>

+      <eAnnotations source="subsets">

+        <details key="org.eclipse.uml2.Element#getOwnedElements" value=""/>

       </eAnnotations>

-      <eAnnotations source="union" references="#//StructuredClassifier/role"/>

+      <eAnnotations source="union"/>

     </eOperations>

-    <eOperations name="getFeatures" ordered="false" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

+    <eOperations name="getContainedEdges" ordered="false" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

       <eAnnotations source="feature">

         <details key="derived" value="true"/>

         <details key="eOpposite.upperBound" value="-1"/>

-        <details key="name" value="feature"/>

-        <details key="eType" value="org.eclipse.uml2.Feature"/>

-        <details key="eOpposite" value="featuringClassifier"/>

+        <details key="name" value="containedEdge"/>

+        <details key="eType" value="org.eclipse.uml2.ActivityEdge"/>

+        <details key="eOpposite" value="inGroup"/>

         <details key="eOpposite.containment" value="false"/>

         <details key="containment" value="false"/>

         <details key="eOpposite.lowerBound" value="0"/>

       </eAnnotations>

-      <eAnnotations source="union" references="#//StructuredClassifier/ownedConnector"/>

     </eOperations>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="ownedAttribute" ordered="false"

-        upperBound="-1" eType="#//Property" volatile="true" containment="true">

-      <eAnnotations source="subsets">

-        <details key="org.eclipse.uml2.StructuredClassifier#getRoles" value=""/>

-        <details key="org.eclipse.uml2.Classifier#getAttributes" value=""/>

-        <details key="org.eclipse.uml2.Namespace#getOwnedMembers" value=""/>

+    <eOperations name="getContainedNodes" ordered="false" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

+      <eAnnotations source="feature">

+        <details key="derived" value="true"/>

+        <details key="eOpposite.upperBound" value="-1"/>

+        <details key="name" value="containedNode"/>

+        <details key="eType" value="org.eclipse.uml2.ActivityNode"/>

+        <details key="eOpposite" value="inGroup"/>

+        <details key="eOpposite.containment" value="false"/>

+        <details key="containment" value="false"/>

+        <details key="eOpposite.lowerBound" value="0"/>

       </eAnnotations>

-    </eStructuralFeatures>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="part" ordered="false" upperBound="-1"

-        eType="#//Property" changeable="false" volatile="true" transient="true" derived="true"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="role" ordered="false" upperBound="-1"

-        eType="#//ConnectableElement" changeable="false" volatile="true" transient="true"

+    </eOperations>

+    <eOperations name="getActivity" ordered="false" eType="#//Activity">

+      <eAnnotations source="feature">

+        <details key="derived" value="false"/>

+        <details key="eOpposite.upperBound" value="-1"/>

+        <details key="name" value="activity"/>

+        <details key="eType" value="org.eclipse.uml2.Activity"/>

+        <details key="eOpposite" value="node"/>

+        <details key="eOpposite.containment" value="true"/>

+        <details key="containment" value="false"/>

+        <details key="eOpposite.lowerBound" value="0"/>

+      </eAnnotations>

+      <eAnnotations source="redefined" references="#//ActivityGroup/activityGroup_activity"/>

+    </eOperations>

+    <eOperations name="setActivity" ordered="false">

+      <eAnnotations source="feature">

+        <details key="derived" value="false"/>

+        <details key="eOpposite.upperBound" value="-1"/>

+        <details key="name" value="activity"/>

+        <details key="eType" value="org.eclipse.uml2.Activity"/>

+        <details key="eOpposite" value="node"/>

+        <details key="eOpposite.containment" value="true"/>

+        <details key="containment" value="false"/>

+        <details key="eOpposite.lowerBound" value="0"/>

+      </eAnnotations>

+      <eAnnotations source="redefined" references="#//ActivityGroup/activityGroup_activity"/>

+      <eParameters name="newActivity" eType="#//Activity"/>

+    </eOperations>

+    <eOperations name="getOwnedElements" ordered="false" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

+      <eAnnotations source="feature">

+        <details key="derived" value="true"/>

+        <details key="eOpposite.upperBound" value="1"/>

+        <details key="name" value="ownedElement"/>

+        <details key="eType" value="org.eclipse.uml2.Element"/>

+        <details key="eOpposite" value="owner"/>

+        <details key="eOpposite.containment" value="false"/>

+        <details key="containment" value="false"/>

+        <details key="eOpposite.lowerBound" value="0"/>

+      </eAnnotations>

+      <eAnnotations source="union" references="#//ActivityGroup/getSubgroups"/>

+    </eOperations>

+    <eOperations name="getOwner" ordered="false" eType="#//Element">

+      <eAnnotations source="feature">

+        <details key="derived" value="true"/>

+        <details key="eOpposite.upperBound" value="-1"/>

+        <details key="name" value="owner"/>

+        <details key="eType" value="org.eclipse.uml2.Element"/>

+        <details key="eOpposite" value="ownedElement"/>

+        <details key="eOpposite.containment" value="false"/>

+        <details key="containment" value="false"/>

+        <details key="eOpposite.lowerBound" value="0"/>

+      </eAnnotations>

+      <eAnnotations source="union" references="#//ActivityGroup/superGroup #//ActivityGroup/activityGroup_activity"/>

+    </eOperations>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="superGroup" ordered="false"

+        eType="#//ActivityGroup" changeable="false" volatile="true" transient="true"

         derived="true">

-      <eAnnotations source="union" references="#//StructuredClassifier/ownedAttribute"/>

+      <eAnnotations source="union"/>

       <eAnnotations source="subsets">

-        <details key="org.eclipse.uml2.Namespace#getMembers" value=""/>

+        <details key="org.eclipse.uml2.Element#getOwner" value=""/>

+      </eAnnotations>

+      <eAnnotations source="redefined">

+        <details key="eOpposite" value="subgroup"/>

+        <details key="eOpposite.containment" value="false"/>

+        <details key="eOpposite.lowerBound" value="0"/>

+        <details key="eOpposite.upperBound" value="-1"/>

       </eAnnotations>

     </eStructuralFeatures>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="ownedConnector" ordered="false"

-        upperBound="-1" eType="#//Connector" containment="true">

+    <eStructuralFeatures xsi:type="ecore:EReference" name="activityGroup_activity"

+        ordered="false" eType="#//Activity" volatile="true" transient="true" eOpposite="#//Activity/group">

       <eAnnotations source="subsets">

-        <details key="org.eclipse.uml2.Classifier#getFeatures" value=""/>

-        <details key="org.eclipse.uml2.Namespace#getOwnedMembers" value=""/>

+        <details key="org.eclipse.uml2.Element#getOwner" value=""/>

+      </eAnnotations>

+      <eAnnotations source="redefines">

+        <details key="org.eclipse.uml2.ActivityNode#getActivity" value=""/>

       </eAnnotations>

     </eStructuralFeatures>

   </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="ActivityNode" abstract="true" eSuperTypes="#//RedefinableElement">

+    <eOperations name="getOwner" ordered="false" eType="#//Element">

+      <eAnnotations source="feature">

+        <details key="derived" value="true"/>

+        <details key="eOpposite.upperBound" value="-1"/>

+        <details key="name" value="owner"/>

+        <details key="eType" value="org.eclipse.uml2.Element"/>

+        <details key="eOpposite" value="ownedElement"/>

+        <details key="eOpposite.containment" value="false"/>

+        <details key="containment" value="false"/>

+        <details key="eOpposite.lowerBound" value="0"/>

+      </eAnnotations>

+      <eAnnotations source="union" references="#//ActivityNode/activity"/>

+    </eOperations>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="outgoing" ordered="false"

+        upperBound="-1" eType="#//ActivityEdge" eOpposite="#//ActivityEdge/source"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="incoming" ordered="false"

+        upperBound="-1" eType="#//ActivityEdge" eOpposite="#//ActivityEdge/target"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="inGroup" ordered="false"

+        upperBound="-1" eType="#//ActivityGroup" changeable="false" volatile="true"

+        transient="true" derived="true">

+      <eAnnotations source="union" references="#//ActivityNode/inStructuredNode #//ActivityNode/inPartition #//ActivityNode/inInterruptibleRegion"/>

+      <eAnnotations source="redefined">

+        <details key="eOpposite" value="containedNode"/>

+        <details key="eOpposite.containment" value="false"/>

+        <details key="eOpposite.lowerBound" value="0"/>

+        <details key="eOpposite.upperBound" value="-1"/>

+      </eAnnotations>

+    </eStructuralFeatures>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="activity" ordered="false"

+        eType="#//Activity" volatile="true" transient="true" eOpposite="#//Activity/node">

+      <eAnnotations source="subsets">

+        <details key="org.eclipse.uml2.Element#getOwner" value=""/>

+      </eAnnotations>

+    </eStructuralFeatures>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="redefinedElement" ordered="false"

+        upperBound="-1" eType="#//ActivityNode">

+      <eAnnotations source="redefines" references="#//RedefinableElement/getRedefinedElements">

+        <details key="org.eclipse.uml2.RedefinableElement#getRedefinedElements" value=""/>

+      </eAnnotations>

+    </eStructuralFeatures>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="inStructuredNode" ordered="false"

+        eType="#//StructuredActivityNode" transient="true" eOpposite="#//StructuredActivityNode/containedNode">

+      <eAnnotations source="subsets">

+        <details key="org.eclipse.uml2.ActivityNode#getInGroups" value=""/>

+      </eAnnotations>

+    </eStructuralFeatures>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="inPartition" ordered="false"

+        upperBound="-1" eType="#//ActivityPartition" eOpposite="#//ActivityPartition/containedNode">

+      <eAnnotations source="subsets">

+        <details key="org.eclipse.uml2.ActivityNode#getInGroups" value=""/>

+      </eAnnotations>

+    </eStructuralFeatures>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="inInterruptibleRegion"

+        ordered="false" upperBound="-1" eType="#//InterruptibleActivityRegion" eOpposite="#//InterruptibleActivityRegion/containedNode">

+      <eAnnotations source="subsets">

+        <details key="org.eclipse.uml2.ActivityNode#getInGroups" value=""/>

+      </eAnnotations>

+    </eStructuralFeatures>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="Action" eSuperTypes="#//ExecutableNode">

+    <eOperations name="getOwnedElements" ordered="false" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

+      <eAnnotations source="feature">

+        <details key="derived" value="true"/>

+        <details key="eOpposite.upperBound" value="1"/>

+        <details key="name" value="ownedElement"/>

+        <details key="eType" value="org.eclipse.uml2.Element"/>

+        <details key="eOpposite" value="owner"/>

+        <details key="eOpposite.containment" value="false"/>

+        <details key="containment" value="false"/>

+        <details key="eOpposite.lowerBound" value="0"/>

+      </eAnnotations>

+      <eAnnotations source="union" references="#//Action/output #//Action/input #//Action/localPrecondition #//Action/localPostcondition"/>

+    </eOperations>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="effect" ordered="false"

+        eType="#//String" defaultValueLiteral=""/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="output" upperBound="-1"

+        eType="#//OutputPin" changeable="false" volatile="true" transient="true" derived="true">

+      <eAnnotations source="union"/>

+      <eAnnotations source="subsets">

+        <details key="org.eclipse.uml2.Element#getOwnedElements" value=""/>

+      </eAnnotations>

+    </eStructuralFeatures>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="input" upperBound="-1"

+        eType="#//InputPin" changeable="false" volatile="true" transient="true" derived="true">

+      <eAnnotations source="union"/>

+      <eAnnotations source="subsets">

+        <details key="org.eclipse.uml2.Element#getOwnedElements" value=""/>

+      </eAnnotations>

+    </eStructuralFeatures>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="context" ordered="false"

+        eType="#//Classifier" changeable="false" volatile="true" transient="true"

+        derived="true"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="localPrecondition" ordered="false"

+        upperBound="-1" eType="#//Constraint" containment="true">

+      <eAnnotations source="subsets">

+        <details key="org.eclipse.uml2.Element#getOwnedElements" value=""/>

+      </eAnnotations>

+    </eStructuralFeatures>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="localPostcondition" ordered="false"

+        upperBound="-1" eType="#//Constraint" containment="true">

+      <eAnnotations source="subsets">

+        <details key="org.eclipse.uml2.Element#getOwnedElements" value=""/>

+      </eAnnotations>

+    </eStructuralFeatures>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="ObjectNode" abstract="true" eSuperTypes="#//ActivityNode #//TypedElement">

+    <eOperations name="getOwnedElements" ordered="false" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

+      <eAnnotations source="feature">

+        <details key="derived" value="true"/>

+        <details key="eOpposite.upperBound" value="1"/>

+        <details key="name" value="ownedElement"/>

+        <details key="eType" value="org.eclipse.uml2.Element"/>

+        <details key="eOpposite" value="owner"/>

+        <details key="eOpposite.containment" value="false"/>

+        <details key="containment" value="false"/>

+        <details key="eOpposite.lowerBound" value="0"/>

+      </eAnnotations>

+      <eAnnotations source="union" references="#//ObjectNode/upperBound"/>

+    </eOperations>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="ordering" ordered="false"

+        eType="#//ObjectNodeOrderingKind" defaultValueLiteral="FIFO"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="upperBound" ordered="false"

+        lowerBound="1" eType="#//ValueSpecification" containment="true">

+      <eAnnotations source="subsets">

+        <details key="org.eclipse.uml2.Element#getOwnedElements" value=""/>

+      </eAnnotations>

+    </eStructuralFeatures>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="inState" ordered="false"

+        upperBound="-1" eType="#//State"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="selection" ordered="false"

+        eType="#//Behavior"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="ControlNode" abstract="true" eSuperTypes="#//ActivityNode"/>

+  <eClassifiers xsi:type="ecore:EClass" name="ControlFlow" eSuperTypes="#//ActivityEdge"/>

+  <eClassifiers xsi:type="ecore:EClass" name="ObjectFlow" eSuperTypes="#//ActivityEdge">

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="isMulticast" ordered="false"

+        eType="#//Boolean" defaultValueLiteral="false"/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="isMultireceive" ordered="false"

+        eType="#//Boolean" defaultValueLiteral="false"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="transformation" ordered="false"

+        eType="#//Behavior"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="selection" ordered="false"

+        eType="#//Behavior"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="InitialNode" eSuperTypes="#//ControlNode"/>

+  <eClassifiers xsi:type="ecore:EClass" name="FinalNode" abstract="true" eSuperTypes="#//ControlNode"/>

+  <eClassifiers xsi:type="ecore:EClass" name="ActivityFinalNode" eSuperTypes="#//FinalNode"/>

+  <eClassifiers xsi:type="ecore:EClass" name="DecisionNode" eSuperTypes="#//ControlNode">

+    <eStructuralFeatures xsi:type="ecore:EReference" name="decisionInput" ordered="false"

+        eType="#//Behavior"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="MergeNode" eSuperTypes="#//ControlNode"/>

+  <eClassifiers xsi:type="ecore:EClass" name="ExecutableNode" abstract="true" eSuperTypes="#//ActivityNode">

+    <eOperations name="getOwnedElements" ordered="false" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

+      <eAnnotations source="feature">

+        <details key="derived" value="true"/>

+        <details key="eOpposite.upperBound" value="1"/>

+        <details key="name" value="ownedElement"/>

+        <details key="eType" value="org.eclipse.uml2.Element"/>

+        <details key="eOpposite" value="owner"/>

+        <details key="eOpposite.containment" value="false"/>

+        <details key="containment" value="false"/>

+        <details key="eOpposite.lowerBound" value="0"/>

+      </eAnnotations>

+      <eAnnotations source="union" references="#//ExecutableNode/handler"/>

+    </eOperations>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="handler" ordered="false"

+        upperBound="-1" eType="#//ExceptionHandler" containment="true" eOpposite="#//ExceptionHandler/protectedNode">

+      <eAnnotations source="subsets">

+        <details key="org.eclipse.uml2.Element#getOwnedElements" value=""/>

+      </eAnnotations>

+    </eStructuralFeatures>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="OutputPin" eSuperTypes="#//Pin"/>

+  <eClassifiers xsi:type="ecore:EClass" name="InputPin" eSuperTypes="#//Pin"/>

+  <eClassifiers xsi:type="ecore:EClass" name="Pin" abstract="true" eSuperTypes="#//ObjectNode"/>

+  <eClassifiers xsi:type="ecore:EClass" name="ActivityParameterNode" eSuperTypes="#//ObjectNode">

+    <eStructuralFeatures xsi:type="ecore:EReference" name="parameter" ordered="false"

+        lowerBound="1" eType="#//Parameter"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="ValuePin" eSuperTypes="#//InputPin">

+    <eStructuralFeatures xsi:type="ecore:EReference" name="value" ordered="false"

+        lowerBound="1" eType="#//ValueSpecification" containment="true"/>

+  </eClassifiers>

   <eClassifiers xsi:type="ecore:EClass" name="CollaborationOccurrence" eSuperTypes="#//NamedElement">

     <eOperations name="getOwnedElements" ordered="false" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

       <eAnnotations source="feature">

@@ -3756,6 +3756,676 @@
       </eAnnotations>

     </eStructuralFeatures>

   </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="Interaction" eSuperTypes="#//Behavior #//InteractionFragment">

+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

+      <details key="documentation" value="The point is that the InteractionConstraint &quot;received&quot; from StructuralArchitecture will consist of a set of such units described by sequence diagrams (or collaboration diagrams)."/>

+    </eAnnotations>

+    <eOperations name="getOwnedMembers" ordered="false" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

+      <eAnnotations source="feature">

+        <details key="derived" value="true"/>

+        <details key="eOpposite.upperBound" value="1"/>

+        <details key="name" value="ownedMember"/>

+        <details key="eType" value="org.eclipse.uml2.NamedElement"/>

+        <details key="eOpposite" value="namespace"/>

+        <details key="eOpposite.containment" value="false"/>

+        <details key="containment" value="false"/>

+        <details key="eOpposite.lowerBound" value="0"/>

+      </eAnnotations>

+      <eAnnotations source="union" references="#//Interaction/lifeline #//Interaction/message #//Interaction/formalGate"/>

+    </eOperations>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="lifeline" ordered="false"

+        upperBound="-1" eType="#//Lifeline" containment="true" eOpposite="#//Lifeline/interaction">

+      <eAnnotations source="subsets">

+        <details key="org.eclipse.uml2.Namespace#getOwnedMembers" value=""/>

+      </eAnnotations>

+    </eStructuralFeatures>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="message" ordered="false"

+        upperBound="-1" eType="#//Message" containment="true" eOpposite="#//Message/interaction">

+      <eAnnotations source="subsets">

+        <details key="org.eclipse.uml2.Namespace#getOwnedMembers" value=""/>

+      </eAnnotations>

+    </eStructuralFeatures>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="fragment" upperBound="-1"

+        eType="#//InteractionFragment" containment="true" eOpposite="#//InteractionFragment/enclosingInteraction"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="formalGate" ordered="false"

+        upperBound="-1" eType="#//Gate" containment="true">

+      <eAnnotations source="subsets">

+        <details key="org.eclipse.uml2.Namespace#getOwnedMembers" value=""/>

+      </eAnnotations>

+    </eStructuralFeatures>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="InteractionFragment" abstract="true"

+      eSuperTypes="#//NamedElement">

+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

+      <details key="documentation" value="An InteractionFragment is a general class that holds the common parts of CompositeFragment, AtomicFragment and InteractionExpressionOperand.&#xD;&#xA;Conceptually it is very much the same as a full sequence diagram, but a fragment is not named and must be referred then through structure."/>

+    </eAnnotations>

+    <eOperations name="getOwnedElements" ordered="false" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

+      <eAnnotations source="feature">

+        <details key="derived" value="true"/>

+        <details key="eOpposite.upperBound" value="1"/>

+        <details key="name" value="ownedElement"/>

+        <details key="eType" value="org.eclipse.uml2.Element"/>

+        <details key="eOpposite" value="owner"/>

+        <details key="eOpposite.containment" value="false"/>

+        <details key="containment" value="false"/>

+        <details key="eOpposite.lowerBound" value="0"/>

+      </eAnnotations>

+      <eAnnotations source="union" references="#//InteractionFragment/generalOrdering"/>

+    </eOperations>

+    <eOperations name="getNamespace" ordered="false" eType="#//Namespace">

+      <eAnnotations source="feature">

+        <details key="derived" value="true"/>

+        <details key="containment" value="false"/>

+        <details key="name" value="namespace"/>

+        <details key="eType" value="org.eclipse.uml2.Namespace"/>

+        <details key="eOpposite" value="ownedMember"/>

+        <details key="eOpposite.containment" value="false"/>

+        <details key="eOpposite.lowerBound" value="0"/>

+        <details key="eOpposite.upperBound" value="-1"/>

+      </eAnnotations>

+      <eAnnotations source="union" references="#//InteractionFragment/enclosingOperand"/>

+    </eOperations>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="covered" ordered="false"

+        upperBound="-1" eType="#//Lifeline" volatile="true" eOpposite="#//Lifeline/coveredBy"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="generalOrdering" ordered="false"

+        upperBound="-1" eType="#//GeneralOrdering" containment="true">

+      <eAnnotations source="subsets">

+        <details key="org.eclipse.uml2.Element#getOwnedElements" value=""/>

+      </eAnnotations>

+    </eStructuralFeatures>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="enclosingInteraction" ordered="false"

+        eType="#//Interaction" transient="true" eOpposite="#//Interaction/fragment"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="enclosingOperand" ordered="false"

+        eType="#//InteractionOperand" transient="true" eOpposite="#//InteractionOperand/fragment">

+      <eAnnotations source="subsets">

+        <details key="org.eclipse.uml2.NamedElement#getNamespace" value=""/>

+      </eAnnotations>

+    </eStructuralFeatures>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="Lifeline" eSuperTypes="#//NamedElement">

+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

+      <details key="documentation" value="A Lifelineis the concept behind a lifeline in a Sequence &#xD;&#xA;Diagram. A Participant may be a Part or it may be a parameter representing a part. Its qualification is a Classifier which in turn may be an Interface (or ClassifierRole?)"/>

+    </eAnnotations>

+    <eOperations name="getNamespace" ordered="false" eType="#//Namespace">

+      <eAnnotations source="feature">

+        <details key="derived" value="true"/>

+        <details key="containment" value="false"/>

+        <details key="name" value="namespace"/>

+        <details key="eType" value="org.eclipse.uml2.Namespace"/>

+        <details key="eOpposite" value="ownedMember"/>

+        <details key="eOpposite.containment" value="false"/>

+        <details key="eOpposite.lowerBound" value="0"/>

+        <details key="eOpposite.upperBound" value="-1"/>

+      </eAnnotations>

+      <eAnnotations source="union" references="#//Lifeline/interaction"/>

+    </eOperations>

+    <eOperations name="getOwnedElements" ordered="false" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

+      <eAnnotations source="feature">

+        <details key="derived" value="true"/>

+        <details key="eOpposite.upperBound" value="1"/>

+        <details key="name" value="ownedElement"/>

+        <details key="eType" value="org.eclipse.uml2.Element"/>

+        <details key="eOpposite" value="owner"/>

+        <details key="eOpposite.containment" value="false"/>

+        <details key="containment" value="false"/>

+        <details key="eOpposite.lowerBound" value="0"/>

+      </eAnnotations>

+      <eAnnotations source="union" references="#//Lifeline/selector"/>

+    </eOperations>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="coveredBy" ordered="false"

+        upperBound="-1" eType="#//InteractionFragment" volatile="true" eOpposite="#//InteractionFragment/covered"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="represents" ordered="false"

+        lowerBound="1" eType="#//ConnectableElement"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="interaction" ordered="false"

+        lowerBound="1" eType="#//Interaction" transient="true" eOpposite="#//Interaction/lifeline">

+      <eAnnotations source="subsets">

+        <details key="org.eclipse.uml2.NamedElement#getNamespace" value=""/>

+      </eAnnotations>

+    </eStructuralFeatures>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="selector" ordered="false"

+        eType="#//OpaqueExpression" containment="true">

+      <eAnnotations source="subsets">

+        <details key="org.eclipse.uml2.Element#getOwnedElements" value=""/>

+      </eAnnotations>

+    </eStructuralFeatures>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="decomposedAs" ordered="false"

+        eType="#//PartDecomposition"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="Message" eSuperTypes="#//NamedElement">

+    <eOperations name="getNamespace" ordered="false" eType="#//Namespace">

+      <eAnnotations source="feature">

+        <details key="derived" value="true"/>

+        <details key="containment" value="false"/>

+        <details key="name" value="namespace"/>

+        <details key="eType" value="org.eclipse.uml2.Namespace"/>

+        <details key="eOpposite" value="ownedMember"/>

+        <details key="eOpposite.containment" value="false"/>

+        <details key="eOpposite.lowerBound" value="0"/>

+        <details key="eOpposite.upperBound" value="-1"/>

+      </eAnnotations>

+      <eAnnotations source="union" references="#//Message/interaction"/>

+    </eOperations>

+    <eOperations name="getOwnedElements" ordered="false" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

+      <eAnnotations source="feature">

+        <details key="derived" value="true"/>

+        <details key="eOpposite.upperBound" value="1"/>

+        <details key="name" value="ownedElement"/>

+        <details key="eType" value="org.eclipse.uml2.Element"/>

+        <details key="eOpposite" value="owner"/>

+        <details key="eOpposite.containment" value="false"/>

+        <details key="containment" value="false"/>

+        <details key="eOpposite.lowerBound" value="0"/>

+      </eAnnotations>

+      <eAnnotations source="union" references="#//Message/argument"/>

+    </eOperations>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="messageKind" ordered="false"

+        eType="#//MessageKind" changeable="false" volatile="true" transient="true"

+        derived="true"/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="messageSort" ordered="false"

+        eType="#//MessageSort"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="receiveEvent" ordered="false"

+        eType="#//MessageEnd" eOpposite="#//MessageEnd/receiveMessage"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="sendEvent" ordered="false"

+        eType="#//MessageEnd" eOpposite="#//MessageEnd/sendMessage"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="connector" ordered="false"

+        eType="#//Connector"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="interaction" ordered="false"

+        lowerBound="1" eType="#//Interaction" transient="true" eOpposite="#//Interaction/message">

+      <eAnnotations source="subsets">

+        <details key="org.eclipse.uml2.NamedElement#getNamespace" value=""/>

+      </eAnnotations>

+    </eStructuralFeatures>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="signature" ordered="false"

+        eType="#//NamedElement"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="argument" ordered="false"

+        upperBound="-1" eType="#//ValueSpecification" containment="true">

+      <eAnnotations source="subsets">

+        <details key="org.eclipse.uml2.Element#getOwnedElements" value=""/>

+      </eAnnotations>

+    </eStructuralFeatures>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="GeneralOrdering" eSuperTypes="#//NamedElement">

+    <eStructuralFeatures xsi:type="ecore:EReference" name="before" ordered="false"

+        lowerBound="1" eType="#//EventOccurrence" eOpposite="#//EventOccurrence/toAfter"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="after" ordered="false"

+        lowerBound="1" eType="#//EventOccurrence" eOpposite="#//EventOccurrence/toBefore"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EEnum" name="MessageKind">

+    <eLiterals name="complete"/>

+    <eLiterals name="lost" value="1"/>

+    <eLiterals name="found" value="2"/>

+    <eLiterals name="unknown" value="3"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EEnum" name="MessageSort">

+    <eLiterals name="synchCall"/>

+    <eLiterals name="synchSignal" value="1"/>

+    <eLiterals name="asynchCall" value="2"/>

+    <eLiterals name="asynchSignal" value="3"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="MessageEnd" abstract="true" eSuperTypes="#//NamedElement">

+    <eStructuralFeatures xsi:type="ecore:EReference" name="receiveMessage" ordered="false"

+        eType="#//Message" eOpposite="#//Message/receiveEvent"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="sendMessage" ordered="false"

+        eType="#//Message" eOpposite="#//Message/sendEvent"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="EventOccurrence" eSuperTypes="#//InteractionFragment #//MessageEnd">

+    <eOperations name="getCovereds" ordered="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

+      <eAnnotations source="feature">

+        <details key="derived" value="false"/>

+        <details key="containment" value="false"/>

+        <details key="name" value="covered"/>

+        <details key="eType" value="org.eclipse.uml2.Lifeline"/>

+      </eAnnotations>

+      <eAnnotations source="redefines" references="#//InteractionFragment/covered">

+        <details key="org.eclipse.uml2.InteractionFragment#getCovereds" value=""/>

+      </eAnnotations>

+    </eOperations>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="startExec" ordered="false"

+        upperBound="-1" eType="#//ExecutionOccurrence" eOpposite="#//ExecutionOccurrence/start"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="finishExec" ordered="false"

+        upperBound="-1" eType="#//ExecutionOccurrence" eOpposite="#//ExecutionOccurrence/finish"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="toAfter" ordered="false"

+        upperBound="-1" eType="#//GeneralOrdering" eOpposite="#//GeneralOrdering/before"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="toBefore" ordered="false"

+        upperBound="-1" eType="#//GeneralOrdering" eOpposite="#//GeneralOrdering/after"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="ExecutionOccurrence" eSuperTypes="#//InteractionFragment">

+    <eStructuralFeatures xsi:type="ecore:EReference" name="start" ordered="false"

+        lowerBound="1" eType="#//EventOccurrence" eOpposite="#//EventOccurrence/startExec"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="finish" ordered="false"

+        lowerBound="1" eType="#//EventOccurrence" eOpposite="#//EventOccurrence/finishExec"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="behavior" ordered="false"

+        upperBound="-1" eType="#//Behavior"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="StateInvariant" eSuperTypes="#//InteractionFragment">

+    <eOperations name="getCovereds" ordered="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

+      <eAnnotations source="feature">

+        <details key="derived" value="false"/>

+        <details key="containment" value="false"/>

+        <details key="name" value="covered"/>

+        <details key="eType" value="org.eclipse.uml2.Lifeline"/>

+      </eAnnotations>

+      <eAnnotations source="redefines" references="#//InteractionFragment/covered">

+        <details key="org.eclipse.uml2.InteractionFragment#getCovereds" value=""/>

+      </eAnnotations>

+    </eOperations>

+    <eOperations name="getOwnedElements" ordered="false" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

+      <eAnnotations source="feature">

+        <details key="derived" value="true"/>

+        <details key="eOpposite.upperBound" value="1"/>

+        <details key="name" value="ownedElement"/>

+        <details key="eType" value="org.eclipse.uml2.Element"/>

+        <details key="eOpposite" value="owner"/>

+        <details key="eOpposite.containment" value="false"/>

+        <details key="containment" value="false"/>

+        <details key="eOpposite.lowerBound" value="0"/>

+      </eAnnotations>

+      <eAnnotations source="union" references="#//StateInvariant/invariant"/>

+    </eOperations>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="invariant" ordered="false"

+        lowerBound="1" eType="#//Constraint" containment="true">

+      <eAnnotations source="subsets">

+        <details key="org.eclipse.uml2.Element#getOwnedElements" value=""/>

+      </eAnnotations>

+    </eStructuralFeatures>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="Stop" eSuperTypes="#//EventOccurrence"/>

+  <eClassifiers xsi:type="ecore:EClass" name="Port" eSuperTypes="#//Property">

+    <eOperations name="getRedefinedElements" ordered="false" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

+      <eAnnotations source="feature">

+        <details key="derived" value="true"/>

+        <details key="containment" value="false"/>

+        <details key="name" value="redefinedElement"/>

+        <details key="eType" value="org.eclipse.uml2.RedefinableElement"/>

+      </eAnnotations>

+      <eAnnotations source="union" references="#//Port/redefinedPort"/>

+    </eOperations>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="isBehavior" ordered="false"

+        eType="#//Boolean" defaultValueLiteral="false"/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="isService" ordered="false"

+        eType="#//Boolean" defaultValueLiteral="true"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="required" ordered="false"

+        upperBound="-1" eType="#//Interface" changeable="false" volatile="true" transient="true"

+        derived="true"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="redefinedPort" ordered="false"

+        upperBound="-1" eType="#//Port">

+      <eAnnotations source="subsets">

+        <details key="org.eclipse.uml2.RedefinableElement#getRedefinedElements" value=""/>

+      </eAnnotations>

+    </eStructuralFeatures>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="provided" ordered="false"

+        upperBound="-1" eType="#//Interface" changeable="false" volatile="true" transient="true"

+        derived="true"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="protocol" ordered="false"

+        eType="#//ProtocolStateMachine"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="EncapsulatedClassifier" abstract="true"

+      eSuperTypes="#//StructuredClassifier">

+    <eOperations name="getFeatures" ordered="false" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

+      <eAnnotations source="feature">

+        <details key="derived" value="true"/>

+        <details key="eOpposite.upperBound" value="-1"/>

+        <details key="name" value="feature"/>

+        <details key="eType" value="org.eclipse.uml2.Feature"/>

+        <details key="eOpposite" value="featuringClassifier"/>

+        <details key="eOpposite.containment" value="false"/>

+        <details key="containment" value="false"/>

+        <details key="eOpposite.lowerBound" value="0"/>

+      </eAnnotations>

+      <eAnnotations source="union" references="#//EncapsulatedClassifier/ownedPort"/>

+    </eOperations>

+    <eOperations name="getOwnedMembers" ordered="false" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

+      <eAnnotations source="feature">

+        <details key="derived" value="true"/>

+        <details key="eOpposite.upperBound" value="1"/>

+        <details key="name" value="ownedMember"/>

+        <details key="eType" value="org.eclipse.uml2.NamedElement"/>

+        <details key="eOpposite" value="namespace"/>

+        <details key="eOpposite.containment" value="false"/>

+        <details key="containment" value="false"/>

+        <details key="eOpposite.lowerBound" value="0"/>

+      </eAnnotations>

+      <eAnnotations source="union" references="#//EncapsulatedClassifier/ownedPort"/>

+    </eOperations>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="ownedPort" ordered="false"

+        upperBound="-1" eType="#//Port" containment="true">

+      <eAnnotations source="subsets">

+        <details key="org.eclipse.uml2.Classifier#getFeatures" value=""/>

+        <details key="org.eclipse.uml2.Namespace#getOwnedMembers" value=""/>

+      </eAnnotations>

+    </eStructuralFeatures>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EEnum" name="CallConcurrencyKind">

+    <eLiterals name="sequential"/>

+    <eLiterals name="guarded" value="1"/>

+    <eLiterals name="concurrent" value="2"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="CallTrigger" eSuperTypes="#//MessageTrigger">

+    <eStructuralFeatures xsi:type="ecore:EReference" name="operation" ordered="false"

+        lowerBound="1" eType="#//Operation"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="MessageTrigger" abstract="true" eSuperTypes="#//Trigger"/>

+  <eClassifiers xsi:type="ecore:EClass" name="ChangeTrigger" eSuperTypes="#//Trigger">

+    <eOperations name="getOwnedElements" ordered="false" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

+      <eAnnotations source="feature">

+        <details key="derived" value="true"/>

+        <details key="eOpposite.upperBound" value="1"/>

+        <details key="name" value="ownedElement"/>

+        <details key="eType" value="org.eclipse.uml2.Element"/>

+        <details key="eOpposite" value="owner"/>

+        <details key="eOpposite.containment" value="false"/>

+        <details key="containment" value="false"/>

+        <details key="eOpposite.lowerBound" value="0"/>

+      </eAnnotations>

+      <eAnnotations source="union" references="#//ChangeTrigger/changeExpression"/>

+    </eOperations>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="changeExpression" ordered="false"

+        lowerBound="1" eType="#//ValueSpecification" containment="true">

+      <eAnnotations source="subsets">

+        <details key="org.eclipse.uml2.Element#getOwnedElements" value=""/>

+      </eAnnotations>

+    </eStructuralFeatures>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="Trigger" abstract="true" eSuperTypes="#//PackageableElement">

+    <eStructuralFeatures xsi:type="ecore:EReference" name="port" ordered="false" upperBound="-1"

+        eType="#//Port"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="Reception" eSuperTypes="#//BehavioralFeature">

+    <eStructuralFeatures xsi:type="ecore:EReference" name="signal" ordered="false"

+        eType="#//Signal"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="Signal" eSuperTypes="#//BehavioredClassifier">

+    <eOperations name="getAttributes" ordered="false" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

+      <eAnnotations source="feature">

+        <details key="derived" value="true"/>

+        <details key="containment" value="false"/>

+        <details key="name" value="attribute"/>

+        <details key="eType" value="org.eclipse.uml2.Property"/>

+      </eAnnotations>

+      <eAnnotations source="union" references="#//Signal/ownedAttribute"/>

+    </eOperations>

+    <eOperations name="getOwnedMembers" ordered="false" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

+      <eAnnotations source="feature">

+        <details key="derived" value="true"/>

+        <details key="eOpposite.upperBound" value="1"/>

+        <details key="name" value="ownedMember"/>

+        <details key="eType" value="org.eclipse.uml2.NamedElement"/>

+        <details key="eOpposite" value="namespace"/>

+        <details key="eOpposite.containment" value="false"/>

+        <details key="containment" value="false"/>

+        <details key="eOpposite.lowerBound" value="0"/>

+      </eAnnotations>

+      <eAnnotations source="union" references="#//Signal/ownedAttribute"/>

+    </eOperations>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="ownedAttribute" upperBound="-1"

+        eType="#//Property" containment="true">

+      <eAnnotations source="subsets">

+        <details key="org.eclipse.uml2.Classifier#getAttributes" value=""/>

+        <details key="org.eclipse.uml2.Namespace#getOwnedMembers" value=""/>

+      </eAnnotations>

+    </eStructuralFeatures>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="SignalTrigger" eSuperTypes="#//MessageTrigger">

+    <eStructuralFeatures xsi:type="ecore:EReference" name="signal" ordered="false"

+        upperBound="-1" eType="#//Signal"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="TimeTrigger" eSuperTypes="#//Trigger">

+    <eOperations name="getOwnedElements" ordered="false" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

+      <eAnnotations source="feature">

+        <details key="derived" value="true"/>

+        <details key="eOpposite.upperBound" value="1"/>

+        <details key="name" value="ownedElement"/>

+        <details key="eType" value="org.eclipse.uml2.Element"/>

+        <details key="eOpposite" value="owner"/>

+        <details key="eOpposite.containment" value="false"/>

+        <details key="containment" value="false"/>

+        <details key="eOpposite.lowerBound" value="0"/>

+      </eAnnotations>

+      <eAnnotations source="union" references="#//TimeTrigger/when"/>

+    </eOperations>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="isRelative" ordered="false"

+        eType="#//Boolean"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="when" ordered="false" lowerBound="1"

+        eType="#//ValueSpecification" containment="true">

+      <eAnnotations source="subsets">

+        <details key="org.eclipse.uml2.Element#getOwnedElements" value=""/>

+      </eAnnotations>

+    </eStructuralFeatures>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="AnyTrigger" eSuperTypes="#//MessageTrigger"/>

+  <eClassifiers xsi:type="ecore:EClass" name="Variable" eSuperTypes="#//ConnectableElement #//TypedElement">

+    <eOperations name="getOwner" ordered="false" eType="#//Element">

+      <eAnnotations source="feature">

+        <details key="derived" value="true"/>

+        <details key="eOpposite.upperBound" value="-1"/>

+        <details key="name" value="owner"/>

+        <details key="eType" value="org.eclipse.uml2.Element"/>

+        <details key="eOpposite" value="ownedElement"/>

+        <details key="eOpposite.containment" value="false"/>

+        <details key="containment" value="false"/>

+        <details key="eOpposite.lowerBound" value="0"/>

+      </eAnnotations>

+      <eAnnotations source="union" references="#//Variable/scope"/>

+    </eOperations>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="scope" ordered="false"

+        lowerBound="1" eType="#//StructuredActivityNode" transient="true" eOpposite="#//StructuredActivityNode/variable">

+      <eAnnotations source="subsets">

+        <details key="org.eclipse.uml2.Element#getOwner" value=""/>

+      </eAnnotations>

+    </eStructuralFeatures>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="StructuredActivityNode" eSuperTypes="#//Action #//Namespace #//ActivityGroup">

+    <eOperations name="getActivity" ordered="false" eType="#//Activity">

+      <eAnnotations source="feature">

+        <details key="derived" value="true"/>

+        <details key="eOpposite.upperBound" value="-1"/>

+        <details key="name" value="activity"/>

+        <details key="eType" value="org.eclipse.uml2.Activity"/>

+        <details key="eOpposite" value="structuredNode"/>

+        <details key="eOpposite.containment" value="false"/>

+        <details key="containment" value="false"/>

+        <details key="eOpposite.lowerBound" value="0"/>

+      </eAnnotations>

+      <eAnnotations source="redefines" references="#//ActivityNode/activity #//ActivityGroup/activityGroup_activity">

+        <details key="org.eclipse.uml2.ActivityNode#getActivity" value=""/>

+        <details key="org.eclipse.uml2.ActivityGroup#getActivityGroup_activity" value=""/>

+      </eAnnotations>

+    </eOperations>

+    <eOperations name="setActivity" ordered="false">

+      <eAnnotations source="feature">

+        <details key="derived" value="true"/>

+        <details key="eOpposite.upperBound" value="-1"/>

+        <details key="name" value="activity"/>

+        <details key="eType" value="org.eclipse.uml2.Activity"/>

+        <details key="eOpposite" value="structuredNode"/>

+        <details key="eOpposite.containment" value="false"/>

+        <details key="containment" value="false"/>

+        <details key="eOpposite.lowerBound" value="0"/>

+      </eAnnotations>

+      <eAnnotations source="redefines" references="#//ActivityNode/activity #//ActivityGroup/activityGroup_activity">

+        <details key="org.eclipse.uml2.ActivityNode#getActivity" value=""/>

+        <details key="org.eclipse.uml2.ActivityGroup#getActivityGroup_activity" value=""/>

+      </eAnnotations>

+      <eParameters name="newActivity" eType="#//Activity"/>

+    </eOperations>

+    <eOperations name="getActivityGroup_activity" ordered="false" eType="#//Activity">

+      <eAnnotations source="feature">

+        <details key="derived" value="false"/>

+        <details key="eOpposite.upperBound" value="-1"/>

+        <details key="name" value="activityGroup_activity"/>

+        <details key="eType" value="org.eclipse.uml2.Activity"/>

+        <details key="eOpposite" value="group"/>

+        <details key="eOpposite.containment" value="true"/>

+        <details key="containment" value="false"/>

+        <details key="eOpposite.lowerBound" value="0"/>

+      </eAnnotations>

+      <eAnnotations source="redefined" references="#//StructuredActivityNode/getActivity"/>

+    </eOperations>

+    <eOperations name="setActivityGroup_activity" ordered="false">

+      <eAnnotations source="feature">

+        <details key="derived" value="false"/>

+        <details key="eOpposite.upperBound" value="-1"/>

+        <details key="name" value="activityGroup_activity"/>

+        <details key="eType" value="org.eclipse.uml2.Activity"/>

+        <details key="eOpposite" value="group"/>

+        <details key="eOpposite.containment" value="true"/>

+        <details key="containment" value="false"/>

+        <details key="eOpposite.lowerBound" value="0"/>

+      </eAnnotations>

+      <eAnnotations source="redefined" references="#//StructuredActivityNode/setActivity"/>

+      <eParameters name="newActivityGroup_activity" eType="#//Activity"/>

+    </eOperations>

+    <eOperations name="getOwnedMembers" ordered="false" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

+      <eAnnotations source="feature">

+        <details key="derived" value="true"/>

+        <details key="eOpposite.upperBound" value="1"/>

+        <details key="name" value="ownedMember"/>

+        <details key="eType" value="org.eclipse.uml2.NamedElement"/>

+        <details key="eOpposite" value="namespace"/>

+        <details key="eOpposite.containment" value="false"/>

+        <details key="containment" value="false"/>

+        <details key="eOpposite.lowerBound" value="0"/>

+      </eAnnotations>

+      <eAnnotations source="union" references="#//StructuredActivityNode/variable"/>

+    </eOperations>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="variable" ordered="false"

+        upperBound="-1" eType="#//Variable" containment="true" eOpposite="#//Variable/scope">

+      <eAnnotations source="subsets">

+        <details key="org.eclipse.uml2.Namespace#getOwnedMembers" value=""/>

+      </eAnnotations>

+    </eStructuralFeatures>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="containedNode" ordered="false"

+        upperBound="-1" eType="#//ActivityNode" containment="true" eOpposite="#//ActivityNode/inStructuredNode">

+      <eAnnotations source="redefines" references="#//ActivityGroup/getContainedNodes">

+        <details key="org.eclipse.uml2.ActivityGroup#getContainedNodes" value=""/>

+      </eAnnotations>

+    </eStructuralFeatures>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="containedEdge" ordered="false"

+        upperBound="-1" eType="#//ActivityEdge" containment="true" eOpposite="#//ActivityEdge/inStructuredNode">

+      <eAnnotations source="redefines" references="#//ActivityGroup/getContainedEdges">

+        <details key="org.eclipse.uml2.ActivityGroup#getContainedEdges" value=""/>

+      </eAnnotations>

+    </eStructuralFeatures>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="mustIsolate" ordered="false"

+        eType="#//Boolean"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="ConditionalNode" eSuperTypes="#//StructuredActivityNode">

+    <eOperations name="getOwnedElements" ordered="false" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

+      <eAnnotations source="feature">

+        <details key="derived" value="true"/>

+        <details key="eOpposite.upperBound" value="1"/>

+        <details key="name" value="ownedElement"/>

+        <details key="eType" value="org.eclipse.uml2.Element"/>

+        <details key="eOpposite" value="owner"/>

+        <details key="eOpposite.containment" value="false"/>

+        <details key="containment" value="false"/>

+        <details key="eOpposite.lowerBound" value="0"/>

+      </eAnnotations>

+      <eAnnotations source="union" references="#//ConditionalNode/clause"/>

+    </eOperations>

+    <eOperations name="getOutputs" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

+      <eAnnotations source="feature">

+        <details key="derived" value="true"/>

+        <details key="containment" value="false"/>

+        <details key="name" value="output"/>

+        <details key="eType" value="org.eclipse.uml2.OutputPin"/>

+      </eAnnotations>

+      <eAnnotations source="union" references="#//ConditionalNode/result"/>

+    </eOperations>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="isDeterminate" ordered="false"

+        eType="#//Boolean"/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="isAssured" ordered="false"

+        eType="#//Boolean"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="clause" ordered="false"

+        lowerBound="1" upperBound="-1" eType="#//Clause" containment="true">

+      <eAnnotations source="subsets">

+        <details key="org.eclipse.uml2.Element#getOwnedElements" value=""/>

+      </eAnnotations>

+    </eStructuralFeatures>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="result" upperBound="-1"

+        eType="#//OutputPin" containment="true">

+      <eAnnotations source="subsets">

+        <details key="org.eclipse.uml2.Action#getOutputs" value=""/>

+      </eAnnotations>

+    </eStructuralFeatures>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="Clause" eSuperTypes="#//Element">

+    <eStructuralFeatures xsi:type="ecore:EReference" name="test" ordered="false" upperBound="-1"

+        eType="#//ActivityNode"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="body" ordered="false" upperBound="-1"

+        eType="#//ActivityNode"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="predecessorClause" ordered="false"

+        upperBound="-1" eType="#//Clause" eOpposite="#//Clause/successorClause"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="successorClause" ordered="false"

+        upperBound="-1" eType="#//Clause" eOpposite="#//Clause/predecessorClause"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="decider" ordered="false"

+        lowerBound="1" eType="#//OutputPin"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="bodyOutput" ordered="false"

+        upperBound="-1" eType="#//OutputPin"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="LoopNode" eSuperTypes="#//StructuredActivityNode">

+    <eOperations name="getOutputs" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

+      <eAnnotations source="feature">

+        <details key="derived" value="true"/>

+        <details key="containment" value="false"/>

+        <details key="name" value="output"/>

+        <details key="eType" value="org.eclipse.uml2.OutputPin"/>

+      </eAnnotations>

+      <eAnnotations source="union" references="#//LoopNode/result"/>

+    </eOperations>

+    <eOperations name="getOwnedElements" ordered="false" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

+      <eAnnotations source="feature">

+        <details key="derived" value="true"/>

+        <details key="eOpposite.upperBound" value="1"/>

+        <details key="name" value="ownedElement"/>

+        <details key="eType" value="org.eclipse.uml2.Element"/>

+        <details key="eOpposite" value="owner"/>

+        <details key="eOpposite.containment" value="false"/>

+        <details key="containment" value="false"/>

+        <details key="eOpposite.lowerBound" value="0"/>

+      </eAnnotations>

+      <eAnnotations source="union" references="#//LoopNode/loopVariable"/>

+    </eOperations>

+    <eOperations name="getInputs" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

+      <eAnnotations source="feature">

+        <details key="derived" value="true"/>

+        <details key="containment" value="false"/>

+        <details key="name" value="input"/>

+        <details key="eType" value="org.eclipse.uml2.InputPin"/>

+      </eAnnotations>

+      <eAnnotations source="union" references="#//LoopNode/loopVariableInput"/>

+    </eOperations>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="isTestedFirst" ordered="false"

+        eType="#//Boolean"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="bodyPart" ordered="false"

+        upperBound="-1" eType="#//ActivityNode"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="setupPart" ordered="false"

+        upperBound="-1" eType="#//ActivityNode"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="decider" ordered="false"

+        lowerBound="1" eType="#//OutputPin"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="test" ordered="false" upperBound="-1"

+        eType="#//ActivityNode"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="result" upperBound="-1"

+        eType="#//OutputPin" containment="true">

+      <eAnnotations source="subsets">

+        <details key="org.eclipse.uml2.Action#getOutputs" value=""/>

+      </eAnnotations>

+    </eStructuralFeatures>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="loopVariable" upperBound="-1"

+        eType="#//OutputPin" containment="true">

+      <eAnnotations source="subsets">

+        <details key="org.eclipse.uml2.Element#getOwnedElements" value=""/>

+      </eAnnotations>

+    </eStructuralFeatures>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="bodyOutput" ordered="false"

+        upperBound="-1" eType="#//OutputPin"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="loopVariableInput" upperBound="-1"

+        eType="#//InputPin" containment="true">

+      <eAnnotations source="subsets">

+        <details key="org.eclipse.uml2.Action#getInputs" value=""/>

+      </eAnnotations>

+    </eStructuralFeatures>

+  </eClassifiers>

   <eClassifiers xsi:type="ecore:EClass" name="TemplateSignature" eSuperTypes="#//Element">

     <eOperations name="getOwnedElements" ordered="false" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

       <eAnnotations source="feature">

@@ -4073,7 +4743,7 @@
       <eAnnotations source="superset" references="#//TemplateParameterSubstitution/ownedActual"/>

     </eStructuralFeatures>

     <eStructuralFeatures xsi:type="ecore:EReference" name="ownedActual" ordered="false"

-        eType="#//ParameterableElement" volatile="true" containment="true">

+        upperBound="-1" eType="#//ParameterableElement" volatile="true" containment="true">

       <eAnnotations source="subsets" references="#//TemplateParameterSubstitution/actual">

         <details key="org.eclipse.uml2.TemplateParameterSubstitution#getActuals" value=""/>

         <details key="org.eclipse.uml2.Element#getOwnedElements" value=""/>

@@ -4092,817 +4762,6 @@
       eSuperTypes="#//Classifier"/>

   <eClassifiers xsi:type="ecore:EClass" name="ConnectableElementTemplateParameter"

       eSuperTypes="#//TemplateParameter"/>

-  <eClassifiers xsi:type="ecore:EClass" name="Interaction" eSuperTypes="#//Behavior #//InteractionFragment">

-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-      <details key="documentation" value="The point is that the InteractionConstraint &quot;received&quot; from StructuralArchitecture will consist of a set of such units described by sequence diagrams (or collaboration diagrams)."/>

-    </eAnnotations>

-    <eOperations name="getOwnedMembers" ordered="false" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

-      <eAnnotations source="feature">

-        <details key="derived" value="true"/>

-        <details key="eOpposite.upperBound" value="1"/>

-        <details key="name" value="ownedMember"/>

-        <details key="eType" value="org.eclipse.uml2.NamedElement"/>

-        <details key="eOpposite" value="namespace"/>

-        <details key="eOpposite.containment" value="false"/>

-        <details key="containment" value="false"/>

-        <details key="eOpposite.lowerBound" value="0"/>

-      </eAnnotations>

-      <eAnnotations source="union" references="#//Interaction/lifeline #//Interaction/message #//Interaction/formalGate"/>

-    </eOperations>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="lifeline" ordered="false"

-        upperBound="-1" eType="#//Lifeline" containment="true" eOpposite="#//Lifeline/interaction">

-      <eAnnotations source="subsets">

-        <details key="org.eclipse.uml2.Namespace#getOwnedMembers" value=""/>

-      </eAnnotations>

-    </eStructuralFeatures>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="message" ordered="false"

-        upperBound="-1" eType="#//Message" containment="true" eOpposite="#//Message/interaction">

-      <eAnnotations source="subsets">

-        <details key="org.eclipse.uml2.Namespace#getOwnedMembers" value=""/>

-      </eAnnotations>

-    </eStructuralFeatures>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="fragment" upperBound="-1"

-        eType="#//InteractionFragment" containment="true" eOpposite="#//InteractionFragment/enclosingInteraction"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="formalGate" ordered="false"

-        upperBound="-1" eType="#//Gate" containment="true">

-      <eAnnotations source="subsets">

-        <details key="org.eclipse.uml2.Namespace#getOwnedMembers" value=""/>

-      </eAnnotations>

-    </eStructuralFeatures>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="InteractionFragment" abstract="true"

-      eSuperTypes="#//NamedElement">

-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-      <details key="documentation" value="An InteractionFragment is a general class that holds the common parts of CompositeFragment, AtomicFragment and InteractionExpressionOperand.&#xD;&#xA;Conceptually it is very much the same as a full sequence diagram, but a fragment is not named and must be referred then through structure."/>

-    </eAnnotations>

-    <eOperations name="getOwnedElements" ordered="false" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

-      <eAnnotations source="feature">

-        <details key="derived" value="true"/>

-        <details key="eOpposite.upperBound" value="1"/>

-        <details key="name" value="ownedElement"/>

-        <details key="eType" value="org.eclipse.uml2.Element"/>

-        <details key="eOpposite" value="owner"/>

-        <details key="eOpposite.containment" value="false"/>

-        <details key="containment" value="false"/>

-        <details key="eOpposite.lowerBound" value="0"/>

-      </eAnnotations>

-      <eAnnotations source="union" references="#//InteractionFragment/generalOrdering"/>

-    </eOperations>

-    <eOperations name="getNamespace" ordered="false" eType="#//Namespace">

-      <eAnnotations source="feature">

-        <details key="derived" value="true"/>

-        <details key="containment" value="false"/>

-        <details key="name" value="namespace"/>

-        <details key="eType" value="org.eclipse.uml2.Namespace"/>

-        <details key="eOpposite" value="ownedMember"/>

-        <details key="eOpposite.containment" value="false"/>

-        <details key="eOpposite.lowerBound" value="0"/>

-        <details key="eOpposite.upperBound" value="-1"/>

-      </eAnnotations>

-      <eAnnotations source="union" references="#//InteractionFragment/enclosingOperand"/>

-    </eOperations>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="covered" ordered="false"

-        upperBound="-1" eType="#//Lifeline" volatile="true" eOpposite="#//Lifeline/coveredBy"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="generalOrdering" ordered="false"

-        upperBound="-1" eType="#//GeneralOrdering" containment="true">

-      <eAnnotations source="subsets">

-        <details key="org.eclipse.uml2.Element#getOwnedElements" value=""/>

-      </eAnnotations>

-    </eStructuralFeatures>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="enclosingInteraction" ordered="false"

-        eType="#//Interaction" transient="true" eOpposite="#//Interaction/fragment"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="enclosingOperand" ordered="false"

-        eType="#//InteractionOperand" transient="true" eOpposite="#//InteractionOperand/fragment">

-      <eAnnotations source="subsets">

-        <details key="org.eclipse.uml2.NamedElement#getNamespace" value=""/>

-      </eAnnotations>

-    </eStructuralFeatures>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="Lifeline" eSuperTypes="#//NamedElement">

-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-      <details key="documentation" value="A Lifelineis the concept behind a lifeline in a Sequence &#xD;&#xA;Diagram. A Participant may be a Part or it may be a parameter representing a part. Its qualification is a Classifier which in turn may be an Interface (or ClassifierRole?)"/>

-    </eAnnotations>

-    <eOperations name="getNamespace" ordered="false" eType="#//Namespace">

-      <eAnnotations source="feature">

-        <details key="derived" value="true"/>

-        <details key="containment" value="false"/>

-        <details key="name" value="namespace"/>

-        <details key="eType" value="org.eclipse.uml2.Namespace"/>

-        <details key="eOpposite" value="ownedMember"/>

-        <details key="eOpposite.containment" value="false"/>

-        <details key="eOpposite.lowerBound" value="0"/>

-        <details key="eOpposite.upperBound" value="-1"/>

-      </eAnnotations>

-      <eAnnotations source="union" references="#//Lifeline/interaction"/>

-    </eOperations>

-    <eOperations name="getOwnedElements" ordered="false" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

-      <eAnnotations source="feature">

-        <details key="derived" value="true"/>

-        <details key="eOpposite.upperBound" value="1"/>

-        <details key="name" value="ownedElement"/>

-        <details key="eType" value="org.eclipse.uml2.Element"/>

-        <details key="eOpposite" value="owner"/>

-        <details key="eOpposite.containment" value="false"/>

-        <details key="containment" value="false"/>

-        <details key="eOpposite.lowerBound" value="0"/>

-      </eAnnotations>

-      <eAnnotations source="union" references="#//Lifeline/selector"/>

-    </eOperations>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="coveredBy" ordered="false"

-        upperBound="-1" eType="#//InteractionFragment" volatile="true" eOpposite="#//InteractionFragment/covered"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="represents" ordered="false"

-        lowerBound="1" eType="#//ConnectableElement"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="interaction" ordered="false"

-        lowerBound="1" eType="#//Interaction" transient="true" eOpposite="#//Interaction/lifeline">

-      <eAnnotations source="subsets">

-        <details key="org.eclipse.uml2.NamedElement#getNamespace" value=""/>

-      </eAnnotations>

-    </eStructuralFeatures>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="selector" ordered="false"

-        eType="#//OpaqueExpression" containment="true">

-      <eAnnotations source="subsets">

-        <details key="org.eclipse.uml2.Element#getOwnedElements" value=""/>

-      </eAnnotations>

-    </eStructuralFeatures>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="decomposedAs" ordered="false"

-        eType="#//PartDecomposition"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="Message" eSuperTypes="#//NamedElement">

-    <eOperations name="getNamespace" ordered="false" eType="#//Namespace">

-      <eAnnotations source="feature">

-        <details key="derived" value="true"/>

-        <details key="containment" value="false"/>

-        <details key="name" value="namespace"/>

-        <details key="eType" value="org.eclipse.uml2.Namespace"/>

-        <details key="eOpposite" value="ownedMember"/>

-        <details key="eOpposite.containment" value="false"/>

-        <details key="eOpposite.lowerBound" value="0"/>

-        <details key="eOpposite.upperBound" value="-1"/>

-      </eAnnotations>

-      <eAnnotations source="union" references="#//Message/interaction"/>

-    </eOperations>

-    <eOperations name="getOwnedElements" ordered="false" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

-      <eAnnotations source="feature">

-        <details key="derived" value="true"/>

-        <details key="eOpposite.upperBound" value="1"/>

-        <details key="name" value="ownedElement"/>

-        <details key="eType" value="org.eclipse.uml2.Element"/>

-        <details key="eOpposite" value="owner"/>

-        <details key="eOpposite.containment" value="false"/>

-        <details key="containment" value="false"/>

-        <details key="eOpposite.lowerBound" value="0"/>

-      </eAnnotations>

-      <eAnnotations source="union" references="#//Message/argument"/>

-    </eOperations>

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="messageKind" ordered="false"

-        eType="#//MessageKind" changeable="false" volatile="true" transient="true"

-        derived="true"/>

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="messageSort" ordered="false"

-        eType="#//MessageSort"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="receiveEvent" ordered="false"

-        eType="#//MessageEnd" eOpposite="#//MessageEnd/receiveMessage"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="sendEvent" ordered="false"

-        eType="#//MessageEnd" eOpposite="#//MessageEnd/sendMessage"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="connector" ordered="false"

-        eType="#//Connector"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="interaction" ordered="false"

-        lowerBound="1" eType="#//Interaction" transient="true" eOpposite="#//Interaction/message">

-      <eAnnotations source="subsets">

-        <details key="org.eclipse.uml2.NamedElement#getNamespace" value=""/>

-      </eAnnotations>

-    </eStructuralFeatures>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="signature" ordered="false"

-        eType="#//NamedElement"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="argument" ordered="false"

-        upperBound="-1" eType="#//ValueSpecification" containment="true">

-      <eAnnotations source="subsets">

-        <details key="org.eclipse.uml2.Element#getOwnedElements" value=""/>

-      </eAnnotations>

-    </eStructuralFeatures>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="GeneralOrdering" eSuperTypes="#//NamedElement">

-    <eStructuralFeatures xsi:type="ecore:EReference" name="before" ordered="false"

-        lowerBound="1" eType="#//EventOccurrence" eOpposite="#//EventOccurrence/toAfter"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="after" ordered="false"

-        lowerBound="1" eType="#//EventOccurrence" eOpposite="#//EventOccurrence/toBefore"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EEnum" name="MessageKind">

-    <eLiterals name="complete"/>

-    <eLiterals name="lost" value="1"/>

-    <eLiterals name="found" value="2"/>

-    <eLiterals name="unknown" value="3"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EEnum" name="MessageSort">

-    <eLiterals name="synchCall"/>

-    <eLiterals name="synchSignal" value="1"/>

-    <eLiterals name="asynchCall" value="2"/>

-    <eLiterals name="asynchSignal" value="3"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="MessageEnd" abstract="true" eSuperTypes="#//NamedElement">

-    <eStructuralFeatures xsi:type="ecore:EReference" name="receiveMessage" ordered="false"

-        eType="#//Message" eOpposite="#//Message/receiveEvent"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="sendMessage" ordered="false"

-        eType="#//Message" eOpposite="#//Message/sendEvent"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="EventOccurrence" eSuperTypes="#//InteractionFragment #//MessageEnd">

-    <eOperations name="getCovereds" ordered="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

-      <eAnnotations source="feature">

-        <details key="derived" value="false"/>

-        <details key="containment" value="false"/>

-        <details key="name" value="covered"/>

-        <details key="eType" value="org.eclipse.uml2.Lifeline"/>

-      </eAnnotations>

-      <eAnnotations source="redefines" references="#//InteractionFragment/covered">

-        <details key="org.eclipse.uml2.InteractionFragment#getCovereds" value=""/>

-      </eAnnotations>

-    </eOperations>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="startExec" ordered="false"

-        upperBound="-1" eType="#//ExecutionOccurrence" eOpposite="#//ExecutionOccurrence/start"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="finishExec" ordered="false"

-        upperBound="-1" eType="#//ExecutionOccurrence" eOpposite="#//ExecutionOccurrence/finish"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="toAfter" ordered="false"

-        upperBound="-1" eType="#//GeneralOrdering" eOpposite="#//GeneralOrdering/before"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="toBefore" ordered="false"

-        upperBound="-1" eType="#//GeneralOrdering" eOpposite="#//GeneralOrdering/after"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="ExecutionOccurrence" eSuperTypes="#//InteractionFragment">

-    <eStructuralFeatures xsi:type="ecore:EReference" name="start" ordered="false"

-        lowerBound="1" eType="#//EventOccurrence" eOpposite="#//EventOccurrence/startExec"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="finish" ordered="false"

-        lowerBound="1" eType="#//EventOccurrence" eOpposite="#//EventOccurrence/finishExec"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="behavior" ordered="false"

-        upperBound="-1" eType="#//Behavior"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="StateInvariant" eSuperTypes="#//InteractionFragment">

-    <eOperations name="getCovereds" ordered="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

-      <eAnnotations source="feature">

-        <details key="derived" value="false"/>

-        <details key="containment" value="false"/>

-        <details key="name" value="covered"/>

-        <details key="eType" value="org.eclipse.uml2.Lifeline"/>

-      </eAnnotations>

-      <eAnnotations source="redefines" references="#//InteractionFragment/covered">

-        <details key="org.eclipse.uml2.InteractionFragment#getCovereds" value=""/>

-      </eAnnotations>

-    </eOperations>

-    <eOperations name="getOwnedElements" ordered="false" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

-      <eAnnotations source="feature">

-        <details key="derived" value="true"/>

-        <details key="eOpposite.upperBound" value="1"/>

-        <details key="name" value="ownedElement"/>

-        <details key="eType" value="org.eclipse.uml2.Element"/>

-        <details key="eOpposite" value="owner"/>

-        <details key="eOpposite.containment" value="false"/>

-        <details key="containment" value="false"/>

-        <details key="eOpposite.lowerBound" value="0"/>

-      </eAnnotations>

-      <eAnnotations source="union" references="#//StateInvariant/invariant"/>

-    </eOperations>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="invariant" ordered="false"

-        lowerBound="1" eType="#//Constraint" containment="true">

-      <eAnnotations source="subsets">

-        <details key="org.eclipse.uml2.Element#getOwnedElements" value=""/>

-      </eAnnotations>

-    </eStructuralFeatures>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="Stop" eSuperTypes="#//EventOccurrence"/>

-  <eClassifiers xsi:type="ecore:EClass" name="Variable" eSuperTypes="#//ConnectableElement #//TypedElement">

-    <eOperations name="getOwner" ordered="false" eType="#//Element">

-      <eAnnotations source="feature">

-        <details key="derived" value="true"/>

-        <details key="eOpposite.upperBound" value="-1"/>

-        <details key="name" value="owner"/>

-        <details key="eType" value="org.eclipse.uml2.Element"/>

-        <details key="eOpposite" value="ownedElement"/>

-        <details key="eOpposite.containment" value="false"/>

-        <details key="containment" value="false"/>

-        <details key="eOpposite.lowerBound" value="0"/>

-      </eAnnotations>

-      <eAnnotations source="union" references="#//Variable/scope"/>

-    </eOperations>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="scope" ordered="false"

-        lowerBound="1" eType="#//StructuredActivityNode" transient="true" eOpposite="#//StructuredActivityNode/variable">

-      <eAnnotations source="subsets">

-        <details key="org.eclipse.uml2.Element#getOwner" value=""/>

-      </eAnnotations>

-    </eStructuralFeatures>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="StructuredActivityNode" eSuperTypes="#//Action #//Namespace #//ActivityGroup">

-    <eOperations name="getActivity" ordered="false" eType="#//Activity">

-      <eAnnotations source="feature">

-        <details key="derived" value="true"/>

-        <details key="eOpposite.upperBound" value="-1"/>

-        <details key="name" value="activity"/>

-        <details key="eType" value="org.eclipse.uml2.Activity"/>

-        <details key="eOpposite" value="structuredNode"/>

-        <details key="eOpposite.containment" value="false"/>

-        <details key="containment" value="false"/>

-        <details key="eOpposite.lowerBound" value="0"/>

-      </eAnnotations>

-      <eAnnotations source="redefines" references="#//ActivityNode/activity #//ActivityGroup/activityGroup_activity">

-        <details key="org.eclipse.uml2.ActivityNode#getActivity" value=""/>

-        <details key="org.eclipse.uml2.ActivityGroup#getActivityGroup_activity" value=""/>

-      </eAnnotations>

-    </eOperations>

-    <eOperations name="setActivity" ordered="false">

-      <eAnnotations source="feature">

-        <details key="derived" value="true"/>

-        <details key="eOpposite.upperBound" value="-1"/>

-        <details key="name" value="activity"/>

-        <details key="eType" value="org.eclipse.uml2.Activity"/>

-        <details key="eOpposite" value="structuredNode"/>

-        <details key="eOpposite.containment" value="false"/>

-        <details key="containment" value="false"/>

-        <details key="eOpposite.lowerBound" value="0"/>

-      </eAnnotations>

-      <eAnnotations source="redefines" references="#//ActivityNode/activity #//ActivityGroup/activityGroup_activity">

-        <details key="org.eclipse.uml2.ActivityNode#getActivity" value=""/>

-        <details key="org.eclipse.uml2.ActivityGroup#getActivityGroup_activity" value=""/>

-      </eAnnotations>

-      <eParameters name="newActivity" eType="#//Activity"/>

-    </eOperations>

-    <eOperations name="getActivityGroup_activity" ordered="false" eType="#//Activity">

-      <eAnnotations source="feature">

-        <details key="derived" value="false"/>

-        <details key="eOpposite.upperBound" value="-1"/>

-        <details key="name" value="activityGroup_activity"/>

-        <details key="eType" value="org.eclipse.uml2.Activity"/>

-        <details key="eOpposite" value="group"/>

-        <details key="eOpposite.containment" value="true"/>

-        <details key="containment" value="false"/>

-        <details key="eOpposite.lowerBound" value="0"/>

-      </eAnnotations>

-      <eAnnotations source="redefined" references="#//StructuredActivityNode/getActivity"/>

-    </eOperations>

-    <eOperations name="setActivityGroup_activity" ordered="false">

-      <eAnnotations source="feature">

-        <details key="derived" value="false"/>

-        <details key="eOpposite.upperBound" value="-1"/>

-        <details key="name" value="activityGroup_activity"/>

-        <details key="eType" value="org.eclipse.uml2.Activity"/>

-        <details key="eOpposite" value="group"/>

-        <details key="eOpposite.containment" value="true"/>

-        <details key="containment" value="false"/>

-        <details key="eOpposite.lowerBound" value="0"/>

-      </eAnnotations>

-      <eAnnotations source="redefined" references="#//StructuredActivityNode/setActivity"/>

-      <eParameters name="newActivityGroup_activity" eType="#//Activity"/>

-    </eOperations>

-    <eOperations name="getOwnedMembers" ordered="false" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

-      <eAnnotations source="feature">

-        <details key="derived" value="true"/>

-        <details key="eOpposite.upperBound" value="1"/>

-        <details key="name" value="ownedMember"/>

-        <details key="eType" value="org.eclipse.uml2.NamedElement"/>

-        <details key="eOpposite" value="namespace"/>

-        <details key="eOpposite.containment" value="false"/>

-        <details key="containment" value="false"/>

-        <details key="eOpposite.lowerBound" value="0"/>

-      </eAnnotations>

-      <eAnnotations source="union" references="#//StructuredActivityNode/variable"/>

-    </eOperations>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="variable" ordered="false"

-        upperBound="-1" eType="#//Variable" containment="true" eOpposite="#//Variable/scope">

-      <eAnnotations source="subsets">

-        <details key="org.eclipse.uml2.Namespace#getOwnedMembers" value=""/>

-      </eAnnotations>

-    </eStructuralFeatures>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="containedNode" ordered="false"

-        upperBound="-1" eType="#//ActivityNode" containment="true" eOpposite="#//ActivityNode/inStructuredNode">

-      <eAnnotations source="redefines" references="#//ActivityGroup/getContainedNodes">

-        <details key="org.eclipse.uml2.ActivityGroup#getContainedNodes" value=""/>

-      </eAnnotations>

-    </eStructuralFeatures>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="containedEdge" ordered="false"

-        upperBound="-1" eType="#//ActivityEdge" containment="true" eOpposite="#//ActivityEdge/inStructuredNode">

-      <eAnnotations source="redefines" references="#//ActivityGroup/getContainedEdges">

-        <details key="org.eclipse.uml2.ActivityGroup#getContainedEdges" value=""/>

-      </eAnnotations>

-    </eStructuralFeatures>

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="mustIsolate" ordered="false"

-        eType="#//Boolean"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="ConditionalNode" eSuperTypes="#//StructuredActivityNode">

-    <eOperations name="getOwnedElements" ordered="false" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

-      <eAnnotations source="feature">

-        <details key="derived" value="true"/>

-        <details key="eOpposite.upperBound" value="1"/>

-        <details key="name" value="ownedElement"/>

-        <details key="eType" value="org.eclipse.uml2.Element"/>

-        <details key="eOpposite" value="owner"/>

-        <details key="eOpposite.containment" value="false"/>

-        <details key="containment" value="false"/>

-        <details key="eOpposite.lowerBound" value="0"/>

-      </eAnnotations>

-      <eAnnotations source="union" references="#//ConditionalNode/clause"/>

-    </eOperations>

-    <eOperations name="getOutputs" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

-      <eAnnotations source="feature">

-        <details key="derived" value="true"/>

-        <details key="containment" value="false"/>

-        <details key="name" value="output"/>

-        <details key="eType" value="org.eclipse.uml2.OutputPin"/>

-      </eAnnotations>

-      <eAnnotations source="union" references="#//ConditionalNode/result"/>

-    </eOperations>

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="isDeterminate" ordered="false"

-        eType="#//Boolean"/>

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="isAssured" ordered="false"

-        eType="#//Boolean"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="clause" ordered="false"

-        lowerBound="1" upperBound="-1" eType="#//Clause" containment="true">

-      <eAnnotations source="subsets">

-        <details key="org.eclipse.uml2.Element#getOwnedElements" value=""/>

-      </eAnnotations>

-    </eStructuralFeatures>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="result" upperBound="-1"

-        eType="#//OutputPin" containment="true">

-      <eAnnotations source="subsets">

-        <details key="org.eclipse.uml2.Action#getOutputs" value=""/>

-      </eAnnotations>

-    </eStructuralFeatures>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="Clause" eSuperTypes="#//Element">

-    <eStructuralFeatures xsi:type="ecore:EReference" name="test" ordered="false" upperBound="-1"

-        eType="#//ActivityNode"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="body" ordered="false" upperBound="-1"

-        eType="#//ActivityNode"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="predecessorClause" ordered="false"

-        upperBound="-1" eType="#//Clause" eOpposite="#//Clause/successorClause"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="successorClause" ordered="false"

-        upperBound="-1" eType="#//Clause" eOpposite="#//Clause/predecessorClause"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="decider" ordered="false"

-        lowerBound="1" eType="#//OutputPin"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="bodyOutput" ordered="false"

-        upperBound="-1" eType="#//OutputPin"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="LoopNode" eSuperTypes="#//StructuredActivityNode">

-    <eOperations name="getOutputs" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

-      <eAnnotations source="feature">

-        <details key="derived" value="true"/>

-        <details key="containment" value="false"/>

-        <details key="name" value="output"/>

-        <details key="eType" value="org.eclipse.uml2.OutputPin"/>

-      </eAnnotations>

-      <eAnnotations source="union" references="#//LoopNode/result"/>

-    </eOperations>

-    <eOperations name="getOwnedElements" ordered="false" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

-      <eAnnotations source="feature">

-        <details key="derived" value="true"/>

-        <details key="eOpposite.upperBound" value="1"/>

-        <details key="name" value="ownedElement"/>

-        <details key="eType" value="org.eclipse.uml2.Element"/>

-        <details key="eOpposite" value="owner"/>

-        <details key="eOpposite.containment" value="false"/>

-        <details key="containment" value="false"/>

-        <details key="eOpposite.lowerBound" value="0"/>

-      </eAnnotations>

-      <eAnnotations source="union" references="#//LoopNode/loopVariable"/>

-    </eOperations>

-    <eOperations name="getInputs" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

-      <eAnnotations source="feature">

-        <details key="derived" value="true"/>

-        <details key="containment" value="false"/>

-        <details key="name" value="input"/>

-        <details key="eType" value="org.eclipse.uml2.InputPin"/>

-      </eAnnotations>

-      <eAnnotations source="union" references="#//LoopNode/loopVariableInput"/>

-    </eOperations>

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="isTestedFirst" ordered="false"

-        eType="#//Boolean"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="bodyPart" ordered="false"

-        upperBound="-1" eType="#//ActivityNode"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="setupPart" ordered="false"

-        upperBound="-1" eType="#//ActivityNode"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="decider" ordered="false"

-        lowerBound="1" eType="#//OutputPin"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="test" ordered="false" upperBound="-1"

-        eType="#//ActivityNode"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="result" upperBound="-1"

-        eType="#//OutputPin" containment="true">

-      <eAnnotations source="subsets">

-        <details key="org.eclipse.uml2.Action#getOutputs" value=""/>

-      </eAnnotations>

-    </eStructuralFeatures>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="loopVariable" upperBound="-1"

-        eType="#//OutputPin" containment="true">

-      <eAnnotations source="subsets">

-        <details key="org.eclipse.uml2.Element#getOwnedElements" value=""/>

-      </eAnnotations>

-    </eStructuralFeatures>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="bodyOutput" ordered="false"

-        upperBound="-1" eType="#//OutputPin"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="loopVariableInput" upperBound="-1"

-        eType="#//InputPin" containment="true">

-      <eAnnotations source="subsets">

-        <details key="org.eclipse.uml2.Action#getInputs" value=""/>

-      </eAnnotations>

-    </eStructuralFeatures>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="Port" eSuperTypes="#//Property">

-    <eOperations name="getRedefinedElements" ordered="false" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

-      <eAnnotations source="feature">

-        <details key="derived" value="true"/>

-        <details key="containment" value="false"/>

-        <details key="name" value="redefinedElement"/>

-        <details key="eType" value="org.eclipse.uml2.RedefinableElement"/>

-      </eAnnotations>

-      <eAnnotations source="union" references="#//Port/redefinedPort"/>

-    </eOperations>

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="isBehavior" ordered="false"

-        eType="#//Boolean" defaultValueLiteral="false"/>

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="isService" ordered="false"

-        eType="#//Boolean" defaultValueLiteral="true"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="required" ordered="false"

-        upperBound="-1" eType="#//Interface" changeable="false" volatile="true" transient="true"

-        derived="true"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="redefinedPort" ordered="false"

-        upperBound="-1" eType="#//Port">

-      <eAnnotations source="subsets">

-        <details key="org.eclipse.uml2.RedefinableElement#getRedefinedElements" value=""/>

-      </eAnnotations>

-    </eStructuralFeatures>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="provided" ordered="false"

-        upperBound="-1" eType="#//Interface" changeable="false" volatile="true" transient="true"

-        derived="true"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="protocol" ordered="false"

-        eType="#//ProtocolStateMachine"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="EncapsulatedClassifier" abstract="true"

-      eSuperTypes="#//StructuredClassifier">

-    <eOperations name="getFeatures" ordered="false" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

-      <eAnnotations source="feature">

-        <details key="derived" value="true"/>

-        <details key="eOpposite.upperBound" value="-1"/>

-        <details key="name" value="feature"/>

-        <details key="eType" value="org.eclipse.uml2.Feature"/>

-        <details key="eOpposite" value="featuringClassifier"/>

-        <details key="eOpposite.containment" value="false"/>

-        <details key="containment" value="false"/>

-        <details key="eOpposite.lowerBound" value="0"/>

-      </eAnnotations>

-      <eAnnotations source="union" references="#//EncapsulatedClassifier/ownedPort"/>

-    </eOperations>

-    <eOperations name="getOwnedMembers" ordered="false" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

-      <eAnnotations source="feature">

-        <details key="derived" value="true"/>

-        <details key="eOpposite.upperBound" value="1"/>

-        <details key="name" value="ownedMember"/>

-        <details key="eType" value="org.eclipse.uml2.NamedElement"/>