481699 - [Composite Diagram] Creating a Collaboration Role opens an empty Shell on Linux

5 files changed, 10 insertions, 37 deletions

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/messages/Messages.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/messages/Messages.java
index d66bb31ff09..a43193418f5 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/messages/Messages.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/messages/Messages.java
@@ -19,28 +19,6 @@ public class Messages extends NLS {
 
 	private static final String BUNDLE_NAME = "org.eclipse.papyrus.uml.diagram.composite.custom.messages.messages"; //$NON-NLS-1$
 
-	public static String CollaborationRoleSelectionDialog_Title;
-
-	public static String CollaborationRoleSelectionDialog_Message;
-
-	public static String ConnectorCreateCommand_INVALID_ARGS_MSG;
-
-	public static String ConnectorCreateCommand_INVALID_SOURCE_MSG;
-
-	public static String ConnectorCreateCommand_INVALID_TARGET_MSG;
-
-	public static String RoleBindingCreateCommand_INVALID_ARGS_MSG;
-
-	public static String RoleBindingRoleSelectionDialog_Title;
-
-	public static String RoleBindingRoleSelectionDialog_Message;
-
-	public static String InformationFlowSelectionDialog_Title;
-
-	public static String InformationFlowSelectionDialog_Message;
-
-	public static String InformationItemGetNameDialog_Error_Message;
-
 	public static String SelectionValidated;
 
 	public static String ShowHideRelatedContentsAction_Message;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/messages/messages.properties b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/messages/messages.properties
index 021283b4d76..2b49ac86407 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/messages/messages.properties
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/messages/messages.properties
@@ -1,14 +1,3 @@
-CollaborationRoleSelectionDialog_Title=Collaboration role creation
-CollaborationRoleSelectionDialog_Message=Select the ConnectableElement (ex: Property) to reference as a role:
-ConnectorCreateCommand_INVALID_ARGS_MSG=Invalid arguments in create link command
-ConnectorCreateCommand_INVALID_SOURCE_MSG=Invalid source in create Connector command
-ConnectorCreateCommand_INVALID_TARGET_MSG=Invalid target in create Connector command
-RoleBindingCreateCommand_INVALID_ARGS_MSG=Invalid arguments in create link command
-RoleBindingRoleSelectionDialog_Title=Collaboration role binding
-RoleBindingRoleSelectionDialog_Message=Select the role to bind:
-InformationFlowSelectionDialog_Title=InformationFlow creation
-InformationFlowSelectionDialog_Message=Select the InformationItems or the Classifiers to convey
-InformationItemGetNameDialog_Error_Message=Enter a name for the new InformationItem
 SelectionValidated=Selection validated.
 ShowHideRelatedContentsAction_Message=Choose the elements to show
 ShowHideRelatedContentsAction_Title=Show/Hide Related Contents
diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/command/CollaborationRoleCreateCommand.java b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/command/CollaborationRoleCreateCommand.java
index f11376eca03..00dc81ce115 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/command/CollaborationRoleCreateCommand.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/command/CollaborationRoleCreateCommand.java
@@ -24,6 +24,7 @@ import org.eclipse.gmf.runtime.common.core.command.CommandResult;
 import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
 import org.eclipse.jface.window.Window;
+import org.eclipse.papyrus.uml.service.types.messages.Messages;
 import org.eclipse.papyrus.uml.service.types.ui.CollaborationRoleValidator;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Display;
@@ -75,13 +76,12 @@ public class CollaborationRoleCreateCommand extends EditElementCommand {
 
 		// Create and open the selection dialog
 		ComposedAdapterFactory adapterFactory = new ComposedAdapterFactory(ComposedAdapterFactory.Descriptor.Registry.INSTANCE);
-		Shell currentShell = new Shell(Display.getCurrent(), SWT.DIALOG_TRIM | SWT.APPLICATION_MODAL);
-		ElementTreeSelectionDialog dialog = new ElementTreeSelectionDialog(currentShell, new AdapterFactoryLabelProvider(adapterFactory), new AdapterFactoryContentProvider(adapterFactory));
+		ElementTreeSelectionDialog dialog = new ElementTreeSelectionDialog(Display.getCurrent().getActiveShell(), new AdapterFactoryLabelProvider(adapterFactory), new AdapterFactoryContentProvider(adapterFactory));
 
 		try {
 			// Set dialog parameters
-			dialog.setTitle("Collaboration role creation");
-			dialog.setMessage("Select the ConnectableElement (ex: Property) to reference as a role:");
+			dialog.setTitle(Messages.CollaborationRoleCreateCommand_CollaborationRoleCreation_Title);
+			dialog.setMessage(Messages.CollaborationRoleCreateCommand_CollaborationRoleCreation_Message);
 			dialog.setAllowMultiple(false);
 			dialog.setHelpAvailable(false);
 			// ConnectableElement from the whole model can be selected as role.
diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/messages/Messages.java b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/messages/Messages.java
index 13998cefa37..f949f789042 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/messages/Messages.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/messages/Messages.java
@@ -57,6 +57,10 @@ public class Messages extends NLS {
 

 	public static String AssociationSelectionDialog_0;

 

+	public static String CollaborationRoleCreateCommand_CollaborationRoleCreation_Message;

+

+	public static String CollaborationRoleCreateCommand_CollaborationRoleCreation_Title;

+

 	public static String ConnectorReorientSemanticCommand_0;

 

 	public static String ContainmentSubsetRemovalAdvice_0;

diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/messages/messages.properties b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/messages/messages.properties
index 2af983404c1..c934d04712a 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/messages/messages.properties
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/messages/messages.properties
@@ -18,6 +18,8 @@ ActivityPartitionEditHelper_1=Move ActivityNode command
 AssociationReorientCommand_0=Cannot add a Property on Classifier 

 AssociationReorientCommand_1=Invalid arguments in reorient link command

 AssociationSelectionDialog_0=<untyped>

+CollaborationRoleCreateCommand_CollaborationRoleCreation_Message=Select the ConnectableElement (ex: Property) to reference as a role:

+CollaborationRoleCreateCommand_CollaborationRoleCreation_Title=Collaboration role creation

 ConnectorReorientSemanticCommand_0=connector

 ContainmentSubsetRemovalAdvice_0=Ensure supersets

 GeneralizationSetCreationCommand_0=GeneralizationSet Selection