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

equal deleted inserted replaced

-:2a9601315dfc
+:98ccebc37403
 import com.nokia.mj.impl.installer.ui.UninstallInfo;
 import com.nokia.mj.impl.security.midp.common.SigningCertificate;
 import java.io.InputStream;
+import org.eclipse.ercp.swt.mobile.MobileDevice;
+import org.eclipse.ercp.swt.mobile.Screen;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.ScrolledComposite;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.events.SelectionListener;
 import org.eclipse.swt.graphics.Image;
 /** Default content size. */
 private Point iDefaultContentSize = null;
 /** Certificate details view.  */
 private CertificateDetailsView iCertificateDetailsView = null;
 /** Certificates for this application. */
-private SigningCertificate[] iCertificates = null;
+protected SigningCertificate[] iCertificates = null;
 /** Constructor */
 protected ViewBase()
 {
 }
 /** Constructor */
-protected ViewBase(InstallerUiEswt aInstaller, Composite aParent, int aColumns)
+protected ViewBase(InstallerUiEswt aInstallerUi, Composite aParent, int aColumns)
 {
-this(aInstaller, aParent, aColumns, false);
+this(aInstallerUi, aParent, aColumns, false);
 }
 /** Constructor */
-protected ViewBase(InstallerUiEswt aInstaller, Composite aParent, int aColumns, boolean aScrollable)
+protected ViewBase(InstallerUiEswt aInstallerUi, Composite aParent, int aColumns, boolean aScrollable)
 {
-iInstallerUi = aInstaller;
+iInstallerUi = aInstallerUi;
 // Each view gets a shell to be used as a parameter.
 iParent = (Shell)aParent;
 iContainer = new Composite(iParent, 0);
 iParent.getDisplay().syncExec
 (new Runnable()
 {
 public void run()
 {
-log(className + ": disposing view container");
+if (!isDisposed())
-iContainer.dispose();
+{
+log(className + ": disposing view container");
+iContainer.dispose();
+}
 }
 });
 }
 /** Returns true this view has been disposed, false otherwise. */
 {
 iInstallerUi.setActiveView(null);
 }
 }
 // UI updates must be executed in UI thread.
-iParent.getDisplay().syncExec
+iParent.getDisplay().syncExec(new Runnable()
-(new Runnable()
 {
 public void run()
 {
+if (isDisposed())
+{
+return;
+}
 if (iVisible)
 {
 updateSize();
 }
 iContainer.setVisible(iVisible);
 {
 updateSize();
 }
 /**
+* Forces screen orientation. Valid values are
+* Screen.PORTRAIT, Screen.LANDSCAPE, and SWT.DEFAULT.
+*/
+protected void forceScreenOrientation(int aOrientation)
+{
+Screen[] screens = MobileDevice.getMobileDevice().getScreens();
+for (int i = 0; i < screens.length; i++)
+{
+screens[i].setOrientation(aOrientation);
+}
+log(this.toString() + ": screen orientation set to " + aOrientation);
+}
+/**
 * Returns true if the View should have focus after it has been opened.
 */
 protected boolean forceFocusToView()
 {
 return true;
 {
 return iColumns;
 }
 /**
-* Adds header used in installation and uninstallation views.
+* Adds header used in installation views.
 */
 protected void addHeader(
 String aTitle, InstallInfo aInstallInfo, UninstallInfo aUninstallInfo)
+{
+addHeader(aTitle, aInstallInfo, aUninstallInfo, true);
+}
+/**
+* Adds header used in installation views.
+*/
+protected void addHeader(
+String aTitle, InstallInfo aInstallInfo, UninstallInfo aUninstallInfo,
+boolean aSecurityButton)
 {
 // Add title.
 String title = "Install?";
 if (aInstallInfo != null)
 {
 iCertificates = aUninstallInfo.getCertificates();
 }
 Label titleLabel = createLabel(aTitle, getColumns() - 1, SWT.WRAP);
 titleLabel.setFont(iInstallerUi.getBoldFont());
-// Add security icon.
+if (aSecurityButton)
-createSecurityButton();
+{
+// Add security icon.
+createSecurityButton();
+}
+else
+{
+// Add security icon.
+createSecurityLabel(iCertificates != null);
+}
 // Add suite icon.
 InputStream iconInputStream = null;
 String iconPath = null;
 if (aInstallInfo != null)
 */
 protected Label createSecurityLabel(boolean aIdentified)
 {
 Label label = createLabel((Image)null, 1, SWT.NONE);
 Image securityIcon = null;
-if (iInstallerUi instanceof InstallerUiEswt)
+if (iInstallerUi != null)
 {
-securityIcon = ((InstallerUiEswt)iInstallerUi).getSecurityIcon
+securityIcon = iInstallerUi.getSecurityIcon(
-(getDisplay(), aIdentified);
+getDisplay(), aIdentified);
 }
 if (securityIcon != null)
 {
 label.setImage(securityIcon);
 }
 gridData.horizontalSpan = 1;
 gridData.horizontalAlignment = SWT.CENTER;
 gridData.verticalAlignment = SWT.CENTER;
 button.setLayoutData(gridData);
 Image securityIcon = null;
-if (iInstallerUi instanceof InstallerUiEswt)
+if (iInstallerUi != null)
 {
-securityIcon =
+securityIcon = iInstallerUi.getSecurityIcon(
-((InstallerUiEswt)iInstallerUi).getSecurityIcon(
+getDisplay(), iCertificates != null);
-getDisplay(), iCertificates != null);
 }
 if (securityIcon != null)
 {
 button.setImage(securityIcon);
 }

changeset 23	98ccebc37403
parent 21	2a9601315dfc
child 25	9ac0a0a7da70