diff options
Diffstat (limited to 'plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ReadVariableActionEditPart.java')
-rw-r--r-- | plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ReadVariableActionEditPart.java | 98 |
1 files changed, 45 insertions, 53 deletions
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ReadVariableActionEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ReadVariableActionEditPart.java index f5663812b71..5332d85f8f3 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ReadVariableActionEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ReadVariableActionEditPart.java @@ -67,7 +67,7 @@ public class ReadVariableActionEditPart extends RoundedCompartmentEditPart { /** * @generated */ - public static final int VISUAL_ID = 3097; + public static final String VISUAL_ID = "3097"; /** * @generated @@ -94,16 +94,12 @@ public class ReadVariableActionEditPart extends RoundedCompartmentEditPart { installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy()); super.createDefaultEditPolicies(); installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy()); - installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy()); - installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy()); //in Papyrus diagrams are not strongly synchronised //installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.activity.edit.policies.ReadVariableActionCanonicalEditPolicy()); - installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy()); - installEditPolicy(EditPolicyRoles.OPEN_ROLE, - new OpenDiagramEditPolicy()); + installEditPolicy(EditPolicyRoles.OPEN_ROLE, new OpenDiagramEditPolicy()); installEditPolicy(RequestConstants.REQ_CREATE, new CreateActionLocalConditionEditPolicy()); installEditPolicy(RequestConstants.REQ_DELETE, new DeleteActionViewEditPolicy()); installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy()); @@ -121,23 +117,26 @@ public class ReadVariableActionEditPart extends RoundedCompartmentEditPart { @Override protected EditPolicy createChildEditPolicy(EditPart child) { - View childView = (View) child.getModel(); - switch (UMLVisualIDRegistry.getVisualID(childView)) { - case ReadVariableActionFloatingNameEditPart.VISUAL_ID: - return new BorderItemSelectionEditPolicy() { - - @Override - protected List<?> createSelectionHandles() { - MoveHandle mh = new MoveHandle((GraphicalEditPart) getHost()); - mh.setBorder(null); - return Collections.singletonList(mh); - } - }; - case OutputPinInReadVariableActionAsResultEditPart.VISUAL_ID: - return new BorderItemResizableEditPolicy(); + View childView = (View)child.getModel(); + String vid = UMLVisualIDRegistry.getVisualID(childView); + if(vid != null) { + switch(vid) { + case ReadVariableActionFloatingNameEditPart.VISUAL_ID: + return new BorderItemSelectionEditPolicy() { + + @Override + protected List<?> createSelectionHandles() { + MoveHandle mh = new MoveHandle((GraphicalEditPart)getHost()); + mh.setBorder(null); + return Collections.singletonList(mh); + } + }; + case OutputPinInReadVariableActionAsResultEditPart.VISUAL_ID: + return new BorderItemResizableEditPolicy(); + } } EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); - if (result == null) { + if(result == null) { result = new NonResizableEditPolicy(); } return result; @@ -167,29 +166,23 @@ public class ReadVariableActionEditPart extends RoundedCompartmentEditPart { * @generated */ public RoundedCompartmentFigure getPrimaryShape() { - return (RoundedCompartmentFigure) primaryShape; + return (RoundedCompartmentFigure)primaryShape; } /** * @generated */ protected boolean addFixedChild(EditPart childEditPart) { - if (childEditPart instanceof ReadVariableActionNameEditPart) { - ((ReadVariableActionNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel()); + if(childEditPart instanceof ReadVariableActionNameEditPart) { + ((ReadVariableActionNameEditPart)childEditPart).setLabel(getPrimaryShape().getNameLabel()); return true; } - - - - //Papyrus Gencode :Affixed Pin locator for Actions - if (childEditPart instanceof OutputPinInReadVariableActionAsResultEditPart) { + if(childEditPart instanceof OutputPinInReadVariableActionAsResultEditPart) { IBorderItemLocator locator = new PinPositionLocator(getMainFigure(), PositionConstants.NONE); - getBorderedFigure().getBorderItemContainer().add(((OutputPinInReadVariableActionAsResultEditPart) childEditPart).getFigure(), locator); + getBorderedFigure().getBorderItemContainer().add(((OutputPinInReadVariableActionAsResultEditPart)childEditPart).getFigure(), locator); return true; } - - return false; } @@ -197,11 +190,11 @@ public class ReadVariableActionEditPart extends RoundedCompartmentEditPart { * @generated */ protected boolean removeFixedChild(EditPart childEditPart) { - if (childEditPart instanceof ReadVariableActionNameEditPart) { + if(childEditPart instanceof ReadVariableActionNameEditPart) { return true; } - if (childEditPart instanceof OutputPinInReadVariableActionAsResultEditPart) { - getBorderedFigure().getBorderItemContainer().remove(((OutputPinInReadVariableActionAsResultEditPart) childEditPart).getFigure()); + if(childEditPart instanceof OutputPinInReadVariableActionAsResultEditPart) { + getBorderedFigure().getBorderItemContainer().remove(((OutputPinInReadVariableActionAsResultEditPart)childEditPart).getFigure()); return true; } return false; @@ -212,7 +205,7 @@ public class ReadVariableActionEditPart extends RoundedCompartmentEditPart { */ @Override protected void addChildVisual(EditPart childEditPart, int index) { - if (addFixedChild(childEditPart)) { + if(addFixedChild(childEditPart)) { return; } super.addChildVisual(childEditPart, -1); @@ -223,7 +216,7 @@ public class ReadVariableActionEditPart extends RoundedCompartmentEditPart { */ @Override protected void removeChildVisual(EditPart childEditPart) { - if (removeFixedChild(childEditPart)) { + if(removeFixedChild(childEditPart)) { return; } super.removeChildVisual(childEditPart); @@ -234,7 +227,7 @@ public class ReadVariableActionEditPart extends RoundedCompartmentEditPart { */ @Override protected IFigure getContentPaneFor(IGraphicalEditPart editPart) { - if (editPart instanceof IBorderItemEditPart) { + if(editPart instanceof IBorderItemEditPart) { return getBorderedFigure().getBorderItemContainer(); } return getContentPane(); @@ -244,7 +237,7 @@ public class ReadVariableActionEditPart extends RoundedCompartmentEditPart { * @generated */ protected void addBorderItem(IFigure borderItemContainer, IBorderItemEditPart borderItemEditPart) { - if (borderItemEditPart instanceof ReadVariableActionFloatingNameEditPart) { + if(borderItemEditPart instanceof ReadVariableActionFloatingNameEditPart) { BorderItemLocator locator = new BorderItemLocator(getMainFigure(), PositionConstants.SOUTH); locator.setBorderItemOffset(new Dimension(-20, -20)); borderItemContainer.add(borderItemEditPart.getFigure(), locator); @@ -272,7 +265,6 @@ public class ReadVariableActionEditPart extends RoundedCompartmentEditPart { @Override protected NodeFigure createMainFigure() { return new SelectableBorderedNodeFigure(createMainFigureWithSVG()); - } /** @@ -284,7 +276,7 @@ public class ReadVariableActionEditPart extends RoundedCompartmentEditPart { * @generated */ protected IFigure setupContentPane(IFigure nodeShape) { - if (nodeShape.getLayoutManager() == null) { + if(nodeShape.getLayoutManager() == null) { ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout(); layout.setSpacing(5); nodeShape.setLayoutManager(layout); @@ -297,7 +289,7 @@ public class ReadVariableActionEditPart extends RoundedCompartmentEditPart { */ @Override public IFigure getContentPane() { - if (contentPane != null) { + if(contentPane != null) { return contentPane; } return super.getContentPane(); @@ -308,7 +300,7 @@ public class ReadVariableActionEditPart extends RoundedCompartmentEditPart { */ @Override protected void setForegroundColor(Color color) { - if (primaryShape != null) { + if(primaryShape != null) { primaryShape.setForegroundColor(color); } } @@ -326,8 +318,8 @@ public class ReadVariableActionEditPart extends RoundedCompartmentEditPart { */ @Override protected void setLineType(int style) { - if (primaryShape instanceof IPapyrusNodeFigure) { - ((IPapyrusNodeFigure) primaryShape).setLineStyle(style); + if(primaryShape instanceof IPapyrusNodeFigure) { + ((IPapyrusNodeFigure)primaryShape).setLineStyle(style); } } @@ -348,22 +340,22 @@ public class ReadVariableActionEditPart extends RoundedCompartmentEditPart { protected void handleNotificationEvent(Notification notification) { super.handleNotificationEvent(notification); Object feature = notification.getFeature(); - if (UMLPackage.Literals.VARIABLE_ACTION__VARIABLE.equals(feature)) { + if(UMLPackage.Literals.VARIABLE_ACTION__VARIABLE.equals(feature)) { final Object result = this.resolveSemanticElement().eGet(UMLPackage.Literals.READ_VARIABLE_ACTION__RESULT); Object _varaible = notification.getNewValue(); - if (_varaible instanceof Variable) { + if(_varaible instanceof Variable) { org.eclipse.emf.common.command.Command cmdSetResultType = null; - Variable newVariable = (Variable) _varaible; + Variable newVariable = (Variable)_varaible; Type type = newVariable.getType(); - if (type != null) { + if(type != null) { cmdSetResultType = SetCommand.create(getEditingDomain(), result, UMLPackage.Literals.TYPED_ELEMENT__TYPE, type); } try { - if (cmdSetResultType != null) { - if (cmdSetResultType.canExecute()) { + if(cmdSetResultType != null) { + if(cmdSetResultType.canExecute()) { CommandStack commandStack = getEditingDomain().getCommandStack(); - if (commandStack instanceof TransactionalCommandStack) { - ((TransactionalCommandStack) commandStack).execute(cmdSetResultType, Collections.singletonMap(Transaction.OPTION_UNPROTECTED, Boolean.TRUE)); + if(commandStack instanceof TransactionalCommandStack) { + ((TransactionalCommandStack)commandStack).execute(cmdSetResultType, Collections.singletonMap(Transaction.OPTION_UNPROTECTED, Boolean.TRUE)); } else { commandStack.execute(cmdSetResultType); } |