diff options
| author | Nicolas FAUVERGUE | 2018-11-12 10:18:32 -0500 |
|---|---|---|
| committer | Quentin Le Menez | 2018-11-12 11:14:34 -0500 |
| commit | 6e402bb1385888f4bffff1eccdb680bf3a3d3699 (patch) | |
| tree | e5cd64acfc6bc12cbe5c3a643505a52fa6a468c9 | |
| parent | 9772ea957acd5bd1aee9432f184479688d04c907 (diff) | |
| download | org.eclipse.papyrus-6e402bb1385888f4bffff1eccdb680bf3a3d3699.tar.gz org.eclipse.papyrus-6e402bb1385888f4bffff1eccdb680bf3a3d3699.tar.xz org.eclipse.papyrus-6e402bb1385888f4bffff1eccdb680bf3a3d3699.zip | |
Bug 541041: [Diagram] When creating a DurationObservation, it does not
have name
Return 'null' instead of empty command in helper advice.
Change-Id: I76f8b8c9e3385ac39f2ced19eaf07f0e9f12aae9
Signed-off-by: Nicolas FAUVERGUE <nicolas.fauvergue@cea.fr>
| -rw-r--r-- | plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/DurationObservationEditHelperAdvice.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/DurationObservationEditHelperAdvice.java b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/DurationObservationEditHelperAdvice.java index 6e448bcf446..4b05589ba4b 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/DurationObservationEditHelperAdvice.java +++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/DurationObservationEditHelperAdvice.java @@ -8,6 +8,7 @@ * * Contributors: * EclipseSource - Initial API and implementation + * Nicolas FAUVERGUE (CEA LIST) nicolas.fauvergue@cea.fr - Bug 541041 *****************************************************************************/ package org.eclipse.papyrus.uml.service.types.helper.advice; @@ -37,7 +38,7 @@ public class DurationObservationEditHelperAdvice extends AbstractOccurrenceLinkE @Override protected ICommand getAfterConfigureCommand(ConfigureRequest request) { - ICommand composite = new CompositeCommand("After Configure Command of DurationObservation");// $NON-NLS-0$ + CompositeCommand composite = new CompositeCommand("After Configure Command of DurationObservation");// $NON-NLS-0$ ICommand afterConfigureCommand = super.getAfterConfigureCommand(request); if (null != afterConfigureCommand && afterConfigureCommand.canExecute()) { composite.compose(afterConfigureCommand); @@ -70,7 +71,7 @@ public class DurationObservationEditHelperAdvice extends AbstractOccurrenceLinkE composite.compose(initConstrainedElements); } - return composite; + return !composite.isEmpty() ? composite : null; } @Override |