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

equal deleted inserted replaced

-:7cee158cb8cd
+:26b2b12093af
 import com.nokia.mj.impl.installer.ui.InstallerUiListener;
 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 java.io.InputStream;
 import java.io.IOException;
-import java.util.Enumeration;
 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.graphics.Image;
 import org.eclipse.swt.graphics.ImageData;
+import org.eclipse.swt.graphics.ImageLoader;
 import org.eclipse.swt.graphics.Point;
 import org.eclipse.swt.graphics.Rectangle;
 import org.eclipse.swt.internal.extension.DisplayExtension;
-import org.eclipse.swt.internal.qt.BaseCSSEngine;
 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;
 /**
 * JavaInstaller eSWT UI.
 */
 public class InstallerUiEswt extends InstallerUi
 {
-/** Disable UI temporarily. */
-private static final boolean DISABLE_UI =
-(System.getProperty("com.nokia.mj.impl.installer.ui.disableui")
-== null? false: true);
 /** Default shell style. */
 private static final int SHELL_STYLE =
 SWT.BORDER | SWT.APPLICATION_MODAL | SWT.ON_TOP;
-private BaseCSSEngine iCssEngine = null;
 private Shell iParent = null;
 private Shell iDialog = null;
 private ProgressView iProgressView = null;
 private ProgressView iDlProgressView = null;
 private ProgressView iOcspProgressView = null;
 private Image iSecurityIcon = null;
 /** Flag telling if progress bar should be displayed. */
 private boolean iDisplayProgress = false;
 /** Flag telling if the first progress bar update has been traced. */
 private boolean iProgressBarUpdateTraced = false;
+/** Flag telling if MinimalUi should be used if UI creation fails. */
-/** Certificate details view, owned by the view where it was opened. */
+private boolean iMinimalUiEnabled = true;
-private CertificateDetailsView iCertificateDetailsView = null;
 /** Hashtable for storing the loaded icons. */
 private static Hashtable iImageTable = null;
 /** Best size for application icon. */
 private static Point iBestIconSize = null;
 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;
 UIThreadSupport.startInUIThread(new Runnable()
 {
 public void run()
 {
 uiMain();
 * This method is executed in UI main thread.
 */
 private void uiMain()
 {
 log("uiMain: thread started");
-iUiThreadExists = true;
 try
 {
 // Create the necessary views.
 DisplayExtension display = new DisplayExtension();
 StartUpTrace.doTrace("InstallerUiEswt display created");
 display.setAppName(""); // Remove display title.
-iCssEngine = new BaseCSSEngine(display);
 iParent = new Shell(display);
 iDialog = new Shell(iParent, SHELL_STYLE);
 iDefaultShellBounds = iDialog.internal_getDefaultBounds();
 iDefaultShellClientBounds = iDialog.getClientArea();
 iBoldFont = getBoldFont();
 //aEvent.doit = false;
 }
 });
 // Initialize best icon size.
-//iBestIconSize = new Point(
+iBestIconSize = new Point(
-//    display.getBestImageWidth(DisplayExtension.ALERT),
+display.getBestImageWidth(DisplayExtension.ALERT),
-//    display.getBestImageHeight(DisplayExtension.ALERT));
+display.getBestImageHeight(DisplayExtension.ALERT));
-//log("Best icon size: " + iBestIconSize);
+log("Best icon size: " + iBestIconSize);
 synchronized (iInitWaitObject)
 {
 // Notify that UI is now ready.
 iInitWaitObject.notify();
 if (!display.readAndDispatch())
 {
 display.sleep();
 }
 }
-disposeResources();
+if (iBoldFont != null && !iBoldFont.isDisposed())
+{
+iBoldFont.dispose();
+}
 display.dispose();
 log("uiMain: display disposed");
 synchronized (iExitWaitObject)
 {
 // Notify that UI main thread has been terminated.
 * Cancels all confirmation views that are currently displayed.
 */
 public void cancelConfirmations()
 {
 super.cancelConfirmations();
-if (iCertificateDetailsView != null)
-{
-iCertificateDetailsView.confirmCancel();
-}
 if (iInstallConfirmationView != null)
 {
 iInstallConfirmationView.confirmCancel();
 }
 if (iPermissionConfirmationView != null)
 public boolean confirm(InstallInfo aInstallInfo)
 {
 super.confirm(aInstallInfo);
 waitForUi();
+boolean result = true;
 if (!isUiReady())
 {
-// If UI is not ready by the time confirmation is requested,
+result = false;
-// throw an exception.
+if (iMinimalUiEnabled)
-throw new RuntimeException("JavaInstallerUi not ready");
+{
-}
+result = MinimalUi.confirmStatic(aInstallInfo);
+log("MinimalUi installation confirmation returns " + result);
-boolean result = true;
+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 (iInstallConfirmationView == null)
 {
 if (!isUiReady())
 {
 aPermissionInfo.setPermissionAllowed(false);
 return true;
 }
-// Ensure that UI is visible when this prompt is displayed.
-unhide();
 synchronized (iProgressSyncObject)
 {
 // Do not display progress bar during dialog.
 iDisplayProgress = false;
 * @param aProgress progress value between 0 and 100
 */
 public void updateProgress(int aProgress)
 {
 super.updateProgress(aProgress);
-if (DISABLE_UI) return; // Disable UI temporarily.
 if (!isUiReady())
 {
 return;
 }
 // UI is created asynchronously, so it might be that
 // UI was not yet ready when started() was called.
 // Ensure that iProgressView has been opened before
 // updating it.
 synchronized (iProgressSyncObject)
 {
-if (iDlProgressView != null && iDlProgressView.isVisible())
+if (iDisplayProgress && !iProgressView.isVisible())
-{
-// If download progress is being displayed,
-// do not display installation progress.
-return;
-}
-if (iDisplayProgress && !iProgressView.isVisible() &&
-iCertificateDetailsView == null)
 {
 // Re-create iProgressView here so that it gets
 // application info that was set when confirm()
 // was called.
 final InstallerUiEswt self = this;
 * This method must return quickly.
 */
 public void ended()
 {
 super.ended();
-if (DISABLE_UI) return; // Disable UI temporarily.
 if (!isUiReady())
 {
 return;
 }
 Display display = iParent.getDisplay();
 * @param aDownloadInfo information about download
 */
 public void started(DownloadInfo aDownloadInfo)
 {
 super.started(aDownloadInfo);
-if (DISABLE_UI) return; // Disable UI temporarily.
 if (!isUiReady())
 {
 return;
 }
 // Ensure that download progress bar is displayed and
 * @param aDownloadInfo information about download
 */
 public void updateProgress(DownloadInfo aDownloadInfo)
 {
 super.updateProgress(aDownloadInfo);
-if (DISABLE_UI) return; // Disable UI temporarily.
 if (!isUiReady())
 {
 return;
 }
 iDlProgressView.addCancelCommand();
 }
 synchronized (iProgressSyncObject)
 {
-if (iDisplayProgress && !iDlProgressView.isVisible() &&
+if (iDisplayProgress && !iDlProgressView.isVisible())
-iCertificateDetailsView == null)
 {
 iDlProgressView.setVisible(true);
 }
 }
 if (aDownloadInfo.getTotalSize() > 0)
 * @param aDownloadInfo information about download
 */
 public void ended(DownloadInfo aDownloadInfo)
 {
 super.ended(aDownloadInfo);
-if (DISABLE_UI) return; // Disable UI temporarily.
 if (!isUiReady())
 {
 return;
 }
 if (iDlProgressView != null && !iDlProgressView.isDisposed())
 iDlProgressView.dispose();
 iDlProgressView = null;
 }
 synchronized (iProgressSyncObject)
 {
-if (iDisplayProgress && !iProgressView.isVisible() &&
+if (iDisplayProgress && !iProgressView.isVisible())
-iCertificateDetailsView == null)
 {
 iProgressView.setVisible(true);
 }
 }
 }
 * @param aOn true when OCSP is started, false when OCSP is stopped
 */
 public void setOcspIndicator(boolean aOn)
 {
 super.setOcspIndicator(aOn);
-if (DISABLE_UI) return; // Disable UI temporarily.
 waitForUi();
 if (!isUiReady())
 {
 log("UI not ready, could not set OCSP indicator to " + aOn);
 return;
 final InstallerUiEswt self = this;
 iParent.getDisplay().syncExec(new Runnable()
 {
 public void run()
 {
-iOcspProgressView = new ProgressView(
+iOcspProgressView = new ProgressView(self, iDialog,
-self, iDialog,
+InstallerUiTexts.get(InstallerUiTexts.OCSP_CHECK_PROGRESS),
-InstallerUiTexts.get(InstallerUiTexts.OCSP_CHECK_PROGRESS),
+true);
-true);
 }
 });
 iOcspProgressView.addCancelCommand();
 }
 if (iOcspProgressView != null)
 {
-if (!iOcspProgressView.isVisible() &&
+if (!iOcspProgressView.isVisible())
-iCertificateDetailsView == null)
 {
 iOcspProgressView.setVisible(true);
 }
 }
 }
 * @param aInstallerException exception indicating the error reason
 */
 public void error(InstallerExceptionBase aInstallerException)
 {
 super.error(aInstallerException);
-if (DISABLE_UI) return; // Disable UI temporarily.
 waitForUi();
-waitForCertificateDetailsView();
+if (!isUiReady()) {
-if (!isUiReady() || iHidden || iConfirmationsCanceled) {
 return;
 }
 // Use ErrorView to display error message.
 if (iErrorView == null)
 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;
+if (iInstallInfo != null)
+{
+if (iInstallInfo.getCertificates() != null)
+{
+identified = true;
+}
+}
+else if (iUninstallInfo != null)
+{
+if (iUninstallInfo.getCertificates() != null)
+{
+identified = true;
+}
+}
+String tmpTitle = InstallerUiTexts.get(InstallerUiTexts.INSTALL_FAILED);
+// Ensure that no confirmations are being displayed.
+cancelConfirmations();
+// Hide progress view before displaying error message.
+if (iProgressView != null)
+{
+iProgressView.setVisible(false);
+}
+// 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
 * @return             true if the user has answered, false if the user has
 *                     canceled the confirmation
 */
 public boolean confirm(String aAppName, ConfirmData aConfirmData)
 {
-if (DISABLE_UI) return true; // Disable UI temporarily.
 waitForUi();
 if (!isUiReady()) {
 return true;
 }
-waitForCertificateDetailsView();
-if (iConfirmationsCanceled)
-{
-return false;
-}
-// Ensure that UI is visible when this prompt is displayed.
-unhide();
 if (iRuntimeConfirmationView == null)
 {
 final Display display = iParent.getDisplay();
 final InstallerUiEswt self = this;
 * and second being password. If username and password
 * cannot be obtained, this method returns null.
 */
 public String[] getUsernamePassword(String aUrl)
 {
-if (DISABLE_UI) return new String[] { "", "" }; // Disable UI temporarily.
 waitForUi();
-waitForCertificateDetailsView();
+if (!isUiReady())
-if (!isUiReady() || iConfirmationsCanceled)
 {
 return null;
 }
-// Ensure that UI is visible when this prompt is displayed.
-unhide();
 synchronized (iProgressSyncObject)
 {
 // Do not display progress bar during dialog.
 iDisplayProgress = false;
 * @return true if the user has chosen to launch the application,
 * false if the user has canceled the query
 */
 public boolean launchAppQuery(LaunchAppInfo aLaunchAppInfo)
 {
-if (DISABLE_UI) return false; // Disable UI temporarily.
 waitForUi();
-waitForCertificateDetailsView();
+if (!isUiReady() || iConfirmationsCanceled || getInstallInfo() == null)
-if (!isUiReady() || iConfirmationsCanceled ||
+{
-iHidden || getInstallInfo() == null)
+// Either UI is not yet ready, or user has cancelled
-{
+// installation, in both cases do nothing.
-// Either UI is not yet ready, user has cancelled
-// installation or UI is hidden; in all these cases
-// do nothing.
 return false;
 }
 if (iLaunchAppQueryView == null)
 {
 iLaunchAppQueryView = new LaunchAppQueryView(self, iDialog);
 }
 });
 }
 boolean result = iLaunchAppQueryView.launchAppQuery(aLaunchAppInfo);
-iLaunchAppQueryView.dispose();
+iParent.getDisplay().syncExec(new Runnable()
+{
+public void run()
+{
+iParent.dispose();
+}
+});
 iLaunchAppQueryView = null;
-if (!result)
-{
-iParent.getDisplay().syncExec(new Runnable()
-{
-public void run()
-{
-iParent.dispose();
-}
-});
-}
 log("LaunchAppQuery returns " + result + " for " + aLaunchAppInfo);
 return result;
 }
 /**
-* Executes given Runnable synchronously in the UI thread.
-*/
-public void syncExec(Runnable aRunnable)
-{
-if (!iParent.getDisplay().isDisposed())
-{
-iParent.getDisplay().syncExec(aRunnable);
-}
-}
-/**
 * Hides or unhides InstallerUi.
 */
 public void hide(boolean aHide)
 {
-iHidden = aHide;
+final boolean hide = aHide;
-if (iDialog != null)
+if (iParent != null)
 {
-iDialog.getDisplay().syncExec(new Runnable()
+iParent.getDisplay().syncExec(new Runnable()
 {
 public void run()
 {
-iDialog.setMinimized(iHidden);
+iParent.setMinimized(hide);
 }
 });
 }
 super.hide(aHide);
 }
 hide(false);
 }
 }
 /**
-* Sets flag telling if certificate details view is open.
-*/
-protected void setCertificateDetailsView(CertificateDetailsView aView)
-{
-if (iCertificateDetailsView != null && aView == null)
-{
-// Certificate details view has been closed,
-// notify possible waiters.
-synchronized (iCertificateDetailsView)
-{
-iCertificateDetailsView.notify();
-}
-}
-iCertificateDetailsView = aView;
-}
-/**
-* Waits until certificate details view is closed.
-*/
-protected void waitForCertificateDetailsView()
-{
-if (iCertificateDetailsView != null)
-{
-// If certificate details view is open, wait until
-// user closes it.
-synchronized (iCertificateDetailsView)
-{
-try
-{
-iCertificateDetailsView.wait();
-}
-catch (InterruptedException ie)
-{
-}
-}
-}
-}
-/**
 * Returns string title basing on mode of this InstallerUi.
 */
 protected String getTitle()
 {
-String result = super.getTitle();
+String result = null;
-if (isUiReady())
+if (iMode == MODE_INSTALL)
 {
-if (iMode == MODE_INSTALL)
+result = InstallerUiTexts.get(InstallerUiTexts.INSTALLING);
-{
+}
-result = InstallerUiTexts.get(InstallerUiTexts.INSTALLING);
+else if (iMode == MODE_UNINSTALL)
-}
+{
-else if (iMode == MODE_UNINSTALL)
+result = InstallerUiTexts.get("Uninstalling");
-{
+}
-result = InstallerUiTexts.get("Uninstalling");
+else if (iMode == MODE_APP_CONVERSION)
-}
+{
-else if (iMode == MODE_APP_CONVERSION)
+result = InstallerUiTexts.get(
-{
+"Converting data for application " +
-result = InstallerUiTexts.get(
+iAppConversionCurrent + "/" + iAppConversionTotal);
-"Converting data for application " +
-iAppConversionCurrent + "/" + iAppConversionTotal);
-}
 }
 return result;
 }
 /**
 {
 if (iSecurityIcon != null)
 {
 return iSecurityIcon;
 }
-String iconFilename = "java_3_untrusted.png";
+String iconFilename = ResourceUtil.UNTRUSTED_ICON_NAME;
 if (aIdentified)
 {
-iconFilename = "java_3_trusted.png";
+iconFilename = ResourceUtil.TRUSTED_ICON_NAME;
 }
-try
+String resourceDir = ResourceUtil.getResourceDir(0);
-{
+for (int i = 1; iSecurityIcon == null && resourceDir != null; i++)
-String resourceDir = ResourceUtil.getResourceDir(0);
+{
-for (int i = 1; iSecurityIcon == null && resourceDir != null; i++)
+iSecurityIcon = loadImage(aDisplay, resourceDir + iconFilename, false);
-{
+resourceDir = ResourceUtil.getResourceDir(i);
-iSecurityIcon = loadImage(
-aDisplay, resourceDir + iconFilename, false);
-resourceDir = ResourceUtil.getResourceDir(i);
-}
-}
-catch (Throwable t)
-{
-log("Can not load security icon: " + t);
 }
 return iSecurityIcon;
 }
 /**
 return result;
 }
 try
 {
 long startTime = System.currentTimeMillis();
-Image image = new Image(aDisplay, aInputStream);
+ImageData[] imageDatas = new ImageLoader().load(aInputStream);
-ImageData imageData = image.getImageData();
+ImageData imageData = imageDatas[0];
 if (aScaleImage)
 {
 Point bestSize = getBestImageSize(
 imageData.width, imageData.height);
 if (bestSize.x != imageData.width ||
 bestSize.y != imageData.height)
 {
-Point oldSize =
-new Point(imageData.width, imageData.height);
 imageData = imageData.scaledTo(bestSize.x, bestSize.y);
 log("Image " + aImageName + " scaled from " +
-oldSize.x + "x" + oldSize.y + " to " +
+imageDatas[0].width + "x" + imageDatas[0].height +
-bestSize.x + "x" + bestSize.y);
+" to " + bestSize.x + "x" + bestSize.y);
 }
 }
 result = new Image(aDisplay, imageData);
 long endTime = System.currentTimeMillis();
 log("Loaded image " + aImageName + " (load time " +
 /**
 * Determines the best image size for the image of given size.
 */
 private static Point getBestImageSize(int aWidth, int aHeight)
 {
-final int MAX_WIDTH = (iBestIconSize == null? 50: iBestIconSize.x);
+final int MAX_WIDTH = iBestIconSize.x;
-final int MAX_HEIGHT = (iBestIconSize == null? 50: iBestIconSize.y);
+final int MAX_HEIGHT = iBestIconSize.y;
 Point result = new Point(aWidth, aHeight);
 if (result.x > MAX_WIDTH || result.y > MAX_HEIGHT)
 {
 if (result.x >= MAX_WIDTH)
 {
 ViewBase getActiveView()
 {
 return iActiveView;
 }
-/**
-* Loads JavaInstaller UI stylesheet.
-*/
-void loadCss()
-{
-String cssFilename = "javaapplicationinstaller.css";
-String cssPath = null;
-try
-{
-if (iCssEngine != null)
-{
-boolean loaded = false;
-String resourceDir = ResourceUtil.getResourceDir(0);
-for (int i = 1; !loaded && resourceDir != null; i++)
-{
-cssPath = resourceDir + cssFilename;
-FileUtility cssFile = new FileUtility(cssPath);
-if (cssFile.exists())
-{
-iCssEngine.loadCSS(cssPath);
-log("CSS loaded from " + cssPath);
-break;
-}
-resourceDir = ResourceUtil.getResourceDir(i);
-}
-}
-}
-catch (Throwable t)
-{
-logError("Loading CSS from " + cssPath + " failed", t);
-}
-}
-private void disposeResources() {
-if (iBoldFont != null && !iBoldFont.isDisposed())
-{
-iBoldFont.dispose();
-}
-if (iSecurityIcon != null && !iSecurityIcon.isDisposed())
-{
-iSecurityIcon.dispose();
-}
-Enumeration e = iImageTable.elements();
-while (e.hasMoreElements())
-{
-Image img = (Image)e.nextElement();
-if (img != null && !img.isDisposed())
-{
-img.dispose();
-}
-}
-}
 }

branch	RCL_3
changeset 83	26b2b12093af
parent 77	7cee158cb8cd