X-Git-Url: https://git.pterodactylus.net/?p=jSite.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fde%2Ftodesbaum%2Fjsite%2Fapplication%2FProjectInserter.java;h=c7dad3b11f9d77b62d7cdb9a33cb50f6e1e6bc54;hp=53b0726a1d216fda3ed1f01d1e6ff479d76b0617;hb=cd351fe39bcbc8933187c3864e79e3dc896a374c;hpb=48b6a16c476a1a5b7cd18f100146bebbac0fe3cf diff --git a/src/main/java/de/todesbaum/jsite/application/ProjectInserter.java b/src/main/java/de/todesbaum/jsite/application/ProjectInserter.java index 53b0726..c7dad3b 100644 --- a/src/main/java/de/todesbaum/jsite/application/ProjectInserter.java +++ b/src/main/java/de/todesbaum/jsite/application/ProjectInserter.java @@ -25,6 +25,7 @@ import java.io.IOException; import java.io.InputStream; import java.util.ArrayList; import java.util.Arrays; +import java.util.Collection; import java.util.HashSet; import java.util.Iterator; import java.util.List; @@ -40,7 +41,7 @@ import java.util.logging.Logger; import net.pterodactylus.util.io.StreamCopier.ProgressListener; import de.todesbaum.jsite.gui.FileScanner; -import de.todesbaum.jsite.gui.FileScanner.ScannedFile; +import de.todesbaum.jsite.gui.ScannedFile; import de.todesbaum.jsite.gui.FileScannerListener; import de.todesbaum.util.freenet.fcp2.Client; import de.todesbaum.util.freenet.fcp2.ClientPutComplexDir; @@ -288,13 +289,7 @@ public class ProjectInserter implements FileScannerListener, Runnable { } long totalSize = 0; final CountDownLatch completionLatch = new CountDownLatch(1); - FileScanner fileScanner = new FileScanner(project, new FileScannerListener() { - - @Override - public void fileScannerFinished(FileScanner fileScanner) { - completionLatch.countDown(); - } - }); + FileScanner fileScanner = new FileScanner(project, (error, files) -> completionLatch.countDown()); fileScanner.startInBackground(); while (completionLatch.getCount() > 0) { try { @@ -432,8 +427,8 @@ public class ProjectInserter implements FileScannerListener, Runnable { * {@inheritDoc} */ @Override - public void fileScannerFinished(FileScanner fileScanner) { - if (!fileScanner.isError()) { + public void fileScannerFinished(boolean error, Collection files) { + if (!error) { new Thread(this).start(); } else { projectInsertListeners.fireProjectInsertFinished(project, false, null);