From 9eafefbca8ddf6c20500a78789a474000cdfe457 Mon Sep 17 00:00:00 2001 From: =?utf8?q?David=20=E2=80=98Bombe=E2=80=99=20Roden?= Date: Fri, 22 Jan 2016 16:38:50 +0100 Subject: [PATCH] Move starting file scanner in background to file scanner class --- src/main/java/de/todesbaum/jsite/application/ProjectInserter.java | 4 ++-- src/main/java/de/todesbaum/jsite/gui/FileScanner.java | 4 ++++ src/main/java/de/todesbaum/jsite/gui/ProjectFilesPage.java | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) 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} *

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() { -- 2.7.4