Author: bombe
Date: 2008-10-21 21:30:22 +0000 (Tue, 21 Oct 2008)
New Revision: 23022
Modified:
trunk/apps/jSite/src/de/todesbaum/jsite/gui/ProjectInsertPage.java
trunk/apps/jSite/src/de/todesbaum/jsite/i18n/jSite.properties
trunk/apps/jSite/src/de/todesbaum/jsite/i18n/jSite_de.properties
trunk/apps/jSite/src/de/todesbaum/jsite/i18n/jSite_fr.properties
trunk/apps/jSite/src/de/todesbaum/jsite/i18n/jSite_it.properties
trunk/apps/jSite/src/de/todesbaum/jsite/i18n/jSite_pl.properties
trunk/apps/jSite/src/de/todesbaum/jsite/main/Version.java
Log:
Version 0.6.1: Add approximated insert speed to progress bar text.
Modified: trunk/apps/jSite/src/de/todesbaum/jsite/gui/ProjectInsertPage.java
===================================================================
--- trunk/apps/jSite/src/de/todesbaum/jsite/gui/ProjectInsertPage.java
2008-10-21 20:17:05 UTC (rev 23021)
+++ trunk/apps/jSite/src/de/todesbaum/jsite/gui/ProjectInsertPage.java
2008-10-21 21:30:22 UTC (rev 23022)
@@ -57,7 +57,7 @@
/**
* Wizard page that shows the progress of an insert.
- *
+ *
* @author David ?Bombe? Roden <bombe at freenetproject.org>
*/
public class ProjectInsertPage extends TWizardPage implements InsertListener,
ClipboardOwner {
@@ -82,7 +82,7 @@
/**
* Creates a new progress insert wizard page.
- *
+ *
* @param wizard
* The wizard this page belongs to
*/
@@ -138,7 +138,7 @@
/**
* Creates the main panel.
- *
+ *
* @return The main panel
*/
private JComponent createProjectInsertPanel() {
@@ -210,7 +210,7 @@
/**
* Sets whether to activate the debug mode.
- *
+ *
* @param debug
* <code>true</code> to activate the debug mode,
* <code>false</code> to deactivate.
@@ -221,7 +221,7 @@
/**
* Sets the project to insert.
- *
+ *
* @param project
* The project to insert
*/
@@ -238,7 +238,7 @@
/**
* Sets the freenet interface to use.
- *
+ *
* @param freenetInterface
* The freenet interface to use
*/
@@ -291,8 +291,10 @@
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(total * 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 @@
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
//
Modified: trunk/apps/jSite/src/de/todesbaum/jsite/i18n/jSite.properties
===================================================================
--- trunk/apps/jSite/src/de/todesbaum/jsite/i18n/jSite.properties
2008-10-21 20:17:05 UTC (rev 23021)
+++ trunk/apps/jSite/src/de/todesbaum/jsite/i18n/jSite.properties
2008-10-21 21:30:22 UTC (rev 23022)
@@ -68,6 +68,7 @@
jsite.insert.starting=Starting\u2026
jsite.insert.done=Done.
jsite.insert.progress=Progress
+jsite.insert.k-per-s=KB/s
jsite.insert.insert-failed=<html><b>Insert failed</b><br><br>The insert of the
project failed.<br>Some files could not be inserted.</html>
jsite.insert.insert-failed-with-cause=<html><b>Insert failed</b><br><br>The
insert of the project failed.<br>Some files could not be inserted.<br>The
following error occured:<br><br><code>{0}</code></html>
jsite.insert.inserted=<html><b>Project inserted</b><br><br>Your project was
inserted successfully.</html>
Modified: trunk/apps/jSite/src/de/todesbaum/jsite/i18n/jSite_de.properties
===================================================================
--- trunk/apps/jSite/src/de/todesbaum/jsite/i18n/jSite_de.properties
2008-10-21 20:17:05 UTC (rev 23021)
+++ trunk/apps/jSite/src/de/todesbaum/jsite/i18n/jSite_de.properties
2008-10-21 21:30:22 UTC (rev 23022)
@@ -68,6 +68,7 @@
jsite.insert.starting=Beginne\u2026
jsite.insert.done=Fertig.
jsite.insert.progress=Fortschritt
+jsite.insert.k-per-s=KB/s
jsite.insert.insert-failed=<html><b>Einf\u00fcgen
fehlgeschlagen</b><br><br>Das Einf\u00fcgen des Projektes ist fehlgeschlagen,
da<br>einige Dateien nicht eingef\u00fcgt werden konnten.</html>
jsite.insert.insert-failed-with-cause=<html><b>Einf\u00fcgen
fehlgeschlagen</b><br><br>Das Einf\u00fcgen des Projektes ist fehlgeschlagen,
da<br>einige Dateien nicht eingef\u00fcgt werden konnten.<br>Folgender Fehler
trat auf:<br><br><code>{0}</code></html>
jsite.insert.inserted=<html><b>Projekt eingef\u00fcgt</b><br><br>Ihr Projekt
wurde erfolgreich eingef\u00fcgt.</html>
Modified: trunk/apps/jSite/src/de/todesbaum/jsite/i18n/jSite_fr.properties
===================================================================
--- trunk/apps/jSite/src/de/todesbaum/jsite/i18n/jSite_fr.properties
2008-10-21 20:17:05 UTC (rev 23021)
+++ trunk/apps/jSite/src/de/todesbaum/jsite/i18n/jSite_fr.properties
2008-10-21 21:30:22 UTC (rev 23022)
@@ -68,6 +68,7 @@
jsite.insert.starting=D\u00e9marrage\u2026
jsite.insert.done=Termin\u00e9.
jsite.insert.progress=Avancement
+jsite.insert.k-per-s=Ko/s
jsite.insert.insert-failed=<html><b>Insertion
\u00e9chou\u00e9e</b><br><br>L'insertion du projet \u00e0
\u00e9chou\u00e9e.<br>Certain fichiers n'ont pas \u00e9t\u00e9
ins\u00e9r\u00e9s.</html>
jsite.insert.insert-failed-with-cause=<html><b>Insertion
\u00e9chou\u00e9e</b><br><br>L'insertion du projet \u00e0
\u00e9chou\u00e9e.<br>Certain fichiers n'ont pas \u00e9t\u00e9
ins\u00e9r\u00e9s.<br>L'erreur suivante s'est
produite:<br><br><code>{0}</code></html>
jsite.insert.inserted=<html><b>Projet ins\u00e9r\u00e9!</b><br><br>Votre
projet \u00e0 \u00e9t\u00e9 correctement ins\u00e9r\u00e9.</html>
Modified: trunk/apps/jSite/src/de/todesbaum/jsite/i18n/jSite_it.properties
===================================================================
--- trunk/apps/jSite/src/de/todesbaum/jsite/i18n/jSite_it.properties
2008-10-21 20:17:05 UTC (rev 23021)
+++ trunk/apps/jSite/src/de/todesbaum/jsite/i18n/jSite_it.properties
2008-10-21 21:30:22 UTC (rev 23022)
@@ -68,6 +68,7 @@
jsite.insert.starting=Inizio\u2026
jsite.insert.done=Completato.
jsite.insert.progress=Progresso
+jsite.insert.k-per-s=KB/s
jsite.insert.insert-failed=<html><b>Inserzione fallita</b><br><br>Non \u00e8
stato completare l'inserzione del progetto.<br>Alcuni file sono risultati
impossibili da inserire.</html>
jsite.insert.insert-failed-with-cause=<html><b>Inserzione
fallita</b><br><br>Non \u00e8 stato possibile completare l''inserzione del
progetto.<br>Alcuni file sono risultati impossibili da inserire.<br>Si \u00e8
verificato il seguente errore:<br><br><code>{0}</code></html>
jsite.insert.inserted=<html><b>Inserzione progetto completata</b><br><br>Il
progetto \u00e8 stato inserito correttamente.</html>
Modified: trunk/apps/jSite/src/de/todesbaum/jsite/i18n/jSite_pl.properties
===================================================================
--- trunk/apps/jSite/src/de/todesbaum/jsite/i18n/jSite_pl.properties
2008-10-21 20:17:05 UTC (rev 23021)
+++ trunk/apps/jSite/src/de/todesbaum/jsite/i18n/jSite_pl.properties
2008-10-21 21:30:22 UTC (rev 23022)
@@ -68,6 +68,7 @@
jsite.insert.starting=Zaczynam\u2026
jsite.insert.done=Sko\u0144czone.
jsite.insert.progress=W trakcie
+jsite.insert.k-per-s=KB/s
jsite.insert.insert-failed=<html><b>Wgranie nie powiod\u0142o
si\u0119</b><br><br>Pliki nie zosta\u0142y wgrane<br>Niekt\u00f3re pliki nie
wgra\u0142y si\u0119.</html>
jsite.insert.insert-failed-with-cause=<html><b>Wgranie nie powiod\u0142o
si\u0119</b><br><br>Wgranie plik\u00f3w nie uda\u0142o
si\u0119.<br>Niekt\u00f3re pliki nie zosta\u0142y wgrane.<br>Zobacz jakie
b\u0142\u0119dy zg\u0142oszono:<br><br><code>{0}</code></html>
jsite.insert.inserted=<html><b>Projekt wgrany</b><br><br>Tw\u00f3j projekt
zosta\u0142 wgrany poprawnie.</html>
Modified: trunk/apps/jSite/src/de/todesbaum/jsite/main/Version.java
===================================================================
--- trunk/apps/jSite/src/de/todesbaum/jsite/main/Version.java 2008-10-21
20:17:05 UTC (rev 23021)
+++ trunk/apps/jSite/src/de/todesbaum/jsite/main/Version.java 2008-10-21
21:30:22 UTC (rev 23022)
@@ -27,7 +27,7 @@
public class Version {
/** The version. */
- private static final String VERSION = "0.6";
+ private static final String VERSION = "0.6.1";
/**
* Returns the version.
