Show progress dialog if scanning takes more than two seconds.

diff --git a/src/main/java/de/todesbaum/jsite/gui/ProjectFilesPage.java b/src/main/java/de/todesbaum/jsite/gui/ProjectFilesPage.java
index 5b26661..9321d6e 100644 (file)
--- a/src/main/java/de/todesbaum/jsite/gui/ProjectFilesPage.java
+++ b/src/main/java/de/todesbaum/jsite/gui/ProjectFilesPage.java
@@ -26,6 +26,8 @@ import java.awt.Insets;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.KeyEvent;
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
 import java.text.MessageFormat;
 import java.util.HashSet;
 import java.util.Iterator;
@@ -34,18 +36,23 @@ import java.util.Set;
 
 import javax.swing.AbstractAction;
 import javax.swing.Action;
+import javax.swing.BorderFactory;
 import javax.swing.JButton;
 import javax.swing.JCheckBox;
 import javax.swing.JComboBox;
 import javax.swing.JComponent;
+import javax.swing.JDialog;
 import javax.swing.JLabel;
 import javax.swing.JList;
 import javax.swing.JOptionPane;
 import javax.swing.JPanel;
+import javax.swing.JProgressBar;
 import javax.swing.JScrollPane;
 import javax.swing.JTextField;
 import javax.swing.ListSelectionModel;
+import javax.swing.SwingConstants;
 import javax.swing.SwingUtilities;
+import javax.swing.WindowConstants;
 import javax.swing.event.DocumentEvent;
 import javax.swing.event.DocumentListener;
 import javax.swing.event.ListSelectionEvent;
@@ -54,6 +61,8 @@ import javax.swing.text.BadLocationException;
 import javax.swing.text.Document;
 
 import net.pterodactylus.util.io.MimeTypes;
+import net.pterodactylus.util.swing.DelayedNotification;
+import net.pterodactylus.util.swing.SwingUtils;
 import de.todesbaum.jsite.application.FileOption;
 import de.todesbaum.jsite.application.Project;
 import de.todesbaum.jsite.gui.FileScanner.ScannedFile;
@@ -106,6 +115,18 @@ public class ProjectFilesPage extends TWizardPage implements ActionListener, Lis
        /** The “mime type” combo box. */
        private JComboBox fileOptionsMIMETypeComboBox;
 
+       /** Delayed notification for file scanning. */
+       private DelayedNotification delayedNotification;
+
+       /** Dialog to display while scanning. */
+       private JDialog scanningFilesDialog;
+
+       /** The file scanner. */
+       private FileScanner fileScanner;
+
+       /** The progress bar. */
+       private JProgressBar progressBar;
+
        /**
         * Creates a new project file page.
         *
@@ -157,6 +178,10 @@ public class ProjectFilesPage extends TWizardPage implements ActionListener, Lis
         */
        @Override
        public void pageAdded(TWizard wizard) {
+               /* create file scanner. */
+               fileScanner = new FileScanner(project);
+               fileScanner.addFileScannerListener(this);
+
                actionScan();
                this.wizard.setPreviousName(I18n.getMessage("jsite.wizard.previous"));
                this.wizard.setNextName(I18n.getMessage("jsite.project-files.insert-now"));
@@ -295,6 +320,36 @@ public class ProjectFilesPage extends TWizardPage implements ActionListener, Lis
                fileOptionsPanel.add(mimeTypeLabel, new GridBagConstraints(0, 8, 1, 1, 0.0, 0.0, GridBagConstraints.LINE_START, GridBagConstraints.NONE, new Insets(6, 18, 0, 0), 0, 0));
                fileOptionsPanel.add(fileOptionsMIMETypeComboBox, new GridBagConstraints(1, 8, 4, 1, 1.0, 0.0, GridBagConstraints.LINE_START, GridBagConstraints.HORIZONTAL, new Insets(6, 6, 0, 0), 0, 0));
 
+               /* create dialog to show while scanning. */
+               scanningFilesDialog = new JDialog(wizard);
+               scanningFilesDialog.setModal(true);
+               scanningFilesDialog.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
+
+               JPanel progressPanel = new JPanel(new BorderLayout(12, 12));
+               scanningFilesDialog.getContentPane().add(progressPanel, BorderLayout.CENTER);
+               progressPanel.setBorder(BorderFactory.createEmptyBorder(12, 12, 12, 12));
+
+               final TLabel scanningLabel = new TLabel(I18n.getMessage("jsite.project-files.scanning"), SwingConstants.CENTER);
+               progressPanel.add(scanningLabel, BorderLayout.NORTH);
+               progressBar = new JProgressBar(SwingConstants.HORIZONTAL);
+               progressPanel.add(progressBar, BorderLayout.SOUTH);
+               progressBar.setIndeterminate(true);
+               progressBar.setStringPainted(true);
+               progressBar.setPreferredSize(new Dimension(progressBar.getPreferredSize().width * 2, progressBar.getPreferredSize().height));
+
+               scanningFilesDialog.pack();
+               scanningFilesDialog.addWindowListener(new WindowAdapter() {
+
+                       /**
+                        * {@inheritDoc}
+                        */
+                       @Override
+                       @SuppressWarnings("synthetic-access")
+                       public void windowOpened(WindowEvent e) {
+                               SwingUtils.center(scanningFilesDialog, wizard);
+                       }
+               });
+
                I18nContainer.getInstance().registerRunnable(new Runnable() {
 
                        @Override
@@ -317,6 +372,7 @@ public class ProjectFilesPage extends TWizardPage implements ActionListener, Lis
                                fileOptionsRenameCheckBox.setToolTipText("jsite.project-files.rename.tooltip");
                                fileOptionsMIMETypeComboBox.setToolTipText(I18n.getMessage("jsite.project-files.mime-type.tooltip"));
                                mimeTypeLabel.setText(I18n.getMessage("jsite.project-files.mime-type") + ":");
+                               scanningLabel.setText(I18n.getMessage("jsite.project-files.scanning"));
                        }
                });
 
@@ -359,9 +415,24 @@ public class ProjectFilesPage extends TWizardPage implements ActionListener, Lis
                wizard.setPreviousEnabled(false);
                wizard.setQuitEnabled(false);
 
-               FileScanner fileScanner = new FileScanner(project);
-               fileScanner.addFileScannerListener(this);
+               delayedNotification = new DelayedNotification(scanningFilesDialog, 2000);
                new Thread(fileScanner).start();
+               new Thread(delayedNotification).start();
+               new Thread(new Runnable() {
+
+                       @Override
+                       @SuppressWarnings("synthetic-access")
+                       public void run() {
+                               while (!delayedNotification.isFinished()) {
+                                       try {
+                                               Thread.sleep(250);
+                                       } catch (InterruptedException ie1) {
+                                               /* ignore. */
+                                       }
+                                       progressBar.setString(fileScanner.getLastFilename());
+                               }
+                       }
+               }).start();
        }
 
        /**
@@ -371,6 +442,7 @@ public class ProjectFilesPage extends TWizardPage implements ActionListener, Lis
         */
        @Override
        public void fileScannerFinished(FileScanner fileScanner) {
+               delayedNotification.finish();
                final boolean error = fileScanner.isError();
                if (!error) {
                        final List<ScannedFile> files = fileScanner.getFiles();

diff --git a/src/main/resources/de/todesbaum/jsite/i18n/jSite.properties b/src/main/resources/de/todesbaum/jsite/i18n/jSite.properties
index cd80c67..942692d 100644 (file)
--- a/src/main/resources/de/todesbaum/jsite/i18n/jSite.properties
+++ b/src/main/resources/de/todesbaum/jsite/i18n/jSite.properties
@@ -163,6 +163,7 @@ jsite.project-files.container.tooltip=Selects a container for the current file
 jsite.project-files.scan-error=<html><b>Error scanning files</b><br><br>Either the directory of the project does not exist<br>or some files/directories in it are not accessible.<br>Please go back and select the correct directory.</html>
 jsite.project-files.insert-now=Insert now
 jsite.project-files.invalid-default-file=Only files in the root directory may be selected as default files.
+jsite.project-files.scanning=Scanning\u2026
 
 jsite.update-checker.found-version.title=Found New Version
 jsite.update-checker.found-version.message=<html>A new version was found.<br><br>Version {0} (released {1,date})</html>

diff --git a/src/main/resources/de/todesbaum/jsite/i18n/jSite_de.properties b/src/main/resources/de/todesbaum/jsite/i18n/jSite_de.properties
index 8641d14..dd04f6f 100644 (file)
--- a/src/main/resources/de/todesbaum/jsite/i18n/jSite_de.properties
+++ b/src/main/resources/de/todesbaum/jsite/i18n/jSite_de.properties
@@ -163,6 +163,7 @@ jsite.project-files.container.tooltip=W\u00e4hlt einen Container f\u00fcr diese
 jsite.project-files.scan-error=<html><b>Fehler beim Einlesen der Dateien</b><br><br>Entweder existiert das Projektverzeichnis nicht,<br>oder einige Dateien und/oder Verzeichnisse sind nicht lesbar!<br>Bitte gehen Sie zur\u00fcck und beheben Sie den Fehler!</html>
 jsite.project-files.insert-now=Jetzt einf\u00fcgen
 jsite.project-files.invalid-default-file=Nur Dateien im obersten Verzeichnis d\u00fcrfen als Index-Dateien ausgew\u00e4hlt werden.
+jsite.project-files.scanning=Suche Dateien\u2026
 
 jsite.update-checker.found-version.title=Neue Version gefunden
 jsite.update-checker.found-version.message=<html>Eine neue Version wurde gefunden.<br><br>Version {0} (ver\u00f6ffentlicht {1,date})</html>

diff --git a/src/main/resources/de/todesbaum/jsite/i18n/jSite_fr.properties b/src/main/resources/de/todesbaum/jsite/i18n/jSite_fr.properties
index 6f1e8c6..0f40e0f 100644 (file)
--- a/src/main/resources/de/todesbaum/jsite/i18n/jSite_fr.properties
+++ b/src/main/resources/de/todesbaum/jsite/i18n/jSite_fr.properties
@@ -163,6 +163,7 @@ jsite.project-files.container.tooltip=S\u00e9lectionnez un container pour le fic
 jsite.project-files.scan-error=<html><b>Erreur lors du parcours des fichiers</b><br><br>Soit le r\u00e9pertoire du projet n'existe pas,<br>ou des fichiers/r\u00e9pertoires sont inaccessibles.<br>Veuillez revenir en arri\u00e8re et s\u00e9lectionner un autre r\u00e9pertoire.</html>
 jsite.project-files.insert-now=Ins\u00e9rer
 jsite.project-files.invalid-default-file=Seulement les fichiers de la racine peuvent \u00eatre selectionn\u00e9s comme fichiers par defaut
+jsite.project-files.scanning=Scanning\u2026
 
 jsite.update-checker.found-version.title=Nouvelle version disponible
 jsite.update-checker.found-version.message=<html>Une nouvelle version est disponible.<br><br>Version {0} (publi\u00e9e le {1,date})</html>
@@ -193,3 +194,5 @@ jsite.error.index-not-inserted=<html><b>Fichier par d\u00e9faut non ins\u00e9r\u
 jsite.error.no-custom-key=<html><b>Pas de clef existante sp\u00e9cifi\u00e9e pour ce fichier</b><br><br>Vous avez sp\u00e9cifier de ne pas ins\u00e9rer <code>{0}</code><br> mais n'avez pas sp\u00e9cifier de clef ou rediriger!</html>
 jsite.error.no-files-to-insert=<html><b>Aucun fichier \u00e0 ins\u00e9rer</b><br><br>Vous n'avez s\u00e9lectionn\u00e9 aucun fichier pour l'insertion !<br>Veuillez s\u00e9lectionner au moins un fichier \u00e0 ins\u00e9rer.</html>
 jsite.error.duplicate-file=<html><b>Fichier dupliqu\u00e9</b><br><br>Le fichier <code>{0}</code> est ins\u00e9r\u00e9 deux fois !<br>Veuillez v\u00e9rifier les noms de fichier et les redirections.</html>
+
+# to update: jsite.project-files.scanning
\ No newline at end of file