From: David ‘Bombe’ Roden <bombe@freenetproject.org>
Date: Fri, 22 Jan 2016 15:38:50 +0000 (+0100)
Subject: Move starting file scanner in background to file scanner class
X-Git-Tag: 0.13^2~19
X-Git-Url: https://git.pterodactylus.net/?p=jSite.git;a=commitdiff_plain;h=9eafefbca8ddf6c20500a78789a474000cdfe457

Move starting file scanner in background to file scanner class
---

diff --git a/src/main/java/de/todesbaum/jsite/application/ProjectInserter.java b/src/main/java/de/todesbaum/jsite/application/ProjectInserter.java
index cfc18d2..dd85bf3 100644
--- a/src/main/java/de/todesbaum/jsite/application/ProjectInserter.java
+++ b/src/main/java/de/todesbaum/jsite/application/ProjectInserter.java
@@ -173,7 +173,7 @@ public class ProjectInserter implements FileScannerListener, Runnable {
 		this.progressListener = progressListener;
 		fileScanner = new FileScanner(project);
 		fileScanner.addFileScannerListener(this);
-		new Thread(fileScanner).start();
+		fileScanner.startInBackground();
 	}
 
 	/**
@@ -297,7 +297,7 @@ public class ProjectInserter implements FileScannerListener, Runnable {
 				completionLatch.countDown();
 			}
 		});
-		new Thread(fileScanner).start();
+		fileScanner.startInBackground();
 		while (completionLatch.getCount() > 0) {
 			try {
 				completionLatch.await();
diff --git a/src/main/java/de/todesbaum/jsite/gui/FileScanner.java b/src/main/java/de/todesbaum/jsite/gui/FileScanner.java
index eef5158..9135073 100644
--- a/src/main/java/de/todesbaum/jsite/gui/FileScanner.java
+++ b/src/main/java/de/todesbaum/jsite/gui/FileScanner.java
@@ -115,6 +115,10 @@ public class FileScanner implements Runnable {
 		return lastFilename;
 	}
 
+	public void startInBackground() {
+		new Thread(this).start();
+	}
+
 	/**
 	 * {@inheritDoc}
 	 * <p>
diff --git a/src/main/java/de/todesbaum/jsite/gui/ProjectFilesPage.java b/src/main/java/de/todesbaum/jsite/gui/ProjectFilesPage.java
index 0e700c9..922a772 100644
--- a/src/main/java/de/todesbaum/jsite/gui/ProjectFilesPage.java
+++ b/src/main/java/de/todesbaum/jsite/gui/ProjectFilesPage.java
@@ -445,7 +445,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() {