X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fde%2Ftodesbaum%2Fjsite%2Fgui%2FProjectFilesPage.java;h=eaae3bd6d4941eff6a3c92286554024b636d82b2;hb=755c2a82abdb528794d1ccc3f342bb3b6d1481a1;hp=0969846a1f66aae7cef7ae25dee2b0268803da75;hpb=da487bd7b258bc47ad888c22f89343c6162569a6;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 0969846..eaae3bd 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
@@ -182,8 +182,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 +444,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() {
 
@@ -630,7 +629,7 @@ public class ProjectFilesPage extends TWizardPage implements ActionListener, Lis
 			fileOptionsCustomKeyTextField.setText(fileOption.getCustomKey());
 			fileOptionsRenameCheckBox.setSelected(fileOption.getChangedName().isPresent());
 			fileOptionsRenameTextField.setEnabled(fileOption.getChangedName().isPresent());
-			fileOptionsRenameTextField.setText(fileOption.getChangedName().or(""));
+			fileOptionsRenameTextField.setText(fileOption.getChangedName().orElse(""));
 			fileOptionsMIMETypeComboBox.getModel().setSelectedItem(fileOption.getMimeType());
 		} else {
 			defaultFileCheckBox.setSelected(false);