X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fde%2Ftodesbaum%2Fjsite%2Fapplication%2FProjectInserter.java;h=f20c3d0efed367481546b46eda268b169bdf779f;hb=4ce9a8e2c9430dc1dbc4d3e639e12d0ebce692fd;hp=1504a9fb7891868d7af617d2e962565ec73fbc45;hpb=f936411037a6ec1afbc5efbb17dc9b0136adda76;p=jSite.git

diff --git a/src/main/java/de/todesbaum/jsite/application/ProjectInserter.java b/src/main/java/de/todesbaum/jsite/application/ProjectInserter.java
index 1504a9f..f20c3d0 100644
--- a/src/main/java/de/todesbaum/jsite/application/ProjectInserter.java
+++ b/src/main/java/de/todesbaum/jsite/application/ProjectInserter.java
@@ -32,6 +32,7 @@ import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
 import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.atomic.AtomicInteger;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -65,7 +66,7 @@ public class ProjectInserter implements FileScannerListener, Runnable {
 	private static final int random = (int) (Math.random() * Integer.MAX_VALUE);
 
 	/** Counter for FCP connection identifier. */
-	private static int counter = 0;
+	private static final AtomicInteger counter = new AtomicInteger();
 
 	private final ProjectInsertListeners projectInsertListeners = new ProjectInsertListeners();
 
@@ -170,9 +171,8 @@ public class ProjectInserter implements FileScannerListener, Runnable {
 	public void start(ProgressListener progressListener) {
 		cancelled = false;
 		this.progressListener = progressListener;
-		fileScanner = new FileScanner(project);
-		fileScanner.addFileScannerListener(this);
-		new Thread(fileScanner).start();
+		fileScanner = new FileScanner(project, this);
+		fileScanner.startInBackground();
 	}
 
 	/**
@@ -287,16 +287,15 @@ public class ProjectInserter implements FileScannerListener, Runnable {
 			}
 		}
 		long totalSize = 0;
-		FileScanner fileScanner = new FileScanner(project);
 		final CountDownLatch completionLatch = new CountDownLatch(1);
-		fileScanner.addFileScannerListener(new FileScannerListener() {
+		FileScanner fileScanner = new FileScanner(project, new FileScannerListener() {
 
 			@Override
 			public void fileScannerFinished(FileScanner fileScanner) {
 				completionLatch.countDown();
 			}
 		});
-		new Thread(fileScanner).start();
+		fileScanner.startInBackground();
 		while (completionLatch.getCount() > 0) {
 			try {
 				completionLatch.await();
@@ -328,7 +327,7 @@ public class ProjectInserter implements FileScannerListener, Runnable {
 
 		/* create connection to node */
 		synchronized (lockObject) {
-			connection = freenetInterface.getConnection("project-insert-" + random + counter++);
+			connection = freenetInterface.getConnection("project-insert-" + random + counter.getAndIncrement());
 		}
 		connection.setTempDirectory(tempDirectory);
 		boolean connected = false;
@@ -349,7 +348,7 @@ public class ProjectInserter implements FileScannerListener, Runnable {
 		/* collect files */
 		int edition = project.getEdition();
 		String dirURI = "USK@" + project.getInsertURI() + "/" + project.getPath() + "/" + edition + "/";
-		ClientPutComplexDir putDir = new ClientPutComplexDir("dir-" + counter++, dirURI, tempDirectory);
+		ClientPutComplexDir putDir = new ClientPutComplexDir("dir-" + counter.getAndIncrement(), dirURI, tempDirectory);
 		if ((project.getIndexFile() != null) && (project.getIndexFile().length() > 0)) {
 			FileOption indexFileOption = project.getFileOption(project.getIndexFile());
 			Optional<String> changedName = indexFileOption.getChangedName();
@@ -439,7 +438,6 @@ public class ProjectInserter implements FileScannerListener, Runnable {
 		} else {
 			projectInsertListeners.fireProjectInsertFinished(project, false, null);
 		}
-		fileScanner.removeFileScannerListener(this);
 	}
 
 	/**