X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fde%2Ftodesbaum%2Fjsite%2Fgui%2FProjectFilesPage.java;h=c7a0a97ad967bc313c2ccefa9333a388036a4860;hb=cd351fe39bcbc8933187c3864e79e3dc896a374c;hp=a9c46991e298866c43d2c2429914470d740299b0;hpb=38bdc433e50669e8244a63b5af59e597f88f1d29;p=jSite.git

diff --git a/src/main/java/de/todesbaum/jsite/gui/ProjectFilesPage.java b/src/main/java/de/todesbaum/jsite/gui/ProjectFilesPage.java
index a9c4699..c7a0a97 100644
--- a/src/main/java/de/todesbaum/jsite/gui/ProjectFilesPage.java
+++ b/src/main/java/de/todesbaum/jsite/gui/ProjectFilesPage.java
@@ -1,5 +1,5 @@
 /*
- * jSite - ProjectFilesPage.java - Copyright © 2006–2012 David Roden
+ * jSite - ProjectFilesPage.java - Copyright © 2006–2014 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
@@ -29,9 +29,9 @@ import java.awt.event.KeyEvent;
 import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
 import java.text.MessageFormat;
+import java.util.Collection;
 import java.util.HashSet;
 import java.util.Iterator;
-import java.util.List;
 import java.util.Set;
 
 import javax.swing.AbstractAction;
@@ -65,7 +65,6 @@ import net.pterodactylus.util.swing.SwingUtils;
 import net.pterodactylus.util.thread.StoppableDelay;
 import de.todesbaum.jsite.application.FileOption;
 import de.todesbaum.jsite.application.Project;
-import de.todesbaum.jsite.gui.FileScanner.ScannedFile;
 import de.todesbaum.jsite.i18n.I18n;
 import de.todesbaum.jsite.i18n.I18nContainer;
 import de.todesbaum.util.swing.TLabel;
@@ -182,8 +181,7 @@ public class ProjectFilesPage extends TWizardPage implements ActionListener, Lis
 	@Override
 	public void pageAdded(TWizard wizard) {
 		/* create file scanner. */
-		fileScanner = new FileScanner(project);
-		fileScanner.addFileScannerListener(this);
+		fileScanner = new FileScanner(project, this);
 
 		actionScan();
 		this.wizard.setPreviousName(I18n.getMessage("jsite.wizard.previous"));
@@ -445,7 +443,7 @@ public class ProjectFilesPage extends TWizardPage implements ActionListener, Lis
 				scanningFilesDialog.setVisible(false);
 			}
 		}, 2000);
-		new Thread(fileScanner).start();
+		fileScanner.startInBackground();
 		new Thread(delayedNotification).start();
 		new Thread(new Runnable() {
 
@@ -470,11 +468,9 @@ public class ProjectFilesPage extends TWizardPage implements ActionListener, Lis
 	 * Updates the file list.
 	 */
 	@Override
-	public void fileScannerFinished(FileScanner fileScanner) {
+	public void fileScannerFinished(boolean error, Collection<ScannedFile> files) {
 		delayedNotification.finish();
-		final boolean error = fileScanner.isError();
 		if (!error) {
-			final List<ScannedFile> files = fileScanner.getFiles();
 			SwingUtilities.invokeLater(new Runnable() {
 
 				@Override
@@ -628,9 +624,9 @@ public class ProjectFilesPage extends TWizardPage implements ActionListener, Lis
 			fileOptionsInsertRedirectCheckBox.setSelected(fileOption.isInsertRedirect());
 			fileOptionsCustomKeyTextField.setEnabled(fileOption.isInsertRedirect());
 			fileOptionsCustomKeyTextField.setText(fileOption.getCustomKey());
-			fileOptionsRenameCheckBox.setSelected(fileOption.hasChangedName());
-			fileOptionsRenameTextField.setEnabled(fileOption.hasChangedName());
-			fileOptionsRenameTextField.setText(fileOption.getChangedName());
+			fileOptionsRenameCheckBox.setSelected(fileOption.getChangedName().isPresent());
+			fileOptionsRenameTextField.setEnabled(fileOption.getChangedName().isPresent());
+			fileOptionsRenameTextField.setText(fileOption.getChangedName().orElse(""));
 			fileOptionsMIMETypeComboBox.getModel().setSelectedItem(fileOption.getMimeType());
 		} else {
 			defaultFileCheckBox.setSelected(false);