diff options
author | Oliver Bolte <obo@openoffice.org> | 2008-07-22 11:02:28 +0000 |
---|---|---|
committer | Oliver Bolte <obo@openoffice.org> | 2008-07-22 11:02:28 +0000 |
commit | 56545a2d45a525c04023ebe3e89e023a9639fdc3 (patch) | |
tree | 8f1367562943314970f0052e80e54add111c56a9 /javainstaller2 | |
parent | f1f1827eb4d40674e09e7eb54b543affae8b0786 (diff) |
INTEGRATION: CWS native174 (1.5.18); FILE MERGED
2008/07/18 10:47:56 is 1.5.18.1: #158230# round problems for progress bar
Diffstat (limited to 'javainstaller2')
2 files changed, 4 insertions, 4 deletions
diff --git a/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/InstallationOngoingCtrl.java b/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/InstallationOngoingCtrl.java index c3e835f6ecd1..cb08fb41bbe8 100755 --- a/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/InstallationOngoingCtrl.java +++ b/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/InstallationOngoingCtrl.java @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: InstallationOngoingCtrl.java,v $ - * $Revision: 1.5 $ + * $Revision: 1.6 $ * * This file is part of OpenOffice.org. * @@ -106,7 +106,7 @@ public class InstallationOngoingCtrl extends PanelController { for (int i = 0; i < installPackages.size(); i++) { PackageDescription packageData = (PackageDescription) installPackages.get(i); - int progress = java.lang.Math.round(100/installPackages.size()) * (i+1); + int progress = java.lang.Math.round((100*(i+1))/installPackages.size()); panel.setProgressValue(progress); panel.setProgressText(packageData.getPackageName()); diff --git a/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/UninstallationOngoingCtrl.java b/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/UninstallationOngoingCtrl.java index a2c151f81b8a..802421486169 100755 --- a/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/UninstallationOngoingCtrl.java +++ b/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/UninstallationOngoingCtrl.java @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: UninstallationOngoingCtrl.java,v $ - * $Revision: 1.5 $ + * $Revision: 1.6 $ * * This file is part of OpenOffice.org. * @@ -102,7 +102,7 @@ public class UninstallationOngoingCtrl extends PanelController { for (int i = 0; i < uninstallPackages.size(); i++) { PackageDescription packageData = (PackageDescription) uninstallPackages.get(i); - int progress = java.lang.Math.round(100/uninstallPackages.size()) * (i+1); + int progress = java.lang.Math.round((100*(i+1))/uninstallPackages.size()); panel.setProgressValue(progress); panel.setProgressText(packageData.getPackageName()); |