diff options
Diffstat (limited to 'plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org')
3 files changed, 19 insertions, 12 deletions
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/builders/NotificationBuilder.java b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/builders/NotificationBuilder.java index 646281bd0f1..bdbecf8d15e 100644 --- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/builders/NotificationBuilder.java +++ b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/builders/NotificationBuilder.java @@ -315,7 +315,7 @@ public class NotificationBuilder { * @return a notification builder
*/
public static NotificationBuilder createAsyncPopup(String text) {
- return new NotificationBuilder().setAsynchronous(true).setBuilderClass(AsyncNotifierBuilder.class).setTemporary(true).setMessage(text);
+ return new NotificationBuilder().setAsynchronous(true).setTemporary(true).setMessage(text).setDelay(2000);
}
/**
@@ -328,7 +328,7 @@ public class NotificationBuilder { * @return a notification builder
*/
public static NotificationBuilder createAsyncPopup(String title, String text) {
- return new NotificationBuilder().setAsynchronous(true).setBuilderClass(AsyncNotifierBuilder.class).setTemporary(true).setMessage(text).setTitle(title);
+ return new NotificationBuilder().setAsynchronous(true).setTemporary(true).setMessage(text).setTitle(title).setDelay(2000);
}
/**
@@ -339,7 +339,7 @@ public class NotificationBuilder { * @return a notification builder
*/
public static NotificationBuilder createInfoPopup(String text) {
- return new NotificationBuilder().setAsynchronous(false).setBuilderClass(PopupBuilder.class).setTemporary(false).setMessage(text).setType(Type.INFO);
+ return new NotificationBuilder().setAsynchronous(false).setTemporary(false).setMessage(text).setType(Type.INFO);
}
/**
@@ -350,7 +350,7 @@ public class NotificationBuilder { * @return a notification builder
*/
public static NotificationBuilder createWarningPopup(String text) {
- return new NotificationBuilder().setAsynchronous(false).setBuilderClass(PopupBuilder.class).setTemporary(false).setMessage(text).setType(Type.WARNING);
+ return new NotificationBuilder().setAsynchronous(false).setTemporary(false).setMessage(text).setType(Type.WARNING);
}
/**
@@ -361,7 +361,7 @@ public class NotificationBuilder { * @return a notification builder
*/
public static NotificationBuilder createQuestionPopup(String text) {
- return new NotificationBuilder().setAsynchronous(false).setBuilderClass(PopupBuilder.class).setTemporary(false).setMessage(text).setType(Type.QUESTION);
+ return new NotificationBuilder().setAsynchronous(false).setTemporary(false).setMessage(text).setType(Type.QUESTION);
}
/**
@@ -372,7 +372,7 @@ public class NotificationBuilder { * @return a notification builder
*/
public static NotificationBuilder createErrorPopup(String text) {
- return new NotificationBuilder().setAsynchronous(false).setBuilderClass(PopupBuilder.class).setTemporary(false).setMessage(text).setType(Type.ERROR);
+ return new NotificationBuilder().setAsynchronous(false).setTemporary(false).setMessage(text).setType(Type.ERROR);
}
/**
@@ -385,7 +385,7 @@ public class NotificationBuilder { * @return a notification builder
*/
public static NotificationBuilder createYesNo(String message, final Runnable yes, final Runnable no) {
- return new NotificationBuilder().setType(Type.QUESTION).setAsynchronous(true).setTemporary(false).setMessage(message).addAction(new NotificationRunnable() {
+ return new NotificationBuilder().setType(Type.QUESTION).setAsynchronous(false).setTemporary(false).setMessage(message).addAction(new NotificationRunnable() {
public void run(IContext context) {
if(yes != null) {
@@ -454,7 +454,7 @@ public class NotificationBuilder { * @return a notification builder
*/
public static NotificationBuilder createYesNo(String message, final NotificationRunnable yes, final NotificationRunnable no) {
- return new NotificationBuilder().setType(Type.QUESTION).setAsynchronous(true).setTemporary(false).setMessage(message).addAction(new NotificationRunnable() {
+ return new NotificationBuilder().setType(Type.QUESTION).setAsynchronous(false).setTemporary(false).setMessage(message).addAction(new NotificationRunnable() {
public void run(IContext context) {
if(yes != null) {
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 342119c84f1..87770f54de5 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 @@ -18,6 +18,7 @@ import org.eclipse.papyrus.infra.widgets.toolbox.notification.popups.IconAndMess import org.eclipse.papyrus.infra.widgets.toolbox.notification.popups.MessagePapyrusPopup;
import org.eclipse.papyrus.infra.widgets.toolbox.notification.popups.PopupNotification;
import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Shell;
import org.eclipse.ui.forms.widgets.FormToolkit;
/**
@@ -44,13 +45,14 @@ public class PopupBuilder implements IBuilder { if(wrapper.getMessage() != null) {
message = wrapper.getMessage();
}
+ Shell activeShell = new Shell(Display.getDefault());
if(wrapper.getType() != null) {
- popup = new IconAndMessagePapyrusPopup(Display.getDefault().getActiveShell(), toolkit, message, wrapper.getType());
+ popup = new IconAndMessagePapyrusPopup(activeShell, toolkit, message, wrapper.getType());
} else if(wrapper.getImage() != null) {
- popup = new IconAndMessagePapyrusPopup(Display.getDefault().getActiveShell(), toolkit, message);
+ popup = new IconAndMessagePapyrusPopup(activeShell, toolkit, message);
((IconAndMessagePapyrusPopup)popup).setImage(wrapper.getImage());
} else {
- popup = new MessagePapyrusPopup(Display.getDefault().getActiveShell(), toolkit, message);
+ popup = new MessagePapyrusPopup(activeShell, toolkit, message);
}
popup.setTitle(title);
popup.setUseHtml(wrapper.isHtml());
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/dialogs/PapyrusAsyncNotificationPopup.java b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/dialogs/PapyrusAsyncNotificationPopup.java index 24cdb50a1f2..ac9fb7c9c72 100644 --- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/dialogs/PapyrusAsyncNotificationPopup.java +++ b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/dialogs/PapyrusAsyncNotificationPopup.java @@ -74,7 +74,12 @@ public class PapyrusAsyncNotificationPopup extends AbstractNotificationPopup { @Override
public void linkActivated(HyperlinkEvent e) {
- run(r);
+ Display.getDefault().asyncExec(new Runnable() {
+
+ public void run() {
+ PapyrusAsyncNotificationPopup.this.run(r);
+ }
+ });
}
});
first = false;
|