mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-08-09 01:05:38 +02:00
Code Issues Wiki Activity

[187115] force SystemMessageDialog always into Display thread

Browse source
This commit is contained in:
Martin Oberhuber 2007-05-15 21:03:10 +00:00
parent 0b9bb16418
commit 7217c7516a
1 changed files with 56 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

66
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/messages/SystemMessageDialog.java
View file

@ -12,6 +12,7 @@
* *
* Contributors: * Contributors:
* Martin Oberhuber (Wind River) - [183824] Forward SystemMessageException from IRemoteFileSubsystem * Martin Oberhuber (Wind River) - [183824] Forward SystemMessageException from IRemoteFileSubsystem
* Martin Oberhuber (Wind River) - [187115] force SystemMessageDialog always into Display thread
********************************************************************************/ ********************************************************************************/
package org.eclipse.rse.ui.messages; package org.eclipse.rse.ui.messages;
@ -25,6 +26,7 @@ import org.eclipse.core.runtime.Status;
import org.eclipse.jface.dialogs.ErrorDialog; import org.eclipse.jface.dialogs.ErrorDialog;
import org.eclipse.jface.dialogs.IDialogConstants; import org.eclipse.jface.dialogs.IDialogConstants;
import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.jface.window.Window;
import org.eclipse.rse.core.SystemBasePlugin; import org.eclipse.rse.core.SystemBasePlugin;
import org.eclipse.rse.internal.ui.SystemResources; import org.eclipse.rse.internal.ui.SystemResources;
import org.eclipse.rse.services.clientserver.messages.IndicatorException; import org.eclipse.rse.services.clientserver.messages.IndicatorException;
@ -44,6 +46,7 @@ import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Event; import org.eclipse.swt.widgets.Event;
import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Listener; import org.eclipse.swt.widgets.Listener;
import org.eclipse.swt.widgets.MessageBox;
import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.Shell;
import org.eclipse.swt.widgets.Text; import org.eclipse.swt.widgets.Text;
@ -586,13 +589,41 @@ public class SystemMessageDialog extends ErrorDialog implements Listener {
return SystemBasePlugin.getActiveWorkbenchShell(); return SystemBasePlugin.getActiveWorkbenchShell();
} }
private static void runInUIThread(final Runnable r) {
Display d = Display.getCurrent();
if (d!=null) {
r.run();
}
else {
d = Display.getDefault();
d.syncExec(r);
}
}
private static int openInUIThread(final Window dlg) {
Display d = Display.getCurrent();
if (d!=null) {
return dlg.open();
}
else {
d = Display.getDefault();
final int[] rv = new int[1];
d.syncExec(new Runnable() {
public void run() {
rv[0] = dlg.open();
}
});
return rv[0];
}
}
/** /**
* For ease of use for simple messages with no response from user. * For ease of use for simple messages with no response from user.
*/ */
public static void displayErrorMessage(Shell shell, SystemMessage msg) public static void displayErrorMessage(Shell shell, SystemMessage msg)
{ {
SystemMessageDialog msgDlg = new SystemMessageDialog(shell, msg); SystemMessageDialog msgDlg = new SystemMessageDialog(shell, msg);
msgDlg.open(); openInUIThread(msgDlg);
} }
/** /**
@ -602,7 +633,7 @@ public class SystemMessageDialog extends ErrorDialog implements Listener {
{ {
SystemMessageDialog msgDlg = new SystemMessageDialog(shell, msg); SystemMessageDialog msgDlg = new SystemMessageDialog(shell, msg);
msgDlg.setException(exc); msgDlg.setException(exc);
msgDlg.open(); openInUIThread(msgDlg);
} }
/** /**
@ -651,7 +682,7 @@ public class SystemMessageDialog extends ErrorDialog implements Listener {
SystemMessage msg = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_GENERIC_E); SystemMessage msg = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_GENERIC_E);
msg.makeSubstitution(hostMsg); msg.makeSubstitution(hostMsg);
SystemMessageDialog msgDlg = new SystemMessageDialog(shell, msg); SystemMessageDialog msgDlg = new SystemMessageDialog(shell, msg);
msgDlg.open(); openInUIThread(msgDlg);
} }
/** /**
@ -663,7 +694,7 @@ public class SystemMessageDialog extends ErrorDialog implements Listener {
SystemMessage msg = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_GENERIC_E_HELP); SystemMessage msg = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_GENERIC_E_HELP);
msg.makeSubstitution(hostMsg,levelTwo); msg.makeSubstitution(hostMsg,levelTwo);
SystemMessageDialog msgDlg = new SystemMessageDialog(shell, msg); SystemMessageDialog msgDlg = new SystemMessageDialog(shell, msg);
msgDlg.open(); openInUIThread(msgDlg);
} }
/** /**
@ -674,7 +705,7 @@ public class SystemMessageDialog extends ErrorDialog implements Listener {
SystemMessage msg = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_GENERIC_W); SystemMessage msg = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_GENERIC_W);
msg.makeSubstitution(hostMsg); msg.makeSubstitution(hostMsg);
SystemMessageDialog msgDlg = new SystemMessageDialog(shell, msg); SystemMessageDialog msgDlg = new SystemMessageDialog(shell, msg);
msgDlg.open(); openInUIThread(msgDlg);
} }
/** /**
@ -686,7 +717,7 @@ public class SystemMessageDialog extends ErrorDialog implements Listener {
SystemMessage msg = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_GENERIC_W_HELP); SystemMessage msg = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_GENERIC_W_HELP);
msg.makeSubstitution(hostMsg,levelTwo); msg.makeSubstitution(hostMsg,levelTwo);
SystemMessageDialog msgDlg = new SystemMessageDialog(shell, msg); SystemMessageDialog msgDlg = new SystemMessageDialog(shell, msg);
msgDlg.open(); openInUIThread(msgDlg);
} }
/** /**
@ -699,7 +730,7 @@ public class SystemMessageDialog extends ErrorDialog implements Listener {
shell = Display.getCurrent().getActiveShell(); shell = Display.getCurrent().getActiveShell();
SystemMessageDialog msgDlg = new SystemMessageDialog(shell, msg); SystemMessageDialog msgDlg = new SystemMessageDialog(shell, msg);
msgDlg.setException(exc); msgDlg.setException(exc);
msgDlg.open(); openInUIThread(msgDlg);
} }
@ -719,10 +750,14 @@ public class SystemMessageDialog extends ErrorDialog implements Listener {
*/ */
public static void showExceptionMessage(Shell shell, String msg, Exception exc) public static void showExceptionMessage(Shell shell, String msg, Exception exc)
{ {
org.eclipse.swt.widgets.MessageBox mb = new org.eclipse.swt.widgets.MessageBox(null); final MessageBox mb = new MessageBox(null);
//mb.setTitle("Remote Systems Programming Error"); //mb.setTitle("Remote Systems Programming Error");
mb.setMessage(msg); mb.setMessage(msg);
runInUIThread(new Runnable() {
public void run() {
mb.open(); mb.open();
}
});
SystemBasePlugin.logError(msg,exc); SystemBasePlugin.logError(msg,exc);
} }
@ -734,12 +769,19 @@ public class SystemMessageDialog extends ErrorDialog implements Listener {
public static boolean show(Shell shell, SystemMessage msg) public static boolean show(Shell shell, SystemMessage msg)
{ {
boolean yes = false; boolean yes = false;
SystemMessageDialog msgDlg = new SystemMessageDialog(shell, msg); final SystemMessageDialog msgDlg = new SystemMessageDialog(shell, msg);
if (msg.getIndicator() != SystemMessage.INQUIRY) if (msg.getIndicator() != SystemMessage.INQUIRY)
msgDlg.open(); openInUIThread(msgDlg);
else else {
yes = msgDlg.openQuestionNoException(); final boolean[] rv = new boolean[1];
runInUIThread(new Runnable() {
public void run() {
rv[0] = msgDlg.openQuestionNoException();
}
});
yes = rv[0];
}
return yes; return yes;
} }