diff options
Diffstat (limited to 'plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service')
29 files changed, 118 insertions, 100 deletions
diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/command/CombinedFragmentDestroyCommand.java b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/command/CombinedFragmentDestroyCommand.java index 4c92d0572f6..6a6337df6d6 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/command/CombinedFragmentDestroyCommand.java +++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/command/CombinedFragmentDestroyCommand.java @@ -24,6 +24,9 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest; import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
+/**
+ * @since 3.0
+ */
public class CombinedFragmentDestroyCommand extends AbstractTransactionalCommand {
private IElementEditService provider;
diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/command/MoveOperandFragmentsCommand.java b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/command/MoveOperandFragmentsCommand.java index 3a6423e674e..1c6376b4644 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/command/MoveOperandFragmentsCommand.java +++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/command/MoveOperandFragmentsCommand.java @@ -27,6 +27,7 @@ import org.eclipse.uml2.uml.InteractionOperand; /**
* Command to move Operand fragments.
+ * @since 3.0
*/
public class MoveOperandFragmentsCommand extends EditElementCommand {
diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/command/SelectAndDeleteCommand.java b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/command/SelectAndDeleteCommand.java index d9002aace14..4fff26e3b8d 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/command/SelectAndDeleteCommand.java +++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/command/SelectAndDeleteCommand.java @@ -29,6 +29,7 @@ import org.eclipse.ui.PlatformUI; /**
* Select and delete pops up menu command.
+ * @since 3.0
*/
public class SelectAndDeleteCommand extends PopupMenuCommand {
diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/command/SetMessageSort.java b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/command/SetMessageSort.java index c69cd99d2e2..0ede05bd788 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/command/SetMessageSort.java +++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/command/SetMessageSort.java @@ -24,6 +24,7 @@ import org.eclipse.uml2.uml.MessageSort; /**
* {@link EditElementCommand} to set {@link MessageSort}.
+ * @since 3.0
*/
public class SetMessageSort extends EditElementCommand {
diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/BehaviorExecutionSpecificationEditHelper.java b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/BehaviorExecutionSpecificationEditHelper.java index 47b58a9b097..a7c49af0dc3 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/BehaviorExecutionSpecificationEditHelper.java +++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/BehaviorExecutionSpecificationEditHelper.java @@ -13,6 +13,9 @@ package org.eclipse.papyrus.uml.service.types.helper;
+/**
+ * @since 3.0
+ */
public class BehaviorExecutionSpecificationEditHelper extends ExecutionSpecificationEditHelper {
diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/CombinedFragmentEditHelper.java b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/CombinedFragmentEditHelper.java index 1a475663daa..98fdd9dea55 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/CombinedFragmentEditHelper.java +++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/CombinedFragmentEditHelper.java @@ -16,25 +16,17 @@ package org.eclipse.papyrus.uml.service.types.helper; import org.eclipse.core.commands.ExecutionException;
import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.ecore.EObject;
import org.eclipse.gmf.runtime.common.core.command.CommandResult;
import org.eclipse.gmf.runtime.common.core.command.CompositeCommand;
import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.common.core.command.UnexecutableCommand;
import org.eclipse.gmf.runtime.emf.type.core.commands.ConfigureElementCommand;
import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
-import org.eclipse.papyrus.uml.service.types.command.CombinedFragmentDestroyCommand;
-import org.eclipse.papyrus.uml.service.types.command.MoveOperandFragmentsCommand;
-import org.eclipse.papyrus.uml.service.types.command.SelectAndDeleteCommand;
-import org.eclipse.papyrus.uml.service.types.request.MoveOperandFragmentEditRequest;
-import org.eclipse.papyrus.uml.tools.utils.NamedElementUtil;
import org.eclipse.uml2.uml.CombinedFragment;
-import org.eclipse.uml2.uml.InteractionOperand;
-import org.eclipse.uml2.uml.UMLFactory;
+/**
+ * @since 3.0
+ */
public class CombinedFragmentEditHelper extends ElementEditHelper {
/**
@@ -67,34 +59,34 @@ public class CombinedFragmentEditHelper extends ElementEditHelper { @Override
protected ICommand getDestroyElementCommand(DestroyElementRequest req) {
return super.getDestroyElementCommand(req);
-// EObject elementToDestroy = req.getElementToDestroy();
-// if (elementToDestroy instanceof CombinedFragment) {
-// CombinedFragment combinedFragment = (CombinedFragment) elementToDestroy;
-// IElementEditService provider = ElementEditServiceUtils.getCommandProvider(elementToDestroy);
-// if (provider != null) {
-// // Retrieve delete command from the Element Edit service
-// ICommand deleteCommand = super.getDestroyElementCommand(req);
-//// if (deleteCommand != null) {
-//// if (elementToDestroy instanceof CombinedFragment) {
-////
-//// CompositeCommand deleteAll = new CompositeCommand(req.getLabel());
-//// deleteAll.add(deleteCommand);
-//// CompositeCommand deleteCfOnly = new CompositeCommand(req.getLabel());
-////
-//// // remove children from operands and append to parent combined fragment
-//// for (InteractionOperand op : combinedFragment.getOperands()) {
-//// deleteCfOnly.add(new MoveOperandFragmentsCommand(combinedFragment, op, new MoveOperandFragmentEditRequest(req.getEditingDomain(), combinedFragment)));
-//// }
-//// deleteCfOnly.add(new CombinedFragmentDestroyCommand(req.getEditingDomain(), provider, req));
-////
-//// return new SelectAndDeleteCommand(deleteAll, deleteCfOnly, new String[] { "Delete all", "Keep contents" });
-//// } else {
-// return deleteCommand;
-//// }
-//// }
-// }
-// }
-// return UnexecutableCommand.INSTANCE;
+ // EObject elementToDestroy = req.getElementToDestroy();
+ // if (elementToDestroy instanceof CombinedFragment) {
+ // CombinedFragment combinedFragment = (CombinedFragment) elementToDestroy;
+ // IElementEditService provider = ElementEditServiceUtils.getCommandProvider(elementToDestroy);
+ // if (provider != null) {
+ // // Retrieve delete command from the Element Edit service
+ // ICommand deleteCommand = super.getDestroyElementCommand(req);
+ //// if (deleteCommand != null) {
+ //// if (elementToDestroy instanceof CombinedFragment) {
+ ////
+ //// CompositeCommand deleteAll = new CompositeCommand(req.getLabel());
+ //// deleteAll.add(deleteCommand);
+ //// CompositeCommand deleteCfOnly = new CompositeCommand(req.getLabel());
+ ////
+ //// // remove children from operands and append to parent combined fragment
+ //// for (InteractionOperand op : combinedFragment.getOperands()) {
+ //// deleteCfOnly.add(new MoveOperandFragmentsCommand(combinedFragment, op, new MoveOperandFragmentEditRequest(req.getEditingDomain(), combinedFragment)));
+ //// }
+ //// deleteCfOnly.add(new CombinedFragmentDestroyCommand(req.getEditingDomain(), provider, req));
+ ////
+ //// return new SelectAndDeleteCommand(deleteAll, deleteCfOnly, new String[] { "Delete all", "Keep contents" });
+ //// } else {
+ // return deleteCommand;
+ //// }
+ //// }
+ // }
+ // }
+ // return UnexecutableCommand.INSTANCE;
}
diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/ConsiderIgnoreFragmentEditHelper.java b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/ConsiderIgnoreFragmentEditHelper.java index 795e4ddd6db..73ed519aa9a 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/ConsiderIgnoreFragmentEditHelper.java +++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/ConsiderIgnoreFragmentEditHelper.java @@ -24,6 +24,9 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest; import org.eclipse.uml2.uml.ConsiderIgnoreFragment;
import org.eclipse.uml2.uml.InteractionOperatorKind;
+/**
+ * @since 3.0
+ */
public class ConsiderIgnoreFragmentEditHelper extends CombinedFragmentEditHelper {
diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/ExecutionSpecificationEditHelper.java b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/ExecutionSpecificationEditHelper.java index e50f342d91b..6ffe1b6bb2a 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/ExecutionSpecificationEditHelper.java +++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/ExecutionSpecificationEditHelper.java @@ -17,25 +17,16 @@ import java.util.ArrayList; import java.util.Collections;
import java.util.List;
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
import org.eclipse.gmf.runtime.common.core.command.CompositeCommand;
import org.eclipse.gmf.runtime.common.core.command.ICommand;
import org.eclipse.gmf.runtime.common.core.command.UnexecutableCommand;
-import org.eclipse.gmf.runtime.emf.type.core.commands.ConfigureElementCommand;
import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
-import org.eclipse.papyrus.uml.service.types.utils.SequenceRequestConstant;
-import org.eclipse.papyrus.uml.tools.utils.NamedElementUtil;
import org.eclipse.uml2.uml.Element;
-import org.eclipse.uml2.uml.ExecutionOccurrenceSpecification;
import org.eclipse.uml2.uml.ExecutionSpecification;
import org.eclipse.uml2.uml.Interaction;
import org.eclipse.uml2.uml.InteractionFragment;
@@ -44,13 +35,15 @@ import org.eclipse.uml2.uml.Lifeline; import org.eclipse.uml2.uml.Message;
import org.eclipse.uml2.uml.MessageOccurrenceSpecification;
import org.eclipse.uml2.uml.OccurrenceSpecification;
-import org.eclipse.uml2.uml.UMLFactory;
+/**
+ * @since 3.0
+ */
public abstract class ExecutionSpecificationEditHelper extends ElementEditHelper {
-
+
/**
* @see org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper#getDestroyElementCommand(org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest)
diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/InteractionEditHelper.java b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/InteractionEditHelper.java index 621a588c5e8..bd0f006d7a5 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/InteractionEditHelper.java +++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/InteractionEditHelper.java @@ -16,6 +16,9 @@ package org.eclipse.papyrus.uml.service.types.helper; import org.eclipse.gmf.runtime.common.core.command.ICommand;
import org.eclipse.gmf.runtime.emf.type.core.requests.GetEditContextRequest;
+/**
+ * @since 3.0
+ */
public class InteractionEditHelper extends ElementEditHelper {
/**
diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/InteractionOperandEditHelper.java b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/InteractionOperandEditHelper.java index a29abbdacce..263ea538c80 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/InteractionOperandEditHelper.java +++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/InteractionOperandEditHelper.java @@ -21,15 +21,11 @@ import org.eclipse.gmf.runtime.common.core.command.CompositeCommand; import org.eclipse.gmf.runtime.common.core.command.ICommand;
import org.eclipse.gmf.runtime.emf.type.core.commands.ConfigureElementCommand;
import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;
-import org.eclipse.uml2.uml.CombinedFragment;
import org.eclipse.uml2.uml.InteractionConstraint;
import org.eclipse.uml2.uml.InteractionOperand;
/**
- * @author PT202707
- *
+ * @since 3.0
*/
public class InteractionOperandEditHelper extends ElementEditHelper {
@@ -46,7 +42,7 @@ public class InteractionOperandEditHelper extends ElementEditHelper { protected CommandResult doExecuteWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {
InteractionOperand interactionOperand = (InteractionOperand) req.getElementToConfigure();
- InteractionConstraint guard= interactionOperand.createGuard("guard");
+ InteractionConstraint guard = interactionOperand.createGuard("guard");
return CommandResult.newOKCommandResult(interactionOperand);
}
};
diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/LifelineEditHelper.java b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/LifelineEditHelper.java index 0c0b4e7a7a4..3c9dda9d867 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/LifelineEditHelper.java +++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/LifelineEditHelper.java @@ -32,6 +32,9 @@ import org.eclipse.uml2.uml.InteractionOperand; import org.eclipse.uml2.uml.Lifeline;
import org.eclipse.uml2.uml.UMLPackage;
+/**
+ * @since 3.0
+ */
public class LifelineEditHelper extends ElementEditHelper {
/**
diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/AbstractReferenceDeleteRelationshipEditHelperAdvice.java b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/AbstractReferenceDeleteRelationshipEditHelperAdvice.java index 3d8ee57d42f..f55d5282e01 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/AbstractReferenceDeleteRelationshipEditHelperAdvice.java +++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/AbstractReferenceDeleteRelationshipEditHelperAdvice.java @@ -66,6 +66,7 @@ public abstract class AbstractReferenceDeleteRelationshipEditHelperAdvice extend * the visual id * @return * the EReference represented by the view with this visual id + * @since 3.0 */ protected EReference getFeature(String visualId, IClientContext context) { List<IElementType> elementTypes = ElementTypeRegistryUtils.getElementTypesBySemanticHint(visualId, context.getId()); diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/AssociationCompositeDirectedEditHelperAdvice.java b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/AssociationCompositeDirectedEditHelperAdvice.java index 2c8119e2a7d..1eab5948d2e 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/AssociationCompositeDirectedEditHelperAdvice.java +++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/AssociationCompositeDirectedEditHelperAdvice.java @@ -19,6 +19,8 @@ import org.eclipse.uml2.uml.Property; /** * Association Composite Directed edit helper advice. + * + * @since 3.0 */ public class AssociationCompositeDirectedEditHelperAdvice extends AssociationCompositeEditHelperAdvice { diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/AssociationCompositeEditHelperAdvice.java b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/AssociationCompositeEditHelperAdvice.java index c7a5610d7d9..79707ebf3a4 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/AssociationCompositeEditHelperAdvice.java +++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/AssociationCompositeEditHelperAdvice.java @@ -18,6 +18,8 @@ import org.eclipse.uml2.uml.Property; /** * Association Composite edit helper advice. + * + * @since 3.0 */ public class AssociationCompositeEditHelperAdvice extends AssociationEditHelperAdvice { diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/AssociationDirectedEditHelperAdvice.java b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/AssociationDirectedEditHelperAdvice.java index ec3ac20d927..f52c8867f7b 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/AssociationDirectedEditHelperAdvice.java +++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/AssociationDirectedEditHelperAdvice.java @@ -19,6 +19,8 @@ import org.eclipse.uml2.uml.Property; /** * Association Directed edit helper advice. + * + * @since 3.0 */ public class AssociationDirectedEditHelperAdvice extends AssociationEditHelperAdvice { diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/AssociationEditHelperAdvice.java b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/AssociationEditHelperAdvice.java index 5ff532a4722..ca5ff2ed081 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/AssociationEditHelperAdvice.java +++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/AssociationEditHelperAdvice.java @@ -126,6 +126,7 @@ public class AssociationEditHelperAdvice extends AbstractEditHelperAdvice { * * @param sourceProperty * The property to configure. + * @since 3.0 */ protected void configureSourceProperty(Property sourceProperty) { // do nothing @@ -136,6 +137,7 @@ public class AssociationEditHelperAdvice extends AbstractEditHelperAdvice { * * @param targetProperty * The property to configure. + * @since 3.0 */ protected void configureTargetProperty(Property targetProperty) { // do nothing diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/AssociationSharedDirectedEditHelperAdvice.java b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/AssociationSharedDirectedEditHelperAdvice.java index d8dd9258485..9461540f41c 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/AssociationSharedDirectedEditHelperAdvice.java +++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/AssociationSharedDirectedEditHelperAdvice.java @@ -19,6 +19,8 @@ import org.eclipse.uml2.uml.Property; /** * Association Shared Directed edit helper advice. + * + * @since 3.0 */ public class AssociationSharedDirectedEditHelperAdvice extends AssociationSharedEditHelperAdvice { diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/AssociationSharedEditHelperAdvice.java b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/AssociationSharedEditHelperAdvice.java index de546a5498d..88188bc8197 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/AssociationSharedEditHelperAdvice.java +++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/AssociationSharedEditHelperAdvice.java @@ -18,6 +18,8 @@ import org.eclipse.uml2.uml.Property; /** * Association Composite edit helper advice. + * + * @since 3.0 */ public class AssociationSharedEditHelperAdvice extends AssociationEditHelperAdvice { diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/DurationConstraintEditHelperAdvice.java b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/DurationConstraintEditHelperAdvice.java index 150c61b9377..738dd55c6a6 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/DurationConstraintEditHelperAdvice.java +++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/DurationConstraintEditHelperAdvice.java @@ -29,7 +29,7 @@ import org.eclipse.uml2.uml.DurationInterval; import org.eclipse.uml2.uml.UMLFactory;
/**
- * @author Céline JANSSENS
+ * @since 3.0
*
*/
public class DurationConstraintEditHelperAdvice extends AbstractEditHelperAdvice {
diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/ElementHelperAdvice.java b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/ElementHelperAdvice.java index 31d97405fc7..5dad8b9a50c 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/ElementHelperAdvice.java +++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/ElementHelperAdvice.java @@ -20,6 +20,7 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.MoveRequest; * <pre> * This HelperAdvice prohibits the move command of elements into a proxy element. * </pre> + * @since 3.0 */ public class ElementHelperAdvice extends AbstractEditHelperAdvice { diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/ExecutionSpecificationHelperAdvice.java b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/ExecutionSpecificationHelperAdvice.java index ba72f5e13ea..8fa91f44524 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/ExecutionSpecificationHelperAdvice.java +++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/ExecutionSpecificationHelperAdvice.java @@ -26,7 +26,6 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.emf.ecore.EObject;
import org.eclipse.gmf.runtime.common.core.command.CommandResult;
import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.common.core.command.UnexecutableCommand;
import org.eclipse.gmf.runtime.emf.type.core.IElementType;
import org.eclipse.gmf.runtime.emf.type.core.commands.ConfigureElementCommand;
import org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice;
@@ -34,18 +33,14 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest; import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyDependentsRequest;
import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
import org.eclipse.papyrus.uml.diagram.common.helper.InteractionFragmentHelper;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-import org.eclipse.papyrus.uml.service.types.utils.ElementUtil;
import org.eclipse.papyrus.uml.service.types.utils.SequenceRequestConstant;
import org.eclipse.uml2.uml.Association;
-import org.eclipse.uml2.uml.Element;
import org.eclipse.uml2.uml.ExecutionOccurrenceSpecification;
import org.eclipse.uml2.uml.ExecutionSpecification;
import org.eclipse.uml2.uml.Interaction;
import org.eclipse.uml2.uml.InteractionFragment;
import org.eclipse.uml2.uml.Lifeline;
import org.eclipse.uml2.uml.Message;
-import org.eclipse.uml2.uml.MessageEnd;
import org.eclipse.uml2.uml.MessageOccurrenceSpecification;
import org.eclipse.uml2.uml.MessageSort;
import org.eclipse.uml2.uml.OccurrenceSpecification;
@@ -60,13 +55,16 @@ public class ExecutionSpecificationHelperAdvice extends AbstractEditHelperAdvice /**
* Create an execution Occurrence
*
- * @param execution the execution that references the execution occurrences always !=null
- * @param lifeline the lifeLine that is covered by the execution occurrences ,always !=null
+ * @param execution
+ * the execution that references the execution occurrences always !=null
+ * @param lifeline
+ * the lifeLine that is covered by the execution occurrences ,always !=null
+ * @since 3.0
*/
public static ExecutionOccurrenceSpecification createOccurenceSpecification(ExecutionSpecification execution, Lifeline lifeline) {
- ExecutionOccurrenceSpecification occurrenceSpecification=UMLFactory.eINSTANCE.createExecutionOccurrenceSpecification();
+ ExecutionOccurrenceSpecification occurrenceSpecification = UMLFactory.eINSTANCE.createExecutionOccurrenceSpecification();
occurrenceSpecification.setCovered(lifeline);
- ((Interaction)execution.getOwner()).getFragments().add(occurrenceSpecification);
+ ((Interaction) execution.getOwner()).getFragments().add(occurrenceSpecification);
return occurrenceSpecification;
}
@@ -98,29 +96,27 @@ public class ExecutionSpecificationHelperAdvice extends AbstractEditHelperAdvice final ExecutionSpecification execution = (ExecutionSpecification) request.getElementToConfigure();
- Object replaceStart= request.getParameters().get(SequenceRequestConstant.REPLACE_EXECUTION_SPECIFICATION_START);
- if(replaceStart instanceof MessageOccurrenceSpecification ){
- execution.setStart((MessageOccurrenceSpecification)replaceStart);
- }
- else{
- //create Occurrence SpecStart
- ExecutionOccurrenceSpecification start=createOccurenceSpecification(execution, coveredLifeline);
- start.setName(execution.getName()+"Start");
+ Object replaceStart = request.getParameters().get(SequenceRequestConstant.REPLACE_EXECUTION_SPECIFICATION_START);
+ if (replaceStart instanceof MessageOccurrenceSpecification) {
+ execution.setStart((MessageOccurrenceSpecification) replaceStart);
+ } else {
+ // create Occurrence SpecStart
+ ExecutionOccurrenceSpecification start = createOccurenceSpecification(execution, coveredLifeline);
+ start.setName(execution.getName() + "Start");
start.setExecution(execution);
execution.setStart(start);
}
- //add covered for the execution
+ // add covered for the execution
coveredLifeline.getCoveredBys().add(execution);
execution.getCovereds().add(coveredLifeline);
- //create Occurrence SpecFinish
- Object replaceFinish= request.getParameters().get(SequenceRequestConstant.REPLACE_EXECUTION_SPECIFICATION_FINISH);
- if(replaceFinish instanceof MessageOccurrenceSpecification ){
- execution.setFinish((MessageOccurrenceSpecification)replaceFinish);
- }
- else{
- ExecutionOccurrenceSpecification finish=createOccurenceSpecification(execution, coveredLifeline);
- finish.setName(execution.getName()+"Finish");
+ // create Occurrence SpecFinish
+ Object replaceFinish = request.getParameters().get(SequenceRequestConstant.REPLACE_EXECUTION_SPECIFICATION_FINISH);
+ if (replaceFinish instanceof MessageOccurrenceSpecification) {
+ execution.setFinish((MessageOccurrenceSpecification) replaceFinish);
+ } else {
+ ExecutionOccurrenceSpecification finish = createOccurenceSpecification(execution, coveredLifeline);
+ finish.setName(execution.getName() + "Finish");
finish.setExecution(execution);
execution.setFinish(finish);
}
@@ -140,7 +136,7 @@ public class ExecutionSpecificationHelperAdvice extends AbstractEditHelperAdvice * @see org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice#getBeforeDestroyDependentsCommand(org.eclipse.gmf.runtime.emf.type.core.requests.DestroyDependentsRequest)
*
* @param request
- * the request
+ * the request
* @return the command to execute before the edit helper work is done
*/
@Override
@@ -148,16 +144,16 @@ public class ExecutionSpecificationHelperAdvice extends AbstractEditHelperAdvice List<EObject> dependentsToDestroy = new ArrayList<EObject>();
- ExecutionSpecification es = (ExecutionSpecification)request.getElementToDestroy();
+ ExecutionSpecification es = (ExecutionSpecification) request.getElementToDestroy();
// Check whether start - finish referenced OccurrenceSpecification should be added to the dependents list
OccurrenceSpecification osStart = es.getStart();
- if(shouldDestroyOccurrenceSpecification(es, osStart)) {
+ if (shouldDestroyOccurrenceSpecification(es, osStart)) {
dependentsToDestroy.add(osStart);
}
OccurrenceSpecification osFinish = es.getFinish();
- if(shouldDestroyOccurrenceSpecification(es, osFinish)) {
+ if (shouldDestroyOccurrenceSpecification(es, osFinish)) {
dependentsToDestroy.add(osFinish);
}
@@ -165,12 +161,12 @@ public class ExecutionSpecificationHelperAdvice extends AbstractEditHelperAdvice // find initiating MOS of a synch message
InteractionFragment previousIft = InteractionFragmentHelper.findPreviousFragment(osStart, es.getOwner());
- while(previousIft != null) {
+ while (previousIft != null) {
// keep the first ift with the same lifelines, and check it
- if(coveredLifelines.equals(new HashSet<Lifeline>(previousIft.getCovereds()))) {
- if(previousIft instanceof MessageOccurrenceSpecification) {
- Message msg = ((MessageOccurrenceSpecification)previousIft).getMessage();
- if(msg != null && MessageSort.SYNCH_CALL_LITERAL.equals(msg.getMessageSort())) {
+ if (coveredLifelines.equals(new HashSet<Lifeline>(previousIft.getCovereds()))) {
+ if (previousIft instanceof MessageOccurrenceSpecification) {
+ Message msg = ((MessageOccurrenceSpecification) previousIft).getMessage();
+ if (msg != null && MessageSort.SYNCH_CALL_LITERAL.equals(msg.getMessageSort())) {
dependentsToDestroy.add(previousIft);
}
}
@@ -181,9 +177,9 @@ public class ExecutionSpecificationHelperAdvice extends AbstractEditHelperAdvice // find MOS between the start and finish
InteractionFragment fragment = osStart;
- while(fragment != null && !fragment.equals(osFinish)) {
+ while (fragment != null && !fragment.equals(osFinish)) {
// remove MOS if it have the same covered lifelines as the ES
- if(fragment instanceof MessageOccurrenceSpecification && coveredLifelines.equals(new HashSet<Lifeline>(fragment.getCovereds()))) {
+ if (fragment instanceof MessageOccurrenceSpecification && coveredLifelines.equals(new HashSet<Lifeline>(fragment.getCovereds()))) {
dependentsToDestroy.add(fragment);
}
@@ -191,7 +187,7 @@ public class ExecutionSpecificationHelperAdvice extends AbstractEditHelperAdvice }
// return command to destroy dependents
- if(!dependentsToDestroy.isEmpty()) {
+ if (!dependentsToDestroy.isEmpty()) {
return request.getDestroyDependentsCommand(dependentsToDestroy);
}
@@ -209,10 +205,10 @@ public class ExecutionSpecificationHelperAdvice extends AbstractEditHelperAdvice * </pre>
*
* @param es
- * {@link ExecutionSpecification} which references {@link OccurrenceSpecification} (by means of #start/#finish references)
+ * {@link ExecutionSpecification} which references {@link OccurrenceSpecification} (by means of #start/#finish references)
* @param os
- * start or finish {@link OccurrenceSpecification} which defines the duration of {@link ExecutionSpecification}
- * @return true in case {@link OccurrenceSpecification} should be destroyed
+ * start or finish {@link OccurrenceSpecification} which defines the duration of {@link ExecutionSpecification}
+ * @return true in case {@link OccurrenceSpecification} should be destroyed
*/
private boolean shouldDestroyOccurrenceSpecification(ExecutionSpecification es, OccurrenceSpecification os) {
return os instanceof ExecutionOccurrenceSpecification
diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/LifelineHelperAdvice.java b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/LifelineHelperAdvice.java index 8313b1b3463..e93b4e6e1c1 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/LifelineHelperAdvice.java +++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/LifelineHelperAdvice.java @@ -44,7 +44,8 @@ import org.eclipse.uml2.uml.PartDecomposition; public class LifelineHelperAdvice extends AbstractEditHelperAdvice {
- /** A request parameter indicating the connectable element that a lifeline represents. */
+ /** A request parameter indicating the connectable element that a lifeline represents.
+ * @since 3.0*/
public static final String REPRESENTS = "Lifeline::represents"; //$NON-NLS-1$
/**
diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/MessageHelperAdvice.java b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/MessageHelperAdvice.java index f2e1b0e1196..771c13a67d8 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/MessageHelperAdvice.java +++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/MessageHelperAdvice.java @@ -342,6 +342,7 @@ public class MessageHelperAdvice extends AbstractEditHelperAdvice { * @param knownReferencer
* the known referencer
* @return true if the known referencer is the only referencer.
+ * @since 3.0
*/
public static boolean isSharedEvent(MessageEnd usedObject, EObject knownReferencer) {
EPackage mmPackage = usedObject.eClass().getEPackage();
diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/matcher/AssociationMatcher.java b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/matcher/AssociationMatcher.java index 58ba2d6771d..579c82bf073 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/matcher/AssociationMatcher.java +++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/matcher/AssociationMatcher.java @@ -27,6 +27,7 @@ import org.eclipse.uml2.uml.Element; * Existing Associations (created in previous Papyrus version and which have no nature set)
* are treated as UML Associations.
* </pre>
+ * @since 3.0
*/
public class AssociationMatcher implements IElementMatcher {
diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/matcher/RefineMatcher.java b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/matcher/RefineMatcher.java index 9fc19e7d01e..e36aed81f62 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/matcher/RefineMatcher.java +++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/matcher/RefineMatcher.java @@ -17,6 +17,7 @@ import org.eclipse.uml2.uml.util.UMLUtil; /**
* Test if current {@link Abstraction} is a {@link Refine}
+ * @since 3.0
*/
public class RefineMatcher implements IElementMatcher {
diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/matcher/TraceMatcher.java b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/matcher/TraceMatcher.java index bb8b819d572..f9916bc47e3 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/matcher/TraceMatcher.java +++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/matcher/TraceMatcher.java @@ -17,6 +17,7 @@ import org.eclipse.uml2.uml.util.UMLUtil; /**
* Test if current {@link Abstraction} is a {@link Trace}
+ * @since 3.0
*/
public class TraceMatcher implements IElementMatcher {
diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/utils/ElementUtil.java b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/utils/ElementUtil.java index a2807be031b..da0fc650637 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/utils/ElementUtil.java +++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/utils/ElementUtil.java @@ -132,6 +132,7 @@ public class ElementUtil { /** * @return true element is type of type to match + * @since 3.0 */ public static boolean isTypeOf(IElementType element, IElementType typeTomatch) { if (typeTomatch.equals(element)) { diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/utils/MessageUtils.java b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/utils/MessageUtils.java index cd6c0519362..fd87555748c 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/utils/MessageUtils.java +++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/utils/MessageUtils.java @@ -16,7 +16,9 @@ import org.eclipse.emf.ecore.EObject; import org.eclipse.uml2.uml.Message; /** - * Utility class for {@link Message}. + * Utility class for {@link Message}. + * + * @since 3.0 * */ public class MessageUtils { diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/utils/SequenceRequestConstant.java b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/utils/SequenceRequestConstant.java index 92d09d973da..b82602bf8f3 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/utils/SequenceRequestConstant.java +++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/utils/SequenceRequestConstant.java @@ -15,6 +15,7 @@ package org.eclipse.papyrus.uml.service.types.utils; /**
* Constants used in the sequence diagram
+ * @since 3.0
*/
public interface SequenceRequestConstant {
|