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

equal deleted inserted replaced

-:e5618cc85d74
+:6c158198356e
 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. */
-private boolean iMinimalUiEnabled = true;
 /** 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();
 }
 }
-if (iBoldFont != null && !iBoldFont.isDisposed())
+disposeResources();
-{
-iBoldFont.dispose();
-}
 display.dispose();
 log("uiMain: display disposed");
 synchronized (iExitWaitObject)
 {
 // Notify that UI main thread has been terminated.
 public boolean confirm(InstallInfo aInstallInfo)
 {
 super.confirm(aInstallInfo);
 waitForUi();
+if (!isUiReady())
+{
+// If UI is not ready by the time confirmation is requested,
+// throw an exception.
+throw new RuntimeException("JavaInstallerUi not ready");
+}
 boolean result = true;
-if (!isUiReady())
-{
-result = false;
-if (iMinimalUiEnabled)
-{
-result = MinimalUi.confirmStatic(aInstallInfo);
-log("MinimalUi installation 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 (iInstallConfirmationView == null)
 {
 * @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 download progress is being displayed,
+// do not display installation progress.
+return;
+}
 if (iDisplayProgress && !iProgressView.isVisible())
 {
 // Re-create iProgressView here so that it gets
 // application info that was set when confirm()
 // was called.
 * 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;
 }
 * @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())
 * @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(self, iDialog,
+iOcspProgressView = new ProgressView(
-InstallerUiTexts.get(InstallerUiTexts.OCSP_CHECK_PROGRESS),
+self, iDialog,
-true);
+InstallerUiTexts.get(InstallerUiTexts.OCSP_CHECK_PROGRESS),
+true);
 }
 });
 iOcspProgressView.addCancelCommand();
 }
 if (iOcspProgressView != null)
 * @param aInstallerException exception indicating the error reason
 */
 public void error(InstallerExceptionBase aInstallerException)
 {
 super.error(aInstallerException);
+if (DISABLE_UI) return; // Disable UI temporarily.
 waitForUi();
 if (!isUiReady()) {
 return;
 }
 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;
 }
 * 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();
 if (!isUiReady())
 {
 return null;
 }
 * @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();
 if (!isUiReady() || iConfirmationsCanceled || getInstallInfo() == null)
 {
 // Either UI is not yet ready, or user has cancelled
 // installation, in both cases do nothing.
 iLaunchAppQueryView = new LaunchAppQueryView(self, iDialog);
 }
 });
 }
 boolean result = iLaunchAppQueryView.launchAppQuery(aLaunchAppInfo);
-iParent.getDisplay().syncExec(new Runnable()
+iLaunchAppQueryView.dispose();
-{
-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)
+{
+iParent.getDisplay().syncExec(aRunnable);
+}
+/**
 * Hides or unhides InstallerUi.
 */
 public void hide(boolean aHide)
 {
 final boolean hide = aHide;
 /**
 * Returns string title basing on mode of this InstallerUi.
 */
 protected String getTitle()
 {
-String result = null;
+String result = super.getTitle();
-if (iMode == MODE_INSTALL)
+if (isUiReady())
 {
-result = InstallerUiTexts.get(InstallerUiTexts.INSTALLING);
+if (iMode == MODE_INSTALL)
-}
+{
-else if (iMode == MODE_UNINSTALL)
+result = InstallerUiTexts.get(InstallerUiTexts.INSTALLING);
-{
+}
-result = InstallerUiTexts.get("Uninstalling");
+else if (iMode == MODE_UNINSTALL)
-}
+{
-else if (iMode == MODE_APP_CONVERSION)
+result = InstallerUiTexts.get("Uninstalling");
-{
+}
-result = InstallerUiTexts.get(
+else if (iMode == MODE_APP_CONVERSION)
-"Converting data for application " +
+{
-iAppConversionCurrent + "/" + iAppConversionTotal);
+result = InstallerUiTexts.get(
+"Converting data for application " +
+iAppConversionCurrent + "/" + iAppConversionTotal);
+}
 }
 return result;
 }
 /**
 {
 if (iSecurityIcon != null)
 {
 return iSecurityIcon;
 }
-String iconFilename = ResourceUtil.UNTRUSTED_ICON_NAME;
+String iconFilename = "java_3_untrusted.png";
 if (aIdentified)
 {
-iconFilename = ResourceUtil.TRUSTED_ICON_NAME;
+iconFilename = "java_3_trusted.png";
 }
-String resourceDir = ResourceUtil.getResourceDir(0);
+try
-for (int i = 1; iSecurityIcon == null && resourceDir != null; i++)
+{
-{
+String resourceDir = ResourceUtil.getResourceDir(0);
-iSecurityIcon = loadImage(aDisplay, resourceDir + iconFilename, false);
+for (int i = 1; iSecurityIcon == null && resourceDir != null; i++)
-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();
-ImageData[] imageDatas = new ImageLoader().load(aInputStream);
+Image image = new Image(aDisplay, aInputStream);
-ImageData imageData = imageDatas[0];
+ImageData imageData = image.getImageData();
 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 " +
-imageDatas[0].width + "x" + imageDatas[0].height +
+oldSize.x + "x" + oldSize.y + " to " +
-" to " + bestSize.x + "x" + bestSize.y);
+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.x;
+final int MAX_WIDTH = (iBestIconSize == null? 50: iBestIconSize.x);
-final int MAX_HEIGHT = iBestIconSize.y;
+final int MAX_HEIGHT = (iBestIconSize == null? 50: 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 60	6c158198356e
parent 25	9ac0a0a7da70
child 77	7cee158cb8cd