X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fde%2Ftodesbaum%2Fjsite%2Fgui%2FFileScanner.java;h=1377604d4adec932a1dd16b530dcc85d10bd8cde;hb=4ce9a8e2c9430dc1dbc4d3e639e12d0ebce692fd;hp=d86a6ba69e06f3d610eae7a706344a707fba97cf;hpb=70be82588445ab81b6f1b64537c65bb5dac2b1d2;p=jSite.git

diff --git a/src/main/java/de/todesbaum/jsite/gui/FileScanner.java b/src/main/java/de/todesbaum/jsite/gui/FileScanner.java
index d86a6ba..1377604 100644
--- a/src/main/java/de/todesbaum/jsite/gui/FileScanner.java
+++ b/src/main/java/de/todesbaum/jsite/gui/FileScanner.java
@@ -1,5 +1,5 @@
 /*
- * jSite - FileScanner.java - Copyright © 2006–2012 David Roden
+ * jSite - FileScanner.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,6 +29,7 @@ import java.security.NoSuchAlgorithmException;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.Objects;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -52,7 +53,7 @@ public class FileScanner implements Runnable {
 	private final static Logger logger = Logger.getLogger(FileScanner.class.getName());
 
 	/** The list of listeners. */
-	private final List<FileScannerListener> fileScannerListeners = new ArrayList<FileScannerListener>();
+	private final FileScannerListener fileScannerListener;
 
 	/** The project to scan. */
 	private final Project project;
@@ -72,37 +73,9 @@ public class FileScanner implements Runnable {
 	 * @param project
 	 *            The project whose files to scan
 	 */
-	public FileScanner(Project project) {
+	public FileScanner(Project project, FileScannerListener fileScannerListener) {
 		this.project = project;
-	}
-
-	/**
-	 * Adds the given listener to the list of listeners.
-	 *
-	 * @param fileScannerListener
-	 *            The listener to add
-	 */
-	public void addFileScannerListener(FileScannerListener fileScannerListener) {
-		fileScannerListeners.add(fileScannerListener);
-	}
-
-	/**
-	 * Removes the given listener from the list of listeners.
-	 *
-	 * @param fileScannerListener
-	 *            The listener to remove
-	 */
-	public void removeFileScannerListener(FileScannerListener fileScannerListener) {
-		fileScannerListeners.remove(fileScannerListener);
-	}
-
-	/**
-	 * Notifies all listeners that the file scan finished.
-	 */
-	protected void fireFileScannerFinished() {
-		for (FileScannerListener fileScannerListener : new ArrayList<FileScannerListener>(fileScannerListeners)) {
-			fileScannerListener.fileScannerFinished(this);
-		}
+		this.fileScannerListener = Objects.requireNonNull(fileScannerListener);
 	}
 
 	/**
@@ -115,6 +88,10 @@ public class FileScanner implements Runnable {
 		return lastFilename;
 	}
 
+	public void startInBackground() {
+		new Thread(this).start();
+	}
+
 	/**
 	 * {@inheritDoc}
 	 * <p>
@@ -134,7 +111,7 @@ public class FileScanner implements Runnable {
 		} catch (IOException ioe1) {
 			error = true;
 		}
-		fireFileScannerFinished();
+		fileScannerListener.fileScannerFinished(this);
 	}
 
 	/**