Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'origin/master' into planger/issues/42
Conflicts: plugins/org.eclipse.papyrus.uml.interaction.model/src/org/eclipse/papyrus/uml/interaction/internal/model/commands/SetCoveredCommand.java
- Loading branch information
Showing
20 changed files
with
1,423 additions
and
342 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
81 changes: 81 additions & 0 deletions
81
...pyrus/uml/diagram/sequence/runtime/internal/edit/policies/LifelineBodyDropEditPolicy.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,81 @@ | ||
| /***************************************************************************** | ||
| * Copyright (c) 2018 Christian W. Damus and others. | ||
| * | ||
| * All rights reserved. This program and the accompanying materials | ||
| * are made available under the terms of the Eclipse Public License v1.0 | ||
| * which accompanies this distribution, and is available at | ||
| * http://www.eclipse.org/legal/epl-v10.html | ||
| * | ||
| * Contributors: | ||
| * Christian W. Damus - Initial API and implementation | ||
| *****************************************************************************/ | ||
|
|
||
| package org.eclipse.papyrus.uml.diagram.sequence.runtime.internal.edit.policies; | ||
|
|
||
| import static org.eclipse.papyrus.uml.interaction.model.util.Optionals.as; | ||
|
|
||
| import java.util.Optional; | ||
| import java.util.OptionalInt; | ||
|
|
||
| import org.eclipse.emf.ecore.EObject; | ||
| import org.eclipse.gef.commands.Command; | ||
| import org.eclipse.gef.commands.UnexecutableCommand; | ||
| import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy; | ||
| import org.eclipse.gmf.runtime.diagram.ui.requests.DropObjectsRequest; | ||
| import org.eclipse.papyrus.uml.interaction.model.MExecution; | ||
| import org.eclipse.papyrus.uml.interaction.model.MLifeline; | ||
| import org.eclipse.papyrus.uml.interaction.model.util.Optionals; | ||
| import org.eclipse.uml2.uml.ExecutionSpecification; | ||
| import org.eclipse.uml2.uml.Lifeline; | ||
|
|
||
| /** | ||
| * Edit policy for dropping elements onto the lifeline body. | ||
| */ | ||
| public class LifelineBodyDropEditPolicy extends DragDropEditPolicy implements ISequenceEditPolicy { | ||
|
|
||
| /** | ||
| * Initializes me. | ||
| */ | ||
| public LifelineBodyDropEditPolicy() { | ||
| super(); | ||
| } | ||
|
|
||
| @Override | ||
| protected Command getDropElementCommand(EObject element, DropObjectsRequest request) { | ||
| Command result = null; | ||
|
|
||
| if (element instanceof ExecutionSpecification) { | ||
| Optional<MExecution> exec = Optionals | ||
| .as(getInteraction().getElement((ExecutionSpecification)element), MExecution.class); | ||
| return exec.map(e -> getDropExecutionCommand(e, request)).orElse(null); | ||
| } | ||
|
|
||
| return result; | ||
| } | ||
|
|
||
| /** | ||
| * Obtain a command that drops an {@code execution} specification onto the host lifeline. | ||
| * | ||
| * @param execution | ||
| * an execution specification to drop | ||
| * @param request | ||
| * the drop request | ||
| * @return the command, or {@code null} if none | ||
| */ | ||
| protected Command getDropExecutionCommand(MExecution execution, DropObjectsRequest request) { | ||
| Optional<MLifeline> lifeline = getHostLifeline(); | ||
|
|
||
| if (!PrivateRequestUtils.isAllowSemanticReordering(request)) { | ||
| // Block the operation if the semantic override modifier is not applied | ||
| return UnexecutableCommand.INSTANCE; | ||
| } | ||
|
|
||
| return lifeline.map(ll -> wrap(execution.setOwner(ll, OptionalInt.empty(), OptionalInt.empty()))) | ||
| .orElse(null); | ||
| } | ||
|
|
||
| protected Optional<MLifeline> getHostLifeline() { | ||
| Optional<Lifeline> lifeline = as(Optional.ofNullable(getHostObject()), Lifeline.class); | ||
| return lifeline.flatMap(getInteraction()::getLifeline); | ||
| } | ||
| } |
Oops, something went wrong.