Unify copyright file headers, update years to include 2011.

[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 86305aa..66a0c0d 100644 (file)
--- a/src/de/todesbaum/jsite/gui/ProjectInsertPage.java
+++ b/src/de/todesbaum/jsite/gui/ProjectInsertPage.java
@@ -1,6 +1,5 @@
 /*
- * jSite - a tool for uploading websites into Freenet
- * Copyright (C) 2006 David Roden
+ * jSite - ProjectInsertPage.java - Copyright © 2006–2011 David Roden
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -48,12 +47,14 @@ import javax.swing.JProgressBar;
 import javax.swing.JTextField;
 import javax.swing.SwingUtilities;
 
+import de.todesbaum.jsite.application.AbortedException;
 import de.todesbaum.jsite.application.Freenet7Interface;
 import de.todesbaum.jsite.application.InsertListener;
 import de.todesbaum.jsite.application.Project;
 import de.todesbaum.jsite.application.ProjectInserter;
 import de.todesbaum.jsite.i18n.I18n;
 import de.todesbaum.jsite.i18n.I18nContainer;
+import de.todesbaum.util.io.StreamCopier.ProgressListener;
 import de.todesbaum.util.swing.TWizard;
 import de.todesbaum.util.swing.TWizardPage;
 
@@ -206,7 +207,7 @@ public class ProjectInsertPage extends TWizardPage implements InsertListener, Cl
        public void pageAdded(TWizard wizard) {
                this.wizard.setPreviousName(I18n.getMessage("jsite.wizard.previous"));
                this.wizard.setPreviousEnabled(false);
-               this.wizard.setNextName(I18n.getMessage("jsite.wizard.next"));
+               this.wizard.setNextName(I18n.getMessage("jsite.general.cancel"));
                this.wizard.setQuitName(I18n.getMessage("jsite.wizard.quit"));
        }
 
@@ -215,12 +216,31 @@ public class ProjectInsertPage extends TWizardPage implements InsertListener, Cl
         */
        public void startInsert() {
                running = true;
-               wizard.setNextEnabled(false);
                copyURIAction.setEnabled(false);
                progressBar.setValue(0);
                progressBar.setString(I18n.getMessage("jsite.insert.starting"));
                progressBar.setFont(progressBar.getFont().deriveFont(Font.PLAIN));
-               projectInserter.start();
+               projectInserter.start(new ProgressListener() {
+
+                       public void onProgress(final long copied, final long length) {
+                               SwingUtilities.invokeLater(new Runnable() {
+
+                                       /**
+                                        * {@inheritDoc}
+                                        */
+                                       @SuppressWarnings("synthetic-access")
+                                       public void run() {
+                                               int divisor = 1;
+                                               while (((copied / divisor) > Integer.MAX_VALUE) || ((length / divisor) > Integer.MAX_VALUE)) {
+                                                       divisor *= 10;
+                                               }
+                                               progressBar.setMaximum((int) (length / divisor));
+                                               progressBar.setValue((int) (copied / divisor));
+                                               progressBar.setString("Uploaded: " + copied + " / " + length);
+                                       }
+                               });
+                       }
+               });
        }
 
        /**
@@ -315,6 +335,14 @@ public class ProjectInsertPage extends TWizardPage implements InsertListener, Cl
         */
        public void projectUploadFinished(Project project) {
                startTime = System.currentTimeMillis();
+               SwingUtilities.invokeLater(new Runnable() {
+
+                       @SuppressWarnings("synthetic-access")
+                       public void run() {
+                               progressBar.setString(I18n.getMessage("jsite.insert.starting"));
+                               progressBar.setValue(0);
+                       }
+               });
        }
 
        /**
@@ -389,9 +417,13 @@ public class ProjectInsertPage extends TWizardPage implements InsertListener, Cl
                        }
                } else {
                        if (cause == null) {
-                               JOptionPane.showMessageDialog(this, I18n.getMessage("jsite.insert.insert-failed"), null, JOptionPane.ERROR_MESSAGE);
+                               JOptionPane.showMessageDialog(this, I18n.getMessage("jsite.insert.insert-failed"), I18n.getMessage("jsite.insert.insert-failed.title"), JOptionPane.ERROR_MESSAGE);
                        } else {
-                               JOptionPane.showMessageDialog(this, MessageFormat.format(I18n.getMessage("jsite.insert.insert-failed-with-cause"), cause.getMessage()), null, JOptionPane.ERROR_MESSAGE);
+                               if (cause instanceof AbortedException) {
+                                       JOptionPane.showMessageDialog(this, I18n.getMessage("jsite.insert.insert-aborted"), I18n.getMessage("jsite.insert.insert-aborted.title"), JOptionPane.INFORMATION_MESSAGE);
+                               } else {
+                                       JOptionPane.showMessageDialog(this, MessageFormat.format(I18n.getMessage("jsite.insert.insert-failed-with-cause"), cause.getMessage()), I18n.getMessage("jsite.insert.insert-failed.title"), JOptionPane.ERROR_MESSAGE);
+                               }
                        }
                }
                SwingUtilities.invokeLater(new Runnable() {
@@ -400,6 +432,7 @@ public class ProjectInsertPage extends TWizardPage implements InsertListener, Cl
                        public void run() {
                                progressBar.setValue(progressBar.getMaximum());
                                progressBar.setString(I18n.getMessage("jsite.insert.done") + " (" + getTransferRate() + " " + I18n.getMessage("jsite.insert.k-per-s") + ")");
+                               wizard.setNextName(I18n.getMessage("jsite.wizard.next"));
                                wizard.setNextEnabled(true);
                                wizard.setQuitEnabled(true);
                        }