From cecb06d5a0493740bac46db67f0334333a32e510 Mon Sep 17 00:00:00 2001
From: Ansgar Radermacher
Date: Fri, 23 Oct 2015 14:34:57 +0200
Subject: 480497 - [Popup] Popup dialog creates a new empty window that does
 not go away

---
 .../infra/widgets/toolbox/notification/builders/PopupBuilder.java     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'plugins')

diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/builders/PopupBuilder.java b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/builders/PopupBuilder.java
index e2abced4591..75d8cff4852 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/builders/PopupBuilder.java
+++ b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/builders/PopupBuilder.java
@@ -37,7 +37,7 @@ public class PopupBuilder implements IBuilder {
 	 */
 	public INotification build(PropertyWrapper wrapper, FormToolkit toolkit) {
 		PapyrusPopup popup = null;
-		String title = "Papyrus";
+		String title = "Papyrus"; //$NON-NLS-1$
 		if (wrapper.getTitle() != null) {
 			title = wrapper.getTitle();
 		}
@@ -45,7 +45,7 @@ public class PopupBuilder implements IBuilder {
 		if (wrapper.getMessage() != null) {
 			message = wrapper.getMessage();
 		}
-		Shell activeShell = new Shell(Display.getDefault());
+		Shell activeShell = Display.getDefault().getActiveShell();
 		if (wrapper.getType() != null) {
 			popup = new IconAndMessagePapyrusPopup(activeShell, toolkit, message, wrapper.getType());
 		} else if (wrapper.getImage() != null) {
-- 
cgit v1.2.3