summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGabriel Pascual2014-05-16 03:14:47 (EDT)
committerGabriel Pascual2014-05-16 03:14:47 (EDT)
commit8108c5ff06df98e8b006b1ccf541ad82a8700f6f (patch)
treec544e869c2c5bb15aa67beeaef891ddcd60c79d1
parent5d3c2a2f51c8e2c45b468d4fce47cb4cf0562152 (diff)
downloadorg.eclipse.papyrus-8108c5ff06df98e8b006b1ccf541ad82a8700f6f.zip
org.eclipse.papyrus-8108c5ff06df98e8b006b1ccf541ad82a8700f6f.tar.gz
org.eclipse.papyrus-8108c5ff06df98e8b006b1ccf541ad82a8700f6f.tar.bz2
385761: Non-atomicity of the Undo command about application ofrefs/changes/00/26700/1
stereotype on a displayed element https://bugs.eclipse.org/bugs/show_bug.cgi?id=385761 - Fix error introduced during last merge to correct this issue Change-Id: I6b60310679667405a4140c6763ab66b2986d4ebc Signed-off-by: Gabriel Pascual <gabriel.pascual@all4tec.net>
-rw-r--r--plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/profile/ui/compositeforview/AppliedStereotypeCompositeWithView.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/profile/ui/compositeforview/AppliedStereotypeCompositeWithView.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/profile/ui/compositeforview/AppliedStereotypeCompositeWithView.java
index 8921275..4444727 100644
--- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/profile/ui/compositeforview/AppliedStereotypeCompositeWithView.java
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/profile/ui/compositeforview/AppliedStereotypeCompositeWithView.java
@@ -139,7 +139,7 @@ public class AppliedStereotypeCompositeWithView extends org.eclipse.papyrus.uml.
/*
* (non-Javadoc)
- *
+ *
* @see com.cea.papyrus.profile.ui.composites.StereotypeComposite#removeButtonPressed()
*/
@Override
@@ -177,7 +177,7 @@ public class AppliedStereotypeCompositeWithView extends org.eclipse.papyrus.uml.
*/
@Override
protected Command getApplyStereotypeCommmand(Element elt, Stereotype st, TransactionalEditingDomain domain) {
- CompoundCommand compoundCommand = new CompoundCommand("applyStereotypeCommand");
+ CompoundCommand compoundCommand = new CompoundCommand("ApplyStereotypeCommand");
Command parentCommmand = super.getApplyStereotypeCommmand(elt, st, domain);
compoundCommand.append(parentCommmand);
@@ -191,7 +191,7 @@ public class AppliedStereotypeCompositeWithView extends org.eclipse.papyrus.uml.
compoundCommand.append(command);
}
- return parentCommmand;
+ return compoundCommand;
}
/**