diff -r 4ad59aaee882 -r 2f468c1958d0 javamanager/javainstaller/installerui/javasrc/com/nokia/mj/impl/installer/ui/eswt2/ViewBase.java --- a/javamanager/javainstaller/installerui/javasrc/com/nokia/mj/impl/installer/ui/eswt2/ViewBase.java Fri Sep 17 08:28:21 2010 +0300 +++ b/javamanager/javainstaller/installerui/javasrc/com/nokia/mj/impl/installer/ui/eswt2/ViewBase.java Mon Oct 04 00:10:53 2010 +0300 @@ -538,7 +538,7 @@ /** * Adds application information to the header. */ - protected void addAppInfo(InstallInfo aInstallInfo, boolean aFull) + protected void addAppInfo(InstallInfo aInstallInfo, boolean aFullInfo, boolean aUpdateInfo) { if (aInstallInfo == null) { @@ -547,12 +547,26 @@ } // Add suite name and version. - createAppInfoLabel( - InstallerUiTexts.get( - InstallerUiTexts.SUITE_NAME_VERSION, - new String[] { aInstallInfo.getName(), - aInstallInfo.getVersion() })); - if (aFull) + if (aUpdateInfo && aInstallInfo != null && + aInstallInfo.getOldVersion() != null) + { + createAppInfoLabel( + InstallerUiTexts.get( + InstallerUiTexts.SUITE_NAME_VERSION_UPDATE, + new String[] { aInstallInfo.getName(), + aInstallInfo.getOldVersion(), + aInstallInfo.getVersion()})); + } + else + { + createAppInfoLabel( + InstallerUiTexts.get( + InstallerUiTexts.SUITE_NAME_VERSION, + new String[] { aInstallInfo.getName(), + aInstallInfo.getVersion() })); + } + + if (aFullInfo) { // Add vendor. createAppInfoLabel( @@ -587,7 +601,7 @@ new Object[] { new Integer((int)(1 + size/1024)) })); } } - if (aFull) + if (aFullInfo) { // Add application names. ApplicationInfo[] apps = aInstallInfo.getApplications();