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

equal deleted inserted replaced

-:0fd27995241b
+:9ac0a0a7da70
 import java.io.InputStream;
 import java.io.IOException;
 import java.util.Hashtable;
+import org.eclipse.ercp.swt.midp.UIThreadSupport;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.ControlEvent;
 import org.eclipse.swt.events.ControlListener;
 import org.eclipse.swt.graphics.Font;
 import org.eclipse.swt.graphics.FontData;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Event;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Listener;
 import org.eclipse.swt.widgets.Shell;
-//import org.eclipse.swt.widgets.MessageBox;
 /**
 * JavaInstaller eSWT UI.
 */
 public class InstallerUiEswt extends InstallerUi
 private Shell iDialog = null;
 private ProgressView iProgressView = null;
 private ProgressView iDlProgressView = null;
 private ProgressView iOcspProgressView = null;
 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;
 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()
+UIThreadSupport.startInUIThread(new Runnable()
 {
 public void run()
 {
 uiMain();
 }
-}, "InstallerUiMainThread").start();
+});
 // To wait InstallerUi to be ready before installer main thread
 // continues, uncomment the following line.
 //waitForUi();
 }
 super.cancelConfirmations();
 if (iInstallConfirmationView != null)
 {
 iInstallConfirmationView.confirmCancel();
 }
-if (iUninstallConfirmationView != null)
-{
-iUninstallConfirmationView.confirmCancel();
-}
 if (iPermissionConfirmationView != null)
 {
 iPermissionConfirmationView.confirmCancel();
 }
 if (iUsernamePasswordView != null)
 StartUpTrace.doTrace("InstallerUiEswt confirm");
 if (iInstallConfirmationView == null)
 {
 final Display display = iParent.getDisplay();
 final InstallerUiEswt self = this;
-display.syncExec
+display.syncExec(new Runnable()
-(new Runnable()
 {
 public void run()
 {
 iInstallConfirmationView =
 new InstallConfirmationView(self, iDialog);
 }
 else
 {
 // The install confirmation has been rejected,
 // nothing to display anymore.
-iParent.getDisplay().syncExec
+iParent.getDisplay().syncExec(new Runnable()
-(new Runnable()
 {
 public void run()
 {
 iParent.dispose();
 }
 }
 if (iPermissionConfirmationView == null)
 {
 final Display display = iParent.getDisplay();
 final InstallerUiEswt self = this;
-display.syncExec
+display.syncExec(new Runnable()
-(new Runnable()
 {
 public void run()
 {
 iPermissionConfirmationView =
 new PermissionConfirmationView(self, iDialog);
 * @param aUninstallInfo uninstallation information
 * @return true if user has accepted uninstallation, false otherwise
 */
 public boolean confirm(UninstallInfo aUninstallInfo)
 {
-super.confirm(aUninstallInfo);
+return super.confirm(aUninstallInfo);
-waitForUi();
-boolean result = true;
-if (!isUiReady())
-{
-result = false;
-if (iMinimalUiEnabled)
-{
-result = MinimalUi.confirmStatic(aUninstallInfo);
-log("MinimalUi uninstallation confirmation returns " + result);
-return result;
-}
-else
-{
-// If UI is not ready by the time confirmation is requested,
-// throw an exception.
-throw new RuntimeException("JavaInstallerUi not ready");
-}
-}
-if (result)
-{
-StartUpTrace.doTrace("InstallerUiEswt confirm");
-if (iUninstallConfirmationView == null)
-{
-final Display display = iParent.getDisplay();
-final InstallerUiEswt self = this;
-display.syncExec
-(new Runnable()
-{
-public void run()
-{
-iUninstallConfirmationView =
-new UninstallConfirmationView(self, iDialog);
-}
-});
-}
-result = iUninstallConfirmationView.confirm(aUninstallInfo);
-iUninstallConfirmationView.dispose();
-iUninstallConfirmationView = null;
-}
-if (result)
-{
-iDisplayProgress = true;
-}
-else
-{
-// The uninstall confirmation has been rejected,
-// nothing to display anymore.
-iParent.getDisplay().syncExec
-(new Runnable()
-{
-public void run()
-{
-iParent.dispose();
-}
-});
-}
-log("Uninstallation confirmation returns " + result);
-return result;
 }
 /**
 * This method is used to notify UI that installation or
 * uninstallation has started. Upon this call UI could
 if (!isUiReady())
 {
 return;
 }
 Display display = iParent.getDisplay();
-display.syncExec
+display.syncExec(new Runnable()
-(new Runnable()
 {
 public void run()
 {
 iParent.dispose();
 }
 if (aOn)
 {
 if (iOcspProgressView == null)
 {
 final InstallerUiEswt self = this;
-iParent.getDisplay().syncExec
+iParent.getDisplay().syncExec(new Runnable()
-(new Runnable()
 {
 public void run()
 {
 iOcspProgressView = new ProgressView(self, iDialog,
 InstallerUiTexts.get(InstallerUiTexts.OCSP_CHECK_PROGRESS),
 {
 super.error(aInstallerException);
 waitForUi();
 if (!isUiReady()) {
-showRuntimeUiError(aInstallerException);
 return;
 }
 // Use ErrorView to display error message.
 if (iErrorView == 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;
 if (iInstallInfo != null)
 {
 if (iUninstallInfo.getCertificates() != null)
 {
 identified = true;
 }
 }
-String tmpTitle = "";
+String tmpTitle = InstallerUiTexts.get(InstallerUiTexts.INSTALL_FAILED);
-if (iMode == MODE_INSTALL)
-{
-tmpTitle = InstallerUiTexts.get(InstallerUiTexts.INSTALL_FAILED);
-}
-else if (iMode == MODE_UNINSTALL)
-{
-tmpTitle = InstallerUiTexts.get(InstallerUiTexts.UNINSTALL_FAILED);
-}
 // Ensure that no confirmations are being displayed.
 cancelConfirmations();
 // Hide progress view before displaying error message.
 if (iProgressView != null)
 // Use RuntimeUi to display uninstallation error message.
 RuntimeUi runtimeUi = RuntimeUiFactory.getRuntimeUi(identified);
 runtimeUi.error(tmpTitle, aInstallerException);
 runtimeUi.destroy();
 }
+*/
 /**
 * Seeks confirmation from the user.
 *
 * @param aAppName     the name of the application on behalf of which the
 {
 iLaunchAppQueryView = new LaunchAppQueryView(self, iDialog);
 }
 });
 }
 boolean result = iLaunchAppQueryView.launchAppQuery(aLaunchAppInfo);
-iParent.getDisplay().syncExec
+iParent.getDisplay().syncExec(new Runnable()
-(new Runnable()
 {
 public void run()
 {
 iParent.dispose();
 }
 /**
 * Hides or unhides InstallerUi.
 */
 public void hide(boolean aHide)
 {
-iParent.setMinimized(aHide);
+final boolean hide = aHide;
+if (iParent != null)
+{
+iParent.getDisplay().syncExec(new Runnable()
+{
+public void run()
+{
+iParent.setMinimized(hide);
+}
+});
+}
+super.hide(aHide);
+}
+/**
+* Unhides the UI if it has been hidden.
+*/
+protected void unhide()
+{
+if (iHidden)
+{
+hide(false);
+}
 }
 /**
 * Returns string title basing on mode of this InstallerUi.
 */
 {
 result = InstallerUiTexts.get(InstallerUiTexts.INSTALLING);
 }
 else if (iMode == MODE_UNINSTALL)
 {
-result = InstallerUiTexts.get(InstallerUiTexts.UNINSTALLING);
+result = InstallerUiTexts.get("Uninstalling");
 }
 else if (iMode == MODE_APP_CONVERSION)
 {
 result = InstallerUiTexts.get(
-InstallerUiTexts.APP_CONVERSION_PROGRESS,
+"Converting data for application " +
-new Object[] { new Integer(iAppConversionCurrent),
+iAppConversionCurrent + "/" + iAppConversionTotal);
-new Integer(iAppConversionTotal)
-});
 }
 return result;
 }
 /**

branch	RCL_3
changeset 25	9ac0a0a7da70
parent 24	0fd27995241b
child 35	85266cc22c7f
child 60	6c158198356e