diff options
| author | adaussy | 2012-07-03 08:59:49 +0000 |
|---|---|---|
| committer | adaussy | 2012-07-03 08:59:49 +0000 |
| commit | 3a7cb1dabb512b5bd57efd42ff791fb4b9a168c0 (patch) | |
| tree | d730a4a5c8fa2099e0c7f2e1379fd2aa8d4eee65 | |
| parent | 0001e95d616e71411fecf2633d01d50c15923599 (diff) | |
| download | org.eclipse.papyrus-3a7cb1dabb512b5bd57efd42ff791fb4b9a168c0.tar.gz org.eclipse.papyrus-3a7cb1dabb512b5bd57efd42ff791fb4b9a168c0.tar.xz org.eclipse.papyrus-3a7cb1dabb512b5bd57efd42ff791fb4b9a168c0.zip | |
367840: [Formatter] Apply Papyrus Formatter with 0 blank line on generated sources
https://bugs.eclipse.org/bugs/show_bug.cgi?id=367840
115 files changed, 222 insertions, 611 deletions
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/ActivityDiagramCreationCondition.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/ActivityDiagramCreationCondition.java index bad01cc107d..9ffc9dcf2a1 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/ActivityDiagramCreationCondition.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/ActivityDiagramCreationCondition.java @@ -30,5 +30,4 @@ public class ActivityDiagramCreationCondition extends PerspectiveContextDependen }
return false;
}
-
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/CreateActivityDiagramWithNavigationHandler.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/CreateActivityDiagramWithNavigationHandler.java index a640232d035..cc3427c43bb 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/CreateActivityDiagramWithNavigationHandler.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/CreateActivityDiagramWithNavigationHandler.java @@ -20,5 +20,4 @@ public class CreateActivityDiagramWithNavigationHandler extends CreateDiagramWit public CreateActivityDiagramWithNavigationHandler() {
super(new CreateActivityDiagramCommand(), new ActivityDiagramCreationCondition());
}
-
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/UmlActivityDiagramForMultiEditor.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/UmlActivityDiagramForMultiEditor.java index 05d252e9070..f08da7307b1 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/UmlActivityDiagramForMultiEditor.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/UmlActivityDiagramForMultiEditor.java @@ -127,7 +127,6 @@ public class UmlActivityDiagramForMultiEditor extends UMLDiagramEditor { // // return new DiagramGraphicalViewer();
// return new GroupGraphicalViewer();
// }
-
/**
* {@inheritDoc}
*/
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/activitygroup/IContainerNodeDescriptor.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/activitygroup/IContainerNodeDescriptor.java index 0b9e9ba578a..de2762c46b9 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/activitygroup/IContainerNodeDescriptor.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/activitygroup/IContainerNodeDescriptor.java @@ -17,7 +17,6 @@ package org.eclipse.papyrus.uml.diagram.activity.activitygroup; import java.util.List;
import java.util.Map;
-import org.eclipse.draw2d.geometry.Rectangle;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EReference;
import org.eclipse.emf.ecore.EStructuralFeature;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/activitygroup/IGroupRequestAdvisor.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/activitygroup/IGroupRequestAdvisor.java index f9910d801bc..7e7d45282a2 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/activitygroup/IGroupRequestAdvisor.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/activitygroup/IGroupRequestAdvisor.java @@ -31,12 +31,14 @@ public interface IGroupRequestAdvisor { /**
* Remove the listener from the Group framework
+ *
* @param editpolicy
*/
public void removeListenner(IGroupNotifier editpolicy);
/**
* Register into the group framework
+ *
* @param eObject
* @param editpolicy
*/
@@ -44,6 +46,7 @@ public interface IGroupRequestAdvisor { /**
* Notify to the group framework a change (come from a Notifing Edit policy)
+ *
* @param request
* @return
*/
@@ -51,6 +54,7 @@ public interface IGroupRequestAdvisor { /**
* Return all register edit policy
+ *
* @return
*/
public Multimap<EObject, IGroupNotifier> getListenerRegistry();
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/activitygroup/groupcontainment/ActivityContainment.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/activitygroup/groupcontainment/ActivityContainment.java index 3d8dd562e3d..141fd730547 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/activitygroup/groupcontainment/ActivityContainment.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/activitygroup/groupcontainment/ActivityContainment.java @@ -30,14 +30,17 @@ import org.eclipse.uml2.uml.UMLPackage; /**
* Node descriptor for an activity
+ *
* @author adaussy
- *
+ *
*/
public class ActivityContainment extends AbstractContainerNodeDescriptor {
private List<EReference> parentReferences;
- /* (non-Javadoc)
+ /*
+ * (non-Javadoc)
+ *
* @see org.eclipse.papyrus.uml.diagram.activity.activitygroup.AbstractContainerNodeDescriptor#getContainerEClass()
*/
@Override
@@ -45,7 +48,9 @@ public class ActivityContainment extends AbstractContainerNodeDescriptor { return UMLPackage.Literals.ACTIVITY;
}
- /* (non-Javadoc)
+ /*
+ * (non-Javadoc)
+ *
* @see org.eclipse.papyrus.uml.diagram.activity.activitygroup.AbstractContainerNodeDescriptor#getChildrenReferences()
*/
@Override
@@ -58,7 +63,9 @@ public class ActivityContainment extends AbstractContainerNodeDescriptor { return parentReferences;
}
- /* (non-Javadoc)
+ /*
+ * (non-Javadoc)
+ *
* @see org.eclipse.papyrus.uml.diagram.activity.activitygroup.AbstractContainerNodeDescriptor#getParentReferences()
*/
@Override
@@ -66,22 +73,30 @@ public class ActivityContainment extends AbstractContainerNodeDescriptor { return Collections.emptyList();
}
- /* (non-Javadoc)
- * @see org.eclipse.papyrus.uml.diagram.activity.activitygroup.AbstractContainerNodeDescriptor#getCompartmentPartFromView(org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart)
+ /*
+ * (non-Javadoc)
+ *
+ * @see
+ * org.eclipse.papyrus.uml.diagram.activity.activitygroup.AbstractContainerNodeDescriptor#getCompartmentPartFromView(org.eclipse.gmf.runtime.diagram
+ * .ui.editparts.IGraphicalEditPart)
*/
public IGraphicalEditPart getCompartmentPartFromView(IGraphicalEditPart editpart) {
String hint = "" + ActivityActivityContentCompartmentEditPart.VISUAL_ID;
return ((GraphicalEditPart)editpart).getChildBySemanticHintOnPrimaryView(hint);
}
- /* (non-Javadoc)
+ /*
+ * (non-Javadoc)
+ *
* @see org.eclipse.papyrus.uml.diagram.activity.activitygroup.IContainerNodeDescriptor#getGroupPriority()
*/
public int getGroupPriority() {
return IGroupPriority.ACTIVITY_PRIORITY;
}
- /* (non-Javadoc)
+ /*
+ * (non-Javadoc)
+ *
* @see org.eclipse.papyrus.uml.diagram.activity.activitygroup.AbstractContainerNodeDescriptor#getParentEOppositeReferences()
*/
@Override
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/activitygroup/groupcontainment/ActivityNodeContainment.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/activitygroup/groupcontainment/ActivityNodeContainment.java index b7675d44b47..10094d225a1 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/activitygroup/groupcontainment/ActivityNodeContainment.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/activitygroup/groupcontainment/ActivityNodeContainment.java @@ -27,19 +27,21 @@ import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart; import org.eclipse.papyrus.uml.diagram.activity.activitygroup.AbstractContainerNodeDescriptor;
import org.eclipse.uml2.uml.UMLPackage;
-
/**
* Descriptor for an Activity Node
+ *
* @author adaussy
- *
+ *
*/
public class ActivityNodeContainment extends AbstractContainerNodeDescriptor {
private List<EReference> parentReferences;
-
- private Map<EStructuralFeature,EStructuralFeature> parentOpositeReferences;
- /* (non-Javadoc)
+ private Map<EStructuralFeature, EStructuralFeature> parentOpositeReferences;
+
+ /*
+ * (non-Javadoc)
+ *
* @see org.eclipse.papyrus.uml.diagram.activity.activitygroup.AbstractContainerNodeDescriptor#getContainerEClass()
*/
@Override
@@ -47,7 +49,9 @@ public class ActivityNodeContainment extends AbstractContainerNodeDescriptor { return UMLPackage.Literals.ACTIVITY_NODE;
}
- /* (non-Javadoc)
+ /*
+ * (non-Javadoc)
+ *
* @see org.eclipse.papyrus.uml.diagram.activity.activitygroup.AbstractContainerNodeDescriptor#getChildrenReferences()
*/
@Override
@@ -55,13 +59,15 @@ public class ActivityNodeContainment extends AbstractContainerNodeDescriptor { return Collections.emptyList();
}
- /* (non-Javadoc)
+ /*
+ * (non-Javadoc)
+ *
* @see org.eclipse.papyrus.uml.diagram.activity.activitygroup.AbstractContainerNodeDescriptor#getParentReferences()
*/
@Override
public List<EReference> getParentReferences() {
- if (parentReferences == null){
- parentReferences = new ArrayList<EReference>();
+ if(parentReferences == null) {
+ parentReferences = new ArrayList<EReference>();
parentReferences.add(UMLPackage.Literals.ACTIVITY_NODE__IN_INTERRUPTIBLE_REGION);
parentReferences.add(UMLPackage.Literals.ACTIVITY_NODE__IN_PARTITION);
parentReferences.add(UMLPackage.Literals.ACTIVITY_NODE__IN_STRUCTURED_NODE);
@@ -69,39 +75,42 @@ public class ActivityNodeContainment extends AbstractContainerNodeDescriptor { }
return parentReferences;
}
-
-
- /* (non-Javadoc)
+
+ /*
+ * (non-Javadoc)
+ *
* @see org.eclipse.papyrus.uml.diagram.activity.activitygroup.AbstractContainerNodeDescriptor#getParentEOppositeReferences()
*/
@Override
public Map<EStructuralFeature, EStructuralFeature> getParentEOppositeReferences() {
- if (parentOpositeReferences == null){
+ if(parentOpositeReferences == null) {
parentOpositeReferences = new HashMap<EStructuralFeature, EStructuralFeature>();
parentOpositeReferences.put(UMLPackage.Literals.ACTIVITY_NODE__IN_INTERRUPTIBLE_REGION, UMLPackage.Literals.INTERRUPTIBLE_ACTIVITY_REGION__NODE);
- parentOpositeReferences.put(UMLPackage.Literals.ACTIVITY_NODE__IN_PARTITION,UMLPackage.Literals.ACTIVITY_PARTITION__NODE);
- parentOpositeReferences.put(UMLPackage.Literals.ACTIVITY_NODE__IN_STRUCTURED_NODE,UMLPackage.Literals.STRUCTURED_ACTIVITY_NODE__NODE);
- parentOpositeReferences.put(UMLPackage.Literals.ACTIVITY_NODE__ACTIVITY,UMLPackage.Literals.ACTIVITY__OWNED_NODE);
+ parentOpositeReferences.put(UMLPackage.Literals.ACTIVITY_NODE__IN_PARTITION, UMLPackage.Literals.ACTIVITY_PARTITION__NODE);
+ parentOpositeReferences.put(UMLPackage.Literals.ACTIVITY_NODE__IN_STRUCTURED_NODE, UMLPackage.Literals.STRUCTURED_ACTIVITY_NODE__NODE);
+ parentOpositeReferences.put(UMLPackage.Literals.ACTIVITY_NODE__ACTIVITY, UMLPackage.Literals.ACTIVITY__OWNED_NODE);
}
return parentOpositeReferences;
}
- /* (non-Javadoc)
- * @see org.eclipse.papyrus.uml.diagram.activity.activitygroup.AbstractContainerNodeDescriptor#getCompartmentPartFromView(org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart)
+ /*
+ * (non-Javadoc)
+ *
+ * @see
+ * org.eclipse.papyrus.uml.diagram.activity.activitygroup.AbstractContainerNodeDescriptor#getCompartmentPartFromView(org.eclipse.gmf.runtime.diagram
+ * .ui.editparts.IGraphicalEditPart)
*/
@Override
public IGraphicalEditPart getCompartmentPartFromView(IGraphicalEditPart editpart) {
return null;//no compartment for activity node
}
- /* (non-Javadoc)
+ /*
+ * (non-Javadoc)
+ *
* @see org.eclipse.papyrus.uml.diagram.activity.activitygroup.IContainerNodeDescriptor#getGroupPriority()
*/
public int getGroupPriority() {
return IGroupPriority.ACTIVITY_NODE_PRIORITY;
}
-
-
-
-
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/commands/DeferredSetValueCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/commands/DeferredSetValueCommand.java index fa0f6aef335..3f4184cf1ae 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/commands/DeferredSetValueCommand.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/commands/DeferredSetValueCommand.java @@ -17,13 +17,11 @@ package org.eclipse.papyrus.uml.diagram.activity.commands; import org.eclipse.emf.ecore.EObject;
import org.eclipse.papyrus.uml.diagram.activity.activitygroup.request.SetDeferredRequest;
-
public class DeferredSetValueCommand extends org.eclipse.gmf.runtime.emf.type.core.commands.DeferredSetValueCommand {
protected SetDeferredRequest request;
-
+
protected EObject elementToEdit;
-
public DeferredSetValueCommand(SetDeferredRequest request) {
super(request);
@@ -32,15 +30,12 @@ public class DeferredSetValueCommand extends org.eclipse.gmf.runtime.emf.type.co @Override
protected EObject getElementToEdit() {
- if (elementToEdit == null){
+ if(elementToEdit == null) {
Object adapter = request.getElementToSet().getAdapter(EObject.class);
- if (adapter instanceof EObject){
+ if(adapter instanceof EObject) {
elementToEdit = (EObject)adapter;
}
}
return elementToEdit;
}
-
-
-
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/draw2d/CenteredColumnConstraint.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/draw2d/CenteredColumnConstraint.java index 3a1de94fb85..2ccdf31d628 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/draw2d/CenteredColumnConstraint.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/draw2d/CenteredColumnConstraint.java @@ -34,5 +34,4 @@ public class CenteredColumnConstraint { public boolean isAvailableSpaceFilled() {
return fill;
}
-
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/draw2d/CenteredColumnLayout.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/draw2d/CenteredColumnLayout.java index 2c6284252e9..66e9875ea33 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/draw2d/CenteredColumnLayout.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/draw2d/CenteredColumnLayout.java @@ -113,7 +113,6 @@ public class CenteredColumnLayout extends StackLayout { d.width = Math.max(d.width, childSize.width);
}
}
-
d.expand(figure.getInsets().getWidth(), figure.getInsets().getHeight());
d.union(getBorderPreferredSize(figure));
return d;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/draw2d/FlowLayoutAdvanced.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/draw2d/FlowLayoutAdvanced.java index 706b8565e03..0be13444026 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/draw2d/FlowLayoutAdvanced.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/draw2d/FlowLayoutAdvanced.java @@ -62,14 +62,12 @@ public class FlowLayoutAdvanced extends FlowLayout { bounds.setSize(bounds.getSize().getCopy().width, getAvailableSpaceForFilledElement(child, Rectangle.SINGLETON.getSize().getCopy()).getCopy().height);
} else {
bounds.setSize(getAvailableSpaceForFilledElement(child, Rectangle.SINGLETON.getSize().getCopy()).getCopy().width, bounds.getSize().getCopy().height);
-
}
}
if(constraint.isFull()) {
bounds.setSize(Rectangle.SINGLETON.getSize().getCopy());
bounds.setLocation(Rectangle.SINGLETON.getLocation().getCopy());
}
-
}
}
child.setBounds(bounds);
@@ -99,7 +97,6 @@ public class FlowLayoutAdvanced extends FlowLayout { // externalize
}
int numberOfFilledElement = 0;
-
for(Object _child : children) {
if(_child instanceof IFigure) {
IFigure child = (IFigure)_child;
@@ -149,7 +146,6 @@ public class FlowLayoutAdvanced extends FlowLayout { minDim = Dimension.min(minDim, figure.getMinimumSize());
}
}
-
}
}
if(minDim == null) {
@@ -157,5 +153,4 @@ public class FlowLayoutAdvanced extends FlowLayout { }
return minDim;
}
-
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/draw2d/FlowLayoutAdvancedConstraint.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/draw2d/FlowLayoutAdvancedConstraint.java index b93dbc482fa..bec6d44b6de 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/draw2d/FlowLayoutAdvancedConstraint.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/draw2d/FlowLayoutAdvancedConstraint.java @@ -108,5 +108,4 @@ public class FlowLayoutAdvancedConstraint { public void setHasMinsize(boolean hasMinsize) {
this.hasMinsize = hasMinsize;
}
-
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/draw2d/GravityConstrainedFlowLayoutConstraint.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/draw2d/GravityConstrainedFlowLayoutConstraint.java index 425638566a1..fef6731fa8f 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/draw2d/GravityConstrainedFlowLayoutConstraint.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/draw2d/GravityConstrainedFlowLayoutConstraint.java @@ -36,5 +36,4 @@ public class GravityConstrainedFlowLayoutConstraint { public void setAlign(int align) {
this.align = align;
}
-
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/draw2d/StructuredActivityNodeFigure.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/draw2d/StructuredActivityNodeFigure.java index 56b80d87587..a2bb2102131 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/draw2d/StructuredActivityNodeFigure.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/draw2d/StructuredActivityNodeFigure.java @@ -11,7 +11,6 @@ * Atos Origin - Initial API and implementation
*
*****************************************************************************/
-
package org.eclipse.papyrus.uml.diagram.activity.draw2d;
import org.eclipse.draw2d.Border;
@@ -33,10 +32,12 @@ import org.eclipse.papyrus.uml.diagram.activity.preferences.IActivityPreferenceC import org.eclipse.papyrus.uml.diagram.common.draw2d.RoundedRectangleDashedBorder;
import org.eclipse.papyrus.uml.diagram.common.figure.node.PapyrusRoundedNodeFigure;
import org.eclipse.swt.graphics.Color;
+
/**
* Figure for structured activity node and its derived element
+ *
* @author arthur daussy
- *
+ *
*/
public class StructuredActivityNodeFigure extends PapyrusRoundedNodeFigure {
@@ -60,7 +61,6 @@ public class StructuredActivityNodeFigure extends PapyrusRoundedNodeFigure { */
protected IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();
-
/**
* Constructor
*/
@@ -79,6 +79,7 @@ public class StructuredActivityNodeFigure extends PapyrusRoundedNodeFigure { /**
* Custom border (Used to avoid the alpha setting affect the border)
+ *
* @return
*/
private org.eclipse.draw2d.LineBorder createBorder0() {
@@ -133,7 +134,6 @@ public class StructuredActivityNodeFigure extends PapyrusRoundedNodeFigure { return constraintFKeyword;
}
-
@Override
protected IFigure getDefaultLabelsContainer() {
if(fFigureCompartmentLabelStructuredActivityNode == null) {
@@ -159,16 +159,15 @@ public class StructuredActivityNodeFigure extends PapyrusRoundedNodeFigure { @Override
public void paintFigure(Graphics graphics) {
int transparency = getTransparency();
- if (transparency == 0){
- transparency = UMLDiagramEditorPlugin.getInstance().getPreferenceStore().getInt(IActivityPreferenceConstants.PREF_STRUCTURED_NODE_ALPHA);
+ if(transparency == 0) {
+ transparency = UMLDiagramEditorPlugin.getInstance().getPreferenceStore().getInt(IActivityPreferenceConstants.PREF_STRUCTURED_NODE_ALPHA);
} else {
- transparency = 100 - getTransparency();
+ transparency = 100 - getTransparency();
}
graphics.setAlpha(transparency);
super.paintFigure(graphics);
}
-
/**
* Compartment for activity node
*/
@@ -178,10 +177,10 @@ public class StructuredActivityNodeFigure extends PapyrusRoundedNodeFigure { /**
* Get the keywork compartment
+ *
* @return
*/
public WrappingLabel getKeyword() {
return getNameLabel();
}
-
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/actions/RestoreRelatedLinksAction.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/actions/RestoreRelatedLinksAction.java index 061b3f2bbc1..0bfef79c8b2 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/actions/RestoreRelatedLinksAction.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/actions/RestoreRelatedLinksAction.java @@ -64,20 +64,16 @@ public class RestoreRelatedLinksAction extends AbstractAction { @Override public void run() { List<View> selection = getSelection(); - if(selection.isEmpty()) { return; } - if(false == getHost() instanceof DiagramEditPart) { return; } DiagramEditPart diagramEditPart = (DiagramEditPart)getHost(); - final DiagramCommandStack commandStack = getHost().getDiagramEditDomain().getDiagramCommandStack(); CompoundCommand cmd = new CompoundCommand("Restore Related Links"); cmd.add(new ICommandProxy(new RestoreRelatedLinksCommand(diagramEditPart, selection))); commandStack.execute(cmd, new NullProgressMonitor()); } - } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/commands/util/CreateCommandUtil.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/commands/util/CreateCommandUtil.java index 22ecc8b6d28..35ce1325835 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/commands/util/CreateCommandUtil.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/commands/util/CreateCommandUtil.java @@ -81,7 +81,6 @@ public class CreateCommandUtil { * @return false if command must be cancelled
*/
public static boolean setNodeParents(ActivityNode newElement, IEditCommandRequest request, EObject elementToEdit) {
-
// simply take the command edited element
EObject owner = elementToEdit;
// create in appropriate model container
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/dialogs/ConfirmActivityParameterNodeAndParameterSyncDialog.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/dialogs/ConfirmActivityParameterNodeAndParameterSyncDialog.java index e9daa65fae0..ac1b17618aa 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/dialogs/ConfirmActivityParameterNodeAndParameterSyncDialog.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/dialogs/ConfirmActivityParameterNodeAndParameterSyncDialog.java @@ -103,5 +103,4 @@ public class ConfirmActivityParameterNodeAndParameterSyncDialog extends MessageD });
return checkBox;
}
-
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/dialogs/ConfirmPinAndParameterSyncDialog.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/dialogs/ConfirmPinAndParameterSyncDialog.java index 9e27aa3e41e..9c1b6ec0f5b 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/dialogs/ConfirmPinAndParameterSyncDialog.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/dialogs/ConfirmPinAndParameterSyncDialog.java @@ -106,5 +106,4 @@ public class ConfirmPinAndParameterSyncDialog extends MessageDialog { });
return checkBox;
}
-
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/dialogs/CreateActivityParameterNodeDialog.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/dialogs/CreateActivityParameterNodeDialog.java index f4dceb8dd59..fcd5150caee 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/dialogs/CreateActivityParameterNodeDialog.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/dialogs/CreateActivityParameterNodeDialog.java @@ -134,16 +134,13 @@ public class CreateActivityParameterNodeDialog extends FormDialog { FormToolkit toolkit = pForm.getToolkit();
Composite parent = scrolledForm.getBody();
parent.setLayout(new GridLayout());
-
createInvocationCreationSection(scrolledForm.getBody(), toolkit);
createInvocationSelectionSection(scrolledForm.getBody(), toolkit);
-
refreshSectionsEnable(false);
hookListeners();
// invoked name is set after listeners, since we count on listener to
// update it properly
setInvokedName(null);
-
scrolledForm.reflow(true);
}
@@ -177,20 +174,16 @@ public class CreateActivityParameterNodeDialog extends FormDialog { }
ImageHyperlink componentHelp = HelpComponentFactory.createHelpComponent(lSection, pToolkit, Messages.CreateActivityParameterNodeDialog_ParameterSelectionHelp);
lSection.setTextClient(componentHelp);
-
ScrolledForm lInsideScrolledForm = pToolkit.createScrolledForm(lSection);
lInsideScrolledForm.setExpandHorizontal(true);
lInsideScrolledForm.setExpandVertical(true);
Composite lBody = lInsideScrolledForm.getBody();
-
GridLayout lLayout = new GridLayout();
lLayout.numColumns = 3;
lBody.setLayout(lLayout);
-
// content of the section
selectionRadio = pToolkit.createButton(lBody, Messages.CreateActivityParameterNodeDialog_ParameterSelectionLabel, SWT.RADIO);
selectionRadio.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 3, 1));
-
// manage parameter selection
pToolkit.createLabel(lBody, getParameterFeature().getEReferenceType().getName() + ":", SWT.NONE);
selectionText = pToolkit.createText(lBody, "", SWT.BORDER | SWT.READ_ONLY);
@@ -199,7 +192,6 @@ public class CreateActivityParameterNodeDialog extends FormDialog { Image image = UMLElementTypes.getImage(getParameterFeature());
selectionButton.setImage(image);
selectionButton.setLayoutData(new GridData(SWT.NONE));
-
lInsideScrolledForm.reflow(true);
lSection.setClient(lInsideScrolledForm);
}
@@ -222,25 +214,20 @@ public class CreateActivityParameterNodeDialog extends FormDialog { }
ImageHyperlink componentHelp = HelpComponentFactory.createHelpComponent(lSection, pToolkit, Messages.CreateActivityParameterNodeDialog_ParameterCreationHelp);
lSection.setTextClient(componentHelp);
-
ScrolledForm lInsideScrolledForm = pToolkit.createScrolledForm(lSection);
lInsideScrolledForm.setExpandHorizontal(true);
lInsideScrolledForm.setExpandVertical(true);
Composite lBody = lInsideScrolledForm.getBody();
-
GridLayout lLayout = new GridLayout();
lLayout.numColumns = 3;
lBody.setLayout(lLayout);
-
// content of the section
creationRadio = pToolkit.createButton(lBody, Messages.CreateActivityParameterNodeDialog_ParameterCreationLabel, SWT.RADIO);
creationRadio.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 3, 1));
-
pToolkit.createLabel(lBody, Messages.CreateActivityParameterNodeDialog_NameLabel, SWT.NONE);
creationNameText = pToolkit.createText(lBody, "", SWT.BORDER);
creationNameText.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 2, 1));
creationNameText.setFocus();
-
// manage type selection
pToolkit.createLabel(lBody, Messages.CreateActivityParameterNodeDialog_TypeLabel, SWT.NONE);
creationTypeText = pToolkit.createText(lBody, labelProvider.getText(selectedType), SWT.BORDER | SWT.READ_ONLY);
@@ -249,7 +236,6 @@ public class CreateActivityParameterNodeDialog extends FormDialog { Image image = UMLElementTypes.getImage(UMLPackage.eINSTANCE.getPackage_PackagedElement());
creationTypeButton.setImage(image);
creationTypeButton.setLayoutData(new GridData(SWT.NONE));
-
// manage direction selection
pToolkit.createLabel(lBody, Messages.CreateActivityParameterNodeDialog_DirectionLabel, SWT.NONE);
creationDirectionCombo = new Combo(lBody, SWT.DROP_DOWN | SWT.READ_ONLY);
@@ -261,7 +247,6 @@ public class CreateActivityParameterNodeDialog extends FormDialog { // initialize selection
directionComboViewer.setSelection(new StructuredSelection(getDirections()[0]));
selectedDirection = ParameterDirectionKind.getByName(getDirections()[0]);
-
lInsideScrolledForm.reflow(true);
lSection.setClient(lInsideScrolledForm);
}
@@ -318,7 +303,6 @@ public class CreateActivityParameterNodeDialog extends FormDialog { };
selectionRadio.addSelectionListener(selectCreateListener);
creationRadio.addSelectionListener(selectCreateListener);
-
// listener to select existing element
SelectionListener selectBtnListener = new SelectionAdapter() {
@@ -332,7 +316,6 @@ public class CreateActivityParameterNodeDialog extends FormDialog { }
};
selectionButton.addSelectionListener(selectBtnListener);
-
if(creationDirectionCombo != null && directionComboViewer != null) {
// listener to select direction
ModifyListener lTypeListener = new ModifyListener() {
@@ -355,7 +338,6 @@ public class CreateActivityParameterNodeDialog extends FormDialog { };
creationDirectionCombo.addModifyListener(lTypeListener);
}
-
// listener to element name
ModifyListener lNameListener = new ModifyListener() {
@@ -367,7 +349,6 @@ public class CreateActivityParameterNodeDialog extends FormDialog { }
};
creationNameText.addModifyListener(lNameListener);
-
// listener to select new element type
SelectionListener selectTypeBtnListener = new SelectionAdapter() {
@@ -581,5 +562,4 @@ public class CreateActivityParameterNodeDialog extends FormDialog { }
return ret;
}
-
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/dialogs/CreateAttributeDialog.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/dialogs/CreateAttributeDialog.java index 27f84da8eba..6752d682672 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/dialogs/CreateAttributeDialog.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/dialogs/CreateAttributeDialog.java @@ -120,14 +120,11 @@ public class CreateAttributeDialog extends FormDialog { FormToolkit toolkit = pForm.getToolkit();
Composite parent = scrolledForm.getBody();
parent.setLayout(new GridLayout());
-
createAttributeSection(scrolledForm.getBody(), toolkit);
-
hookListeners();
// invoked name is set after listeners, since we count on listener to
// update it properly
setInvokedName(null);
-
scrolledForm.reflow(true);
}
@@ -159,16 +156,13 @@ public class CreateAttributeDialog extends FormDialog { if(lSectionTitle != null) {
lSection.setText(lSectionTitle);
}
-
ScrolledForm lInsideScrolledForm = pToolkit.createScrolledForm(lSection);
lInsideScrolledForm.setExpandHorizontal(true);
lInsideScrolledForm.setExpandVertical(true);
Composite lBody = lInsideScrolledForm.getBody();
-
GridLayout lLayout = new GridLayout();
lLayout.numColumns = 3;
lBody.setLayout(lLayout);
-
// content of the section
// eclass
pToolkit.createLabel(lBody, getEClassLabel(), SWT.NONE);
@@ -183,13 +177,11 @@ public class CreateAttributeDialog extends FormDialog { eClassComboViewer.setSelection(new StructuredSelection(getPossibleAttributes()[0]));
selectedEClass = getPossibleAttributes()[0];
}
-
// name
pToolkit.createLabel(lBody, getNameLabel(), SWT.NONE);
creationNameText = pToolkit.createText(lBody, "", SWT.BORDER);
creationNameText.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 2, 1));
creationNameText.setFocus();
-
// manage type selection
pToolkit.createLabel(lBody, getTypeLabel(), SWT.NONE);
creationTypeText = pToolkit.createText(lBody, labelProvider.getText(selectedType), SWT.BORDER | SWT.READ_ONLY);
@@ -198,7 +190,6 @@ public class CreateAttributeDialog extends FormDialog { Image image = getTypeImage();
creationTypeButton.setImage(image);
creationTypeButton.setLayoutData(new GridData(SWT.NONE));
-
lInsideScrolledForm.reflow(true);
lSection.setClient(lInsideScrolledForm);
}
@@ -257,7 +248,6 @@ public class CreateAttributeDialog extends FormDialog { };
creationEClassCombo.addModifyListener(lTypeListener);
}
-
// listener to invocation element name
ModifyListener lNameListener = new ModifyListener() {
@@ -269,7 +259,6 @@ public class CreateAttributeDialog extends FormDialog { }
};
creationNameText.addModifyListener(lNameListener);
-
// listener to select new element parent
SelectionListener selectParentBtnListener = new SelectionAdapter() {
@@ -440,5 +429,4 @@ public class CreateAttributeDialog extends FormDialog { private String getTypeLabel() {
return Messages.CreateAttributeDialog_TypeLabel;
}
-
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/dialogs/CreateCallActionDialog.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/dialogs/CreateCallActionDialog.java index f3efc984166..50aa63a5a18 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/dialogs/CreateCallActionDialog.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/dialogs/CreateCallActionDialog.java @@ -108,20 +108,16 @@ public abstract class CreateCallActionDialog extends CreateInvocationActionDialo }
ImageHyperlink componentHelp = HelpComponentFactory.createHelpComponent(lSection, pToolkit, Messages.CreateCallActionDialog_IsSynchronousHelp, true);
lSection.setTextClient(componentHelp);
-
ScrolledForm lInsideScrolledForm = pToolkit.createScrolledForm(lSection);
lInsideScrolledForm.setExpandHorizontal(true);
lInsideScrolledForm.setExpandVertical(true);
Composite lBody = lInsideScrolledForm.getBody();
-
GridLayout lLayout = new GridLayout();
lLayout.numColumns = 1;
lBody.setLayout(lLayout);
-
// content of the section
isSynchronousButton = pToolkit.createButton(lBody, Messages.CreateCallActionDialog_IsSynchronous, SWT.CHECK | SWT.WRAP);
isSynchronousButton.setSelection(true);
-
lInsideScrolledForm.reflow(true);
lSection.setClient(lInsideScrolledForm);
}
@@ -181,5 +177,4 @@ public abstract class CreateCallActionDialog extends CreateInvocationActionDialo protected String getIsSynchronousSectionTitle() {
return Messages.CreateCallActionDialog_IsSynchronousTitle;
}
-
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/dialogs/CreateCallBehaviorActionDialog.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/dialogs/CreateCallBehaviorActionDialog.java index a9e22586c22..5f92e2c4ca8 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/dialogs/CreateCallBehaviorActionDialog.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/dialogs/CreateCallBehaviorActionDialog.java @@ -191,5 +191,4 @@ public class CreateCallBehaviorActionDialog extends CreateCallActionDialog { protected Image getParentImage() {
return UMLElementTypes.getImage(UMLPackage.eINSTANCE.getPackage());
}
-
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/dialogs/CreateCallOperationActionDialog.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/dialogs/CreateCallOperationActionDialog.java index 21efc61cda8..b9b83ee1154 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/dialogs/CreateCallOperationActionDialog.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/dialogs/CreateCallOperationActionDialog.java @@ -190,5 +190,4 @@ public class CreateCallOperationActionDialog extends CreateCallActionDialog { protected Image getParentImage() {
return UMLElementTypes.getImage(UMLPackage.eINSTANCE.getClass_());
}
-
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/dialogs/CreateInvocationActionDialog.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/dialogs/CreateInvocationActionDialog.java index 8181be34219..baa78b10ce2 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/dialogs/CreateInvocationActionDialog.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/dialogs/CreateInvocationActionDialog.java @@ -32,15 +32,12 @@ import org.eclipse.jface.viewers.ComboViewer; import org.eclipse.jface.viewers.ILabelProvider;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.window.Window;
import org.eclipse.papyrus.infra.core.utils.EditorUtils;
-import org.eclipse.papyrus.infra.widgets.editors.TreeSelectorDialog;
import org.eclipse.papyrus.uml.diagram.activity.part.Messages;
import org.eclipse.papyrus.uml.diagram.activity.part.UMLDiagramEditorPlugin;
import org.eclipse.papyrus.uml.diagram.activity.providers.UMLElementTypes;
import org.eclipse.papyrus.uml.diagram.common.actions.LabelHelper;
import org.eclipse.papyrus.uml.diagram.common.ui.helper.HelpComponentFactory;
-import org.eclipse.papyrus.uml.tools.providers.UMLContentProvider;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.ModifyEvent;
import org.eclipse.swt.events.ModifyListener;
@@ -54,7 +51,6 @@ import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Combo;
import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.swt.widgets.Text;
import org.eclipse.ui.forms.FormDialog;
@@ -169,17 +165,14 @@ public abstract class CreateInvocationActionDialog extends FormDialog { FormToolkit toolkit = pForm.getToolkit();
Composite parent = scrolledForm.getBody();
parent.setLayout(new GridLayout());
-
createInvocationCreationSection(scrolledForm.getBody(), toolkit);
createInvocationSelectionSection(scrolledForm.getBody(), toolkit);
createExtraSections(scrolledForm.getBody(), toolkit);
-
refreshSectionsEnable(isSelectionDefault());
hookListeners();
// invoked name is set after listeners, since we count on listener to
// update it properly
setInvokedName(null);
-
scrolledForm.reflow(true);
}
@@ -249,21 +242,17 @@ public abstract class CreateInvocationActionDialog extends FormDialog { if(lSectionTitle != null) {
lSection.setText(lSectionTitle);
}
-
ScrolledForm lInsideScrolledForm = pToolkit.createScrolledForm(lSection);
lInsideScrolledForm.setExpandHorizontal(true);
lInsideScrolledForm.setExpandVertical(true);
Composite lBody = lInsideScrolledForm.getBody();
-
GridLayout lLayout = new GridLayout();
lLayout.numColumns = 3;
lBody.setLayout(lLayout);
-
// content of the section
selectionRadio = pToolkit.createButton(lBody, getSelectionLabel(), SWT.RADIO);
// selectionRadio.setSelection(false);
selectionRadio.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 3, 1));
-
pToolkit.createLabel(lBody, getInvokedObjectLabel(), SWT.NONE);
selectionText = pToolkit.createText(lBody, "", SWT.BORDER | SWT.READ_ONLY);
selectionText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
@@ -271,7 +260,6 @@ public abstract class CreateInvocationActionDialog extends FormDialog { Image image = UMLElementTypes.getImage(getInvocationFeature());
selectionButton.setImage(image);
selectionButton.setLayoutData(new GridData(SWT.NONE));
-
lInsideScrolledForm.reflow(true);
lSection.setClient(lInsideScrolledForm);
}
@@ -295,21 +283,17 @@ public abstract class CreateInvocationActionDialog extends FormDialog { }
ImageHyperlink componentHelp = HelpComponentFactory.createHelpComponent(lSection, pToolkit, getInvocationCreationSectionHelp(), true);
lSection.setTextClient(componentHelp);
-
ScrolledForm lInsideScrolledForm = pToolkit.createScrolledForm(lSection);
lInsideScrolledForm.setExpandHorizontal(true);
lInsideScrolledForm.setExpandVertical(true);
Composite lBody = lInsideScrolledForm.getBody();
-
GridLayout lLayout = new GridLayout();
lLayout.numColumns = 3;
lBody.setLayout(lLayout);
-
// content of the section
creationRadio = pToolkit.createButton(lBody, getCreationLabel(), SWT.RADIO);
// creationRadio.setSelection(true);
creationRadio.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 3, 1));
-
if(getPossibleInvokedTypes().length == 1) {
selectedType = getPossibleInvokedTypes()[0];
} else {
@@ -326,12 +310,10 @@ public abstract class CreateInvocationActionDialog extends FormDialog { selectedType = getPossibleInvokedTypes()[0];
}
}
-
pToolkit.createLabel(lBody, getInvokedNameLabel(), SWT.NONE);
creationNameText = pToolkit.createText(lBody, "", SWT.BORDER);
creationNameText.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 2, 1));
creationNameText.setFocus();
-
pToolkit.createLabel(lBody, getInvokedParentLabel(), SWT.NONE);
creationParentText = pToolkit.createText(lBody, labelProvider.getText(selectedParent), SWT.BORDER | SWT.READ_ONLY);
creationParentText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
@@ -339,7 +321,6 @@ public abstract class CreateInvocationActionDialog extends FormDialog { Image image = getParentImage();
creationParentButton.setImage(image);
creationParentButton.setLayoutData(new GridData(SWT.NONE));
-
lInsideScrolledForm.reflow(true);
lSection.setClient(lInsideScrolledForm);
}
@@ -407,7 +388,6 @@ public abstract class CreateInvocationActionDialog extends FormDialog { };
selectionRadio.addSelectionListener(selectCreateListener);
creationRadio.addSelectionListener(selectCreateListener);
-
// listener to select existing element
SelectionListener selectBtnListener = new SelectionAdapter() {
@@ -421,7 +401,6 @@ public abstract class CreateInvocationActionDialog extends FormDialog { }
};
selectionButton.addSelectionListener(selectBtnListener);
-
if(creationTypeCombo != null && typeComboViewer != null) {
// listener to select invocation type
ModifyListener lTypeListener = new ModifyListener() {
@@ -446,7 +425,6 @@ public abstract class CreateInvocationActionDialog extends FormDialog { };
creationTypeCombo.addModifyListener(lTypeListener);
}
-
// listener to invocation element name
ModifyListener lNameListener = new ModifyListener() {
@@ -458,7 +436,6 @@ public abstract class CreateInvocationActionDialog extends FormDialog { }
};
creationNameText.addModifyListener(lNameListener);
-
// listener to select new element parent
SelectionListener selectParentBtnListener = new SelectionAdapter() {
@@ -511,14 +488,14 @@ public abstract class CreateInvocationActionDialog extends FormDialog { /*
* TODO BACKPORT
*/
-// TreeSelectorDialog dialog = new TreeSelectorDialog(Display.getDefault().getActiveShell());
-// dialog.setContentProvider(new UMLContentProvider(actionParent, feature))
-// UMLMultiEClassifierTreeSelectorDialog dialog = new UMLMultiEClassifierTreeSelectorDialog(getShell(), actionParent, Collections.singleton(getInvocationFeature().getEType()));
-// dialog.setMessage(Messages.UMLModelingAssistantProviderMessage);
-// dialog.setTitle(Messages.UMLModelingAssistantProviderTitle);
-// if(dialog.open() == Window.OK) {
-// setInvokedSelection((EObject)dialog.getTheResult());
-// }
+ // TreeSelectorDialog dialog = new TreeSelectorDialog(Display.getDefault().getActiveShell());
+ // dialog.setContentProvider(new UMLContentProvider(actionParent, feature))
+ // UMLMultiEClassifierTreeSelectorDialog dialog = new UMLMultiEClassifierTreeSelectorDialog(getShell(), actionParent, Collections.singleton(getInvocationFeature().getEType()));
+ // dialog.setMessage(Messages.UMLModelingAssistantProviderMessage);
+ // dialog.setTitle(Messages.UMLModelingAssistantProviderTitle);
+ // if(dialog.open() == Window.OK) {
+ // setInvokedSelection((EObject)dialog.getTheResult());
+ // }
}
/**
@@ -545,12 +522,12 @@ public abstract class CreateInvocationActionDialog extends FormDialog { /*
* TODO BACKPORT
*/
-// UMLMultiEClassifierTreeSelectorDialog dialog = new UMLMultiEClassifierTreeSelectorDialog(getShell(), actionParent, getPossibleInvokedParents(actionParent),true);
-// dialog.setMessage(Messages.UMLModelingAssistantProviderMessage);
-// dialog.setTitle(Messages.UMLModelingAssistantProviderTitle);
-// if(dialog.open() == Window.OK) {
-// setInvokedParent((EObject)dialog.getTheResult());
-// }
+ // UMLMultiEClassifierTreeSelectorDialog dialog = new UMLMultiEClassifierTreeSelectorDialog(getShell(), actionParent, getPossibleInvokedParents(actionParent),true);
+ // dialog.setMessage(Messages.UMLModelingAssistantProviderMessage);
+ // dialog.setTitle(Messages.UMLModelingAssistantProviderTitle);
+ // if(dialog.open() == Window.OK) {
+ // setInvokedParent((EObject)dialog.getTheResult());
+ // }
}
/**
@@ -767,5 +744,4 @@ public abstract class CreateInvocationActionDialog extends FormDialog { * @return label
*/
abstract protected String getCreationLabel();
-
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/dialogs/CreateParameterDialog.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/dialogs/CreateParameterDialog.java index 40d78dd9fab..9c2fb13bfec 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/dialogs/CreateParameterDialog.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/dialogs/CreateParameterDialog.java @@ -128,14 +128,11 @@ public class CreateParameterDialog extends FormDialog { FormToolkit toolkit = pForm.getToolkit();
Composite parent = scrolledForm.getBody();
parent.setLayout(new GridLayout());
-
createParameterSection(scrolledForm.getBody(), toolkit);
-
hookListeners();
// invoked name is set after listeners, since we count on listener to
// update it properly
setInvokedName(null);
-
scrolledForm.reflow(true);
}
@@ -169,22 +166,18 @@ public class CreateParameterDialog extends FormDialog { }
ImageHyperlink componentHelp = HelpComponentFactory.createHelpComponent(lSection, pToolkit, Messages.CreateParameterDialog_ParameterCreationHelp, true);
lSection.setTextClient(componentHelp);
-
ScrolledForm lInsideScrolledForm = pToolkit.createScrolledForm(lSection);
lInsideScrolledForm.setExpandHorizontal(true);
lInsideScrolledForm.setExpandVertical(true);
Composite lBody = lInsideScrolledForm.getBody();
-
GridLayout lLayout = new GridLayout();
lLayout.numColumns = 3;
lBody.setLayout(lLayout);
-
// content of the section
pToolkit.createLabel(lBody, getNameLabel(), SWT.NONE);
creationNameText = pToolkit.createText(lBody, "", SWT.BORDER);
creationNameText.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 2, 1));
creationNameText.setFocus();
-
// manage type selection
pToolkit.createLabel(lBody, getTypeLabel(), SWT.NONE);
creationTypeText = pToolkit.createText(lBody, labelProvider.getText(selectedType), SWT.BORDER | SWT.READ_ONLY);
@@ -193,7 +186,6 @@ public class CreateParameterDialog extends FormDialog { Image image = getTypeImage();
creationTypeButton.setImage(image);
creationTypeButton.setLayoutData(new GridData(SWT.NONE));
-
// manage direction selection
pToolkit.createLabel(lBody, getDirectionLabel(), SWT.NONE);
creationDirectionCombo = new Combo(lBody, SWT.DROP_DOWN | SWT.READ_ONLY);
@@ -205,7 +197,6 @@ public class CreateParameterDialog extends FormDialog { // initialize selection
directionComboViewer.setSelection(new StructuredSelection(getDefaultDirection()));
selectedDirection = ParameterDirectionKind.getByName(getDefaultDirection());
-
lInsideScrolledForm.reflow(true);
lSection.setClient(lInsideScrolledForm);
}
@@ -263,7 +254,6 @@ public class CreateParameterDialog extends FormDialog { };
creationDirectionCombo.addModifyListener(lTypeListener);
}
-
// listener to invocation element name
ModifyListener lNameListener = new ModifyListener() {
@@ -275,7 +265,6 @@ public class CreateParameterDialog extends FormDialog { }
};
creationNameText.addModifyListener(lNameListener);
-
// listener to select new element parent
SelectionListener selectParentBtnListener = new SelectionAdapter() {
@@ -438,5 +427,4 @@ public class CreateParameterDialog extends FormDialog { private String getDirectionLabel() {
return Messages.CreateParameterDialog_DirectionLabel;
}
-
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/dialogs/CreatePinsForObjectFlowDialog.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/dialogs/CreatePinsForObjectFlowDialog.java index 86f893e7e10..f4c95e6b7a3 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/dialogs/CreatePinsForObjectFlowDialog.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/dialogs/CreatePinsForObjectFlowDialog.java @@ -13,7 +13,6 @@ *****************************************************************************/
package org.eclipse.papyrus.uml.diagram.activity.edit.dialogs;
-import org.eclipse.jface.window.Window;
import org.eclipse.papyrus.uml.diagram.activity.edit.helpers.ObjectFlowEditHelper;
import org.eclipse.papyrus.uml.diagram.activity.part.Messages;
import org.eclipse.papyrus.uml.diagram.activity.providers.UMLElementTypes;
@@ -47,8 +46,6 @@ import org.eclipse.uml2.uml.Type; import org.eclipse.uml2.uml.UMLFactory;
import org.eclipse.uml2.uml.UMLPackage;
-import com.google.common.collect.Sets;
-
/**
* This class provides a dialog to initialize a CallBehaviorAction at its
* creation.
@@ -227,11 +224,8 @@ public class CreatePinsForObjectFlowDialog extends FormDialog { FormToolkit toolkit = pForm.getToolkit();
Composite parent = scrolledForm.getBody();
parent.setLayout(new GridLayout());
-
createPinCreationSection(scrolledForm.getBody(), toolkit);
-
hookListeners();
-
scrolledForm.reflow(true);
}
@@ -253,22 +247,18 @@ public class CreatePinsForObjectFlowDialog extends FormDialog { }
ImageHyperlink componentHelp = HelpComponentFactory.createHelpComponent(lSection, pToolkit, Messages.CreatePinsForObjectFlowDialog_PinCreationHelp, true);
lSection.setTextClient(componentHelp);
-
ScrolledForm lInsideScrolledForm = pToolkit.createScrolledForm(lSection);
lInsideScrolledForm.setExpandHorizontal(true);
lInsideScrolledForm.setExpandVertical(true);
Composite lBody = lInsideScrolledForm.getBody();
-
GridLayout lLayout = new GridLayout();
lLayout.numColumns = 3;
lBody.setLayout(lLayout);
-
// content of the section
pToolkit.createLabel(lBody, NAME_LABEL, SWT.NONE);
creationNameText = pToolkit.createText(lBody, NAME_INITIAL_VALUE, SWT.BORDER);
creationNameText.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 2, 1));
creationNameText.setFocus();
-
pToolkit.createLabel(lBody, TYPE_LABEL, SWT.NONE);
creationTypeText = pToolkit.createText(lBody, "", SWT.BORDER | SWT.READ_ONLY);
creationTypeText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
@@ -276,7 +266,6 @@ public class CreatePinsForObjectFlowDialog extends FormDialog { Image image = UMLElementTypes.getImage(UMLPackage.eINSTANCE.getClass_());
creationTypeButton.setImage(image);
creationTypeButton.setLayoutData(new GridData(SWT.NONE));
-
lInsideScrolledForm.reflow(true);
lSection.setClient(lInsideScrolledForm);
}
@@ -296,7 +285,6 @@ public class CreatePinsForObjectFlowDialog extends FormDialog { }
};
creationNameText.addModifyListener(lNameListener);
-
// listener to select new pin type
SelectionListener selectTypeBtnListener = new SelectionAdapter() {
@@ -319,13 +307,13 @@ public class CreatePinsForObjectFlowDialog extends FormDialog { /*
* TODO Backport
*/
-// UMLMultiEClassifierTreeSelectorDialog dialog = new UMLMultiEClassifierTreeSelectorDialog(getShell(),initialSource, Sets.newHashSet(UMLPackage.Literals.TYPE));
-// dialog.setMessage(Messages.UMLModelingAssistantProviderMessage);
-// dialog.setTitle(Messages.UMLModelingAssistantProviderTitle);
-// if(dialog.open() == Window.OK) {
-// creationType = (Type)dialog.getTheResult();
-// creationTypeText.setText(dialog.getText(creationType));
-// }
+ // UMLMultiEClassifierTreeSelectorDialog dialog = new UMLMultiEClassifierTreeSelectorDialog(getShell(),initialSource, Sets.newHashSet(UMLPackage.Literals.TYPE));
+ // dialog.setMessage(Messages.UMLModelingAssistantProviderMessage);
+ // dialog.setTitle(Messages.UMLModelingAssistantProviderTitle);
+ // if(dialog.open() == Window.OK) {
+ // creationType = (Type)dialog.getTheResult();
+ // creationTypeText.setText(dialog.getText(creationType));
+ // }
}
/**
@@ -364,5 +352,4 @@ public class CreatePinsForObjectFlowDialog extends FormDialog { public ActivityNode getTarget() {
return newTarget;
}
-
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/dialogs/CreateSendSignalActionDialog.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/dialogs/CreateSendSignalActionDialog.java index b4a65d31fb7..a76cffafabf 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/dialogs/CreateSendSignalActionDialog.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/dialogs/CreateSendSignalActionDialog.java @@ -170,5 +170,4 @@ public class CreateSendSignalActionDialog extends CreateInvocationActionDialog { protected Image getParentImage() {
return UMLElementTypes.getImage(UMLPackage.eINSTANCE.getPackage());
}
-
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/dialogs/WarningAndLinkDialog.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/dialogs/WarningAndLinkDialog.java index f8792f97aa6..6cb768e5cf4 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/dialogs/WarningAndLinkDialog.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/dialogs/WarningAndLinkDialog.java @@ -129,7 +129,6 @@ public class WarningAndLinkDialog extends MessageDialog { navigateToElement();
okPressed();
}
-
});
}
return hyperLink;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/part/ActivityGroup/CustomActivityPartitionActivityPartitionContentCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/part/ActivityGroup/CustomActivityPartitionActivityPartitionContentCompartmentEditPart.java index 615e5643500..0f48d9126bb 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/part/ActivityGroup/CustomActivityPartitionActivityPartitionContentCompartmentEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/part/ActivityGroup/CustomActivityPartitionActivityPartitionContentCompartmentEditPart.java @@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.diagram.activity.edit.parts.ActivityPartitionActi * @author arthur daussy
*
*/
-public class CustomActivityPartitionActivityPartitionContentCompartmentEditPart extends ActivityPartitionActivityPartitionContentCompartmentEditPart implements IGroupCompartmentEditPart{
+public class CustomActivityPartitionActivityPartitionContentCompartmentEditPart extends ActivityPartitionActivityPartitionContentCompartmentEditPart implements IGroupCompartmentEditPart {
public CustomActivityPartitionActivityPartitionContentCompartmentEditPart(View view) {
super(view);
@@ -36,12 +36,4 @@ public class CustomActivityPartitionActivityPartitionContentCompartmentEditPart public boolean isSelectable() {
return false;
}
-
-
-
-
-
-
-
-
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/part/ActivityGroup/CustomConditionalNodeStructuredActivityNodeContentCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/part/ActivityGroup/CustomConditionalNodeStructuredActivityNodeContentCompartmentEditPart.java index 4229b28b24e..90a20735b50 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/part/ActivityGroup/CustomConditionalNodeStructuredActivityNodeContentCompartmentEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/part/ActivityGroup/CustomConditionalNodeStructuredActivityNodeContentCompartmentEditPart.java @@ -50,5 +50,4 @@ public class CustomConditionalNodeStructuredActivityNodeContentCompartmentEditPa public boolean isSelectable() {
return false;
}
-
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/part/ActivityGroup/CustomExpansionRegionStructuredActivityNodeContentCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/part/ActivityGroup/CustomExpansionRegionStructuredActivityNodeContentCompartmentEditPart.java index 4bc05504724..b62ee351c5c 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/part/ActivityGroup/CustomExpansionRegionStructuredActivityNodeContentCompartmentEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/part/ActivityGroup/CustomExpansionRegionStructuredActivityNodeContentCompartmentEditPart.java @@ -25,7 +25,7 @@ import org.eclipse.papyrus.uml.diagram.activity.edit.parts.ExpansionRegionStruct * @author arthur daussy
*
*/
-public class CustomExpansionRegionStructuredActivityNodeContentCompartmentEditPart extends ExpansionRegionStructuredActivityNodeContentCompartmentEditPart implements IGroupCompartmentEditPart{
+public class CustomExpansionRegionStructuredActivityNodeContentCompartmentEditPart extends ExpansionRegionStructuredActivityNodeContentCompartmentEditPart implements IGroupCompartmentEditPart {
public CustomExpansionRegionStructuredActivityNodeContentCompartmentEditPart(View view) {
super(view);
@@ -50,5 +50,4 @@ public class CustomExpansionRegionStructuredActivityNodeContentCompartmentEditPa public boolean isSelectable() {
return false;
}
-
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/part/ActivityGroup/CustomInterruptibleActivityRegionInterruptibleActivityRegionContentCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/part/ActivityGroup/CustomInterruptibleActivityRegionInterruptibleActivityRegionContentCompartmentEditPart.java index a2acf34e7a7..34a561b1998 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/part/ActivityGroup/CustomInterruptibleActivityRegionInterruptibleActivityRegionContentCompartmentEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/part/ActivityGroup/CustomInterruptibleActivityRegionInterruptibleActivityRegionContentCompartmentEditPart.java @@ -51,5 +51,4 @@ public class CustomInterruptibleActivityRegionInterruptibleActivityRegionContent public boolean isSelectable() {
return false;
}
-
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/part/ActivityGroup/CustomLoopNodeStructuredActivityNodeContentCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/part/ActivityGroup/CustomLoopNodeStructuredActivityNodeContentCompartmentEditPart.java index b209523e16e..28c59e89858 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/part/ActivityGroup/CustomLoopNodeStructuredActivityNodeContentCompartmentEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/part/ActivityGroup/CustomLoopNodeStructuredActivityNodeContentCompartmentEditPart.java @@ -26,7 +26,7 @@ import org.eclipse.papyrus.uml.diagram.activity.edit.parts.LoopNodeStructuredAct * @author arthur daussy
*
*/
-public class CustomLoopNodeStructuredActivityNodeContentCompartmentEditPart extends LoopNodeStructuredActivityNodeContentCompartmentEditPart implements IGroupCompartmentEditPart{
+public class CustomLoopNodeStructuredActivityNodeContentCompartmentEditPart extends LoopNodeStructuredActivityNodeContentCompartmentEditPart implements IGroupCompartmentEditPart {
public CustomLoopNodeStructuredActivityNodeContentCompartmentEditPart(View view) {
super(view);
@@ -56,5 +56,4 @@ public class CustomLoopNodeStructuredActivityNodeContentCompartmentEditPart exte public boolean isSelectable() {
return false;
}
-
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/part/ActivityGroup/CustomSequenceNodeStructuredActivityNodeContentCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/part/ActivityGroup/CustomSequenceNodeStructuredActivityNodeContentCompartmentEditPart.java index 08b5f006a16..94afe542ad5 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/part/ActivityGroup/CustomSequenceNodeStructuredActivityNodeContentCompartmentEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/part/ActivityGroup/CustomSequenceNodeStructuredActivityNodeContentCompartmentEditPart.java @@ -26,7 +26,7 @@ import org.eclipse.papyrus.uml.diagram.activity.edit.parts.SequenceNodeStructure * @author arthur daussy
*
*/
-public class CustomSequenceNodeStructuredActivityNodeContentCompartmentEditPart extends SequenceNodeStructuredActivityNodeContentCompartmentEditPart implements IGroupCompartmentEditPart{
+public class CustomSequenceNodeStructuredActivityNodeContentCompartmentEditPart extends SequenceNodeStructuredActivityNodeContentCompartmentEditPart implements IGroupCompartmentEditPart {
public CustomSequenceNodeStructuredActivityNodeContentCompartmentEditPart(View view) {
super(view);
@@ -56,5 +56,4 @@ public class CustomSequenceNodeStructuredActivityNodeContentCompartmentEditPart public boolean isSelectable() {
return false;
}
-
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/part/ActivityGroup/CustomStructuredActivityNodeStructuredActivityNodeContentCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/part/ActivityGroup/CustomStructuredActivityNodeStructuredActivityNodeContentCompartmentEditPart.java index fe5b9383696..0d507f901be 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/part/ActivityGroup/CustomStructuredActivityNodeStructuredActivityNodeContentCompartmentEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/part/ActivityGroup/CustomStructuredActivityNodeStructuredActivityNodeContentCompartmentEditPart.java @@ -26,7 +26,7 @@ import org.eclipse.papyrus.uml.diagram.activity.edit.parts.StructuredActivityNod * @author arthur daussy
*
*/
-public class CustomStructuredActivityNodeStructuredActivityNodeContentCompartmentEditPart extends StructuredActivityNodeStructuredActivityNodeContentCompartmentEditPart implements IGroupCompartmentEditPart{
+public class CustomStructuredActivityNodeStructuredActivityNodeContentCompartmentEditPart extends StructuredActivityNodeStructuredActivityNodeContentCompartmentEditPart implements IGroupCompartmentEditPart {
public CustomStructuredActivityNodeStructuredActivityNodeContentCompartmentEditPart(View view) {
super(view);
@@ -56,5 +56,4 @@ public class CustomStructuredActivityNodeStructuredActivityNodeContentCompartmen public boolean isSelectable() {
return false;
}
-
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/part/ActivityGroup/IGroupCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/part/ActivityGroup/IGroupCompartmentEditPart.java index cc96ce7c4bf..806629069d9 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/part/ActivityGroup/IGroupCompartmentEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/part/ActivityGroup/IGroupCompartmentEditPart.java @@ -3,9 +3,9 @@ package org.eclipse.papyrus.uml.diagram.activity.edit.part.ActivityGroup; /**
* Is a Activity Group Compartment EditPart
* TODO : Add to generator
+ *
* @author adaussy
- *
+ *
*/
public interface IGroupCompartmentEditPart {
-
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/part/CustomActivityActivityContentCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/part/CustomActivityActivityContentCompartmentEditPart.java index f4abde00bed..d795c53e36f 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/part/CustomActivityActivityContentCompartmentEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/part/CustomActivityActivityContentCompartmentEditPart.java @@ -19,10 +19,9 @@ import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure; import org.eclipse.gmf.runtime.notation.View;
import org.eclipse.papyrus.uml.diagram.activity.edit.parts.ActivityActivityContentCompartmentEditPart;
-
/**
* @author adaussy
- *
+ *
*/
public class CustomActivityActivityContentCompartmentEditPart extends ActivityActivityContentCompartmentEditPart {
@@ -49,10 +48,4 @@ public class CustomActivityActivityContentCompartmentEditPart extends ActivityAc public boolean isSelectable() {
return true;
}
-
-
-
-
-
-
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/policies/ActivityDiagramChangeStereotypedShapeEditpolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/policies/ActivityDiagramChangeStereotypedShapeEditpolicy.java index 33db59af3da..27308165bfa 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/policies/ActivityDiagramChangeStereotypedShapeEditpolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/policies/ActivityDiagramChangeStereotypedShapeEditpolicy.java @@ -42,24 +42,20 @@ public class ActivityDiagramChangeStereotypedShapeEditpolicy extends ChangeStere ((IGraphicalEditPart)getHost()).getEditingDomain().runExclusive(new Runnable() {
public void run() {
-
Display.getCurrent().asyncExec(new Runnable() {
public void run() {
if(part instanceof GraphicalEditPart) {
GraphicalEditPart gmfparent = (GraphicalEditPart)part.getParent();
GraphicalEditPart gmfpart = (GraphicalEditPart)part;
-
org.eclipse.papyrus.uml.diagram.activity.edit.commands.ElementToStereotypedShape command = new ElementToStereotypedShape(gmfpart.getEditingDomain(), gmfpart);
gmfpart.getEditingDomain().getCommandStack().execute(command);
-
ArrayList<EObject> elementToDrop = getAllSemanticLink(gmfpart);
Request deleteViewRequest = new GroupRequest(RequestConstants.REQ_DELETE);
Command deleteCommand = gmfpart.getCommand(deleteViewRequest);
gmfpart.getDiagramEditDomain().getDiagramCommandStack().execute(deleteCommand);
dropLink(gmfparent, elementToDrop);
}
-
}
});
}
@@ -75,13 +71,11 @@ public class ActivityDiagramChangeStereotypedShapeEditpolicy extends ChangeStere ((IGraphicalEditPart)getHost()).getEditingDomain().runExclusive(new Runnable() {
public void run() {
-
Display.getCurrent().asyncExec(new Runnable() {
public void run() {
if(part instanceof GraphicalEditPart) {
GraphicalEditPart gmfparent = (GraphicalEditPart)part.getParent();
-
GraphicalEditPart gmfpart = (GraphicalEditPart)part;
DropObjectsRequest dropObjectsRequest = new DropObjectsRequest();
ArrayList<EObject> list = new ArrayList<EObject>();
@@ -90,16 +84,12 @@ public class ActivityDiagramChangeStereotypedShapeEditpolicy extends ChangeStere dropObjectsRequest.setLocation(gmfpart.getFigure().getBounds().getLocation());
Command command = gmfpart.getParent().getCommand(dropObjectsRequest);
gmfpart.getEditingDomain().getCommandStack().execute(new GEFtoEMFCommandWrapper(command));
-
ArrayList<EObject> elementToDrop = getAllSemanticLink(gmfpart);
-
Request deleteViewRequest = new GroupRequest(RequestConstants.REQ_DELETE);
Command deleteCommand = gmfpart.getCommand(deleteViewRequest);
gmfpart.getDiagramEditDomain().getDiagramCommandStack().execute(deleteCommand);
-
dropLink(gmfparent, elementToDrop);
}
-
}
});
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/policies/ActivityGroupCustomDragAndDropEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/policies/ActivityGroupCustomDragAndDropEditPolicy.java index daa7f3f6773..953ee51cfbb 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/policies/ActivityGroupCustomDragAndDropEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/policies/ActivityGroupCustomDragAndDropEditPolicy.java @@ -34,10 +34,13 @@ import org.eclipse.gmf.runtime.notation.Diagram; import org.eclipse.papyrus.uml.diagram.activity.activitygroup.ContainerNodeDescriptorRegistry;
import org.eclipse.papyrus.uml.diagram.activity.activitygroup.IContainerNodeDescriptor;
import org.eclipse.uml2.uml.Element;
+
/**
- * Drag and drop policy which allow drop of objects which are not contains from a semantic point of view into a visual element such as Activity Partition
+ * Drag and drop policy which allow drop of objects which are not contains from a semantic point of view into a visual element such as Activity
+ * Partition
+ *
* @author adaussy
- *
+ *
*/
public class ActivityGroupCustomDragAndDropEditPolicy extends CustomDiagramDragDropEditPolicy {
@@ -83,12 +86,12 @@ public class ActivityGroupCustomDragAndDropEditPolicy extends CustomDiagramDragD if(getHost().getModel() instanceof Diagram) {
return getDefaultDropNodeCommand(nodeVISUALID, location, droppedObject, dropRequest);
} else if((graphicalParent instanceof Element)) {
- if(descriptor.canIBeModelParentOf(droppedObject.eClass())){
- if (droppedObject.eContainer() != null && !droppedObject.eContainer().equals(getHostObject())){
+ if(descriptor.canIBeModelParentOf(droppedObject.eClass())) {
+ if(droppedObject.eContainer() != null && !droppedObject.eContainer().equals(getHostObject())) {
return UnexecutableCommand.INSTANCE;
}
return getDefaultDropNodeCommand(nodeVISUALID, location, droppedObject, dropRequest);
- } else if (descriptor.canIBeGraphicalParentOf(droppedObject.eClass())){
+ } else if(descriptor.canIBeGraphicalParentOf(droppedObject.eClass())) {
return getDefaultDropNodeCommand(nodeVISUALID, location, droppedObject, dropRequest);
}
}
@@ -109,16 +112,18 @@ public class ActivityGroupCustomDragAndDropEditPolicy extends CustomDiagramDragD }
return org.eclipse.gmf.runtime.common.core.command.UnexecutableCommand.INSTANCE;
}
+
/**
* Retreive the {@link EClass} of the host
+ *
* @return
*/
- protected EClass getContainerEClass(){
+ protected EClass getContainerEClass() {
EditPart editPart = getHost();
- if (editPart instanceof IGraphicalEditPart){
+ if(editPart instanceof IGraphicalEditPart) {
IGraphicalEditPart part = (IGraphicalEditPart)editPart;
EObject element = part.resolveSemanticElement();
- if (element != null){
+ if(element != null) {
return element.eClass();
}
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/policies/ActivityParameterNodeInCompartmentCreationEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/policies/ActivityParameterNodeInCompartmentCreationEditPolicy.java index 27b8eab0f8a..bee2833999b 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/policies/ActivityParameterNodeInCompartmentCreationEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/policies/ActivityParameterNodeInCompartmentCreationEditPolicy.java @@ -35,10 +35,8 @@ public class ActivityParameterNodeInCompartmentCreationEditPolicy extends Creati @Override
public EditPart getTargetEditPart(Request request) {
-
if(request instanceof CreateUnspecifiedTypeRequest) {
CreateUnspecifiedTypeRequest createUnspecifiedTypeRequest = (CreateUnspecifiedTypeRequest)request;
-
if(understandsRequest(request)) {
List<?> elementTypes = createUnspecifiedTypeRequest.getElementTypes();
// Treat the case where only one element type is listed
@@ -54,5 +52,4 @@ public class ActivityParameterNodeInCompartmentCreationEditPolicy extends Creati }
return super.getTargetEditPart(request);
}
-
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/policies/BehaviorPropertyNodeEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/policies/BehaviorPropertyNodeEditPolicy.java index e5a1ef9a54f..77f6953622a 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/policies/BehaviorPropertyNodeEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/policies/BehaviorPropertyNodeEditPolicy.java @@ -84,14 +84,12 @@ public class BehaviorPropertyNodeEditPolicy extends NonResizableEditPolicyEx { * @return the command contribution to the request
*/
protected Command getMoveCommand(ChangeBoundsRequest request) {
-
// translate the feedback figure
PrecisionRectangle rect = new PrecisionRectangle(getInitialFeedbackBounds().getCopy());
getHostFigure().translateToAbsolute(rect);
rect.translate(request.getMoveDelta());
rect.resize(request.getSizeDelta());
getHostFigure().translateToRelative(rect);
-
if(getHost() instanceof IBorderItemEditPart) {
IBorderItemEditPart borderItemEP = (IBorderItemEditPart)getHost();
IBorderItemLocator borderItemLocator = borderItemEP.getBorderItemLocator();
@@ -154,7 +152,6 @@ public class BehaviorPropertyNodeEditPolicy extends NonResizableEditPolicyEx { if(getHost() instanceof IBorderItemEditPart) {
IBorderItemEditPart borderItemEP = (IBorderItemEditPart)getHost();
IBorderItemLocator borderItemLocator = borderItemEP.getBorderItemLocator();
-
if(borderItemLocator != null) {
IFigure feedback = getDragSourceFeedbackFigure();
PrecisionRectangle rect = new PrecisionRectangle(getInitialFeedbackBounds().getCopy());
@@ -170,18 +167,14 @@ public class BehaviorPropertyNodeEditPolicy extends NonResizableEditPolicyEx { } else {
super.showChangeBoundsFeedback(request);
}
-
// translate the feedback figure
IFigure p = getDragSourceFeedbackFigure();
-
PrecisionRectangle rect = new PrecisionRectangle(getInitialFeedbackBounds().getCopy());
getHostFigure().translateToAbsolute(rect);
rect.translate(request.getMoveDelta());
rect.resize(request.getSizeDelta());
-
p.translateToRelative(rect);
p.setBounds(rect);
-
Point referencePoint = getReferencePoint(request);
Point end = getLinkEndPoint(request, referencePoint);
linkFeedback.setEnd(end);
@@ -201,9 +194,7 @@ public class BehaviorPropertyNodeEditPolicy extends NonResizableEditPolicyEx { * @return point
*/
private Point getReferencePoint(ChangeBoundsRequest request) {
-
Point refPoint = ((LabelEditPart)getHost()).getReferencePoint();
-
Rectangle centerMain = null;
if(((IGraphicalEditPart)getHost().getParent()).getFigure() instanceof Connection) {
centerMain = new Rectangle(refPoint.x, refPoint.y, 0, 0);
@@ -211,7 +202,6 @@ public class BehaviorPropertyNodeEditPolicy extends NonResizableEditPolicyEx { centerMain = ((IGraphicalEditPart)getHost().getParent()).getFigure().getBounds().getCopy();
centerMain.translate(centerMain.width / 2, centerMain.height / 2);
}
-
PrecisionRectangle ref = new PrecisionRectangle(centerMain);
getHostFigure().translateToAbsolute(ref);
getDragSourceFeedbackFigure().translateToRelative(ref);
@@ -302,12 +292,10 @@ public class BehaviorPropertyNodeEditPolicy extends NonResizableEditPolicyEx { Point midBottom = new Point(border.x + border.width / 2, border.y + border.height);
Point midLeft = new Point(border.x, border.y + border.height / 2);
Point midRight = new Point(border.x + border.width, border.y + border.height / 2);
-
Dimension diffTop = referencePoint.getDifference(midTop);
Dimension diffBottom = referencePoint.getDifference(midBottom);
Dimension diffRight = referencePoint.getDifference(midRight);
Dimension diffLeft = referencePoint.getDifference(midLeft);
-
Point startPoint = midBottom;
if(diffBottom.height > 0) {
// check if right or left is more appropriated
@@ -352,13 +340,11 @@ public class BehaviorPropertyNodeEditPolicy extends NonResizableEditPolicyEx { float denom = ((u2.y - u1.y) * (v2.x - v1.x)) - ((u2.x - u1.x) * (v2.y - v1.y));
float nume_a = ((u2.x - u1.x) * (v1.y - u1.y)) - ((u2.y - u1.y) * (v1.x - u1.x));
float nume_b = ((v2.x - v1.x) * (v1.y - u1.y)) - ((v2.y - v1.y) * (v1.x - u1.x));
-
if(denom == 0.0f) {
return null;
}
float ua = nume_a / denom;
float ub = nume_b / denom;
-
if(ua >= 0.0f && ua <= 1.0f && ub >= 0.0f && ub <= 1.0f) {
// Get the intersection point.
Float x = v1.x + ua * (v2.x - v1.x);
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/policies/CustomActivityActivityContentCompartmentItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/policies/CustomActivityActivityContentCompartmentItemSemanticEditPolicy.java index fe85633a4e3..3f7f28eb57a 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/policies/CustomActivityActivityContentCompartmentItemSemanticEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/policies/CustomActivityActivityContentCompartmentItemSemanticEditPolicy.java @@ -3,17 +3,14 @@ package org.eclipse.papyrus.uml.diagram.activity.edit.policies; import org.eclipse.gef.commands.Command;
import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-
public class CustomActivityActivityContentCompartmentItemSemanticEditPolicy extends ActivityActivityContentCompartmentItemSemanticEditPolicy {
@Override
protected Command getCreateCommand(CreateElementRequest req) {
-
// handled by CreateActionLocalConditionEditPolicy, return null
- if (CreateActionLocalConditionEditPolicy.LOCAL_CONDITION_TYPES.contains(req.getElementType())) {
+ if(CreateActionLocalConditionEditPolicy.LOCAL_CONDITION_TYPES.contains(req.getElementType())) {
return null;
}
-
return super.getCreateCommand(req);
}
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/policies/CustomActivityPartitionActivityPartitionContentCompartmentItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/policies/CustomActivityPartitionActivityPartitionContentCompartmentItemSemanticEditPolicy.java index f6d70630c76..800f0e64250 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/policies/CustomActivityPartitionActivityPartitionContentCompartmentItemSemanticEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/policies/CustomActivityPartitionActivityPartitionContentCompartmentItemSemanticEditPolicy.java @@ -3,17 +3,14 @@ package org.eclipse.papyrus.uml.diagram.activity.edit.policies; import org.eclipse.gef.commands.Command;
import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-
public class CustomActivityPartitionActivityPartitionContentCompartmentItemSemanticEditPolicy extends ActivityPartitionActivityPartitionContentCompartmentItemSemanticEditPolicy {
@Override
protected Command getCreateCommand(CreateElementRequest req) {
-
// handled by CreateActionLocalConditionEditPolicy, return null
- if (CreateActionLocalConditionEditPolicy.LOCAL_CONDITION_TYPES.contains(req.getElementType())) {
+ if(CreateActionLocalConditionEditPolicy.LOCAL_CONDITION_TYPES.contains(req.getElementType())) {
return null;
}
-
return super.getCreateCommand(req);
}
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/policies/CustomConditionalNodeStructuredActivityNodeContentCompartmentItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/policies/CustomConditionalNodeStructuredActivityNodeContentCompartmentItemSemanticEditPolicy.java index 451401030b1..ceaefbb535c 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/policies/CustomConditionalNodeStructuredActivityNodeContentCompartmentItemSemanticEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/policies/CustomConditionalNodeStructuredActivityNodeContentCompartmentItemSemanticEditPolicy.java @@ -3,17 +3,14 @@ package org.eclipse.papyrus.uml.diagram.activity.edit.policies; import org.eclipse.gef.commands.Command;
import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-
public class CustomConditionalNodeStructuredActivityNodeContentCompartmentItemSemanticEditPolicy extends ConditionalNodeStructuredActivityNodeContentCompartmentItemSemanticEditPolicy {
@Override
protected Command getCreateCommand(CreateElementRequest req) {
-
// handled by CreateActionLocalConditionEditPolicy, return null
- if (CreateActionLocalConditionEditPolicy.LOCAL_CONDITION_TYPES.contains(req.getElementType())) {
+ if(CreateActionLocalConditionEditPolicy.LOCAL_CONDITION_TYPES.contains(req.getElementType())) {
return null;
}
-
return super.getCreateCommand(req);
}
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/policies/CustomDiagramDragDropEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/policies/CustomDiagramDragDropEditPolicy.java index 548a74c06e3..d0efd93956b 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/policies/CustomDiagramDragDropEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/policies/CustomDiagramDragDropEditPolicy.java @@ -195,19 +195,18 @@ public class CustomDiagramDragDropEditPolicy extends CommonDiagramDragDropEditPo */
protected Command dropAction(final DropObjectsRequest dropRequest, final Element semanticElement, int nodeVISUALID) {
// The element to drop is a node
-
/*
* Check if the element is contained in this new container.
- * A special case as to be handle for structured element as contained node are not contained by the reference OwnedElement
+ * A special case as to be handle for structured element as contained node are not contained by the reference OwnedElement
*/
// Retrieve it's expected graphical parent
EObject graphicalParent = ((GraphicalEditPart)getHost()).resolveSemanticElement();
- if (graphicalParent instanceof StructuredActivityNode){
- if(!((StructuredActivityNode)graphicalParent).getNodes().contains(semanticElement)){
+ if(graphicalParent instanceof StructuredActivityNode) {
+ if(!((StructuredActivityNode)graphicalParent).getNodes().contains(semanticElement)) {
return UnexecutableCommand.INSTANCE;
}
- } else if( graphicalParent instanceof Element) {
- if ( !((Element)graphicalParent).getOwnedElements().contains(semanticElement)){
+ } else if(graphicalParent instanceof Element) {
+ if(!((Element)graphicalParent).getOwnedElements().contains(semanticElement)) {
return UnexecutableCommand.INSTANCE;
}
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/policies/CustomExpansionRegionStructuredActivityNodeContentCompartmentItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/policies/CustomExpansionRegionStructuredActivityNodeContentCompartmentItemSemanticEditPolicy.java index e2c8bc4f295..ca195e0dc1d 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/policies/CustomExpansionRegionStructuredActivityNodeContentCompartmentItemSemanticEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/policies/CustomExpansionRegionStructuredActivityNodeContentCompartmentItemSemanticEditPolicy.java @@ -3,17 +3,14 @@ package org.eclipse.papyrus.uml.diagram.activity.edit.policies; import org.eclipse.gef.commands.Command;
import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-
public class CustomExpansionRegionStructuredActivityNodeContentCompartmentItemSemanticEditPolicy extends ExpansionRegionStructuredActivityNodeContentCompartmentItemSemanticEditPolicy {
@Override
protected Command getCreateCommand(CreateElementRequest req) {
-
// handled by CreateActionLocalConditionEditPolicy, return null
- if (CreateActionLocalConditionEditPolicy.LOCAL_CONDITION_TYPES.contains(req.getElementType())) {
+ if(CreateActionLocalConditionEditPolicy.LOCAL_CONDITION_TYPES.contains(req.getElementType())) {
return null;
}
-
return super.getCreateCommand(req);
}
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/policies/CustomInterruptibleActivityRegionInterruptibleActivityRegionContentCompartmentItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/policies/CustomInterruptibleActivityRegionInterruptibleActivityRegionContentCompartmentItemSemanticEditPolicy.java index 9d9c0e6104b..2540b51edf0 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/policies/CustomInterruptibleActivityRegionInterruptibleActivityRegionContentCompartmentItemSemanticEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/policies/CustomInterruptibleActivityRegionInterruptibleActivityRegionContentCompartmentItemSemanticEditPolicy.java @@ -3,17 +3,14 @@ package org.eclipse.papyrus.uml.diagram.activity.edit.policies; import org.eclipse.gef.commands.Command;
import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-
public class CustomInterruptibleActivityRegionInterruptibleActivityRegionContentCompartmentItemSemanticEditPolicy extends InterruptibleActivityRegionInterruptibleActivityRegionContentCompartmentItemSemanticEditPolicy {
@Override
protected Command getCreateCommand(CreateElementRequest req) {
-
// handled by CreateActionLocalConditionEditPolicy, return null
- if (CreateActionLocalConditionEditPolicy.LOCAL_CONDITION_TYPES.contains(req.getElementType())) {
+ if(CreateActionLocalConditionEditPolicy.LOCAL_CONDITION_TYPES.contains(req.getElementType())) {
return null;
}
-
return super.getCreateCommand(req);
}
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/policies/CustomLoopNodeStructuredActivityNodeContentCompartmentItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/policies/CustomLoopNodeStructuredActivityNodeContentCompartmentItemSemanticEditPolicy.java index 81a4af05501..c506f4fd4aa 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/policies/CustomLoopNodeStructuredActivityNodeContentCompartmentItemSemanticEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/policies/CustomLoopNodeStructuredActivityNodeContentCompartmentItemSemanticEditPolicy.java @@ -3,17 +3,14 @@ package org.eclipse.papyrus.uml.diagram.activity.edit.policies; import org.eclipse.gef.commands.Command;
import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-
public class CustomLoopNodeStructuredActivityNodeContentCompartmentItemSemanticEditPolicy extends LoopNodeStructuredActivityNodeContentCompartmentItemSemanticEditPolicy {
@Override
protected Command getCreateCommand(CreateElementRequest req) {
-
// handled by CreateActionLocalConditionEditPolicy, return null
- if (CreateActionLocalConditionEditPolicy.LOCAL_CONDITION_TYPES.contains(req.getElementType())) {
+ if(CreateActionLocalConditionEditPolicy.LOCAL_CONDITION_TYPES.contains(req.getElementType())) {
return null;
}
-
return super.getCreateCommand(req);
}
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/policies/CustomSequenceNodeStructuredActivityNodeContentCompartmentItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/policies/CustomSequenceNodeStructuredActivityNodeContentCompartmentItemSemanticEditPolicy.java index e6e560b282c..dbdfb128a64 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/policies/CustomSequenceNodeStructuredActivityNodeContentCompartmentItemSemanticEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/policies/CustomSequenceNodeStructuredActivityNodeContentCompartmentItemSemanticEditPolicy.java @@ -3,17 +3,14 @@ package org.eclipse.papyrus.uml.diagram.activity.edit.policies; import org.eclipse.gef.commands.Command;
import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-
public class CustomSequenceNodeStructuredActivityNodeContentCompartmentItemSemanticEditPolicy extends SequenceNodeStructuredActivityNodeContentCompartmentItemSemanticEditPolicy {
@Override
protected Command getCreateCommand(CreateElementRequest req) {
-
// handled by CreateActionLocalConditionEditPolicy, return null
- if (CreateActionLocalConditionEditPolicy.LOCAL_CONDITION_TYPES.contains(req.getElementType())) {
+ if(CreateActionLocalConditionEditPolicy.LOCAL_CONDITION_TYPES.contains(req.getElementType())) {
return null;
}
-
return super.getCreateCommand(req);
}
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/policies/CustomStructuredActivityNodeStructuredActivityNodeContentCompartmentItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/policies/CustomStructuredActivityNodeStructuredActivityNodeContentCompartmentItemSemanticEditPolicy.java index d8f4d16a14e..a72f3a9db7a 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/policies/CustomStructuredActivityNodeStructuredActivityNodeContentCompartmentItemSemanticEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/policies/CustomStructuredActivityNodeStructuredActivityNodeContentCompartmentItemSemanticEditPolicy.java @@ -3,17 +3,14 @@ package org.eclipse.papyrus.uml.diagram.activity.edit.policies; import org.eclipse.gef.commands.Command;
import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-
public class CustomStructuredActivityNodeStructuredActivityNodeContentCompartmentItemSemanticEditPolicy extends StructuredActivityNodeStructuredActivityNodeContentCompartmentItemSemanticEditPolicy {
@Override
protected Command getCreateCommand(CreateElementRequest req) {
-
// handled by CreateActionLocalConditionEditPolicy, return null
- if (CreateActionLocalConditionEditPolicy.LOCAL_CONDITION_TYPES.contains(req.getElementType())) {
+ if(CreateActionLocalConditionEditPolicy.LOCAL_CONDITION_TYPES.contains(req.getElementType())) {
return null;
}
-
return super.getCreateCommand(req);
}
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/policies/CustomUMLBaseItemSemanticPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/policies/CustomUMLBaseItemSemanticPolicy.java index 65afbd858a1..67d52f92d5d 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/policies/CustomUMLBaseItemSemanticPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/policies/CustomUMLBaseItemSemanticPolicy.java @@ -2,11 +2,9 @@ package org.eclipse.papyrus.uml.diagram.activity.edit.policies; import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-
public class CustomUMLBaseItemSemanticPolicy extends UMLBaseItemSemanticEditPolicy {
protected CustomUMLBaseItemSemanticPolicy(IElementType elementType) {
super(elementType);
}
-
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/policies/ForkJoinResizeEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/policies/ForkJoinResizeEditPolicy.java index 07f18dffccf..9909ac3af84 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/policies/ForkJoinResizeEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/policies/ForkJoinResizeEditPolicy.java @@ -10,7 +10,6 @@ * Contributors:
* Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation
*/
-
package org.eclipse.papyrus.uml.diagram.activity.edit.policies;
import org.eclipse.draw2d.geometry.Dimension;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/policies/InterruptibleEdgeEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/policies/InterruptibleEdgeEditPolicy.java index 5f505fb0468..44d6f817012 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/policies/InterruptibleEdgeEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/policies/InterruptibleEdgeEditPolicy.java @@ -92,9 +92,7 @@ public class InterruptibleEdgeEditPolicy extends AbstractEditPolicy { } else {
activityEdgeAux = null;
}
-
final ActivityEdge activityEdge = activityEdgeAux;
-
final View interruptbleEdgeIcon = getInterruptbleEdgeIcon(graphicalHost, interruptibleEdge);
//If property == null and there is an view => delete
if(activityEdge != null) {
@@ -232,5 +230,4 @@ public class InterruptibleEdgeEditPolicy extends AbstractEditPolicy { }
return null;
}
-
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/policies/LoopNodePortCreationInCompartmentEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/policies/LoopNodePortCreationInCompartmentEditPolicy.java index 65ae9747fe2..0cec395e6b7 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/policies/LoopNodePortCreationInCompartmentEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/policies/LoopNodePortCreationInCompartmentEditPolicy.java @@ -27,10 +27,10 @@ import com.google.common.collect.Lists; public class LoopNodePortCreationInCompartmentEditPolicy extends PinAndEdgeCreationInCompartmentEditPolicy {
private static Collection<IElementType> elements = null;
-
+
@Override
protected Collection<IElementType> getElementHandleByParent() {
- if (elements == null){
+ if(elements == null) {
elements = Lists.newArrayList(UMLElementTypes.InputPin_3105);
}
return elements;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/policies/ObjectFlowWithPinsCreationEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/policies/ObjectFlowWithPinsCreationEditPolicy.java index 900007eacf9..0ff7f43598d 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/policies/ObjectFlowWithPinsCreationEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/policies/ObjectFlowWithPinsCreationEditPolicy.java @@ -68,7 +68,6 @@ public class ObjectFlowWithPinsCreationEditPolicy extends GraphicalNodeEditPolic TransactionalEditingDomain editingDomain = getEditingDomain();
CreateCommand createCommand = new CreateCommand(editingDomain, req.getConnectionViewDescriptor(), diagramView.getDiagram());
setViewAdapter((IAdaptable)createCommand.getCommandResult().getReturnValue());
-
SetConnectionEndsCommand sceCommand = new SetConnectionEndsCommand(editingDomain, StringStatics.BLANK);
sceCommand.setEdgeAdaptor(getViewAdapter());
if(getObjectFlowHint().equals(req.getConnectionViewDescriptor().getSemanticHint())) {
@@ -115,13 +114,11 @@ public class ObjectFlowWithPinsCreationEditPolicy extends GraphicalNodeEditPolic if(proxy == null) {
return null;
}
-
// reset the target edit-part for the request
INodeEditPart targetEP = getConnectionCompleteEditPart(request);
if(targetEP == null) {
return null;
}
-
CompositeCommand cc = (CompositeCommand)proxy.getICommand();
ConnectionAnchor targetAnchor = targetEP.getTargetConnectionAnchor(request);
Iterator commandItr = cc.iterator();
@@ -198,7 +195,6 @@ public class ObjectFlowWithPinsCreationEditPolicy extends GraphicalNodeEditPolic * @return the view or null
*/
protected View getObjectFlowExtremityView(boolean isStartEnd) {
-
Object objectFlowView = getViewAdapter().getAdapter(Connector.class);
if(objectFlowView instanceof Connector) {
EObject objectFlow = ((Connector)objectFlowView).getElement();
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/policies/OpaqueActionObjectFlowWithPinsCreationEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/policies/OpaqueActionObjectFlowWithPinsCreationEditPolicy.java index 7866b3cceab..6ec4176a243 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/policies/OpaqueActionObjectFlowWithPinsCreationEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/policies/OpaqueActionObjectFlowWithPinsCreationEditPolicy.java @@ -71,5 +71,4 @@ public class OpaqueActionObjectFlowWithPinsCreationEditPolicy extends ObjectFlow connectionFeedback = null;
}
}
-
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/policies/PinAndEdgeCreationInCompartmentEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/policies/PinAndEdgeCreationInCompartmentEditPolicy.java index 9beb73edfb8..ea9d1687ed8 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/policies/PinAndEdgeCreationInCompartmentEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/policies/PinAndEdgeCreationInCompartmentEditPolicy.java @@ -23,19 +23,16 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CreationEditPolicy; import org.eclipse.gmf.runtime.diagram.ui.requests.CreateUnspecifiedTypeRequest;
import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-
/**
* Aim to redirect pin and edge creation to parent element
* WARNING : NOT WORKING FOR NOW
*/
public abstract class PinAndEdgeCreationInCompartmentEditPolicy extends CreationEditPolicy {
-
+
@Override
public EditPart getTargetEditPart(Request request) {
-
if(request instanceof CreateUnspecifiedTypeRequest) {
CreateUnspecifiedTypeRequest createUnspecifiedTypeRequest = (CreateUnspecifiedTypeRequest)request;
-
if(understandsRequest(request)) {
List<?> elementTypes = createUnspecifiedTypeRequest.getElementTypes();
// Treat the case where only one element type is listed
@@ -48,11 +45,8 @@ public abstract class PinAndEdgeCreationInCompartmentEditPolicy extends Creation }
}
}
-
return super.getTargetEditPart(request);
}
-
+
protected abstract Collection<IElementType> getElementHandleByParent();
-
-
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/policies/RemoveOrphanViewPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/policies/RemoveOrphanViewPolicy.java index f5365a4e5f4..5631b541042 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/policies/RemoveOrphanViewPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/policies/RemoveOrphanViewPolicy.java @@ -44,5 +44,4 @@ public class RemoveOrphanViewPolicy extends OrphanViewPolicy { super();
init(notOrphanNode);
}
-
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/figures/AbstractActionFigure.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/figures/AbstractActionFigure.java index bfb73ebd819..47ac338bb9b 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/figures/AbstractActionFigure.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/figures/AbstractActionFigure.java @@ -42,15 +42,12 @@ public abstract class AbstractActionFigure extends RoundedRectangle implements I * @generated NOT use StereotypeFigureHelper
*/
public AbstractActionFigure() {
-
GridLayout layoutThis = new GridLayout();
layoutThis.numColumns = 1;
layoutThis.makeColumnsEqualWidth = true;
setLayoutManager(layoutThis);
-
setCornerDimensions(new Dimension(getMapMode().DPtoLP(16), getMapMode().DPtoLP(16)));
setLineWidth(1);
-
// use StereotypeFigureHelper
stereotypeHelper = new StereotypeFigureHelper(this) {
@@ -170,5 +167,4 @@ public abstract class AbstractActionFigure extends RoundedRectangle implements I * Get the map mode of the corresponding edit part
*/
public abstract IMapMode getMapMode();
-
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/figures/ActivityEdgeFigure.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/figures/ActivityEdgeFigure.java index 2d22cc854a4..bc00d4082fa 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/figures/ActivityEdgeFigure.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/figures/ActivityEdgeFigure.java @@ -46,7 +46,6 @@ public class ActivityEdgeFigure extends UMLEdgeFigure { */
private WrappedLabel fEdgeWeight;
-
/**
* call the super constructor
*/
@@ -99,9 +98,4 @@ public class ActivityEdgeFigure extends UMLEdgeFigure { public WrappingLabel getAppliedStereotypeLabel() {
return super.getAppliedStereotypeLabel();
}
-
-
-
-
-
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/figures/ActivityFigure.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/figures/ActivityFigure.java index 1da919e1420..01d9027da7c 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/figures/ActivityFigure.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/figures/ActivityFigure.java @@ -69,14 +69,12 @@ public class ActivityFigure extends PapyrusRoundedNodeFigure { protected Dimension calculatePreferredSize(IFigure container, int hint, int hint2) {
int minimumWith = 0;
int minimumHeight = 0;
-
// take in account the content of the figure activity
if((getContentFigure().getChildren().size() > 0)) {
IFigure content = (IFigure)getContentFigure().getChildren().get(0);
minimumWith = content.getPreferredSize().width + 50;
minimumHeight = content.getPreferredSize().height + 50;
}
-
// display name
if(getNameLabel() != null) {
if(getNameLabel().getPreferredSize().width > minimumWith) {
@@ -84,7 +82,6 @@ public class ActivityFigure extends PapyrusRoundedNodeFigure { }
minimumHeight += getNameLabel().getPreferredSize().height;
}
-
if(getHeaderSingleExecution() != null) {
if(getHeaderSingleExecution().getBounds().getTopRight().x > minimumWith) {
minimumWith = getHeaderSingleExecution().getBounds().getTopRight().x;
@@ -108,7 +105,6 @@ public class ActivityFigure extends PapyrusRoundedNodeFigure { } else {
bound.x = getBounds().x + GAP_X;
bound.y = getBounds().y + GAP_Y;
-
}
((IFigure)childrenList.get(i)).setBounds(bound);
}
@@ -159,7 +155,6 @@ public class ActivityFigure extends PapyrusRoundedNodeFigure { if(getPreconditionFigure().getChildren().size() > 0) {
((IFigure)getPreconditionFigure().getChildren().get(0)).setBounds(preconditionBound);;
}
-
// setPoscondtion
Rectangle postconditionBound = getPostconditionFigure().getBounds().getCopy();
postconditionBound.x = getPreconditionFigure().getBounds().x;
@@ -168,13 +163,11 @@ public class ActivityFigure extends PapyrusRoundedNodeFigure { if(getPostconditionFigure().getChildren().size() > 0) {
((IFigure)getPostconditionFigure().getChildren().get(0)).setBounds(postconditionBound);;
}
-
// setPoscondtion
Rectangle singleExecutionBound = getHeaderSingleExecution().getBounds().getCopy();
singleExecutionBound.x = getPreconditionFigure().getBounds().x + getPreconditionFigure().getBounds().width + GAP_X;;
singleExecutionBound.y = getPreconditionFigure().getBounds().y;
getHeaderSingleExecution().setBounds(singleExecutionBound);
-
// replace compartment stereotype properties
if(getStereotypePropertiesContent() != null) {
Rectangle pscontainer = getStereotypePropertiesContent().getBounds().getCopy();
@@ -182,7 +175,6 @@ public class ActivityFigure extends PapyrusRoundedNodeFigure { pscontainer.y = getPostconditionFigure().getBounds().y + getPostconditionFigure().getBounds().height + GAP_Y;
getStereotypePropertiesContent().setBounds(pscontainer);
}
-
// place parameter
// replace compartment stereotype properties
if(getStereotypePropertiesContent() != null) {
@@ -191,7 +183,6 @@ public class ActivityFigure extends PapyrusRoundedNodeFigure { getParameterFigure().setBounds(paramBoundcontainer);
if(getParameterFigure().getChildren().size() > 0) {
((IFigure)shapeCompartment.getChildren().get(0)).setBounds(paramBoundcontainer);
-
}
} else {
Rectangle paramBoundcontainer = getParameterFigure().getBounds().getCopy();
@@ -201,9 +192,7 @@ public class ActivityFigure extends PapyrusRoundedNodeFigure { ((IFigure)shapeCompartment.getChildren().get(0)).setBounds(paramBoundcontainer);;
}
}
-
}
-
}
/**
@@ -250,14 +239,12 @@ public class ActivityFigure extends PapyrusRoundedNodeFigure { public ActivityFigure() {
super();
setLayoutManager(new ActivityLayoutManager());
-
shapeCompartment = new RectangleFigure();
shapeCompartment.setOpaque(false);
shapeCompartment.setFill(false);
shapeCompartment.setOutline(false);
shapeCompartment.setLineWidth(0);
add(shapeCompartment);
-
preconditionFigure = new RectangleFigure();
preconditionFigure.setOpaque(false);
preconditionFigure.setFill(false);
@@ -266,21 +253,18 @@ public class ActivityFigure extends PapyrusRoundedNodeFigure { preconditionFigure.setBorder(null);
preconditionFigure.setForegroundColor(ColorConstants.red);
add(preconditionFigure);
-
parameterFigure = new RectangleFigure();
parameterFigure.setOpaque(false);
parameterFigure.setFill(false);
parameterFigure.setOutline(false);
parameterFigure.setLineWidth(0);
add(parameterFigure);
-
postconditionFigure = new RectangleFigure();
postconditionFigure.setOpaque(false);
postconditionFigure.setFill(false);
postconditionFigure.setOutline(false);
postconditionFigure.setLineWidth(0);
add(postconditionFigure);
-
fHeaderSingleExecution = new WrappingLabel();
add(fHeaderSingleExecution);
// createContents();
@@ -318,12 +302,10 @@ public class ActivityFigure extends PapyrusRoundedNodeFigure { * @generated
*/
private void createContents() {
-
RoundedRectangle activityBorderFigure0 = new RoundedRectangle();
this.add(activityBorderFigure0, BorderLayout.CENTER);
// to remove
activityBorderFigure0.setBackgroundColor(ColorConstants.red);
-
GridLayout layoutActivityBorderFigure0 = new GridLayout();
layoutActivityBorderFigure0.numColumns = 3;
layoutActivityBorderFigure0.makeColumnsEqualWidth = false;
@@ -332,14 +314,12 @@ public class ActivityFigure extends PapyrusRoundedNodeFigure { layoutActivityBorderFigure0.marginWidth = 0;
layoutActivityBorderFigure0.marginHeight = 0;
activityBorderFigure0.setLayoutManager(layoutActivityBorderFigure0);
-
RectangleFigure labelAndParameter1 = new RectangleFigure();
labelAndParameter1.setFill(false);
labelAndParameter1.setOutline(false);
labelAndParameter1.setLineWidth(0);
// to remove
labelAndParameter1.setBackgroundColor(ColorConstants.blue);
-
GridData constraintLabelAndParameter1 = new GridData();
constraintLabelAndParameter1.verticalAlignment = GridData.CENTER;
constraintLabelAndParameter1.horizontalAlignment = GridData.BEGINNING;
@@ -349,15 +329,12 @@ public class ActivityFigure extends PapyrusRoundedNodeFigure { constraintLabelAndParameter1.grabExcessHorizontalSpace = true;
constraintLabelAndParameter1.grabExcessVerticalSpace = false;
activityBorderFigure0.add(labelAndParameter1, constraintLabelAndParameter1);
-
GridLayout layoutLabelAndParameter1 = new GridLayout();
layoutLabelAndParameter1.numColumns = 1;
layoutLabelAndParameter1.makeColumnsEqualWidth = true;
labelAndParameter1.setLayoutManager(layoutLabelAndParameter1);
-
fHeaderLabel = new WrappingLabel();
fHeaderLabel.setText("ActivityName");
-
GridData constraintFHeaderLabel = new GridData();
constraintFHeaderLabel.verticalAlignment = GridData.CENTER;
constraintFHeaderLabel.horizontalAlignment = GridData.BEGINNING;
@@ -367,15 +344,12 @@ public class ActivityFigure extends PapyrusRoundedNodeFigure { constraintFHeaderLabel.grabExcessHorizontalSpace = true;
constraintFHeaderLabel.grabExcessVerticalSpace = false;
labelAndParameter1.add(fHeaderLabel, constraintFHeaderLabel);
-
fActivityParametersCompartment = new RectangleFigure();
// to remove
fActivityParametersCompartment.setBackgroundColor(ColorConstants.green);
-
fActivityParametersCompartment.setFill(false);
fActivityParametersCompartment.setOutline(false);
fActivityParametersCompartment.setLineWidth(0);
-
GridData constraintFActivityParametersCompartment = new GridData();
constraintFActivityParametersCompartment.verticalAlignment = GridData.CENTER;
constraintFActivityParametersCompartment.horizontalAlignment = GridData.BEGINNING;
@@ -385,16 +359,13 @@ public class ActivityFigure extends PapyrusRoundedNodeFigure { constraintFActivityParametersCompartment.grabExcessHorizontalSpace = true;
constraintFActivityParametersCompartment.grabExcessVerticalSpace = false;
labelAndParameter1.add(fActivityParametersCompartment, constraintFActivityParametersCompartment);
-
fActivityParametersCompartment.setLayoutManager(new StackLayout());
-
RectangleFigure prePostContions1 = new RectangleFigure();
// to remove
prePostContions1.setBackgroundColor(ColorConstants.cyan);
prePostContions1.setFill(false);
prePostContions1.setOutline(false);
prePostContions1.setLineWidth(0);
-
GridData constraintPrePostContions1 = new GridData();
constraintPrePostContions1.verticalAlignment = GridData.CENTER;
constraintPrePostContions1.horizontalAlignment = GridData.BEGINNING;
@@ -404,18 +375,15 @@ public class ActivityFigure extends PapyrusRoundedNodeFigure { constraintPrePostContions1.grabExcessHorizontalSpace = true;
constraintPrePostContions1.grabExcessVerticalSpace = false;
activityBorderFigure0.add(prePostContions1, constraintPrePostContions1);
-
GridLayout layoutPrePostContions1 = new GridLayout();
layoutPrePostContions1.numColumns = 1;
layoutPrePostContions1.makeColumnsEqualWidth = true;
prePostContions1.setLayoutManager(layoutPrePostContions1);
-
fActivityPreconditionsCompartment = new RectangleFigure();
fActivityPreconditionsCompartment.setBackgroundColor(ColorConstants.darkBlue);
fActivityPreconditionsCompartment.setFill(false);
fActivityPreconditionsCompartment.setOutline(false);
fActivityPreconditionsCompartment.setLineWidth(0);
-
GridData constraintFActivityPreconditionsCompartment = new GridData();
constraintFActivityPreconditionsCompartment.verticalAlignment = GridData.CENTER;
constraintFActivityPreconditionsCompartment.horizontalAlignment = GridData.BEGINNING;
@@ -425,14 +393,11 @@ public class ActivityFigure extends PapyrusRoundedNodeFigure { constraintFActivityPreconditionsCompartment.grabExcessHorizontalSpace = true;
constraintFActivityPreconditionsCompartment.grabExcessVerticalSpace = false;
prePostContions1.add(fActivityPreconditionsCompartment, constraintFActivityPreconditionsCompartment);
-
fActivityPreconditionsCompartment.setLayoutManager(new StackLayout());
-
fActivityPostconditionsCompartment = new RectangleFigure();
fActivityPostconditionsCompartment.setFill(false);
fActivityPostconditionsCompartment.setOutline(false);
fActivityPostconditionsCompartment.setLineWidth(0);
-
GridData constraintFActivityPostconditionsCompartment = new GridData();
constraintFActivityPostconditionsCompartment.verticalAlignment = GridData.CENTER;
constraintFActivityPostconditionsCompartment.horizontalAlignment = GridData.BEGINNING;
@@ -442,12 +407,9 @@ public class ActivityFigure extends PapyrusRoundedNodeFigure { constraintFActivityPostconditionsCompartment.grabExcessHorizontalSpace = true;
constraintFActivityPostconditionsCompartment.grabExcessVerticalSpace = false;
prePostContions1.add(fActivityPostconditionsCompartment, constraintFActivityPostconditionsCompartment);
-
fActivityPostconditionsCompartment.setLayoutManager(new StackLayout());
-
fHeaderSingleExecution = new WrappingLabel();
fHeaderSingleExecution.setText("");
-
GridData constraintFHeaderSingleExecution = new GridData();
constraintFHeaderSingleExecution.verticalAlignment = GridData.CENTER;
constraintFHeaderSingleExecution.horizontalAlignment = GridData.BEGINNING;
@@ -457,12 +419,10 @@ public class ActivityFigure extends PapyrusRoundedNodeFigure { constraintFHeaderSingleExecution.grabExcessHorizontalSpace = false;
constraintFHeaderSingleExecution.grabExcessVerticalSpace = false;
activityBorderFigure0.add(fHeaderSingleExecution, constraintFHeaderSingleExecution);
-
fCompartmentFigure = new RectangleFigure();
fCompartmentFigure.setFill(false);
fCompartmentFigure.setOutline(false);
fCompartmentFigure.setLineWidth(0);
-
GridData constraintFCompartmentFigure = new GridData();
constraintFCompartmentFigure.verticalAlignment = GridData.FILL;
constraintFCompartmentFigure.horizontalAlignment = GridData.FILL;
@@ -472,7 +432,6 @@ public class ActivityFigure extends PapyrusRoundedNodeFigure { constraintFCompartmentFigure.grabExcessHorizontalSpace = true;
constraintFCompartmentFigure.grabExcessVerticalSpace = true;
activityBorderFigure0.add(fCompartmentFigure, constraintFCompartmentFigure);
-
}
/**
@@ -516,5 +475,4 @@ public class ActivityFigure extends PapyrusRoundedNodeFigure { public RectangleFigure getCompartmentFigure() {
return fCompartmentFigure;
}
-
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/figures/ActivityPartitionFigure.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/figures/ActivityPartitionFigure.java index 3c8df95ab71..0c4e0473935 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/figures/ActivityPartitionFigure.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/figures/ActivityPartitionFigure.java @@ -45,7 +45,6 @@ public class ActivityPartitionFigure extends CompartmentFigure { this.setOpaque(false);
getActivityPartitionCompartment().setOpaque(false);
getActivityPartitionCompartment().setBorder(new LineBorder());
-
}
@Override
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/figures/InterruptibleActivityRegionFigure.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/figures/InterruptibleActivityRegionFigure.java index 65f4cc9d385..428b890d3f1 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/figures/InterruptibleActivityRegionFigure.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/figures/InterruptibleActivityRegionFigure.java @@ -114,5 +114,4 @@ public class InterruptibleActivityRegionFigure extends PapyrusNodeFigure impleme // TODO Auto-generated method stub
return null;
}
-
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/figures/LinkFigure.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/figures/LinkFigure.java index 676cf184250..09416a27b88 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/figures/LinkFigure.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/figures/LinkFigure.java @@ -23,5 +23,4 @@ public class LinkFigure extends DashedEdgeFigure { public LinkFigure() {
super(false);
}
-
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/figures/SimpleLabel.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/figures/SimpleLabel.java index 13ab6886a90..41be12bbc56 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/figures/SimpleLabel.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/figures/SimpleLabel.java @@ -38,7 +38,6 @@ public class SimpleLabel extends PapyrusWrappingLabel { setTextJustification(WrappingLabel.CENTER);
setAlignment(WrappingLabel.CENTER);
setTextWrap(true);
-
// ensure wrapping performed at line breaks only (no auto wrap)
if(getTextFigure().getChildren().size() > 0) {
Object textFigChild = getTextFigure().getChildren().get(0);
@@ -51,7 +50,4 @@ public class SimpleLabel extends PapyrusWrappingLabel { }
}
}
-
-
-
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/figures/WrappedLabel.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/figures/WrappedLabel.java index abc7c1ba3c0..4dd2a369b4c 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/figures/WrappedLabel.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/figures/WrappedLabel.java @@ -33,7 +33,4 @@ public class WrappedLabel extends PapyrusWrappingLabel { setAlignment(WrappingLabel.LEFT);
setTextWrap(true);
}
-
-
-
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/handlers/SynchronizePinsParametersHandler.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/handlers/SynchronizePinsParametersHandler.java index 0da764fa619..6e16d094b5b 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/handlers/SynchronizePinsParametersHandler.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/handlers/SynchronizePinsParametersHandler.java @@ -137,7 +137,6 @@ public class SynchronizePinsParametersHandler extends AbstractSynchronizePinsAnd return null;
}
-
/**
* Synchronizes a Call Action
*
@@ -148,11 +147,9 @@ public class SynchronizePinsParametersHandler extends AbstractSynchronizePinsAnd createNotification(SYNCHRONIZE_PINS_AND_PARAMETERS, "Unable to synchronize pins on " + invocationAction.getQualifiedName() + " : the ressource is unreachable", Type.WARNING);
return;
}
-
//Trying to match pins of the callAction with parameters of same index/direction/type.
//The pins that can not be matched will be destroyed by the "syncCallActionWhenOutdated" method.
matchPinsAndParams(invocationAction);
-
if(isUpToDate(invocationAction)) {
createNotification(SYNCHRONIZE_PINS_AND_PARAMETERS, "The call action " + invocationAction.getQualifiedName() + " is up to date", Type.INFO);
} else {
@@ -189,7 +186,6 @@ public class SynchronizePinsParametersHandler extends AbstractSynchronizePinsAnd behaviorStructural = ((BroadcastSignalAction)invocationAction).getSignal();
}
XMIResource xmiResource = PinAndParameterSynchronizer.getXMIResource(behaviorStructural);
-
for(Pin pin : allPins) {
TypedElement typedElement = PinAndParameterSynchronizer.getLinkedParemeter(pin, xmiResource);
if(typedElement != null) {
@@ -197,7 +193,6 @@ public class SynchronizePinsParametersHandler extends AbstractSynchronizePinsAnd pin.setName(paramName);
}
}
-
return CommandResult.newOKCommandResult();
}
};
@@ -220,19 +215,16 @@ public class SynchronizePinsParametersHandler extends AbstractSynchronizePinsAnd } else {
outputPins = Collections.emptyList();
}
-
//The command that is going to be executed.
CompoundCommand linkingPinsAndParamsCommand = new CompoundCommand();
// CompositeTransactionalCommand linkingPinsAndParamsCommand = new CompositeTransactionalCommand(EditorUtils.getTransactionalEditingDomain(), "Pin synchronization");////$NON-NLS-1$
-
if(invocationAction instanceof CallAction) {
CallAction callAction = (CallAction)invocationAction;
List<Parameter> callActionParams = getParametersFromCallAction(callAction);
Map<Integer, TypedElement> inputParameters = new HashMap<Integer, TypedElement>();
Map<Integer, TypedElement> outputParameters = new HashMap<Integer, TypedElement>();
//Splitting parameters.
- PinAndParameterSynchronizer.splitParameters(callActionParams, Lists.<Parameter> newArrayList(), inputParameters, outputParameters,invocationAction);
-
+ PinAndParameterSynchronizer.splitParameters(callActionParams, Lists.<Parameter> newArrayList(), inputParameters, outputParameters, invocationAction);
//Matching pins and parameters.
matchPinsAndParams(inputPins, inputParameters, linkingPinsAndParamsCommand);
matchPinsAndParams(outputPins, outputParameters, linkingPinsAndParamsCommand);
@@ -240,17 +232,10 @@ public class SynchronizePinsParametersHandler extends AbstractSynchronizePinsAnd Map<Integer, TypedElement> invocationActionProperties = getPropertyFromInvocationAction(invocationAction);
matchPinsAndParams(inputPins, invocationActionProperties, linkingPinsAndParamsCommand);
}
-
//Execution of the command
-
executeCommand(linkingPinsAndParamsCommand, invocationAction);
-
}
-
-
-
-
/**
* Refinement for the matchPinsAndParams(CallAction) method.
*
@@ -307,7 +292,6 @@ public class SynchronizePinsParametersHandler extends AbstractSynchronizePinsAnd if(behavior != null) {
result = behavior.getOwnedParameters();
}
-
} else if(callAction instanceof CallOperationAction) {
Operation operation = ((CallOperationAction)callAction).getOperation();
if(operation != null) {
@@ -356,7 +340,6 @@ public class SynchronizePinsParametersHandler extends AbstractSynchronizePinsAnd } else if(invocationAction instanceof BroadcastSignalAction) {
cmd = PinAndParameterSynchronizer.getResetPinsCmd((BroadcastSignalAction)invocationAction);
}
-
Element behaviorStructural = null;
if(invocationAction instanceof CallBehaviorAction) {
behaviorStructural = ((CallBehaviorAction)invocationAction).getBehavior();
@@ -368,7 +351,6 @@ public class SynchronizePinsParametersHandler extends AbstractSynchronizePinsAnd behaviorStructural = ((BroadcastSignalAction)invocationAction).getSignal();
}
XMIResource xmiResource = PinAndParameterSynchronizer.getXMIResource(behaviorStructural);
-
if(!cmd.isEmpty() && cmd.canExecute()) {
//calculate incoming and outcoming edge
Iterable<ActivityEdge> outgoing = Collections.emptyList();
@@ -385,7 +367,6 @@ public class SynchronizePinsParametersHandler extends AbstractSynchronizePinsAnd incoming = Iterables.concat(incoming, p.getIncomings());
}
}
-
HashSet<ActivityEdge> newHashSet = Sets.newHashSet(Iterables.concat(outgoing, incoming));
//Notifify User that Edge will deleted
DeleteActivityEdgeDialog dialog = new DeleteActivityEdgeDialog(new Shell(), newHashSet, invocationAction);
@@ -402,7 +383,6 @@ public class SynchronizePinsParametersHandler extends AbstractSynchronizePinsAnd //Destroy all edge
EditingDomain editingDomain = AdapterFactoryEditingDomain.getEditingDomainFor(activityEdge);
if(editingDomain instanceof TransactionalEditingDomain) {
-
DestroyElementCommand detryCmd = new DestroyElementPapyrusCommand(new DestroyElementRequest(activityEdge, false));
if(detryCmd != null && detryCmd.canExecute()) {
((TransactionalEditingDomain)editingDomain).getCommandStack().execute(new GMFtoEMFCommandWrapper(detryCmd));
@@ -458,19 +438,16 @@ public class SynchronizePinsParametersHandler extends AbstractSynchronizePinsAnd xmiResource = PinAndParameterSynchronizer.getXMIResource(signal);
typedElementArgument = Lists.newArrayList(transformeToTypedElementIterable(signal.getOwnedAttributes()));
}
-
} else if(invocationAction instanceof BroadcastSignalAction) {
Signal signal = ((BroadcastSignalAction)invocationAction).getSignal();
if(signal != null) {
xmiResource = PinAndParameterSynchronizer.getXMIResource(signal);
typedElementArgument = Lists.newArrayList(transformeToTypedElementIterable(signal.getOwnedAttributes()));
}
-
}
if(typedElementArgument == null) {
return true;
}
-
//checking if each pin is up to date.
final Set<TypedElement> typedElementArgumentFound = new HashSet<TypedElement>();
for(InputPin p : invocationActionArguments) {
@@ -489,7 +466,6 @@ public class SynchronizePinsParametersHandler extends AbstractSynchronizePinsAnd typedElementArgumentFound.add(pa);
}
}
-
// Checking whether new pins should be created (meaning some parameters do not have matching pins)
Iterable<TypedElement> intersectionBetweenPinParamsAndAllParams = Iterables.filter(typedElementArgument, new Predicate<TypedElement>() {
@@ -512,7 +488,6 @@ public class SynchronizePinsParametersHandler extends AbstractSynchronizePinsAnd public TypedElement apply(EObject from) {
if(from instanceof TypedElement) {
return (TypedElement)from;
-
}
return null;
}
@@ -552,7 +527,6 @@ public class SynchronizePinsParametersHandler extends AbstractSynchronizePinsAnd return result;
}
-
/**
* Test if the action can be reached (return false if the CallAction is in a controled package which is not loaded).
*
@@ -599,7 +573,6 @@ public class SynchronizePinsParametersHandler extends AbstractSynchronizePinsAnd } catch (InterruptedException e) {
e.printStackTrace();
} catch (RollbackException e) {
-
e.printStackTrace();
}
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/helper/AcceptEventActionSwitchHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/helper/AcceptEventActionSwitchHelper.java index 2cc908937c9..95ff7f7260d 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/helper/AcceptEventActionSwitchHelper.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/helper/AcceptEventActionSwitchHelper.java @@ -112,7 +112,7 @@ public class AcceptEventActionSwitchHelper extends NotificationHelper { */
public AcceptEventAction getAction() {
EObject resolveSemanticElement = editPart.resolveSemanticElement();
- if ( resolveSemanticElement instanceof AcceptEventAction){
+ if(resolveSemanticElement instanceof AcceptEventAction) {
return (AcceptEventAction)resolveSemanticElement;
}
return null;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/helper/ActivityLinkMappingHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/helper/ActivityLinkMappingHelper.java index 66bf068747e..6ece7669d74 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/helper/ActivityLinkMappingHelper.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/helper/ActivityLinkMappingHelper.java @@ -93,5 +93,4 @@ public class ActivityLinkMappingHelper implements ILinkMappingHelper { }
});
}
-
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/helper/ActivityParameterAndParameterSynchronizer.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/helper/ActivityParameterAndParameterSynchronizer.java index 7a1ea9ab046..edb3aa510e1 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/helper/ActivityParameterAndParameterSynchronizer.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/helper/ActivityParameterAndParameterSynchronizer.java @@ -276,5 +276,4 @@ public class ActivityParameterAndParameterSynchronizer extends AbstractModelCons };
return opener.execute();
}
-
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/helper/IPinToParameterLinkCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/helper/IPinToParameterLinkCommand.java index 4cfebf8b1df..73f9a28f2ad 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/helper/IPinToParameterLinkCommand.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/helper/IPinToParameterLinkCommand.java @@ -34,5 +34,4 @@ public interface IPinToParameterLinkCommand { * ID use to inform the user that no link exist between a {@link Pin} and a {@link Parameter}
*/
public static final String NO_PARAMETER_ID = "NO_PARAMETER_ID";
-
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/helper/PinAndParameterSynchronizeValidator.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/helper/PinAndParameterSynchronizeValidator.java index 8f5f39b9bd8..764dcd1ab62 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/helper/PinAndParameterSynchronizeValidator.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/helper/PinAndParameterSynchronizeValidator.java @@ -24,5 +24,4 @@ import java.lang.annotation.Target; @Target(ElementType.METHOD)
@Retention(RetentionPolicy.RUNTIME)
public @interface PinAndParameterSynchronizeValidator {
-
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/helper/PinAndParameterSynchronizer.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/helper/PinAndParameterSynchronizer.java index 60bf36b9f42..dd9bcd95b0c 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/helper/PinAndParameterSynchronizer.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/helper/PinAndParameterSynchronizer.java @@ -1820,7 +1820,6 @@ public class PinAndParameterSynchronizer extends AbstractModelConstraint { if(linkCommand != null) {
globalCmd.append(linkCommand);
}
-
}
nextKey--;
}
@@ -2161,33 +2160,32 @@ public class PinAndParameterSynchronizer extends AbstractModelConstraint { return globalCmd;
}
-// /**
-// * Get the command to reset all pins of the action.
-// *
-// * @param action
-// * action to reinitialize pins (BroadcastSignalAction)
-// * @return command
-// */
-// protected CompoundCommand getResetPinsCmd(BroadcastSignalAction action) {
-// // Get the editing domain
-// TransactionalEditingDomain editingdomain = EditorUtils.getTransactionalEditingDomain();
-// CompoundCommand globalCmd = new CompoundCommand();
-// if(action.getSignal() != null) {
-// if(action.getArguments().isEmpty()) {
-// EList<Property> properties = action.getSignal().getAllAttributes();
-// for(Property argument : properties) {
-// InputPin argPin = UMLFactory.eINSTANCE.createInputPin();
-// assignUpperBound(argPin);
-// argPin.setName(argument.getName());
-// argPin.setType(argument.getType());
-// Command cmdArg = AddCommand.create(editingdomain, action, UMLPackage.Literals.INVOCATION_ACTION__ARGUMENT, Arrays.asList(argPin));
-// globalCmd.append(cmdArg);
-// }
-// }
-// }
-// return globalCmd;
-// }
-
+ // /**
+ // * Get the command to reset all pins of the action.
+ // *
+ // * @param action
+ // * action to reinitialize pins (BroadcastSignalAction)
+ // * @return command
+ // */
+ // protected CompoundCommand getResetPinsCmd(BroadcastSignalAction action) {
+ // // Get the editing domain
+ // TransactionalEditingDomain editingdomain = EditorUtils.getTransactionalEditingDomain();
+ // CompoundCommand globalCmd = new CompoundCommand();
+ // if(action.getSignal() != null) {
+ // if(action.getArguments().isEmpty()) {
+ // EList<Property> properties = action.getSignal().getAllAttributes();
+ // for(Property argument : properties) {
+ // InputPin argPin = UMLFactory.eINSTANCE.createInputPin();
+ // assignUpperBound(argPin);
+ // argPin.setName(argument.getName());
+ // argPin.setType(argument.getType());
+ // Command cmdArg = AddCommand.create(editingdomain, action, UMLPackage.Literals.INVOCATION_ACTION__ARGUMENT, Arrays.asList(argPin));
+ // globalCmd.append(cmdArg);
+ // }
+ // }
+ // }
+ // return globalCmd;
+ // }
/**
* Get the command to reset all pins of the action.
*
@@ -2404,56 +2402,53 @@ public class PinAndParameterSynchronizer extends AbstractModelConstraint { return globalCmd;
}
-
-
-// /**
-// * Get the command to reset all pins of the action.
-// *
-// * @param action
-// * action to reinitialize pins (SendSignalAction)
-// * @return command
-// */
-// public static CompoundCommand getResetPinsCmd(InvocationAction action) {
-// if(!(action instanceof SendSignalAction || action instanceof BroadcastSignalAction)) {
-// return null;
-// }
-// // Get the editing domain
-// TransactionalEditingDomain editingdomain = EditorUtils.getTransactionalEditingDomain();
-// CompoundCommand globalCmd = new CompoundCommand();
-// // remove argument pins
-// if(!action.getArguments().isEmpty()) {
-// Command cmd = RemoveCommand.create(editingdomain, action, UMLPackage.eINSTANCE.getInvocationAction_Argument(), action.getArguments());
-// globalCmd.append(cmd);
-// }
-// // recover attributes
-// List<Property> attributes = Collections.emptyList();
-// Signal signal = action instanceof SendSignalAction ? ((SendSignalAction)action).getSignal() : ((BroadcastSignalAction)action).getSignal();
-// if(signal != null) {
-// attributes = signal.getOwnedAttributes();
-// }
-// // add pins corresponding to attributes
-// Map<Integer, Property> inParameters = new HashMap<Integer, Property>();
-// int inIndex = 0;
-// for(Property att : attributes) {
-// inParameters.put(inIndex, att);
-// inIndex++;
-// }
-// if(!inParameters.isEmpty()) {
-// Command cmd = getAddPinsCmd(action, inParameters, null);
-// globalCmd.append(cmd);
-// }
-// if(action instanceof SendSignalAction) {
-// SendSignalAction sendSignalAction = (SendSignalAction)action;
-// // add target pin
-// if(sendSignalAction.getTarget() == null) {
-// InputPin targetPin = createTargetPin(null);
-// Command cmd = SetCommand.create(editingdomain, action, UMLPackage.eINSTANCE.getSendSignalAction_Target(), targetPin);
-// globalCmd.append(cmd);
-// }
-// }
-// return globalCmd;
-// }
-
+ // /**
+ // * Get the command to reset all pins of the action.
+ // *
+ // * @param action
+ // * action to reinitialize pins (SendSignalAction)
+ // * @return command
+ // */
+ // public static CompoundCommand getResetPinsCmd(InvocationAction action) {
+ // if(!(action instanceof SendSignalAction || action instanceof BroadcastSignalAction)) {
+ // return null;
+ // }
+ // // Get the editing domain
+ // TransactionalEditingDomain editingdomain = EditorUtils.getTransactionalEditingDomain();
+ // CompoundCommand globalCmd = new CompoundCommand();
+ // // remove argument pins
+ // if(!action.getArguments().isEmpty()) {
+ // Command cmd = RemoveCommand.create(editingdomain, action, UMLPackage.eINSTANCE.getInvocationAction_Argument(), action.getArguments());
+ // globalCmd.append(cmd);
+ // }
+ // // recover attributes
+ // List<Property> attributes = Collections.emptyList();
+ // Signal signal = action instanceof SendSignalAction ? ((SendSignalAction)action).getSignal() : ((BroadcastSignalAction)action).getSignal();
+ // if(signal != null) {
+ // attributes = signal.getOwnedAttributes();
+ // }
+ // // add pins corresponding to attributes
+ // Map<Integer, Property> inParameters = new HashMap<Integer, Property>();
+ // int inIndex = 0;
+ // for(Property att : attributes) {
+ // inParameters.put(inIndex, att);
+ // inIndex++;
+ // }
+ // if(!inParameters.isEmpty()) {
+ // Command cmd = getAddPinsCmd(action, inParameters, null);
+ // globalCmd.append(cmd);
+ // }
+ // if(action instanceof SendSignalAction) {
+ // SendSignalAction sendSignalAction = (SendSignalAction)action;
+ // // add target pin
+ // if(sendSignalAction.getTarget() == null) {
+ // InputPin targetPin = createTargetPin(null);
+ // Command cmd = SetCommand.create(editingdomain, action, UMLPackage.eINSTANCE.getSendSignalAction_Target(), targetPin);
+ // globalCmd.append(cmd);
+ // }
+ // }
+ // return globalCmd;
+ // }
/**
* Retrieve the parameter linked
*
@@ -2501,9 +2496,9 @@ public class PinAndParameterSynchronizer extends AbstractModelConstraint { parameters = ((Signal)behaviorStructural).getOwnedAttributes();
} else if(action instanceof BroadcastSignalAction) {
Signal signal = ((BroadcastSignalAction)action).getSignal();
- if(signal != null){
+ if(signal != null) {
behaviorStructural = signal;
- parameters = ((Signal)behaviorStructural).getOwnedAttributes();
+ parameters = ((Signal)behaviorStructural).getOwnedAttributes();
} else {
parameters = Collections.emptyList();
}
@@ -2537,9 +2532,7 @@ public class PinAndParameterSynchronizer extends AbstractModelConstraint { //Splitting parameters
Map<Integer, TypedElement> inParams = new HashMap<Integer, TypedElement>();
Map<Integer, TypedElement> outParams = new HashMap<Integer, TypedElement>();
-
splitParameters(parameters, parameterWhichPinNotDeleted, inParams, outParams, action);
-
//Creating new pins.
if(!inParams.isEmpty() || !outParams.isEmpty()) {
Command cmd = getAddPinsCmd(action, inParams, outParams, null);
@@ -2562,7 +2555,7 @@ public class PinAndParameterSynchronizer extends AbstractModelConstraint { Command cmd = SetCommand.create(editingdomain, action, UMLPackage.eINSTANCE.getCallOperationAction_Target(), targetPin);
globalCmd.append(cmd);
}
- }else if(action instanceof SendSignalAction) {
+ } else if(action instanceof SendSignalAction) {
SendSignalAction sendSignalAction = (SendSignalAction)action;
// add target pin
if(sendSignalAction.getTarget() == null) {
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/helper/datastructure/LinkPinToParameter.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/helper/datastructure/LinkPinToParameter.java index ee0e2e5f42a..e42c9d69b16 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/helper/datastructure/LinkPinToParameter.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/helper/datastructure/LinkPinToParameter.java @@ -44,9 +44,7 @@ public class LinkPinToParameter implements ILinkPinToTarget { */
private TypedElement parameter;
-
public LinkPinToParameter() {
-
}
/**
@@ -63,29 +61,23 @@ public class LinkPinToParameter implements ILinkPinToTarget { this.parameter = parameter;
}
-
public Pin getPin() {
return pin;
}
-
public void setPin(Pin pin) {
this.pin = pin;
}
-
public TypedElement getParameter() {
return parameter;
}
-
public void setParameter(TypedElement parameter) {
this.parameter = parameter;
}
-
public Element getTarget() {
return parameter;
}
-
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/helper/datastructure/LinkPinToProperty.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/helper/datastructure/LinkPinToProperty.java index 7d5923d3280..9baab597980 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/helper/datastructure/LinkPinToProperty.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/helper/datastructure/LinkPinToProperty.java @@ -20,15 +20,15 @@ import org.eclipse.uml2.uml.Property; /**
* Link a pin a to a property
+ *
* @author arthur daussy
*/
public class LinkPinToProperty implements ILinkPinToTarget {
private Pin pin;
-
+
private Property property;
-
-
+
public LinkPinToProperty(Pin pin, Property property) {
super();
Assert.isNotNull(pin);
@@ -37,14 +37,11 @@ public class LinkPinToProperty implements ILinkPinToTarget { this.property = property;
}
-
public Pin getPin() {
return pin;
}
-
public Element getTarget() {
return property;
}
-
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/listeners/ExceptionHandlerListener.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/listeners/ExceptionHandlerListener.java index 8ba0c9f2678..21da4a04578 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/listeners/ExceptionHandlerListener.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/listeners/ExceptionHandlerListener.java @@ -35,9 +35,9 @@ import org.eclipse.uml2.uml.UMLPackage; public class ExceptionHandlerListener extends AbstractPapyrusModifcationTriggerListener {
private static NotificationFilter FEATURE_FILTER = null;
-
+
public static NotificationFilter getFEATURE_FILTER() {
- if (FEATURE_FILTER == null){
+ if(FEATURE_FILTER == null) {
FEATURE_FILTER = NotificationFilter.createFeatureFilter(UMLPackage.Literals.EXCEPTION_HANDLER__EXCEPTION_INPUT);
}
return FEATURE_FILTER;
@@ -51,7 +51,6 @@ public class ExceptionHandlerListener extends AbstractPapyrusModifcationTriggerL return null;
}
-
@Override
public NotificationFilter getFilter() {
return getFEATURE_FILTER();
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/listeners/InInterruptibleActivityRegionListener.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/listeners/InInterruptibleActivityRegionListener.java index 0186c775998..7bd04949661 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/listeners/InInterruptibleActivityRegionListener.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/listeners/InInterruptibleActivityRegionListener.java @@ -68,8 +68,6 @@ public class InInterruptibleActivityRegionListener extends AbstractPapyrusModifc }
}
-
-
/**
* Get the list of all starting or ending Interruptible Edge wich are related to this {@link ActivityNode} and its descendant.
* Those Iterable can be filled with null elements so test each element for null
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/listeners/InterruptibleEdgeListener.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/listeners/InterruptibleEdgeListener.java index 9e6272b49fe..5877c2185bb 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/listeners/InterruptibleEdgeListener.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/listeners/InterruptibleEdgeListener.java @@ -87,8 +87,7 @@ public class InterruptibleEdgeListener extends AbstractPapyrusModifcationTrigger }
return FEATURE_FILTER;
}
-
-
+
/**
* get the edit part registry
*
@@ -115,7 +114,6 @@ public class InterruptibleEdgeListener extends AbstractPapyrusModifcationTrigger if(Notification.SET == notif.getEventType()) {
CompositeCommand cc = new CompositeCommand("Interruptible Edge Command");////$NON-NLS-0$
//Handling views
-
final Iterable<IGraphicalEditPart> edgesEditPart = DiagramEditPartsUtil.getChildrenByEObject((EObject)notif.getNotifier(), getDiagramEditPart(), true);
InterruptibleEdgeRequest request = new InterruptibleEdgeRequest();
Iterable<View> views = getReferencingView(notif);
@@ -197,7 +195,6 @@ public class InterruptibleEdgeListener extends AbstractPapyrusModifcationTrigger return (TransactionalEditingDomain)editingDomain;
}
return null;
-
}
/**
@@ -277,8 +274,6 @@ public class InterruptibleEdgeListener extends AbstractPapyrusModifcationTrigger getDiagramEditPart().refresh();
return status;
}
-
-
};
return cmd;
}
@@ -293,12 +288,8 @@ public class InterruptibleEdgeListener extends AbstractPapyrusModifcationTrigger return null;
}
-
@Override
public NotificationFilter getFilter() {
return getFEATURE_FILTER();
}
-
-
-
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/listeners/ObjectFlowListener.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/listeners/ObjectFlowListener.java index e695435d9a2..94d4261189f 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/listeners/ObjectFlowListener.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/listeners/ObjectFlowListener.java @@ -28,15 +28,13 @@ import org.eclipse.uml2.uml.ObjectFlow; import org.eclipse.uml2.uml.UMLFactory;
import org.eclipse.uml2.uml.UMLPackage;
-
/**
* @author tfaure
- *
+ *
*/
-public class ObjectFlowListener extends AbstractPapyrusModifcationTriggerListener{
+public class ObjectFlowListener extends AbstractPapyrusModifcationTriggerListener {
@Override
-
public NotificationFilter getFilter() {
// AN EDGE is contained only in activities and structured
NotificationFilter filter1 = NotificationFilter.createEventTypeFilter(Notification.ADD).and(NotificationFilter.createNotifierTypeFilter(UMLPackage.Literals.STRUCTURED_ACTIVITY_NODE));
@@ -50,19 +48,17 @@ public class ObjectFlowListener extends AbstractPapyrusModifcationTriggerListene cc = new CompositeCommand("Modify Flow");
final ObjectFlow object = (ObjectFlow)notif.getNewValue();
TransactionalEditingDomain domain = (TransactionalEditingDomain)AdapterFactoryEditingDomain.getEditingDomainFor(object);
- if (object.getGuard() == null){
+ if(object.getGuard() == null) {
LiteralBoolean bool = UMLFactory.eINSTANCE.createLiteralBoolean();
bool.setValue(true);
cc.compose(new EMFtoGMFCommandWrapper(SetCommand.create(domain, object, UMLPackage.Literals.ACTIVITY_EDGE__GUARD, bool)));
}
- if (object.getWeight() == null){
+ if(object.getWeight() == null) {
LiteralInteger literalInteger = UMLFactory.eINSTANCE.createLiteralInteger();
literalInteger.setValue(1);
cc.compose(new EMFtoGMFCommandWrapper(SetCommand.create(domain, object, UMLPackage.Literals.ACTIVITY_EDGE__WEIGHT, literalInteger)));
}
}
- return cc ;
+ return cc;
}
-
-
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/listeners/ObjectNodeListener.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/listeners/ObjectNodeListener.java index 3572b1a090e..77be88d496b 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/listeners/ObjectNodeListener.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/listeners/ObjectNodeListener.java @@ -26,15 +26,13 @@ import org.eclipse.uml2.uml.ObjectNode; import org.eclipse.uml2.uml.UMLFactory;
import org.eclipse.uml2.uml.UMLPackage;
-
/**
* @author tfaure
- *
+ *
*/
-public class ObjectNodeListener extends AbstractPapyrusModifcationTriggerListener{
+public class ObjectNodeListener extends AbstractPapyrusModifcationTriggerListener {
@Override
-
public NotificationFilter getFilter() {
// an object node is contained only in actions and activities
NotificationFilter filter1 = NotificationFilter.createEventTypeFilter(Notification.ADD).and(NotificationFilter.createNotifierTypeFilter(UMLPackage.Literals.ACTION));
@@ -47,13 +45,12 @@ public class ObjectNodeListener extends AbstractPapyrusModifcationTriggerListene if(notif.getNewValue() instanceof ObjectNode && notif.getFeature() instanceof EReference && ((EReference)notif.getFeature()).isContainment()) {
cc = new CompositeCommand("Modify Pin");
final ObjectNode object = (ObjectNode)notif.getNewValue();
- if (object.getUpperBound() == null){
+ if(object.getUpperBound() == null) {
LiteralInteger literalInteger = UMLFactory.eINSTANCE.createLiteralInteger();
literalInteger.setValue(1);
cc.compose(new EMFtoGMFCommandWrapper(SetCommand.create(AdapterFactoryEditingDomain.getEditingDomainFor(object), object, UMLPackage.Literals.OBJECT_NODE__UPPER_BOUND, literalInteger)));
}
}
- return cc ;
+ return cc;
}
-
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/locator/ActivityParameterNodePositionLocator.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/locator/ActivityParameterNodePositionLocator.java index 9275e474928..a7e28355daf 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/locator/ActivityParameterNodePositionLocator.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/locator/ActivityParameterNodePositionLocator.java @@ -164,7 +164,6 @@ public class ActivityParameterNodePositionLocator extends AdvancedBorderItemLoca @Override
protected Point getPreferredLocation(int side, IFigure borderItem) {
return super.getPreferredLocation(side, borderItem);
-
// manage position for in/out parameter
// Rectangle bounds = getParentBorder();
// int parentFigureWidth = bounds.width;
@@ -206,13 +205,10 @@ public class ActivityParameterNodePositionLocator extends AdvancedBorderItemLoca * @return a possible location on parent figure border
*/
public Rectangle getPreferredLocation(Rectangle proposedLocation) {
-
// Initialize port location with proposed location
// and resolve the bounds of it graphical parent
Rectangle realLocation = new Rectangle(proposedLocation);
-
Rectangle parentRec = getParentFigure().getBounds().getCopy();
-
// Calculate Max position around the graphical parent (1/2 size or the
// port around
// the graphical parent bounds.
@@ -220,30 +216,24 @@ public class ActivityParameterNodePositionLocator extends AdvancedBorderItemLoca int xMax = parentRec.x - borderItemOffset + parentRec.width;
int yMin = parentRec.y - borderItemOffset;
int yMax = parentRec.y - borderItemOffset + parentRec.height;
-
// Modify Port location if MAX X or Y are exceeded
if(realLocation.x < xMin) {
realLocation.x = xMin;
}
-
if(realLocation.x > xMax) {
realLocation.x = xMax;
}
-
if(realLocation.y < yMin) {
realLocation.y = yMin;
}
-
if(realLocation.y > yMax) {
realLocation.y = yMax;
}
-
// Ensure the port is positioned on its parent borders and not in the
// middle.
// Modify position if needed.
if((realLocation.y != yMin) && (realLocation.y != yMax)) {
if((realLocation.x != xMin) && (realLocation.x != xMax)) {
-
if(realLocation.x <= (xMin + (parentRec.width / 2))) {
realLocation.x = xMin;
} else {
@@ -251,9 +241,7 @@ public class ActivityParameterNodePositionLocator extends AdvancedBorderItemLoca }
}
}
-
// Return constrained location
return realLocation;
}
-
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/locator/ParameterNodeLocator.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/locator/ParameterNodeLocator.java index 555d7c72bd2..3e7c2856509 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/locator/ParameterNodeLocator.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/locator/ParameterNodeLocator.java @@ -26,5 +26,4 @@ public class ParameterNodeLocator extends PortPositionLocator { super(parentFigure, preferredSide);
setBorderItemOffset(20);
}
-
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/locator/PinPositionLocator.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/locator/PinPositionLocator.java index e898fd1d1f1..cbe2320640e 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/locator/PinPositionLocator.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/locator/PinPositionLocator.java @@ -558,7 +558,6 @@ public class PinPositionLocator extends AdvancedBorderItemLocator { int parentFigureY = bounds.y;
int x = parentFigureX;
int y = parentFigureY;
-
Dimension borderItemSize = getSize(borderItem);
switch(side) {
case PositionConstants.NORTH:
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/parser/custom/AcceptEventActionParser.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/parser/custom/AcceptEventActionParser.java index 54026673310..ff632ce3c47 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/parser/custom/AcceptEventActionParser.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/parser/custom/AcceptEventActionParser.java @@ -69,7 +69,6 @@ public class AcceptEventActionParser extends MessageFormatParser implements ISem public boolean isAffectingEvent(Object event, int flags) {
EStructuralFeature feature = getEStructuralFeature(event);
return isValidFeature(feature);
-
}
/*
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/parser/custom/AcceptTimeEventActionParser.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/parser/custom/AcceptTimeEventActionParser.java index 8f14eee4c89..f4db47459b3 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/parser/custom/AcceptTimeEventActionParser.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/parser/custom/AcceptTimeEventActionParser.java @@ -69,7 +69,6 @@ public class AcceptTimeEventActionParser extends MessageFormatParser implements public boolean isAffectingEvent(Object event, int flags) {
EStructuralFeature feature = getEStructuralFeature(event);
return isValidFeature(feature);
-
}
/*
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/parser/custom/ActivityEdgeWeightParser.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/parser/custom/ActivityEdgeWeightParser.java index 97845035b04..3c5f302d28c 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/parser/custom/ActivityEdgeWeightParser.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/parser/custom/ActivityEdgeWeightParser.java @@ -78,7 +78,6 @@ public class ActivityEdgeWeightParser extends MessageFormatParser implements ISe public boolean isAffectingEvent(Object event, int flags) {
EStructuralFeature feature = getEStructuralFeature(event);
return isValidFeature(feature);
-
}
@Override
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/parser/custom/ActivityParameterNodeParser.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/parser/custom/ActivityParameterNodeParser.java index 03d9b57f86b..d9978f07386 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/parser/custom/ActivityParameterNodeParser.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/parser/custom/ActivityParameterNodeParser.java @@ -167,5 +167,4 @@ public class ActivityParameterNodeParser extends MessageFormatParser implements private boolean isValidFeature(EStructuralFeature feature) {
return UMLPackage.eINSTANCE.getNamedElement_Name().equals(feature) || UMLPackage.eINSTANCE.getTypedElement_Type().equals(feature) || UMLPackage.eINSTANCE.getObjectNode_InState().equals(feature);
}
-
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/parser/custom/ActivitySingleExecutionParser.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/parser/custom/ActivitySingleExecutionParser.java index d04964d241c..b2f66613649 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/parser/custom/ActivitySingleExecutionParser.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/parser/custom/ActivitySingleExecutionParser.java @@ -68,7 +68,6 @@ public class ActivitySingleExecutionParser extends MessageFormatParser implement public boolean isAffectingEvent(Object event, int flags) {
EStructuralFeature feature = getEStructuralFeature(event);
return isValidFeature(feature);
-
}
/*
@@ -79,7 +78,6 @@ public class ActivitySingleExecutionParser extends MessageFormatParser implement */
public String getPrintString(IAdaptable element, int flags) {
Object obj = element.getAdapter(EObject.class);
-
if(obj instanceof Activity) {
Activity activity = (Activity)obj;
if(activity.isSingleExecution()) {
@@ -127,5 +125,4 @@ public class ActivitySingleExecutionParser extends MessageFormatParser implement private boolean isValidFeature(EStructuralFeature feature) {
return UMLPackage.eINSTANCE.getActivity_IsSingleExecution().equals(feature);
}
-
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/parser/custom/AssociatedBehaviorParser.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/parser/custom/AssociatedBehaviorParser.java index 04fc0701660..44b991fdeda 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/parser/custom/AssociatedBehaviorParser.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/parser/custom/AssociatedBehaviorParser.java @@ -70,7 +70,6 @@ public abstract class AssociatedBehaviorParser extends MessageFormatParser imple public boolean isAffectingEvent(Object event, int flags) {
EStructuralFeature feature = getEStructuralFeature(event);
return isValidFeature(feature);
-
}
@Override
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/parser/custom/CallBehaviorActionParser.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/parser/custom/CallBehaviorActionParser.java index 005befd01d3..b045038401c 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/parser/custom/CallBehaviorActionParser.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/parser/custom/CallBehaviorActionParser.java @@ -70,7 +70,6 @@ public class CallBehaviorActionParser extends MessageFormatParser implements ISe public boolean isAffectingEvent(Object event, int flags) {
EStructuralFeature feature = getEStructuralFeature(event);
return isValidFeature(feature);
-
}
/*
@@ -81,7 +80,6 @@ public class CallBehaviorActionParser extends MessageFormatParser implements ISe */
public String getPrintString(IAdaptable element, int flags) {
Object obj = element.getAdapter(EObject.class);
-
if(obj instanceof CallBehaviorAction) {
CallBehaviorAction action = (CallBehaviorAction)obj;
String actionName = "";
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/parser/custom/CallOperationActionParser.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/parser/custom/CallOperationActionParser.java index f422ca1f175..080448499bd 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/parser/custom/CallOperationActionParser.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/parser/custom/CallOperationActionParser.java @@ -82,7 +82,6 @@ public class CallOperationActionParser extends MessageFormatParser implements IS public boolean isAffectingEvent(Object event, int flags) {
EStructuralFeature feature = getEStructuralFeature(event);
return isValidFeature(feature);
-
}
/*
@@ -93,7 +92,6 @@ public class CallOperationActionParser extends MessageFormatParser implements IS */
public String getPrintString(IAdaptable element, int flags) {
Object obj = element.getAdapter(EObject.class);
-
if(obj instanceof CallOperationAction) {
CallOperationAction action = (CallOperationAction)obj;
String name = action.getName();
@@ -197,5 +195,4 @@ public class CallOperationActionParser extends MessageFormatParser implements IS boolean isPrintedElement = UMLPackage.eINSTANCE.getCallOperationAction_Operation().equals(feature) || UMLPackage.eINSTANCE.getOperation_Class().equals(feature);
return isName || isPrintedElement;
}
-
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/parser/custom/DecisionInputFlowParser.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/parser/custom/DecisionInputFlowParser.java index 9334c300ff6..a929d9e01e4 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/parser/custom/DecisionInputFlowParser.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/parser/custom/DecisionInputFlowParser.java @@ -71,7 +71,6 @@ public class DecisionInputFlowParser extends MessageFormatParser implements ISem public boolean isAffectingEvent(Object event, int flags) {
EStructuralFeature feature = getEStructuralFeature(event);
return isValidFeature(feature);
-
}
/*
@@ -82,7 +81,6 @@ public class DecisionInputFlowParser extends MessageFormatParser implements ISem */
public String getPrintString(IAdaptable element, int flags) {
Object obj = element.getAdapter(EObject.class);
-
if(obj instanceof ObjectFlow) {
ActivityNode target = ((ObjectFlow)obj).getTarget();
if(target instanceof DecisionNode) {
@@ -137,5 +135,4 @@ public class DecisionInputFlowParser extends MessageFormatParser implements ISem private boolean isValidFeature(EStructuralFeature feature) {
return UMLPackage.eINSTANCE.getActivityEdge_Target().equals(feature) || UMLPackage.eINSTANCE.getDecisionNode_DecisionInputFlow().equals(feature);
}
-
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/parser/custom/EdgeGuardParser.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/parser/custom/EdgeGuardParser.java index 4aee8b90734..3609061721d 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/parser/custom/EdgeGuardParser.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/parser/custom/EdgeGuardParser.java @@ -78,7 +78,6 @@ public class EdgeGuardParser extends MessageFormatParser implements ISemanticPar public boolean isAffectingEvent(Object event, int flags) {
EStructuralFeature feature = getEStructuralFeature(event);
return isValidFeature(feature);
-
}
@Override
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/parser/custom/ExceptionHandlerTypeParser.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/parser/custom/ExceptionHandlerTypeParser.java index be379719adb..03f34371f82 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/parser/custom/ExceptionHandlerTypeParser.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/parser/custom/ExceptionHandlerTypeParser.java @@ -72,7 +72,6 @@ public class ExceptionHandlerTypeParser extends MessageFormatParser implements I public boolean isAffectingEvent(Object event, int flags) {
EStructuralFeature feature = getEStructuralFeature(event);
return isValidFeature(feature);
-
}
/*
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/parser/custom/InputDecisionParser.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/parser/custom/InputDecisionParser.java index 6a2df9e4666..2fa41ce365d 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/parser/custom/InputDecisionParser.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/parser/custom/InputDecisionParser.java @@ -46,5 +46,4 @@ public class InputDecisionParser extends AssociatedBehaviorParser { protected EStructuralFeature getReferenceFeature() {
return UMLPackage.eINSTANCE.getDecisionNode_DecisionInput();
}
-
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/parser/custom/JoinSpecParser.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/parser/custom/JoinSpecParser.java index ec62a774460..f2d28633f8c 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/parser/custom/JoinSpecParser.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/parser/custom/JoinSpecParser.java @@ -78,7 +78,6 @@ public class JoinSpecParser extends MessageFormatParser implements ISemanticPars public boolean isAffectingEvent(Object event, int flags) {
EStructuralFeature feature = getEStructuralFeature(event);
return isValidFeature(feature);
-
}
@Override
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/parser/custom/ObjectFlowSelectionParser.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/parser/custom/ObjectFlowSelectionParser.java index e3952c97adf..2e15a4d13c9 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/parser/custom/ObjectFlowSelectionParser.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/parser/custom/ObjectFlowSelectionParser.java @@ -46,5 +46,4 @@ public class ObjectFlowSelectionParser extends AssociatedBehaviorParser { protected EStructuralFeature getReferenceFeature() {
return UMLPackage.eINSTANCE.getObjectFlow_Selection();
}
-
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/parser/custom/ObjectFlowTransformationParser.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/parser/custom/ObjectFlowTransformationParser.java index 336aa82d67c..99e9c526de4 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/parser/custom/ObjectFlowTransformationParser.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/parser/custom/ObjectFlowTransformationParser.java @@ -46,5 +46,4 @@ public class ObjectFlowTransformationParser extends AssociatedBehaviorParser { protected EStructuralFeature getReferenceFeature() {
return UMLPackage.eINSTANCE.getObjectFlow_Transformation();
}
-
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/parser/custom/ObjectNodeParser.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/parser/custom/ObjectNodeParser.java index e1eef6fd004..9b701f7c5e9 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/parser/custom/ObjectNodeParser.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/parser/custom/ObjectNodeParser.java @@ -105,7 +105,6 @@ public class ObjectNodeParser extends MessageFormatParser implements ISemanticPa public String getPrintString(IAdaptable element, int flags) {
StringBuffer result = new StringBuffer();
Object adapter = element.getAdapter(EObject.class);
-
if(adapter instanceof CentralBufferNode) {
if(adapter instanceof DataStoreNode) {
result.append(DATASTORE_PREFIX);
@@ -183,5 +182,4 @@ public class ObjectNodeParser extends MessageFormatParser implements ISemanticPa private boolean isValidFeature(EStructuralFeature feature) {
return UMLPackage.eINSTANCE.getNamedElement_Name().equals(feature) || UMLPackage.eINSTANCE.getTypedElement_Type().equals(feature) || UMLPackage.eINSTANCE.getObjectNode_InState().equals(feature);
}
-
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/parser/custom/ObjectNodeSelectionParser.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/parser/custom/ObjectNodeSelectionParser.java index c9b102527a9..d43d0c78eee 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/parser/custom/ObjectNodeSelectionParser.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/parser/custom/ObjectNodeSelectionParser.java @@ -46,5 +46,4 @@ public class ObjectNodeSelectionParser extends AssociatedBehaviorParser { protected EStructuralFeature getReferenceFeature() {
return UMLPackage.eINSTANCE.getObjectNode_Selection();
}
-
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/parser/custom/ParameterParser.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/parser/custom/ParameterParser.java index 923f42f95e8..38d3877ffb6 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/parser/custom/ParameterParser.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/parser/custom/ParameterParser.java @@ -72,7 +72,6 @@ public class ParameterParser extends MessageFormatParser implements ISemanticPar public boolean isAffectingEvent(Object event, int flags) {
EStructuralFeature feature = getEStructuralFeature(event);
return isValidFeature(feature);
-
}
/*
@@ -83,7 +82,6 @@ public class ParameterParser extends MessageFormatParser implements ISemanticPar */
public String getPrintString(IAdaptable element, int flags) {
Object obj = element.getAdapter(EObject.class);
-
if(obj instanceof Parameter) {
Parameter parameter = (Parameter)obj;
String name = parameter.getName();
@@ -144,5 +142,4 @@ public class ParameterParser extends MessageFormatParser implements ISemanticPar private boolean isValidFeature(EStructuralFeature feature) {
return UMLPackage.eINSTANCE.getNamedElement_Name().equals(feature) || UMLPackage.eINSTANCE.getTypedElement_Type().equals(feature);
}
-
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/parser/custom/PinParser.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/parser/custom/PinParser.java index 2733bb445d5..675bcb3e9a3 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/parser/custom/PinParser.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/parser/custom/PinParser.java @@ -73,7 +73,6 @@ public class PinParser extends MessageFormatParser implements ISemanticParser { public boolean isAffectingEvent(Object event, int flags) {
EStructuralFeature feature = getEStructuralFeature(event);
return isValidFeature(feature);
-
}
/*
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/parser/custom/PinValueParser.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/parser/custom/PinValueParser.java index d802a5938de..082c4aac4b4 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/parser/custom/PinValueParser.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/parser/custom/PinValueParser.java @@ -85,7 +85,6 @@ public class PinValueParser extends MessageFormatParser implements ISemanticPars public boolean isAffectingEvent(Object event, int flags) {
EStructuralFeature feature = getEStructuralFeature(event);
return isValidFeature(feature);
-
}
@Override
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/parser/custom/PostConditionConstraintLabelParser.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/parser/custom/PostConditionConstraintLabelParser.java index 61d3d4b1556..e6d7169f247 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/parser/custom/PostConditionConstraintLabelParser.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/parser/custom/PostConditionConstraintLabelParser.java @@ -10,7 +10,6 @@ * Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation
*
*****************************************************************************/
-
package org.eclipse.papyrus.uml.diagram.activity.parser.custom;
import java.util.ArrayList;
@@ -99,7 +98,6 @@ public class PostConditionConstraintLabelParser implements IParser { if(constraint == null) {
return "<NULL CONSTRAINT>"; //$NON-NLS-1$
}
-
return CHEVRON + constraint.getName();
}
@@ -138,5 +136,4 @@ public class PostConditionConstraintLabelParser implements IParser { }
return null;
}
-
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/parser/custom/PreConditionConstraintLabelParser.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/parser/custom/PreConditionConstraintLabelParser.java index 5aacfef895b..0551a846071 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/parser/custom/PreConditionConstraintLabelParser.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/parser/custom/PreConditionConstraintLabelParser.java @@ -10,7 +10,6 @@ * Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation
*
*****************************************************************************/
-
package org.eclipse.papyrus.uml.diagram.activity.parser.custom;
import java.util.ArrayList;
@@ -99,7 +98,6 @@ public class PreConditionConstraintLabelParser implements IParser { if(constraint == null) {
return "<NULL CONSTRAINT>"; //$NON-NLS-1$
}
-
return CHEVRON + constraint.getName();
}
@@ -138,5 +136,4 @@ public class PreConditionConstraintLabelParser implements IParser { }
return null;
}
-
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/parser/custom/StructuredActivityNodeKeywordParser.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/parser/custom/StructuredActivityNodeKeywordParser.java index dea40b91a0f..5451ac29e37 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/parser/custom/StructuredActivityNodeKeywordParser.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/parser/custom/StructuredActivityNodeKeywordParser.java @@ -94,7 +94,6 @@ public class StructuredActivityNodeKeywordParser extends MessageFormatParser imp public boolean isAffectingEvent(Object event, int flags) {
EStructuralFeature feature = getEStructuralFeature(event);
return isValidFeature(feature);
-
}
/*
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/preferences/ActivityEdgeLabelVisibilityGroup.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/preferences/ActivityEdgeLabelVisibilityGroup.java index b930c478ec7..f8e5949d230 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/preferences/ActivityEdgeLabelVisibilityGroup.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/preferences/ActivityEdgeLabelVisibilityGroup.java @@ -56,12 +56,9 @@ public class ActivityEdgeLabelVisibilityGroup extends AbstractGroup { Group visibilityGroup = new Group(parent, SWT.SCROLL_PAGE);
visibilityGroup.setLayout(new GridLayout());
visibilityGroup.setText(Messages.ActivityEdgePreferencePage_visibilityGroup);
-
// field for name label visibility
showNameLabelBooleanFieldEditor = new BooleanFieldEditor(IActivityPreferenceConstants.PREF_ACTIVITY_EDGE_SHOW_NAME_LABEL, Messages.ActivityEdgePreferencePage_showName, visibilityGroup);
showNameLabelBooleanFieldEditor.setPage(dialogPage);
-
addFieldEditor(showNameLabelBooleanFieldEditor);
-
}
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/preferences/DiagramSpecificPreferenceInitializer.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/preferences/DiagramSpecificPreferenceInitializer.java index 6e3578461ae..32837de25f6 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/preferences/DiagramSpecificPreferenceInitializer.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/preferences/DiagramSpecificPreferenceInitializer.java @@ -28,9 +28,7 @@ public class DiagramSpecificPreferenceInitializer extends AbstractPreferenceInit */
public void initializeDefaultPreferences() {
IPreferenceStore store = getPreferenceStore();
-
DiagramGeneralPreferencePage.initSpecificDefaults(store);
-
// preference for showing Activity edge name is common to several pages
store.setDefault(IActivityPreferenceConstants.PREF_ACTIVITY_EDGE_SHOW_NAME_LABEL, true);
// preferences for keeping user choices are not displayed
@@ -40,7 +38,6 @@ public class DiagramSpecificPreferenceInitializer extends AbstractPreferenceInit store.setDefault(IActivityPreferenceConstants.PREF_NEW_CALL_BEHAVIOR_ACTION_CREATION_OWNER, "");
store.setDefault(IActivityPreferenceConstants.PREF_NEW_CALL_OPERATION_ACTION_CREATION_OWNER, "");
store.setDefault(IActivityPreferenceConstants.PREF_NEW_SEND_SIGNAL_ACTION_CREATION_OWNER, "");
-
// Specific preferences for groups
// Opacity Preferences
store.setDefault(IActivityPreferenceConstants.PREF_ACTIVITY_PARTITION_ALPHA, 50);
@@ -54,7 +51,6 @@ public class DiagramSpecificPreferenceInitializer extends AbstractPreferenceInit store.setDefault(IActivityPreferenceConstants.PREF_STRUCTURED_SPECIFIC_KEYWORD_DISPLAY_LOOP_NODE, true);
store.setDefault(IActivityPreferenceConstants.PREF_STRUCTURED_SPECIFIC_KEYWORD_DISPLAY_SEQUENCE_NODE, true);
store.setDefault(IActivityPreferenceConstants.PREF_STRUCTURED_SPECIFIC_KEYWORD_DISPLAY_STRUCTURED_NODE, true);
-
}
/**
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/preferences/SpecificKeywordStructuredActivityNodeVisibility.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/preferences/SpecificKeywordStructuredActivityNodeVisibility.java index c28a2ffc6ae..23f7bccb47a 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/preferences/SpecificKeywordStructuredActivityNodeVisibility.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/preferences/SpecificKeywordStructuredActivityNodeVisibility.java @@ -57,7 +57,6 @@ public class SpecificKeywordStructuredActivityNodeVisibility extends AbstractGro super(parent, key, dialogPage);
this.type = type;
createContent(parent);
-
}
/**
@@ -88,7 +87,5 @@ public class SpecificKeywordStructuredActivityNodeVisibility extends AbstractGro specificKeywordVisibility = new BooleanFieldEditor(preferenceName, Messages.StructuredActivityNodePreferencePage_showSpecificKeyword, visibilityGroup);
specificKeywordVisibility.setPage(dialogPage);
addFieldEditor(specificKeywordVisibility);
-
}
-
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/providers/ActivityDiagramContributionPolicyClass.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/providers/ActivityDiagramContributionPolicyClass.java index b65cfc8aa67..1610c3ad21a 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/providers/ActivityDiagramContributionPolicyClass.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/providers/ActivityDiagramContributionPolicyClass.java @@ -45,5 +45,4 @@ public class ActivityDiagramContributionPolicyClass implements IPopupMenuContrib }
return false;
}
-
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/providers/CustomEditPolicyProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/providers/CustomEditPolicyProvider.java index aa023347aaa..cceb8d79f35 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/providers/CustomEditPolicyProvider.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/providers/CustomEditPolicyProvider.java @@ -38,7 +38,6 @@ public class CustomEditPolicyProvider implements IEditPolicyProvider { * {@inheritDoc}
*/
public void addProviderChangeListener(IProviderChangeListener listener) {
-
}
/**
@@ -66,7 +65,6 @@ public class CustomEditPolicyProvider implements IEditPolicyProvider { if(ActivityDiagramEditPart.MODEL_ID.equals(diagramType)) {
return true;
}
-
return false;
}
@@ -75,7 +73,5 @@ public class CustomEditPolicyProvider implements IEditPolicyProvider { * {@inheritDoc}
*/
public void removeProviderChangeListener(IProviderChangeListener listener) {
-
}
-
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/providers/CustomUMLEditPartProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/providers/CustomUMLEditPartProvider.java index f8daa7b387f..477cf4ce479 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/providers/CustomUMLEditPartProvider.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/providers/CustomUMLEditPartProvider.java @@ -16,7 +16,6 @@ package org.eclipse.papyrus.uml.diagram.activity.providers; import org.eclipse.papyrus.uml.diagram.activity.edit.part.CustomUMLEditPartFactory;
-
/**
* This class was introduce to rout the EditPartFactory to our own EditPartFactory {@link CustomUMLEditPartFactory}
*/
@@ -27,7 +26,4 @@ public class CustomUMLEditPartProvider extends UMLEditPartProvider { setFactory(new CustomUMLEditPartFactory());
setAllowCaching(true);
}
-
-
-
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/tabbedproperties/appearance/SwitchSegmentDirectionSection.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/tabbedproperties/appearance/SwitchSegmentDirectionSection.java index 8c1b629801e..bfff629c625 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/tabbedproperties/appearance/SwitchSegmentDirectionSection.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/tabbedproperties/appearance/SwitchSegmentDirectionSection.java @@ -63,7 +63,6 @@ public class SwitchSegmentDirectionSection extends AbstractNotationPropertiesSec /** The switch image. */
public static Image switchImage = null;
-
/** Load the switch icon once */
static {
try {
@@ -85,7 +84,6 @@ public class SwitchSegmentDirectionSection extends AbstractNotationPropertiesSec GridLayout layout = new GridLayout(2, false);
Group switchGroup = getWidgetFactory().createGroup(composite, Messages.ForkJoinSegmentSwitchOrientation_actionLabel);
switchGroup.setLayout(layout);
-
// create switch button
Button button = new Button(switchGroup, SWT.PUSH);
button.setImage(switchImage);
@@ -107,7 +105,6 @@ public class SwitchSegmentDirectionSection extends AbstractNotationPropertiesSec switchSelectedSegmentsOrientation();
refresh();
}
-
});
// create help
ImageHyperlink help = HelpComponentFactory.createHelpComponent(switchGroup, getWidgetFactory(), Messages.ForkJoinSegmentSwitchOrientation_helpMessage);
@@ -258,6 +255,5 @@ public class SwitchSegmentDirectionSection extends AbstractNotationPropertiesSec protected IStatus doRedo(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
return doExecute(monitor, info);
}
-
}
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/tabbedproperties/appearance/SwitchSegmentDirectionSectionFilter.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/tabbedproperties/appearance/SwitchSegmentDirectionSectionFilter.java index 0232b87a3f7..9a83934cdf0 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/tabbedproperties/appearance/SwitchSegmentDirectionSectionFilter.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/tabbedproperties/appearance/SwitchSegmentDirectionSectionFilter.java @@ -28,5 +28,4 @@ public class SwitchSegmentDirectionSectionFilter implements IFilter { public boolean select(Object object) {
return object instanceof ForkNodeEditPart || object instanceof JoinNodeEditPart;
}
-
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/testers/UMLCallActionTester.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/testers/UMLCallActionTester.java index ade4bdcbde5..d811aee2bc7 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/testers/UMLCallActionTester.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/testers/UMLCallActionTester.java @@ -11,7 +11,6 @@ * Anass Radouani (Atos) anass.radouani@atos.com - Initial API and implementation
*
*****************************************************************************/
-
package org.eclipse.papyrus.uml.diagram.activity.testers;
import org.eclipse.core.expressions.PropertyTester;
@@ -33,42 +32,33 @@ public class UMLCallActionTester extends PropertyTester { /** Tester ID for UML Call Action nature */
public final static String IS_CALL_ACTION = "isCallAction"; //$NON-NLS-N$
-
/** Default constructor */
public UMLCallActionTester() {
}
/** Test the receiver against the selected property */
public boolean test(Object receiver, String property, Object[] args, Object expectedValue) {
-
// Ensure Papyrus is the active editor
IEditorPart editor = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor();
if((editor == null) || (!(editor instanceof PapyrusMultiDiagramEditor))) {
return false;
}
-
Object currentValue = null;
if(IS_CALL_ACTION.equals(property)) {
-
if(receiver instanceof StructuredSelection) {
StructuredSelection structuredSelection = (StructuredSelection)receiver;
-
Object obj = structuredSelection.getFirstElement();
-
EObject element = null;
if(obj instanceof IAdaptable) {
element = (EObject)((IAdaptable)obj).getAdapter(EObject.class);
-
if(element instanceof View) {
element = ((View)element).getElement();
}
}
currentValue = element instanceof InvocationAction;
}
-
return (currentValue == expectedValue);
}
-
return false;
}
}
|