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

equal deleted inserted replaced

-:85266cc22c7f
+:f40128debb5d
 /**
 * JavaInstaller eSWT UI.
 */
 public class InstallerUiEswt extends InstallerUi
 {
+/** Disable UI temporarily. */
+private static final boolean DISABLE_UI = true;
 /** Default shell style. */
 private static final int SHELL_STYLE =
 SWT.BORDER | SWT.APPLICATION_MODAL | SWT.ON_TOP;
 private Shell iParent = 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");
 * @param aProgress progress value between 0 and 100
 */
 public void updateProgress(int aProgress)
 {
 super.updateProgress(aProgress);
-if (true) return; // Disable UI temporarily.
+if (DISABLE_UI) return; // Disable UI temporarily.
 if (!isUiReady())
 {
 return;
 }
 // UI is created asynchronously, so it might be that
 * This method must return quickly.
 */
 public void ended()
 {
 super.ended();
-if (true) return; // Disable UI temporarily.
+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 (true) return; // Disable UI temporarily.
+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 (true) return; // Disable UI temporarily.
+if (DISABLE_UI) return; // Disable UI temporarily.
 if (!isUiReady())
 {
 return;
 }
 * @param aDownloadInfo information about download
 */
 public void ended(DownloadInfo aDownloadInfo)
 {
 super.ended(aDownloadInfo);
-if (true) return; // Disable UI temporarily.
+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 (true) return; // Disable UI temporarily.
+if (DISABLE_UI) return; // Disable UI temporarily.
 waitForUi();
 if (!isUiReady())
 {
 log("UI not ready, could not set OCSP indicator to " + aOn);
 return;
 * @param aInstallerException exception indicating the error reason
 */
 public void error(InstallerExceptionBase aInstallerException)
 {
 super.error(aInstallerException);
-if (true) return; // Disable UI temporarily.
+if (DISABLE_UI) return; // Disable UI temporarily.
 waitForUi();
 if (!isUiReady()) {
 return;
 }
 * @return             true if the user has answered, false if the user has
 *                     canceled the confirmation
 */
 public boolean confirm(String aAppName, ConfirmData aConfirmData)
 {
-if (true) return true; // Disable UI temporarily.
+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 (true) return new String[] { "", "" }; // Disable UI temporarily.
+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 (true) return false; // Disable UI temporarily.
+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.
 */

changeset 47	f40128debb5d
parent 35	85266cc22c7f
child 48	e0d6e9bd3ca7