[77413] Regenerating with latest source model.
diff --git a/plugins/org.eclipse.uml2.uml.edit/src/org/eclipse/uml2/uml/edit/providers/ActivityItemProvider.java b/plugins/org.eclipse.uml2.uml.edit/src/org/eclipse/uml2/uml/edit/providers/ActivityItemProvider.java
index 965ee65..ca41820 100644
--- a/plugins/org.eclipse.uml2.uml.edit/src/org/eclipse/uml2/uml/edit/providers/ActivityItemProvider.java
+++ b/plugins/org.eclipse.uml2.uml.edit/src/org/eclipse/uml2/uml/edit/providers/ActivityItemProvider.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: ActivityItemProvider.java,v 1.15 2006/05/15 21:06:22 khussey Exp $
+ * $Id: ActivityItemProvider.java,v 1.16 2006/06/08 17:40:25 khussey Exp $
*/
package org.eclipse.uml2.uml.edit.providers;
@@ -365,10 +365,6 @@
newChildDescriptors.add(createChildParameter(
UMLPackage.Literals.ACTIVITY__NODE, UMLFactory.eINSTANCE
- .createValuePin()));
-
- newChildDescriptors.add(createChildParameter(
- UMLPackage.Literals.ACTIVITY__NODE, UMLFactory.eINSTANCE
.createSendSignalAction()));
newChildDescriptors.add(createChildParameter(
@@ -393,6 +389,10 @@
newChildDescriptors.add(createChildParameter(
UMLPackage.Literals.ACTIVITY__NODE, UMLFactory.eINSTANCE
+ .createValuePin()));
+
+ newChildDescriptors.add(createChildParameter(
+ UMLPackage.Literals.ACTIVITY__NODE, UMLFactory.eINSTANCE
.createForkNode()));
newChildDescriptors.add(createChildParameter(
diff --git a/plugins/org.eclipse.uml2.uml.edit/src/org/eclipse/uml2/uml/edit/providers/AssociationClassItemProvider.java b/plugins/org.eclipse.uml2.uml.edit/src/org/eclipse/uml2/uml/edit/providers/AssociationClassItemProvider.java
index 418a712..392aa17 100644
--- a/plugins/org.eclipse.uml2.uml.edit/src/org/eclipse/uml2/uml/edit/providers/AssociationClassItemProvider.java
+++ b/plugins/org.eclipse.uml2.uml.edit/src/org/eclipse/uml2/uml/edit/providers/AssociationClassItemProvider.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: AssociationClassItemProvider.java,v 1.10 2006/06/08 17:10:11 khussey Exp $
+ * $Id: AssociationClassItemProvider.java,v 1.11 2006/06/08 17:40:25 khussey Exp $
*/
package org.eclipse.uml2.uml.edit.providers;
@@ -253,7 +253,7 @@
if (associationClass.isDerived()) {
appendString(text, "/"); //$NON-NLS-1$
}
-
+
String label = associationClass.getLabel(shouldTranslate());
if (!UML2Util.isEmpty(label)) {
diff --git a/plugins/org.eclipse.uml2.uml.edit/src/org/eclipse/uml2/uml/edit/providers/AssociationItemProvider.java b/plugins/org.eclipse.uml2.uml.edit/src/org/eclipse/uml2/uml/edit/providers/AssociationItemProvider.java
index b80468f..d614e26 100644
--- a/plugins/org.eclipse.uml2.uml.edit/src/org/eclipse/uml2/uml/edit/providers/AssociationItemProvider.java
+++ b/plugins/org.eclipse.uml2.uml.edit/src/org/eclipse/uml2/uml/edit/providers/AssociationItemProvider.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: AssociationItemProvider.java,v 1.11 2006/06/08 17:10:11 khussey Exp $
+ * $Id: AssociationItemProvider.java,v 1.12 2006/06/08 17:40:25 khussey Exp $
*/
package org.eclipse.uml2.uml.edit.providers;
@@ -266,7 +266,7 @@
object), "_UI_Association_type"); //$NON-NLS-1$
Association association = (Association) object;
-
+
if (association.isDerived()) {
appendString(text, "/"); //$NON-NLS-1$
}
diff --git a/plugins/org.eclipse.uml2.uml.edit/src/org/eclipse/uml2/uml/edit/providers/CommunicationPathItemProvider.java b/plugins/org.eclipse.uml2.uml.edit/src/org/eclipse/uml2/uml/edit/providers/CommunicationPathItemProvider.java
index de73568..76ef961 100644
--- a/plugins/org.eclipse.uml2.uml.edit/src/org/eclipse/uml2/uml/edit/providers/CommunicationPathItemProvider.java
+++ b/plugins/org.eclipse.uml2.uml.edit/src/org/eclipse/uml2/uml/edit/providers/CommunicationPathItemProvider.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: CommunicationPathItemProvider.java,v 1.5 2006/06/08 17:10:11 khussey Exp $
+ * $Id: CommunicationPathItemProvider.java,v 1.6 2006/06/08 17:40:25 khussey Exp $
*/
package org.eclipse.uml2.uml.edit.providers;
@@ -94,7 +94,7 @@
if (communicationPath.isDerived()) {
appendString(text, "/"); //$NON-NLS-1$
}
-
+
String label = communicationPath.getLabel(shouldTranslate());
if (!UML2Util.isEmpty(label)) {
diff --git a/plugins/org.eclipse.uml2.uml.edit/src/org/eclipse/uml2/uml/edit/providers/ExtensionItemProvider.java b/plugins/org.eclipse.uml2.uml.edit/src/org/eclipse/uml2/uml/edit/providers/ExtensionItemProvider.java
index 8be2aec..9291a9e 100644
--- a/plugins/org.eclipse.uml2.uml.edit/src/org/eclipse/uml2/uml/edit/providers/ExtensionItemProvider.java
+++ b/plugins/org.eclipse.uml2.uml.edit/src/org/eclipse/uml2/uml/edit/providers/ExtensionItemProvider.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: ExtensionItemProvider.java,v 1.8 2006/06/08 17:10:11 khussey Exp $
+ * $Id: ExtensionItemProvider.java,v 1.9 2006/06/08 17:40:25 khussey Exp $
*/
package org.eclipse.uml2.uml.edit.providers;
@@ -143,7 +143,7 @@
if (extension.isDerived()) {
appendString(text, "/"); //$NON-NLS-1$
}
-
+
String label = extension.getLabel(shouldTranslate());
if (!UML2Util.isEmpty(label)) {
diff --git a/plugins/org.eclipse.uml2.uml.edit/src/org/eclipse/uml2/uml/edit/providers/LiteralUnlimitedNaturalItemProvider.java b/plugins/org.eclipse.uml2.uml.edit/src/org/eclipse/uml2/uml/edit/providers/LiteralUnlimitedNaturalItemProvider.java
index ba1057b..86ba866 100644
--- a/plugins/org.eclipse.uml2.uml.edit/src/org/eclipse/uml2/uml/edit/providers/LiteralUnlimitedNaturalItemProvider.java
+++ b/plugins/org.eclipse.uml2.uml.edit/src/org/eclipse/uml2/uml/edit/providers/LiteralUnlimitedNaturalItemProvider.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: LiteralUnlimitedNaturalItemProvider.java,v 1.6 2006/06/08 17:10:11 khussey Exp $
+ * $Id: LiteralUnlimitedNaturalItemProvider.java,v 1.7 2006/06/08 17:40:25 khussey Exp $
*/
package org.eclipse.uml2.uml.edit.providers;
@@ -171,11 +171,10 @@
}
/**
- * This adds to the collection of
- * {@link org.eclipse.emf.edit.command.CommandParameter}s describing all of
- * the children that can be created under this object. <!-- begin-user-doc
- * --> <!-- end-user-doc -->
- *
+ * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
+ * describing all of the children that can be created under this object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
*/
protected void collectNewChildDescriptors(Collection newChildDescriptors,
diff --git a/plugins/org.eclipse.uml2.uml.edit/src/org/eclipse/uml2/uml/edit/providers/StructuredActivityNodeItemProvider.java b/plugins/org.eclipse.uml2.uml.edit/src/org/eclipse/uml2/uml/edit/providers/StructuredActivityNodeItemProvider.java
index 169115e..1e4c400 100644
--- a/plugins/org.eclipse.uml2.uml.edit/src/org/eclipse/uml2/uml/edit/providers/StructuredActivityNodeItemProvider.java
+++ b/plugins/org.eclipse.uml2.uml.edit/src/org/eclipse/uml2/uml/edit/providers/StructuredActivityNodeItemProvider.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: StructuredActivityNodeItemProvider.java,v 1.12 2006/05/15 21:06:22 khussey Exp $
+ * $Id: StructuredActivityNodeItemProvider.java,v 1.13 2006/06/08 17:40:25 khussey Exp $
*/
package org.eclipse.uml2.uml.edit.providers;
@@ -561,10 +561,6 @@
newChildDescriptors.add(createChildParameter(
UMLPackage.Literals.STRUCTURED_ACTIVITY_NODE__NODE,
- UMLFactory.eINSTANCE.createValuePin()));
-
- newChildDescriptors.add(createChildParameter(
- UMLPackage.Literals.STRUCTURED_ACTIVITY_NODE__NODE,
UMLFactory.eINSTANCE.createSendSignalAction()));
newChildDescriptors.add(createChildParameter(
@@ -589,6 +585,10 @@
newChildDescriptors.add(createChildParameter(
UMLPackage.Literals.STRUCTURED_ACTIVITY_NODE__NODE,
+ UMLFactory.eINSTANCE.createValuePin()));
+
+ newChildDescriptors.add(createChildParameter(
+ UMLPackage.Literals.STRUCTURED_ACTIVITY_NODE__NODE,
UMLFactory.eINSTANCE.createForkNode()));
newChildDescriptors.add(createChildParameter(
diff --git a/plugins/org.eclipse.uml2.uml.edit/src/org/eclipse/uml2/uml/edit/providers/UMLItemProviderAdapterFactory.java b/plugins/org.eclipse.uml2.uml.edit/src/org/eclipse/uml2/uml/edit/providers/UMLItemProviderAdapterFactory.java
index 8bdff9e..54413b3 100644
--- a/plugins/org.eclipse.uml2.uml.edit/src/org/eclipse/uml2/uml/edit/providers/UMLItemProviderAdapterFactory.java
+++ b/plugins/org.eclipse.uml2.uml.edit/src/org/eclipse/uml2/uml/edit/providers/UMLItemProviderAdapterFactory.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: UMLItemProviderAdapterFactory.java,v 1.17 2006/04/10 19:16:57 khussey Exp $
+ * $Id: UMLItemProviderAdapterFactory.java,v 1.18 2006/06/08 17:40:25 khussey Exp $
*/
package org.eclipse.uml2.uml.edit.providers;
@@ -4822,8 +4822,6 @@
pinItemProvider.dispose();
if (inputPinItemProvider != null)
inputPinItemProvider.dispose();
- if (valuePinItemProvider != null)
- valuePinItemProvider.dispose();
if (sendSignalActionItemProvider != null)
sendSignalActionItemProvider.dispose();
if (callOperationActionItemProvider != null)
@@ -4840,6 +4838,8 @@
initialNodeItemProvider.dispose();
if (activityParameterNodeItemProvider != null)
activityParameterNodeItemProvider.dispose();
+ if (valuePinItemProvider != null)
+ valuePinItemProvider.dispose();
if (messageItemProvider != null)
messageItemProvider.dispose();
if (interactionItemProvider != null)
