Fix speed calculation.

[jSite.git] / src / de / todesbaum / jsite / gui / ProjectInsertPage.java

diff --git a/src/de/todesbaum/jsite/gui/ProjectInsertPage.java b/src/de/todesbaum/jsite/gui/ProjectInsertPage.java
index 6c3654f..315b89f 100644 (file)
--- a/src/de/todesbaum/jsite/gui/ProjectInsertPage.java
+++ b/src/de/todesbaum/jsite/gui/ProjectInsertPage.java
@@ -291,8 +291,10 @@ public class ProjectInsertPage extends TWizardPage implements InsertListener, Cl
                                int progress = (succeeded + failed + fatal) * 100 / total;
                                StringBuilder progressString = new StringBuilder();
                                progressString.append(progress).append("% (");
-                               progressString.append(succeeded + failed + fatal).append("/").append(total);
-                               progressString.append(")");
+                               progressString.append(succeeded + failed + fatal).append('/').append(total);
+                               progressString.append(") (");
+                               progressString.append(formatNumber(succeeded * 32.0 / ((System.currentTimeMillis() - startTime) / 1000), 1));
+                               progressString.append(' ').append(I18n.getMessage("jsite.insert.k-per-s")).append(')');
                                progressBar.setString(progressString.toString());
                                if (finalized) {
                                        progressBar.setFont(progressBar.getFont().deriveFont(Font.BOLD));
@@ -338,6 +340,28 @@ public class ProjectInsertPage extends TWizardPage implements InsertListener, Cl
                clipboard.setContents(new StringSelection(requestURITextField.getText()), this);
        }
 
+       /**
+        * Formats the given number so that it always has the the given number of
+        * fractional digits.
+        *
+        * @param number
+        *            The number to format
+        * @param digits
+        *            The number of fractional digits
+        * @return The formatted number
+        */
+       private String formatNumber(double number, int digits) {
+               int multiplier = (int) Math.pow(10, digits);
+               String formattedNumber = String.valueOf((int) (number * multiplier) / (double) multiplier);
+               if (formattedNumber.indexOf('.') == -1) {
+                       formattedNumber += '.';
+                       for (int digit = 0; digit < digits; digit++) {
+                               formattedNumber += "0";
+                       }
+               }
+               return formattedNumber;
+       }
+
        //
        // INTERFACE ClipboardOwner
        //