diff options
| author | Camille Letavernier | 2014-07-22 09:14:03 +0000 |
|---|---|---|
| committer | Gerrit Code Review @ Eclipse.org | 2014-07-22 09:14:03 +0000 |
| commit | 218d531d31819f6541c01030ec476429f04878df (patch) | |
| tree | 564a17a5fd7f29ed01ee59bd1c93cd44b969c3e2 | |
| parent | 9a9927ced4aa8a509606d6ef816e50a62cab1784 (diff) | |
| parent | 7192b5cbb5eb2c39a714fb56c4ac98a677b4c6de (diff) | |
| download | org.eclipse.papyrus-218d531d31819f6541c01030ec476429f04878df.tar.gz org.eclipse.papyrus-218d531d31819f6541c01030ec476429f04878df.tar.xz org.eclipse.papyrus-218d531d31819f6541c01030ec476429f04878df.zip | |
Merge "[440039] - NPE while deleting ExpansionNode"
3 files changed, 41 insertions, 68 deletions
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/model/activityDiagram.gmfgen b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/model/activityDiagram.gmfgen index 35cbf6297d5..6cee2377e45 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/model/activityDiagram.gmfgen +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/model/activityDiagram.gmfgen @@ -1456,8 +1456,7 @@ </modelFacet> <labels xsi:type="gmfgen:GenExternalNodeLabel" visualID="5043" editPartClassName="DecisionInputEditPart" itemSemanticEditPolicyClassName="DecisionInputItemSemanticEditPolicy" notationViewFactoryClassName="DecisionNodeLabelViewFactory"> <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/> - <viewmap xsi:type="gmfgen:InnerClassViewmap" className="LinkAndCornerBentWithTextFigure" classBody="
/**
 * @generated
 */
public class LinkAndCornerBentWithTextFigure extends org.eclipse.papyrus.uml.diagram.common.figure.node.CornerBentFigure {


	/**
	 * @generated
	 */
	private org.eclipse.papyrus.uml.diagram.activity.figures.WrappedLabel fCornerBentContent; 
	/**
	 * @generated
	 */
	private org.eclipse.draw2d.PolylineShape fLinkToBehaviorProperty; 


	/**
	 * @generated
	 */
	public LinkAndCornerBentWithTextFigure() {
				

	this.setBackgroundColor(THIS_BACK
);
		createContents();
	}
	/**
	 * @generated
	 */
	private void createContents(){


fCornerBentContent = new org.eclipse.papyrus.uml.diagram.activity.figures.WrappedLabel();



this.add(fCornerBentContent);



fLinkToBehaviorProperty = new org.eclipse.draw2d.PolylineShape();
fLinkToBehaviorProperty.setLineStyle(org.eclipse.draw2d.Graphics.LINE_DASH);

this.add(fLinkToBehaviorProperty);


	}





	/**
	 * @generated
	 */
	public org.eclipse.papyrus.uml.diagram.activity.figures.WrappedLabel getCornerBentContent() {
		return fCornerBentContent;
	}
	/**
	 * @generated
	 */
	public org.eclipse.draw2d.PolylineShape getLinkToBehaviorProperty() {
		return fLinkToBehaviorProperty;
	}


}

/**
 * @generated
 */
static final org.eclipse.swt.graphics.Color THIS_BACK = new org.eclipse.swt.graphics.Color(null, 248, 249, 214);

"> - </viewmap> + <viewmap xsi:type="gmfgen:InnerClassViewmap" className="LinkAndCornerBentWithTextFigure" classBody="
/**
 * @generated
 */
public class LinkAndCornerBentWithTextFigure extends org.eclipse.papyrus.uml.diagram.common.figure.node.CornerBentFigure {


	/**
	 * @generated
	 */
	private org.eclipse.papyrus.uml.diagram.activity.figures.WrappedLabel fCornerBentContent; 
	/**
	 * @generated
	 */
	private org.eclipse.draw2d.PolylineShape fLinkToBehaviorProperty; 


	/**
	 * @generated
	 */
	public LinkAndCornerBentWithTextFigure() {
				

	this.setBackgroundColor(THIS_BACK
);
		createContents();
	}
	/**
	 * @generated
	 */
	private void createContents(){


fCornerBentContent = new org.eclipse.papyrus.uml.diagram.activity.figures.WrappedLabel();



this.add(fCornerBentContent);



fLinkToBehaviorProperty = new org.eclipse.draw2d.PolylineShape();
fLinkToBehaviorProperty.setLineStyle(org.eclipse.draw2d.Graphics.LINE_DASH);

this.add(fLinkToBehaviorProperty);


	}





	/**
	 * @generated
	 */
	public org.eclipse.papyrus.uml.diagram.activity.figures.WrappedLabel getCornerBentContent() {
		return fCornerBentContent;
	}
	/**
	 * @generated
	 */
	public org.eclipse.draw2d.PolylineShape getLinkToBehaviorProperty() {
		return fLinkToBehaviorProperty;
	}


}

/**
 * @generated
 */
static final org.eclipse.swt.graphics.Color THIS_BACK = new org.eclipse.swt.graphics.Color(null, 248, 249, 214);

"/> <behaviour xsi:type="gmfgen:CustomBehaviour" key="EditPolicy.PRIMARY_DRAG_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.edit.policies.BehaviorPropertyNodeEditPolicy"/> <modelFacet parser="/0/@labelParsers/@implementations.10"/> </labels> @@ -1577,8 +1576,7 @@ </labels> <labels xsi:type="gmfgen:GenExternalNodeLabel" visualID="5128" editPartClassName="DataStoreSelectionEditPart" itemSemanticEditPolicyClassName="DataStoreSelectionItemSemanticEditPolicy" notationViewFactoryClassName="DataStoreNodeLabelViewFactory"> <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/> - <viewmap xsi:type="gmfgen:InnerClassViewmap" className="LinkAndCornerBentWithTextFigure" classBody="
/**
 * @generated
 */
public class LinkAndCornerBentWithTextFigure extends org.eclipse.papyrus.uml.diagram.common.figure.node.CornerBentFigure {


	/**
	 * @generated
	 */
	private org.eclipse.papyrus.uml.diagram.activity.figures.WrappedLabel fCornerBentContent; 
	/**
	 * @generated
	 */
	private org.eclipse.draw2d.PolylineShape fLinkToBehaviorProperty; 


	/**
	 * @generated
	 */
	public LinkAndCornerBentWithTextFigure() {
				

	this.setBackgroundColor(THIS_BACK
);
		createContents();
	}
	/**
	 * @generated
	 */
	private void createContents(){


fCornerBentContent = new org.eclipse.papyrus.uml.diagram.activity.figures.WrappedLabel();



this.add(fCornerBentContent);



fLinkToBehaviorProperty = new org.eclipse.draw2d.PolylineShape();
fLinkToBehaviorProperty.setLineStyle(org.eclipse.draw2d.Graphics.LINE_DASH);

this.add(fLinkToBehaviorProperty);


	}





	/**
	 * @generated
	 */
	public org.eclipse.papyrus.uml.diagram.activity.figures.WrappedLabel getCornerBentContent() {
		return fCornerBentContent;
	}
	/**
	 * @generated
	 */
	public org.eclipse.draw2d.PolylineShape getLinkToBehaviorProperty() {
		return fLinkToBehaviorProperty;
	}


}

/**
 * @generated
 */
static final org.eclipse.swt.graphics.Color THIS_BACK = new org.eclipse.swt.graphics.Color(null, 248, 249, 214);

"> - </viewmap> + <viewmap xsi:type="gmfgen:InnerClassViewmap" className="LinkAndCornerBentWithTextFigure" classBody="
/**
 * @generated
 */
public class LinkAndCornerBentWithTextFigure extends org.eclipse.papyrus.uml.diagram.common.figure.node.CornerBentFigure {


	/**
	 * @generated
	 */
	private org.eclipse.papyrus.uml.diagram.activity.figures.WrappedLabel fCornerBentContent; 
	/**
	 * @generated
	 */
	private org.eclipse.draw2d.PolylineShape fLinkToBehaviorProperty; 


	/**
	 * @generated
	 */
	public LinkAndCornerBentWithTextFigure() {
				

	this.setBackgroundColor(THIS_BACK
);
		createContents();
	}
	/**
	 * @generated
	 */
	private void createContents(){


fCornerBentContent = new org.eclipse.papyrus.uml.diagram.activity.figures.WrappedLabel();



this.add(fCornerBentContent);



fLinkToBehaviorProperty = new org.eclipse.draw2d.PolylineShape();
fLinkToBehaviorProperty.setLineStyle(org.eclipse.draw2d.Graphics.LINE_DASH);

this.add(fLinkToBehaviorProperty);


	}





	/**
	 * @generated
	 */
	public org.eclipse.papyrus.uml.diagram.activity.figures.WrappedLabel getCornerBentContent() {
		return fCornerBentContent;
	}
	/**
	 * @generated
	 */
	public org.eclipse.draw2d.PolylineShape getLinkToBehaviorProperty() {
		return fLinkToBehaviorProperty;
	}


}

/**
 * @generated
 */
static final org.eclipse.swt.graphics.Color THIS_BACK = new org.eclipse.swt.graphics.Color(null, 248, 249, 214);

"/> <behaviour xsi:type="gmfgen:CustomBehaviour" key="EditPolicy.PRIMARY_DRAG_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.edit.policies.BehaviorPropertyNodeEditPolicy"/> <modelFacet parser="/0/@labelParsers/@implementations.21"/> </labels> @@ -2554,8 +2552,7 @@ </modelFacet> <labels visualID="5138" editPartClassName="CommentBodyLabelEditPart" itemSemanticEditPolicyClassName="CommentBodyLabelItemSemanticEditPolicy" notationViewFactoryClassName="CommentBodyViewFactory"> <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/> - <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getCornerBentFigure" figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.HTMLCornerBentFigure"> - </viewmap> + <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getCornerBentFigure" figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.HTMLCornerBentFigure"/> <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.23"> <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Comment/body"/> </modelFacet> @@ -3255,8 +3252,7 @@ </labels> <labels xsi:type="gmfgen:GenExternalNodeLabel" visualID="5177" editPartClassName="CentralBufferNodeSelectionEditPart" itemSemanticEditPolicyClassName="CentralBufferNodeSelectionItemSemanticEditPolicy"> <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/> - <viewmap xsi:type="gmfgen:InnerClassViewmap" className="LinkAndCornerBentWithTextFigure" classBody="
/**
 * @generated
 */
public class LinkAndCornerBentWithTextFigure extends org.eclipse.papyrus.uml.diagram.common.figure.node.CornerBentFigure {


	/**
	 * @generated
	 */
	private org.eclipse.papyrus.uml.diagram.activity.figures.WrappedLabel fCornerBentContent; 
	/**
	 * @generated
	 */
	private org.eclipse.draw2d.PolylineShape fLinkToBehaviorProperty; 


	/**
	 * @generated
	 */
	public LinkAndCornerBentWithTextFigure() {
				

	this.setBackgroundColor(THIS_BACK
);
		createContents();
	}
	/**
	 * @generated
	 */
	private void createContents(){


fCornerBentContent = new org.eclipse.papyrus.uml.diagram.activity.figures.WrappedLabel();



this.add(fCornerBentContent);



fLinkToBehaviorProperty = new org.eclipse.draw2d.PolylineShape();
fLinkToBehaviorProperty.setLineStyle(org.eclipse.draw2d.Graphics.LINE_DASH);

this.add(fLinkToBehaviorProperty);


	}





	/**
	 * @generated
	 */
	public org.eclipse.papyrus.uml.diagram.activity.figures.WrappedLabel getCornerBentContent() {
		return fCornerBentContent;
	}
	/**
	 * @generated
	 */
	public org.eclipse.draw2d.PolylineShape getLinkToBehaviorProperty() {
		return fLinkToBehaviorProperty;
	}


}

/**
 * @generated
 */
static final org.eclipse.swt.graphics.Color THIS_BACK = new org.eclipse.swt.graphics.Color(null, 248, 249, 214);

"> - </viewmap> + <viewmap xsi:type="gmfgen:InnerClassViewmap" className="LinkAndCornerBentWithTextFigure" classBody="
/**
 * @generated
 */
public class LinkAndCornerBentWithTextFigure extends org.eclipse.papyrus.uml.diagram.common.figure.node.CornerBentFigure {


	/**
	 * @generated
	 */
	private org.eclipse.papyrus.uml.diagram.activity.figures.WrappedLabel fCornerBentContent; 
	/**
	 * @generated
	 */
	private org.eclipse.draw2d.PolylineShape fLinkToBehaviorProperty; 


	/**
	 * @generated
	 */
	public LinkAndCornerBentWithTextFigure() {
				

	this.setBackgroundColor(THIS_BACK
);
		createContents();
	}
	/**
	 * @generated
	 */
	private void createContents(){


fCornerBentContent = new org.eclipse.papyrus.uml.diagram.activity.figures.WrappedLabel();



this.add(fCornerBentContent);



fLinkToBehaviorProperty = new org.eclipse.draw2d.PolylineShape();
fLinkToBehaviorProperty.setLineStyle(org.eclipse.draw2d.Graphics.LINE_DASH);

this.add(fLinkToBehaviorProperty);


	}





	/**
	 * @generated
	 */
	public org.eclipse.papyrus.uml.diagram.activity.figures.WrappedLabel getCornerBentContent() {
		return fCornerBentContent;
	}
	/**
	 * @generated
	 */
	public org.eclipse.draw2d.PolylineShape getLinkToBehaviorProperty() {
		return fLinkToBehaviorProperty;
	}


}

/**
 * @generated
 */
static final org.eclipse.swt.graphics.Color THIS_BACK = new org.eclipse.swt.graphics.Color(null, 248, 249, 214);

"/> <modelFacet parser="/0/@labelParsers/@implementations.21"/> </labels> </childNodes> @@ -3283,16 +3279,14 @@ </modelFacet> <labels visualID="5189" editPartClassName="ConstraintNameEditPartCN" itemSemanticEditPolicyClassName="ConstraintName2ItemSemanticEditPolicy" elementIcon="true"> <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/> - <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getNameLabel" figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"> - </viewmap> + <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getNameLabel" figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/> <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="" editPattern=""> <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/> </modelFacet> </labels> <labels visualID="5190" editPartClassName="ConstraintBodyEditPartCN" itemSemanticEditPolicyClassName="ConstraintNameItemSemanticEditPolicy"> <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/> - <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getConstraintFigure" figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.ConstraintFigure"> - </viewmap> + <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getConstraintFigure" figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.ConstraintFigure"/> <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.22" viewPattern=""> <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Constraint/specification"/> </modelFacet> @@ -3323,8 +3317,7 @@ </modelFacet> <labels visualID="5001" editPartClassName="ActivityNameEditPart" itemSemanticEditPolicyClassName="ActivityNameItemSemanticEditPolicy" notationViewFactoryClassName="ActivityNameViewFactory"> <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/> - <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getNameLabel" figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"> - </viewmap> + <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getNameLabel" figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/> <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="" editorPattern="" editPattern=""> <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/> </modelFacet> @@ -3340,8 +3333,7 @@ <links visualID="4001" editPartClassName="ActionLocalPreconditionEditPart" itemSemanticEditPolicyClassName="ActionLocalPreconditionItemSemanticEditPolicy" notationViewFactoryClassName="ActionLocalPreconditionViewFactory" createCommandClassName="ActionLocalPreconditionCreateCommand" reorientCommandClassName="ActionLocalPreconditionReorientCommand"> <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Edge"/> <elementType xsi:type="gmfgen:SpecializationType"/> - <viewmap xsi:type="gmfgen:InnerClassViewmap" className="DashedLinkDescriptor" classBody="
/**
 * @generated
 */
public class DashedLinkDescriptor extends org.eclipse.gmf.runtime.draw2d.ui.figures.PolylineConnectionEx {




	/**
	 * @generated
	 */
	public DashedLinkDescriptor() {
		this.setLineStyle(org.eclipse.draw2d.Graphics.LINE_DASH);

	}




}

"> - </viewmap> + <viewmap xsi:type="gmfgen:InnerClassViewmap" className="DashedLinkDescriptor" classBody="
/**
 * @generated
 */
public class DashedLinkDescriptor extends org.eclipse.gmf.runtime.draw2d.ui.figures.PolylineConnectionEx {




	/**
	 * @generated
	 */
	public DashedLinkDescriptor() {
		this.setLineStyle(org.eclipse.draw2d.Graphics.LINE_DASH);

	}




}

"/> <modelFacet xsi:type="gmfgen:FeatureLinkModelFacet"> <metaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Action/localPrecondition"/> </modelFacet> @@ -3349,8 +3341,7 @@ <links visualID="4002" editPartClassName="ActionLocalPostconditionEditPart" itemSemanticEditPolicyClassName="ActionLocalPostconditionItemSemanticEditPolicy" notationViewFactoryClassName="ActionLocalPostconditionViewFactory" createCommandClassName="ActionLocalPostconditionCreateCommand" reorientCommandClassName="ActionLocalPostconditionReorientCommand"> <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Edge"/> <elementType xsi:type="gmfgen:SpecializationType"/> - <viewmap xsi:type="gmfgen:InnerClassViewmap" className="DashedLinkDescriptor" classBody="
/**
 * @generated
 */
public class DashedLinkDescriptor extends org.eclipse.gmf.runtime.draw2d.ui.figures.PolylineConnectionEx {




	/**
	 * @generated
	 */
	public DashedLinkDescriptor() {
		this.setLineStyle(org.eclipse.draw2d.Graphics.LINE_DASH);

	}




}

"> - </viewmap> + <viewmap xsi:type="gmfgen:InnerClassViewmap" className="DashedLinkDescriptor" classBody="
/**
 * @generated
 */
public class DashedLinkDescriptor extends org.eclipse.gmf.runtime.draw2d.ui.figures.PolylineConnectionEx {




	/**
	 * @generated
	 */
	public DashedLinkDescriptor() {
		this.setLineStyle(org.eclipse.draw2d.Graphics.LINE_DASH);

	}




}

"/> <modelFacet xsi:type="gmfgen:FeatureLinkModelFacet"> <metaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Action/localPostcondition"/> </modelFacet> @@ -3592,7 +3583,7 @@ <behaviour xsi:type="gmfgen:CustomBehaviour" key="EditPolicyRoles.DRAG_DROP_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.edit.policies.ActivityGroupCustomDragAndDropEditPolicy"/> <behaviour xsi:type="gmfgen:CustomBehaviour" key=""RemoveOrphanView"" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.edit.policies.RemoveOrphanViewPolicy"/> <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.SEMANTIC_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.edit.policies.CustomSequenceNodeStructuredActivityNodeContentCompartmentItemSemanticEditPolicy"/> - <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy"/> + <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy"/> </compartments> <compartments visualID="7005" editPartClassName="StructuredActivityNodeStructuredActivityNodeContentCompartmentEditPart" itemSemanticEditPolicyClassName="StructuredActivityNodeStructuredActivityNodeContentCompartmentItemSemanticEditPolicy" notationViewFactoryClassName="StructuredActivityNodeStructuredActivityNodeContentCompartmentViewFactory" canonicalEditPolicyClassName="StructuredActivityNodeStructuredActivityNodeContentCompartmentCanonicalEditPolicy" childNodes="/0/@diagram/@childNodes.3 /0/@diagram/@childNodes.4 /0/@diagram/@childNodes.5 /0/@diagram/@childNodes.6 /0/@diagram/@childNodes.11 /0/@diagram/@childNodes.16 /0/@diagram/@childNodes.32 /0/@diagram/@childNodes.33 /0/@diagram/@childNodes.34 /0/@diagram/@childNodes.35 /0/@diagram/@childNodes.36 /0/@diagram/@childNodes.37 /0/@diagram/@childNodes.44 /0/@diagram/@childNodes.52 /0/@diagram/@childNodes.54 /0/@diagram/@childNodes.56 /0/@diagram/@childNodes.57 /0/@diagram/@childNodes.60 /0/@diagram/@childNodes.64 /0/@diagram/@childNodes.65 /0/@diagram/@childNodes.70 /0/@diagram/@childNodes.24 /0/@diagram/@childNodes.25 /0/@diagram/@childNodes.26 /0/@diagram/@childNodes.27 /0/@diagram/@childNodes.28 /0/@diagram/@childNodes.29 /0/@diagram/@childNodes.30 /0/@diagram/@childNodes.31 /0/@diagram/@childNodes.73 /0/@diagram/@childNodes.76 /0/@diagram/@childNodes.79 /0/@diagram/@childNodes.83 /0/@diagram/@childNodes.85 /0/@diagram/@childNodes.87 /0/@diagram/@childNodes.90 /0/@diagram/@childNodes.92 /0/@diagram/@childNodes.69 /0/@diagram/@childNodes.93" title="StructuredActivityNodeContentCompartment" canCollapse="false" needsTitle="false" node="/0/@diagram/@childNodes.65" listLayout="false"> <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/> @@ -5178,7 +5169,7 @@ <extensionNodes xsi:type="papyrusgmfgenextension:LabelVisibilityPreference" comment="Selection" role="Selection" linkLabels="/0/@diagram/@links.2/@labels.2"/> <extensionNodes xsi:type="papyrusgmfgenextension:LabelVisibilityPreference" comment="Transformation" role="Transformation" linkLabels="/0/@diagram/@links.2/@labels.3"/> <extensionNodes xsi:type="papyrusgmfgenextension:LabelVisibilityPreference" comment="DecisionInputFlow" role="DecisionInputFlow" iconPathRole="" linkLabels="/0/@diagram/@links.2/@labels.4"/> - <extensionNodes xsi:type="papyrusgmfgenextension:EditPartUsingDeleteService" comment="" name="Delete service elements" genView="/0/@diagram/@childNodes.7 /0/@diagram/@childNodes.8 /0/@diagram/@childNodes.9 /0/@diagram/@childNodes.10 /0/@diagram/@childNodes.12 /0/@diagram/@childNodes.13 /0/@diagram/@childNodes.14 /0/@diagram/@childNodes.15 /0/@diagram/@childNodes.17 /0/@diagram/@childNodes.18 /0/@diagram/@childNodes.19 /0/@diagram/@childNodes.20 /0/@diagram/@childNodes.21 /0/@diagram/@childNodes.22 /0/@diagram/@childNodes.23 /0/@diagram/@childNodes.38 /0/@diagram/@childNodes.39 /0/@diagram/@childNodes.40 /0/@diagram/@childNodes.41 /0/@diagram/@childNodes.42 /0/@diagram/@childNodes.43 /0/@diagram/@childNodes.45 /0/@diagram/@childNodes.46 /0/@diagram/@childNodes.47 /0/@diagram/@childNodes.48 /0/@diagram/@childNodes.49 /0/@diagram/@childNodes.50 /0/@diagram/@childNodes.53 /0/@diagram/@childNodes.55 /0/@diagram/@childNodes.56 /0/@diagram/@childNodes.60 /0/@diagram/@childNodes.64 /0/@diagram/@childNodes.65 /0/@diagram/@childNodes.77 /0/@diagram/@childNodes.78 /0/@diagram/@childNodes.80 /0/@diagram/@childNodes.81 /0/@diagram/@childNodes.82 /0/@diagram/@childNodes.84 /0/@diagram/@childNodes.86 /0/@diagram/@childNodes.88 /0/@diagram/@childNodes.89 /0/@diagram/@childNodes.91 /0/@diagram/@childNodes.11 /0/@diagram/@childNodes.16 /0/@diagram/@childNodes.3 /0/@diagram/@childNodes.4 /0/@diagram/@childNodes.6 /0/@diagram/@childNodes.32 /0/@diagram/@childNodes.33 /0/@diagram/@childNodes.34 /0/@diagram/@childNodes.35 /0/@diagram/@childNodes.36 /0/@diagram/@childNodes.37 /0/@diagram/@childNodes.44 /0/@diagram/@childNodes.52 /0/@diagram/@childNodes.54 /0/@diagram/@childNodes.83 /0/@diagram/@childNodes.85 /0/@diagram/@childNodes.87 /0/@diagram/@childNodes.90 /0/@diagram/@childNodes.92 /0/@diagram/@childNodes.73 /0/@diagram/@childNodes.5 /0/@diagram/@childNodes.76 /0/@diagram/@childNodes.72 /0/@diagram/@childNodes.68 /0/@diagram/@childNodes.67 /0/@diagram/@topLevelNodes.0 /0/@diagram/@childNodes.51 /0/@diagram/@childNodes.79 /0/@diagram/@childNodes.69 /0/@diagram/@childNodes.31 /0/@diagram/@childNodes.30 /0/@diagram/@childNodes.2 /0/@diagram/@childNodes.1 /0/@diagram/@childNodes.93 /0/@diagram/@links.3 /0/@diagram/@childNodes.24 /0/@diagram/@childNodes.25 /0/@diagram/@childNodes.57 /0/@diagram/@childNodes.66 /0/@diagram/@childNodes.70 /0/@diagram/@childNodes.71 /0/@diagram/@childNodes.75 /0/@diagram/@links.4 /0/@diagram/@links.2 /0/@diagram/@childNodes.74 /0/@diagram/@childNodes.61 /0/@diagram/@childNodes.63/@labels.0 /0/@diagram/@childNodes.62 /0/@diagram/@childNodes.63"/> + <extensionNodes xsi:type="papyrusgmfgenextension:EditPartUsingDeleteService" comment="" name="Delete service elements" genView="/0/@diagram/@childNodes.7 /0/@diagram/@childNodes.8 /0/@diagram/@childNodes.9 /0/@diagram/@childNodes.10 /0/@diagram/@childNodes.12 /0/@diagram/@childNodes.13 /0/@diagram/@childNodes.14 /0/@diagram/@childNodes.15 /0/@diagram/@childNodes.17 /0/@diagram/@childNodes.18 /0/@diagram/@childNodes.19 /0/@diagram/@childNodes.20 /0/@diagram/@childNodes.21 /0/@diagram/@childNodes.22 /0/@diagram/@childNodes.23 /0/@diagram/@childNodes.38 /0/@diagram/@childNodes.39 /0/@diagram/@childNodes.40 /0/@diagram/@childNodes.41 /0/@diagram/@childNodes.42 /0/@diagram/@childNodes.43 /0/@diagram/@childNodes.45 /0/@diagram/@childNodes.46 /0/@diagram/@childNodes.47 /0/@diagram/@childNodes.48 /0/@diagram/@childNodes.49 /0/@diagram/@childNodes.50 /0/@diagram/@childNodes.53 /0/@diagram/@childNodes.55 /0/@diagram/@childNodes.56 /0/@diagram/@childNodes.60 /0/@diagram/@childNodes.64 /0/@diagram/@childNodes.65 /0/@diagram/@childNodes.77 /0/@diagram/@childNodes.78 /0/@diagram/@childNodes.80 /0/@diagram/@childNodes.81 /0/@diagram/@childNodes.82 /0/@diagram/@childNodes.84 /0/@diagram/@childNodes.86 /0/@diagram/@childNodes.88 /0/@diagram/@childNodes.89 /0/@diagram/@childNodes.91 /0/@diagram/@childNodes.11 /0/@diagram/@childNodes.16 /0/@diagram/@childNodes.3 /0/@diagram/@childNodes.4 /0/@diagram/@childNodes.6 /0/@diagram/@childNodes.32 /0/@diagram/@childNodes.33 /0/@diagram/@childNodes.34 /0/@diagram/@childNodes.35 /0/@diagram/@childNodes.36 /0/@diagram/@childNodes.37 /0/@diagram/@childNodes.44 /0/@diagram/@childNodes.52 /0/@diagram/@childNodes.54 /0/@diagram/@childNodes.83 /0/@diagram/@childNodes.85 /0/@diagram/@childNodes.87 /0/@diagram/@childNodes.90 /0/@diagram/@childNodes.92 /0/@diagram/@childNodes.73 /0/@diagram/@childNodes.5 /0/@diagram/@childNodes.76 /0/@diagram/@childNodes.72 /0/@diagram/@childNodes.68 /0/@diagram/@childNodes.67 /0/@diagram/@topLevelNodes.0 /0/@diagram/@childNodes.51 /0/@diagram/@childNodes.79 /0/@diagram/@childNodes.69 /0/@diagram/@childNodes.31 /0/@diagram/@childNodes.30 /0/@diagram/@childNodes.2 /0/@diagram/@childNodes.1 /0/@diagram/@childNodes.93 /0/@diagram/@links.3 /0/@diagram/@childNodes.24 /0/@diagram/@childNodes.25 /0/@diagram/@childNodes.57 /0/@diagram/@childNodes.66 /0/@diagram/@childNodes.70 /0/@diagram/@childNodes.71 /0/@diagram/@childNodes.75 /0/@diagram/@links.4 /0/@diagram/@links.2 /0/@diagram/@childNodes.74 /0/@diagram/@childNodes.61 /0/@diagram/@childNodes.63/@labels.0 /0/@diagram/@childNodes.62 /0/@diagram/@childNodes.63 /0/@diagram/@childNodes.58 /0/@diagram/@childNodes.59"/> <extensionNodes xsi:type="papyrusgmfgenextension:ExtendedGenView" comment="elements that intherit form UMLNodeEditpart" genView="/0/@diagram/@childNodes.67" name="UMLNodeEditPart" superOwnedEditPart="org.eclipse.papyrus.uml.diagram.common.editparts.UMLNodeEditPart"/> <extensionNodes xsi:type="papyrusgmfgenextension:ExtendedGenView" comment="set the super class as AbstractLabelEditPart" genView="/0/@diagram/@childNodes.3/@labels.0 /0/@diagram/@childNodes.4/@labels.0 /0/@diagram/@childNodes.5/@labels.0 /0/@diagram/@childNodes.7/@labels.2 /0/@diagram/@childNodes.8/@labels.2 /0/@diagram/@childNodes.9/@labels.1 /0/@diagram/@childNodes.10/@labels.1 /0/@diagram/@childNodes.12/@labels.2 /0/@diagram/@childNodes.13/@labels.2 /0/@diagram/@childNodes.14/@labels.1 /0/@diagram/@childNodes.15/@labels.1 /0/@diagram/@childNodes.17/@labels.2 /0/@diagram/@childNodes.18/@labels.2 /0/@diagram/@childNodes.19/@labels.1 /0/@diagram/@childNodes.20/@labels.1 /0/@diagram/@childNodes.21/@labels.2 /0/@diagram/@childNodes.22/@labels.2 /0/@diagram/@childNodes.23/@labels.1 /0/@diagram/@childNodes.32/@labels.1 /0/@diagram/@childNodes.33/@labels.0 /0/@diagram/@childNodes.34/@labels.0 /0/@diagram/@childNodes.35/@labels.1 /0/@diagram/@childNodes.38/@labels.2 /0/@diagram/@childNodes.39/@labels.2 /0/@diagram/@childNodes.40/@labels.1 /0/@diagram/@childNodes.41/@labels.2 /0/@diagram/@childNodes.42/@labels.2 /0/@diagram/@childNodes.43/@labels.1 /0/@diagram/@childNodes.45/@labels.2 /0/@diagram/@childNodes.46/@labels.2 /0/@diagram/@childNodes.47/@labels.1 /0/@diagram/@childNodes.48/@labels.2 /0/@diagram/@childNodes.49/@labels.2 /0/@diagram/@childNodes.50/@labels.1 /0/@diagram/@childNodes.52/@labels.2 /0/@diagram/@childNodes.53/@labels.1 /0/@diagram/@childNodes.55/@labels.1 /0/@diagram/@childNodes.71/@labels.1 /0/@diagram/@childNodes.74/@labels.1 /0/@diagram/@childNodes.77/@labels.1 /0/@diagram/@childNodes.80/@labels.1 /0/@diagram/@childNodes.81/@labels.1 /0/@diagram/@childNodes.82/@labels.1 /0/@diagram/@childNodes.84/@labels.1 /0/@diagram/@childNodes.86/@labels.1 /0/@diagram/@childNodes.88/@labels.1 /0/@diagram/@childNodes.89/@labels.1 /0/@diagram/@childNodes.91/@labels.2 /0/@diagram/@childNodes.61/@labels.1 /0/@diagram/@childNodes.62/@labels.1 /0/@diagram/@childNodes.63/@labels.1 /0/@diagram/@childNodes.66/@labels.1" name="AbstractLabelEditPart" superOwnedEditPart="org.eclipse.papyrus.uml.diagram.common.editparts.AbstractLabelEditPart"/> <extensionNodes xsi:type="papyrusgmfgenextension:ExtendedGenView" comment="contains methods to display arrows" genView="/0/@diagram/@childNodes.13 /0/@diagram/@childNodes.22 /0/@diagram/@childNodes.17 /0/@diagram/@childNodes.8 /0/@diagram/@childNodes.39 /0/@diagram/@childNodes.42 /0/@diagram/@childNodes.49 /0/@diagram/@childNodes.45 /0/@diagram/@childNodes.80 /0/@diagram/@childNodes.81 /0/@diagram/@childNodes.88 /0/@diagram/@childNodes.89 /0/@diagram/@childNodes.91 /0/@diagram/@childNodes.14 /0/@diagram/@childNodes.23 /0/@diagram/@childNodes.19 /0/@diagram/@childNodes.84 /0/@diagram/@childNodes.9 /0/@diagram/@childNodes.77 /0/@diagram/@childNodes.40 /0/@diagram/@childNodes.43 /0/@diagram/@childNodes.50 /0/@diagram/@childNodes.47 /0/@diagram/@childNodes.53 /0/@diagram/@childNodes.82 /0/@diagram/@childNodes.15 /0/@diagram/@childNodes.20 /0/@diagram/@childNodes.74 /0/@diagram/@childNodes.10 /0/@diagram/@childNodes.78 /0/@diagram/@childNodes.86 /0/@diagram/@childNodes.55 /0/@diagram/@childNodes.12 /0/@diagram/@childNodes.21 /0/@diagram/@childNodes.18 /0/@diagram/@childNodes.7 /0/@diagram/@childNodes.38 /0/@diagram/@childNodes.41 /0/@diagram/@childNodes.48 /0/@diagram/@childNodes.46 /0/@diagram/@childNodes.71" name="AbstractPinEditPart" superOwnedEditPart="org.eclipse.papyrus.uml.diagram.activity.edit.part.AbstractPinEditPart"/> diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/policies/ExpansionNodeAsInItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/policies/ExpansionNodeAsInItemSemanticEditPolicy.java index 931940a2c79..f4527afbf10 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/policies/ExpansionNodeAsInItemSemanticEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/policies/ExpansionNodeAsInItemSemanticEditPolicy.java @@ -13,23 +13,20 @@ *****************************************************************************/
package org.eclipse.papyrus.uml.diagram.activity.edit.policies;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.emf.ecore.EAnnotation;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.gef.commands.Command;
-import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;
-import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;
+import org.eclipse.gef.commands.UnexecutableCommand;
+import org.eclipse.gmf.runtime.common.core.command.ICommand;
+import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
import org.eclipse.gmf.runtime.emf.type.core.IElementType;
import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;
import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.commands.wrappers.EMFtoGMFCommandWrapper;
import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;
import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;
+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
import org.eclipse.papyrus.uml.diagram.activity.edit.commands.CommentLinkCreateCommand;
import org.eclipse.papyrus.uml.diagram.activity.edit.commands.CommentLinkReorientCommand;
import org.eclipse.papyrus.uml.diagram.activity.edit.commands.ConstraintConstrainedElementCreateCommand;
@@ -63,22 +60,16 @@ public class ExpansionNodeAsInItemSemanticEditPolicy extends UMLBaseItemSemantic * @generated
*/
protected Command getDestroyElementCommand(DestroyElementRequest req) {
- View view = (View)getHost().getModel();
- CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(getEditingDomain(), null);
- cmd.setTransactionNestingEnabled(true);
- EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$
- if(annotation == null) {
- // there are indirectly referenced children, need extra commands: false
- addDestroyShortcutsCommand(cmd, view);
- // delete host element
- List<EObject> todestroy = new ArrayList<EObject>();
- todestroy.add(req.getElementToDestroy());
- //cmd.add(new org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand(req));
- cmd.add(new EMFtoGMFCommandWrapper(new org.eclipse.emf.edit.command.DeleteCommand(getEditingDomain(), todestroy)));
- } else {
- cmd.add(new DeleteCommand(getEditingDomain(), view));
- }
- return getGEFWrapper(cmd.reduce());
+ EObject selectedEObject = req.getElementToDestroy();
+ IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);
+ if(provider != null) {
+ // Retrieve delete command from the Element Edit service
+ ICommand deleteCommand = provider.getEditCommand(req);
+ if(deleteCommand != null) {
+ return new ICommandProxy(deleteCommand);
+ }
+ }
+ return UnexecutableCommand.INSTANCE;
}
/**
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/policies/ExpansionNodeAsOutItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/policies/ExpansionNodeAsOutItemSemanticEditPolicy.java index 06688c99284..cbbf9f30a90 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/policies/ExpansionNodeAsOutItemSemanticEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/policies/ExpansionNodeAsOutItemSemanticEditPolicy.java @@ -13,23 +13,20 @@ *****************************************************************************/
package org.eclipse.papyrus.uml.diagram.activity.edit.policies;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.emf.ecore.EAnnotation;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.gef.commands.Command;
-import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;
-import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;
+import org.eclipse.gef.commands.UnexecutableCommand;
+import org.eclipse.gmf.runtime.common.core.command.ICommand;
+import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
import org.eclipse.gmf.runtime.emf.type.core.IElementType;
import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;
import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.commands.wrappers.EMFtoGMFCommandWrapper;
import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;
import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;
+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
import org.eclipse.papyrus.uml.diagram.activity.edit.commands.CommentLinkCreateCommand;
import org.eclipse.papyrus.uml.diagram.activity.edit.commands.CommentLinkReorientCommand;
import org.eclipse.papyrus.uml.diagram.activity.edit.commands.ConstraintConstrainedElementCreateCommand;
@@ -63,22 +60,16 @@ public class ExpansionNodeAsOutItemSemanticEditPolicy extends UMLBaseItemSemanti * @generated
*/
protected Command getDestroyElementCommand(DestroyElementRequest req) {
- View view = (View)getHost().getModel();
- CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(getEditingDomain(), null);
- cmd.setTransactionNestingEnabled(true);
- EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$
- if(annotation == null) {
- // there are indirectly referenced children, need extra commands: false
- addDestroyShortcutsCommand(cmd, view);
- // delete host element
- List<EObject> todestroy = new ArrayList<EObject>();
- todestroy.add(req.getElementToDestroy());
- //cmd.add(new org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand(req));
- cmd.add(new EMFtoGMFCommandWrapper(new org.eclipse.emf.edit.command.DeleteCommand(getEditingDomain(), todestroy)));
- } else {
- cmd.add(new DeleteCommand(getEditingDomain(), view));
- }
- return getGEFWrapper(cmd.reduce());
+ EObject selectedEObject = req.getElementToDestroy();
+ IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);
+ if(provider != null) {
+ // Retrieve delete command from the Element Edit service
+ ICommand deleteCommand = provider.getEditCommand(req);
+ if(deleteCommand != null) {
+ return new ICommandProxy(deleteCommand);
+ }
+ }
+ return UnexecutableCommand.INSTANCE;
}
/**
|