diff options
| author | ptessier | 2017-05-16 12:07:25 +0000 |
|---|---|---|
| committer | Patrick Tessier | 2017-05-16 20:40:15 +0000 |
| commit | e7a183a020d97cc43b112790423b38cc98d1b04e (patch) | |
| tree | 78d1e203fd687a771e3a7f97f30323a0e7281e92 /plugins | |
| parent | fd1418a94fc2f671b46a6b46bd2d7e55884a4a31 (diff) | |
| download | org.eclipse.papyrus-e7a183a020d97cc43b112790423b38cc98d1b04e.tar.gz org.eclipse.papyrus-e7a183a020d97cc43b112790423b38cc98d1b04e.tar.xz org.eclipse.papyrus-e7a183a020d97cc43b112790423b38cc98d1b04e.zip | |
Bug 515998 - [SequenceDiagram] Fix existed Tests for the Sequence
diagram
Change-Id: I21e6cc2f1b987eb832a1451ee9e4fbf7279a80ce
Diffstat (limited to 'plugins')
2 files changed, 22 insertions, 38 deletions
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CInteractionInteractionCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CInteractionInteractionCompartmentEditPart.java index ba89642639b..f5e0d6b1766 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CInteractionInteractionCompartmentEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CInteractionInteractionCompartmentEditPart.java @@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLDIElementTypes; import org.eclipse.papyrus.uml.service.types.utils.ElementUtil;
/**
- * @author Céline JANSSENS
+ * @author C�line JANSSENS
*
*/
public class CInteractionInteractionCompartmentEditPart extends InteractionInteractionCompartmentEditPart {
@@ -35,7 +35,6 @@ public class CInteractionInteractionCompartmentEditPart extends InteractionInter */
public CInteractionInteractionCompartmentEditPart(View view) {
super(view);
- // TODO Auto-generated constructor stub
}
/**
@@ -46,32 +45,17 @@ public class CInteractionInteractionCompartmentEditPart extends InteractionInter */
@Override
public Command getCommand(Request request) {
- Command cmd = null;
- if (understandsRequest(request)) {
- cmd = super.getCommand(request);
- }
- return cmd;
- }
-
- /**
- * @see org.eclipse.gef.editparts.AbstractEditPart#understandsRequest(org.eclipse.gef.Request)
- *
- * @param req
- * @return
- */
- @Override
- public boolean understandsRequest(Request req) {
- boolean understand = super.understandsRequest(req);
- if (understand && req instanceof CreateViewAndElementRequest && req.getType().equals(REQ_CREATE)) {
- CreateViewAndElementRequest request = (CreateViewAndElementRequest) req;
- ViewAndElementDescriptor descriptor = request.getViewAndElementDescriptor();
+ if ( request instanceof CreateViewAndElementRequest && request.getType().equals(REQ_CREATE)) {
+ CreateViewAndElementRequest createrequest = (CreateViewAndElementRequest) request;
+ ViewAndElementDescriptor descriptor = createrequest.getViewAndElementDescriptor();
IElementType elementType = (IElementType) descriptor.getElementAdapter().getAdapter(IElementType.class);
if (ElementUtil.isTypeOf(elementType, UMLDIElementTypes.DURATION_CONSTRAINT_SHAPE)) {
- understand = false;
+ return null;
}
}
- return understand;
+ return super.getCommand(request);
}
+
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/plugin.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/plugin.xml index f5ae93ad636..1c750d2f20a 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/plugin.xml +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/plugin.xml @@ -223,21 +223,21 @@ </extension>
-<extension point="org.eclipse.ui.preferencePages" id="prefpages">
- <?gmfgen generated="true"?>
- <page
- id="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.PapyrusUMLSequenceDiagram"
- name="PapyrusUMLSequenceDiagram Diagram"
- category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams"
- class="org.eclipse.papyrus.uml.diagram.sequence.preferences.DiagramGeneralPreferencePage">
- </page>
- <page
- id="org.eclipse.papyrus.uml.diagram.sequence.preferences.DiagramPrintingPreferencePage"
- name="%prefpage.org.eclipse.uml2.uml.diagram.printing"
- category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.PapyrusUMLSequenceDiagram"
- class="org.eclipse.papyrus.uml.diagram.sequence.preferences.DiagramPrintingPreferencePage">
- </page>
- </extension>
+<extension point="org.eclipse.ui.preferencePages" id="prefpages"> + <?gmfgen generated="true"?> + <page + id="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.PapyrusUMLSequenceDiagram" + name="PapyrusUMLSequenceDiagram Diagram" + category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams" + class="org.eclipse.papyrus.uml.diagram.sequence.preferences.CustomDiagramGeneralPreferencePage"> + </page> + <page + id="org.eclipse.papyrus.uml.diagram.sequence.preferences.DiagramPrintingPreferencePage" + name="%prefpage.org.eclipse.uml2.uml.diagram.printing" + category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.PapyrusUMLSequenceDiagram" + class="org.eclipse.papyrus.uml.diagram.sequence.preferences.DiagramPrintingPreferencePage"> + </page> + </extension> |