summaryrefslogtreecommitdiff
path: root/javainstaller2/src
diff options
context:
space:
mode:
authorOliver Bolte <obo@openoffice.org>2008-07-22 11:02:28 +0000
committerOliver Bolte <obo@openoffice.org>2008-07-22 11:02:28 +0000
commit93bbc825e46eae2c8994da88494e68ec10d250a7 (patch)
tree9e18723f1be7b4041919fed83126eed1879f5a54 /javainstaller2/src
parent07eb0d61e48fc54efbbb58ac4f04fac1e47c62d5 (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/src')
-rwxr-xr-xjavainstaller2/src/JavaSetup/org/openoffice/setup/Controller/InstallationOngoingCtrl.java4
-rwxr-xr-xjavainstaller2/src/JavaSetup/org/openoffice/setup/Controller/UninstallationOngoingCtrl.java4
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 907622760..dd974de47 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 d2df6d0eb..458609a72 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());