FCL/sf/app/jrt: comparison javamanager/javainstaller/installerui/javasrc/com/nokia/mj/impl/installer/ui/eswt2/InstallerUiEswt.java

equal deleted inserted replaced

-:f9bb0fca356a
+:0fd27995241b
 import com.nokia.mj.impl.installer.ui.InstallInfo;
 import com.nokia.mj.impl.installer.ui.LaunchAppInfo;
 import com.nokia.mj.impl.installer.ui.PermissionInfo;
 import com.nokia.mj.impl.installer.ui.UninstallInfo;
 import com.nokia.mj.impl.installer.ui.eswt.MinimalUi;
+import com.nokia.mj.impl.rt.ui.ConfirmData;
 import com.nokia.mj.impl.rt.ui.RuntimeUi;
 import com.nokia.mj.impl.rt.ui.RuntimeUiFactory;
 import com.nokia.mj.impl.utils.ResourceUtil;
 import com.nokia.mj.impl.utils.StartUpTrace;
 import com.nokia.mj.impl.utils.exception.InstallerExceptionBase;
 import org.eclipse.swt.widgets.Shell;
 //import org.eclipse.swt.widgets.MessageBox;
 /**
 * JavaInstaller eSWT UI.
-*
-* @author Nokia Corporation
-* @version $Rev: 0 $
 */
 public class InstallerUiEswt extends InstallerUi
 {
 /** Default shell style. */
 private static final int SHELL_STYLE =
 private InstallConfirmationView iInstallConfirmationView = null;
 private UninstallConfirmationView iUninstallConfirmationView = null;
 private PermissionConfirmationView iPermissionConfirmationView = null;
 private UsernamePasswordView iUsernamePasswordView = null;
 private LaunchAppQueryView iLaunchAppQueryView = null;
+private ErrorView iErrorView = null;
+private ErrorDetailsView iErrorDetailsView = null;
+private RuntimeConfirmationView iRuntimeConfirmationView = null;
 /** Synchronization object for waiting for the UI initialization. */
 private Object iInitWaitObject = new Object();
 /** Synchronization object for waiting for the UI termination. */
 private Object iExitWaitObject = new Object();
 /**
 */
 public void init(int aMode, InstallerUiListener aListener)
 {
 super.init(aMode, aListener);
 StartUpTrace.doTrace("InstallerUiEswt init");
+InstallerRuntimeUi.init(this);
 // Create a hashtable for icons.
 iImageTable = new Hashtable();
 // Create a new thread to be the UI main thread.
 iUiThreadExists = true;
 new Thread(new Runnable()
 }
 if (iLaunchAppQueryView != null)
 {
 iLaunchAppQueryView.confirmCancel();
 }
+if (iErrorView != null)
+{
+iErrorView.confirmCancel();
+}
+if (iErrorDetailsView != null)
+{
+iErrorDetailsView.confirmCancel();
+}
+if (iRuntimeConfirmationView != null)
+{
+iRuntimeConfirmationView.confirmCancel();
+}
 // Remove download progress bar if it visible.
 if (iDlProgressView != null && !iDlProgressView.isDisposed())
 {
 iDlProgressView.dispose();
 iDlProgressView = null;
 super.ended(aDownloadInfo);
 if (!isUiReady())
 {
 return;
 }
-if (iDlProgressView != null)
+if (iDlProgressView != null && !iDlProgressView.isDisposed())
 {
 iDlProgressView.dispose();
 iDlProgressView = null;
 }
 synchronized (iProgressSyncObject)
 }
 }
 /**
 * Notify user that an error has occurred.
-* This method must return quickly.
 *
 * @param aInstallerException exception indicating the error reason
 */
 public void error(InstallerExceptionBase aInstallerException)
 {
 super.error(aInstallerException);
 waitForUi();
-// InstallerUi does not have to be ready as long as
+if (!isUiReady()) {
-// RuntimeUi is used to display error messages.
+showRuntimeUiError(aInstallerException);
-//if (!isUiReady()) {
+return;
-//    return;
+}
-//}
+// Use ErrorView to display error message.
+if (iErrorView == null)
+{
+final Display display = iParent.getDisplay();
+final InstallerUiEswt self = this;
+display.syncExec(new Runnable()
+{
+public void run()
+{
+iErrorView = new ErrorView(self, iDialog);
+}
+});
+}
+boolean result = iErrorView.error(aInstallerException);
+iErrorView.dispose();
+iErrorView = null;
+if (result)
+{
+// Display error details.
+if (iErrorDetailsView == null)
+{
+final Display display = iParent.getDisplay();
+final InstallerUiEswt self = this;
+display.syncExec(new Runnable()
+{
+public void run()
+{
+iErrorDetailsView = new ErrorDetailsView(self, iDialog);
+}
+});
+}
+result = iErrorDetailsView.error(aInstallerException);
+iErrorDetailsView.dispose();
+iErrorDetailsView = null;
+}
+}
+/**
+* Notify user that an error has occurred using RuntimeUI.
+*
+* @param aInstallerException exception indicating the error reason
+*/
+private void showRuntimeUiError(InstallerExceptionBase aInstallerException)
+{
 boolean identified = false;
-//String tmpAppName = null;
 if (iInstallInfo != null)
 {
-//tmpAppName = iInstallInfo.getName();
 if (iInstallInfo.getCertificates() != null)
 {
 identified = true;
 }
 }
 else if (iUninstallInfo != null)
 {
-//tmpAppName = iUninstallInfo.getName();
 if (iUninstallInfo.getCertificates() != null)
 {
 identified = true;
 }
 }
 // Hide progress view before displaying error message.
 if (iProgressView != null)
 {
 iProgressView.setVisible(false);
 }
-// Use RuntimeUi to display error message.
+// Use RuntimeUi to display uninstallation error message.
 RuntimeUi runtimeUi = RuntimeUiFactory.getRuntimeUi(identified);
 runtimeUi.error(tmpTitle, aInstallerException);
 runtimeUi.destroy();
+}
-/*
-// Display error message using eSWT MessageBox.
+/**
-final String appName = tmpAppName;
+* Seeks confirmation from the user.
-final String title = tmpTitle;
+*
-final String shortMsg = aInstallerException.getShortMessage();
+* @param aAppName     the name of the application on behalf of which the
-final String detailedMsg = aInstallerException.getDetailedMessage();
+*                     confirmation is requested
-// UI updates must be executed in UI thread.
+* @param aConfirmData the data to be confirmed. Unless the user has
-iParent.getDisplay().syncExec
+*                     canceled the confirmation, this data will be filled
-(new Runnable() {
+*                     in with user's answer upon return
-public void run() {
+* @return             true if the user has answered, false if the user has
-if (detailedMsg == null || detailedMsg.length() == 0) {
+*                     canceled the confirmation
-// No detailed msg, display only short msg.
+*/
-MessageBox messageBox = new MessageBox
+public boolean confirm(String aAppName, ConfirmData aConfirmData)
-(iParent, SWT.ICON_ERROR | SWT.OK);
+{
-messageBox.setText(title);
+waitForUi();
-messageBox.setMessage
+if (!isUiReady()) {
-(getMessage(title, appName, shortMsg, false));
+return true;
-messageBox.open();
+}
-} else {
-// Display both short and detailed msgs.
+if (iRuntimeConfirmationView == null)
-MessageBox messageBox = new MessageBox
+{
-(iParent, SWT.ICON_ERROR | SWT.YES | SWT.NO);
+final Display display = iParent.getDisplay();
-messageBox.setText(title);
+final InstallerUiEswt self = this;
-messageBox.setMessage
+final String appName = aAppName;
-(getMessage(title, appName, shortMsg, true));
+final ConfirmData confirmData = aConfirmData;
-int answer = messageBox.open();
+display.syncExec(new Runnable()
-if ((answer & SWT.YES) != 0) {
+{
-// User wants to see details, display them.
+public void run()
-messageBox = new MessageBox
+{
-(iParent, SWT.ICON_ERROR | SWT.OK);
+iRuntimeConfirmationView = new RuntimeConfirmationView(
-messageBox.setText(title);
+self, iDialog, appName, confirmData);
-messageBox.setMessage
+}
-(getMessage(title, appName, detailedMsg, false));
+});
-messageBox.open();
+}
-}
+boolean result = iRuntimeConfirmationView.confirm();
-}
+iRuntimeConfirmationView.dispose();
-}
+iRuntimeConfirmationView = null;
-private String getMessage(String aTitle, String aAppName,
+log("Runtime confirmation returns " + result);
-String aMsg, boolean aDetailsQuery) {
+return result;
-//String result = aTitle + "\n\n";
-String result = "";
-if (aAppName == null) {
-result += aMsg;
-} else {
-result += aAppName + "\n\n" + aMsg;
-}
-if (aDetailsQuery) {
-result += "\n\n";
-result += InstallerUiTexts.get
-(InstallerUiTexts.DETAILS_QUERY);
-}
-return result;
-}
-});
-*/
 }
 /**
 * Ask username and password for http authentication.
 * This method blocks until user has answered to the dialog.
 }
 /**
 * Hides or unhides InstallerUi.
 */
-protected void hide(boolean aHide)
+public void hide(boolean aHide)
 {
 iParent.setMinimized(aHide);
 }
 /**

branch	RCL_3
changeset 24	0fd27995241b
parent 19	04becd199f91
child 25	9ac0a0a7da70