407049: [Interaction Overview] Papyrus shall support UML2 interaction overview diagram

https://bugs.eclipse.org/bugs/show_bug.cgi?id=407049

=> second version of the diagram, with support of the screenshots of the behavioral diagrams inside the interaction overview diagram

5 files changed, 34 insertions, 22 deletions

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/META-INF/MANIFEST.MF
index 32516d24659..7d5c153e364 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/META-INF/MANIFEST.MF
@@ -3,6 +3,7 @@ Export-Package: org.eclipse.papyrus.uml.diagram.activity,
  org.eclipse.papyrus.uml.diagram.activity.commands,

  org.eclipse.papyrus.uml.diagram.activity.draw2d,

  org.eclipse.papyrus.uml.diagram.activity.edit.actions,

+ org.eclipse.papyrus.uml.diagram.activity.edit.advices,

  org.eclipse.papyrus.uml.diagram.activity.edit.commands,

  org.eclipse.papyrus.uml.diagram.activity.edit.dialogs,

  org.eclipse.papyrus.uml.diagram.activity.edit.helpers,

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/advices/CallBehaviorActionEditHelperAdvice.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/advices/CallBehaviorActionEditHelperAdvice.java
index 1a0afa745d3..0745ad179a9 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/advices/CallBehaviorActionEditHelperAdvice.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/advices/CallBehaviorActionEditHelperAdvice.java
@@ -17,6 +17,7 @@ import org.eclipse.gmf.runtime.common.core.command.CompositeCommand;
 import org.eclipse.gmf.runtime.common.core.command.ICommand;

 import org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;

 import org.eclipse.jface.dialogs.IDialogConstants;

 import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

@@ -33,6 +34,9 @@ import org.eclipse.uml2.uml.UMLPackage;
  */

 public class CallBehaviorActionEditHelperAdvice extends AbstractEditHelperAdvice {

 

+	public static String CALL_BEHAVIOR_ACTION = "CallBehaviorAction";

+	public static String POPUP_TYPE = "popupType";

+	

 	/**

 	 * {@inheritDoc}

 	 */

@@ -47,6 +51,7 @@ public class CallBehaviorActionEditHelperAdvice extends AbstractEditHelperAdvice
 			}

 			parent = parent.eContainer();

 		}

+		if(CALL_BEHAVIOR_ACTION.equals(request.getParameter(POPUP_TYPE))){

 		CreateCallBehaviorActionDialog dialog = new CreateCallBehaviorActionDialog(Display.getDefault().getActiveShell(), parentActivity, (InvocationAction)request.getElementToConfigure());

 		if(IDialogConstants.OK_ID == dialog.open()) {

 			// initialize the invoked element (no need to use a command, since action is being created)

@@ -62,6 +67,12 @@ public class CallBehaviorActionEditHelperAdvice extends AbstractEditHelperAdvice
 			command.add(service.getEditCommand(setSynchronousReqest));

 			return command;

 		} 

+		}

 		return null;

 	}

+	

+	@Override

+	public void configureRequest(IEditCommandRequest request) {

+		request.getParameters().put(POPUP_TYPE, CALL_BEHAVIOR_ACTION);

+	}

 }

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 d4116cd7b80..3b313ba10c9 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
@@ -509,7 +509,7 @@ public abstract class CreateInvocationActionDialog extends FormDialog {
 	 * Open the dialog to choose the existing element to select

 	 * 

 	 */

-	private void handleChooseInvoked() {

+	protected void handleChooseInvoked() {

 		TreeSelectorDialog dialog = new TreeSelectorDialog(Display.getDefault().getActiveShell());

 		dialog.setContentProvider(new UMLContentProvider(getInvocationAction(), getInvocationFeature()));

 		dialog.setLabelProvider(new UMLLabelProvider());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/plugin.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/plugin.xml
index 084cbd1abfc..8e8c301d45d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/plugin.xml
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/plugin.xml
@@ -4300,7 +4300,7 @@ self.structuralFeature.oclAsType(Property).opposite.type = self.object.type]]>
 	<metamodel nsURI="http://www.eclipse.org/uml2/4.0.0/UML">

 

 	<!-- specific advices (pop up on creation) -->		

-	<adviceBinding id="org.eclipse.papyrus.uml.diagram.activity.edit.advices.CallBehaviorActionEditHelperAdvice" class="org.eclipse.papyrus.uml.diagram.activity.edit.advices.CallBehaviorActionEditHelperAdvice" inheritance="all" typeId="org.eclipse.papyrus.uml.diagram.activity.CallBehaviorAction_3008"/>

+	<adviceBinding id="org.eclipse.papyrus.uml.diagram.activity.edit.advices.CallBehaviorActionEditHelperAdvice" class="org.eclipse.papyrus.uml.diagram.activity.edit.advices.CallBehaviorActionEditHelperAdvice" inheritance="none" typeId="org.eclipse.papyrus.uml.diagram.activity.CallBehaviorAction_3008"/>

 	<adviceBinding id="org.eclipse.papyrus.uml.diagram.activity.edit.advices.CallOperationActionEditHelperAdvice" class="org.eclipse.papyrus.uml.diagram.activity.edit.advices.CallOperationActionEditHelperAdvice" inheritance="all" typeId="org.eclipse.papyrus.uml.diagram.activity.CallOperationAction_3010"/>

 	<adviceBinding id="org.eclipse.papyrus.uml.diagram.activity.edit.advices.SendSignalActionEditHelperAdvice" class="org.eclipse.papyrus.uml.diagram.activity.edit.advices.SendSignalActionEditHelperAdvice" inheritance="all" typeId="org.eclipse.papyrus.uml.diagram.activity.SendSignalAction_3052"/>

 				

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/META-INF/MANIFEST.MF
index ede6b38fdad..de611de99d2 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/META-INF/MANIFEST.MF
@@ -52,25 +52,25 @@ Require-Bundle: org.eclipse.emf.ecore,
  org.eclipse.papyrus.infra.gmfdiag.navigation;bundle-version="0.10.0",

  org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="0.10.0",

  org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="0.10.0"

-Export-Package: org.eclipse.papyrus.uml.diagram.timing.custom;x-friends:=org.eclipse.papyrus.uml.diagram.timing.tests,

- org.eclipse.papyrus.uml.diagram.timing.custom.edit.commands;x-friends:=org.eclipse.papyrus.uml.diagram.timing.tests,

- org.eclipse.papyrus.uml.diagram.timing.custom.edit.parts;x-friends:=org.eclipse.papyrus.uml.diagram.timing.tests,

- org.eclipse.papyrus.uml.diagram.timing.custom.edit.policies;x-friends:=org.eclipse.papyrus.uml.diagram.timing.tests,

- org.eclipse.papyrus.uml.diagram.timing.custom.figures;x-friends:=org.eclipse.papyrus.uml.diagram.timing.tests,

- org.eclipse.papyrus.uml.diagram.timing.custom.layouts;x-friends:=org.eclipse.papyrus.uml.diagram.timing.tests,

- org.eclipse.papyrus.uml.diagram.timing.custom.parsers;x-friends:=org.eclipse.papyrus.uml.diagram.timing.tests,

- org.eclipse.papyrus.uml.diagram.timing.custom.parts;x-friends:=org.eclipse.papyrus.uml.diagram.timing.tests,

- org.eclipse.papyrus.uml.diagram.timing.custom.providers;x-friends:=org.eclipse.papyrus.uml.diagram.timing.tests,

- org.eclipse.papyrus.uml.diagram.timing.custom.utils;x-friends:=org.eclipse.papyrus.uml.diagram.timing.tests,

- org.eclipse.papyrus.uml.diagram.timing.edit.commands;x-friends:=org.eclipse.papyrus.uml.diagram.timing.tests,

- org.eclipse.papyrus.uml.diagram.timing.edit.helpers;x-friends:=org.eclipse.papyrus.uml.diagram.timing.tests,

- org.eclipse.papyrus.uml.diagram.timing.edit.parts;x-friends:=org.eclipse.papyrus.uml.diagram.timing.tests,

- org.eclipse.papyrus.uml.diagram.timing.edit.policies;x-friends:=org.eclipse.papyrus.uml.diagram.timing.tests,

- org.eclipse.papyrus.uml.diagram.timing.navigator;x-friends:=org.eclipse.papyrus.uml.diagram.timing.tests,

- org.eclipse.papyrus.uml.diagram.timing.parsers;x-friends:=org.eclipse.papyrus.uml.diagram.timing.tests,

- org.eclipse.papyrus.uml.diagram.timing.part;x-friends:=org.eclipse.papyrus.uml.diagram.timing.tests,

- org.eclipse.papyrus.uml.diagram.timing.preferences;x-friends:=org.eclipse.papyrus.uml.diagram.timing.tests,

- org.eclipse.papyrus.uml.diagram.timing.providers;x-friends:=org.eclipse.papyrus.uml.diagram.timing.tests,

- org.eclipse.papyrus.uml.diagram.timing.sheet;x-friends:=org.eclipse.papyrus.uml.diagram.timing.tests

+Export-Package: org.eclipse.papyrus.uml.diagram.timing.custom;x-friends:="org.eclipse.papyrus.uml.diagram.timing.tests",

+ org.eclipse.papyrus.uml.diagram.timing.custom.edit.commands;x-friends:="org.eclipse.papyrus.uml.diagram.timing.tests,org.eclipse.papyrus.uml.diagram.interactionoverview",

+ org.eclipse.papyrus.uml.diagram.timing.custom.edit.parts;x-friends:="org.eclipse.papyrus.uml.diagram.timing.tests,org.eclipse.papyrus.uml.diagram.interactionoverview",

+ org.eclipse.papyrus.uml.diagram.timing.custom.edit.policies;x-friends:="org.eclipse.papyrus.uml.diagram.timing.tests",

+ org.eclipse.papyrus.uml.diagram.timing.custom.figures;x-friends:="org.eclipse.papyrus.uml.diagram.timing.tests",

+ org.eclipse.papyrus.uml.diagram.timing.custom.layouts;x-friends:="org.eclipse.papyrus.uml.diagram.timing.tests",

+ org.eclipse.papyrus.uml.diagram.timing.custom.parsers;x-friends:="org.eclipse.papyrus.uml.diagram.timing.tests",

+ org.eclipse.papyrus.uml.diagram.timing.custom.parts;x-friends:="org.eclipse.papyrus.uml.diagram.timing.tests",

+ org.eclipse.papyrus.uml.diagram.timing.custom.providers;x-friends:="org.eclipse.papyrus.uml.diagram.timing.tests",

+ org.eclipse.papyrus.uml.diagram.timing.custom.utils;x-friends:="org.eclipse.papyrus.uml.diagram.timing.tests",

+ org.eclipse.papyrus.uml.diagram.timing.edit.commands;x-friends:="org.eclipse.papyrus.uml.diagram.timing.tests",

+ org.eclipse.papyrus.uml.diagram.timing.edit.helpers;x-friends:="org.eclipse.papyrus.uml.diagram.timing.tests",

+ org.eclipse.papyrus.uml.diagram.timing.edit.parts;x-friends:="org.eclipse.papyrus.uml.diagram.timing.tests",

+ org.eclipse.papyrus.uml.diagram.timing.edit.policies;x-friends:="org.eclipse.papyrus.uml.diagram.timing.tests",

+ org.eclipse.papyrus.uml.diagram.timing.navigator;x-friends:="org.eclipse.papyrus.uml.diagram.timing.tests",

+ org.eclipse.papyrus.uml.diagram.timing.parsers;x-friends:="org.eclipse.papyrus.uml.diagram.timing.tests",

+ org.eclipse.papyrus.uml.diagram.timing.part;x-friends:="org.eclipse.papyrus.uml.diagram.timing.tests,org.eclipse.papyrus.uml.diagram.interactionoverview",

+ org.eclipse.papyrus.uml.diagram.timing.preferences;x-friends:="org.eclipse.papyrus.uml.diagram.timing.tests",

+ org.eclipse.papyrus.uml.diagram.timing.providers;x-friends:="org.eclipse.papyrus.uml.diagram.timing.tests",

+ org.eclipse.papyrus.uml.diagram.timing.sheet;x-friends:="org.eclipse.papyrus.uml.diagram.timing.tests"

 Eclipse-LazyStart: true

 Bundle-Localization: plugin