Don’t set start time when before the upload starts.

[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 4024e7e..5fe946e 100644 (file)
--- a/src/de/todesbaum/jsite/gui/ProjectInsertPage.java
+++ b/src/de/todesbaum/jsite/gui/ProjectInsertPage.java
@@ -164,7 +164,7 @@ public class ProjectInsertPage extends TWizardPage implements InsertListener, Cl
                final JLabel progressLabel = new JLabel(I18n.getMessage("jsite.insert.progress") + ":");
                projectInsertPanel.add(progressLabel, new GridBagConstraints(0, 3, 1, 1, 0.0, 0.0, GridBagConstraints.LINE_START, GridBagConstraints.HORIZONTAL, new Insets(6, 18, 0, 0), 0, 0));
                projectInsertPanel.add(progressBar, new GridBagConstraints(1, 3, 1, 1, 1.0, 0.0, GridBagConstraints.LINE_START, GridBagConstraints.HORIZONTAL, new Insets(6, 6, 0, 0), 0, 0));
-               projectInsertPanel.add(new JButton(copyURIAction), new GridBagConstraints(0, 4, 2, 1, 0.0, 0.0, GridBagConstraints.LINE_END, GridBagConstraints.NONE, new Insets(6, 18, 0, 0), 0, 0));
+               projectInsertPanel.add(new JButton(copyURIAction), new GridBagConstraints(0, 4, 2, 1, 0.0, 0.0, GridBagConstraints.LINE_END, GridBagConstraints.NONE, new Insets(12, 18, 0, 0), 0, 0));
 
                I18nContainer.getInstance().registerRunnable(new Runnable() {
 
@@ -254,12 +254,12 @@ public class ProjectInsertPage extends TWizardPage implements InsertListener, Cl
         * {@inheritDoc}
         */
        public void projectInsertStarted(final Project project) {
-               startTime = System.currentTimeMillis();
+
                SwingUtilities.invokeLater(new Runnable() {
 
                        @SuppressWarnings("synthetic-access")
                        public void run() {
-                               startTimeLabel.setText(DateFormat.getDateTimeInstance().format(new Date(startTime)));
+                               startTimeLabel.setText(DateFormat.getDateTimeInstance().format(new Date()));
                        }
                });
        }
@@ -267,6 +267,13 @@ public class ProjectInsertPage extends TWizardPage implements InsertListener, Cl
        /**
         * {@inheritDoc}
         */
+       public void projectUploadFinished(Project project) {
+               startTime = System.currentTimeMillis();
+       }
+
+       /**
+        * {@inheritDoc}
+        */
        public void projectURIGenerated(Project project, final String uri) {
                SwingUtilities.invokeLater(new Runnable() {
 
@@ -293,7 +300,7 @@ public class ProjectInsertPage extends TWizardPage implements InsertListener, Cl
                                progressString.append(progress).append("% (");
                                progressString.append(succeeded + failed + fatal).append('/').append(total);
                                progressString.append(") (");
-                               progressString.append(formatNumber(total * 32.0 / ((System.currentTimeMillis() - startTime) / 1000), 1));
+                               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) {