diff options
author | jbruck | 2007-08-30 16:11:49 +0000 |
---|---|---|
committer | jbruck | 2007-08-30 16:11:49 +0000 |
commit | cb7065031bcde72b2687cf83c4a5be4e253c3e57 (patch) | |
tree | 6636f886d3bbf6440b43216e0b700ab1036de7f5 | |
parent | fe078b94ae16466092a03daf7d8fd6c28c5c8c8e (diff) | |
download | org.eclipse.uml2.test-R2_1_maintenance.tar.gz org.eclipse.uml2.test-R2_1_maintenance.tar.xz org.eclipse.uml2.test-R2_1_maintenance.zip |
[200828] AddVariableValueAction doubled in UML editorv200708301222R2_1_maintenance
-rw-r--r-- | plugins/org.eclipse.uml2.uml.edit/src/org/eclipse/uml2/uml/edit/providers/SequenceNodeItemProvider.java | 23 |
1 files changed, 20 insertions, 3 deletions
diff --git a/plugins/org.eclipse.uml2.uml.edit/src/org/eclipse/uml2/uml/edit/providers/SequenceNodeItemProvider.java b/plugins/org.eclipse.uml2.uml.edit/src/org/eclipse/uml2/uml/edit/providers/SequenceNodeItemProvider.java index fa12096f..6ce43891 100644 --- a/plugins/org.eclipse.uml2.uml.edit/src/org/eclipse/uml2/uml/edit/providers/SequenceNodeItemProvider.java +++ b/plugins/org.eclipse.uml2.uml.edit/src/org/eclipse/uml2/uml/edit/providers/SequenceNodeItemProvider.java @@ -8,11 +8,12 @@ * Contributors: * IBM - initial API and implementation * - * $Id: SequenceNodeItemProvider.java,v 1.12 2007/03/22 16:46:12 khussey Exp $ + * $Id: SequenceNodeItemProvider.java,v 1.12.2.1 2007/08/30 16:11:49 jbruck Exp $ */ package org.eclipse.uml2.uml.edit.providers; import java.util.Collection; +import java.util.Iterator; import java.util.List; import org.eclipse.emf.common.notify.AdapterFactory; @@ -21,6 +22,7 @@ import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.util.ResourceLocator; import org.eclipse.emf.ecore.EStructuralFeature; +import org.eclipse.emf.edit.command.CommandParameter; import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; import org.eclipse.emf.edit.provider.IItemLabelProvider; @@ -100,7 +102,7 @@ public class SequenceNodeItemProvider * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @generated + * @generated NOT */ @Override public Collection<? extends EStructuralFeature> getChildrenFeatures( @@ -108,6 +110,8 @@ public class SequenceNodeItemProvider if (childrenFeatures == null) { super.getChildrenFeatures(object); childrenFeatures + .remove(UMLPackage.Literals.STRUCTURED_ACTIVITY_NODE__NODE); + childrenFeatures .add(UMLPackage.Literals.SEQUENCE_NODE__EXECUTABLE_NODE); } return childrenFeatures; @@ -176,12 +180,25 @@ public class SequenceNodeItemProvider * that can be created under this object. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @generated + * @generated NOT */ @Override protected void collectNewChildDescriptors( Collection<Object> newChildDescriptors, Object object) { super.collectNewChildDescriptors(newChildDescriptors, object); + + for (Iterator<Object> childDescriptorIterator = newChildDescriptors + .iterator(); childDescriptorIterator.hasNext();) { + Object commandParameter = childDescriptorIterator.next(); + + if (commandParameter instanceof CommandParameter) { + + if (((CommandParameter) commandParameter).feature + .equals(UMLPackage.Literals.STRUCTURED_ACTIVITY_NODE__NODE)) { + childDescriptorIterator.remove(); + } + } + } newChildDescriptors.add(createChildParameter( UMLPackage.Literals.SEQUENCE_NODE__EXECUTABLE_NODE, |