X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fde%2Ftodesbaum%2Fjsite%2Fapplication%2FProjectInserter.java;h=42b6b24fe959c88e534259852da8a88b929327bf;hb=6216aa546b33277568785f7b6759b52ce50fe320;hp=f3cf98a786480c2ad6c5e896e3190dc7f20d609e;hpb=da487bd7b258bc47ad888c22f89343c6162569a6;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 f3cf98a..42b6b24 100644 --- a/src/main/java/de/todesbaum/jsite/application/ProjectInserter.java +++ b/src/main/java/de/todesbaum/jsite/application/ProjectInserter.java @@ -68,20 +68,19 @@ public class ProjectInserter implements FileScannerListener, Runnable { /** Counter for FCP connection identifier. */ private static int counter = 0; - /** The list of insert listeners. */ - private List insertListeners = new ArrayList(); + private final ProjectInsertListeners projectInsertListeners = new ProjectInsertListeners(); /** The freenet interface. */ - protected Freenet7Interface freenetInterface; + private Freenet7Interface freenetInterface; /** The project to insert. */ - protected Project project; + private Project project; /** The file scanner. */ private FileScanner fileScanner; /** Object used for synchronization. */ - protected final Object lockObject = new Object(); + private final Object lockObject = new Object(); /** The temp directory. */ private String tempDirectory; @@ -111,91 +110,7 @@ public class ProjectInserter implements FileScannerListener, Runnable { * The listener to add */ public void addInsertListener(InsertListener insertListener) { - insertListeners.add(insertListener); - } - - /** - * Removes a listener from the list of registered listeners. - * - * @param insertListener - * The listener to remove - */ - public void removeInsertListener(InsertListener insertListener) { - insertListeners.remove(insertListener); - } - - /** - * Notifies all listeners that the project insert has started. - * - * @see InsertListener#projectInsertStarted(Project) - */ - protected void fireProjectInsertStarted() { - for (InsertListener insertListener : insertListeners) { - insertListener.projectInsertStarted(project); - } - } - - /** - * Notifies all listeners that the insert has generated a URI. - * - * @see InsertListener#projectURIGenerated(Project, String) - * @param uri - * The generated URI - */ - protected void fireProjectURIGenerated(String uri) { - for (InsertListener insertListener : insertListeners) { - insertListener.projectURIGenerated(project, uri); - } - } - - /** - * Notifies all listeners that the insert has made some progress. - * - * @see InsertListener#projectUploadFinished(Project) - */ - protected void fireProjectUploadFinished() { - for (InsertListener insertListener : insertListeners) { - insertListener.projectUploadFinished(project); - } - } - - /** - * Notifies all listeners that the insert has made some progress. - * - * @see InsertListener#projectInsertProgress(Project, int, int, int, int, - * boolean) - * @param succeeded - * The number of succeeded blocks - * @param failed - * The number of failed blocks - * @param fatal - * The number of fatally failed blocks - * @param total - * The total number of blocks - * @param finalized - * true if the total number of blocks has already - * been finalized, false otherwise - */ - protected void fireProjectInsertProgress(int succeeded, int failed, int fatal, int total, boolean finalized) { - for (InsertListener insertListener : insertListeners) { - insertListener.projectInsertProgress(project, succeeded, failed, fatal, total, finalized); - } - } - - /** - * Notifies all listeners the project insert has finished. - * - * @see InsertListener#projectInsertFinished(Project, boolean, Throwable) - * @param success - * true if the project was inserted successfully, - * false if it failed - * @param cause - * The cause of the failure, if any - */ - protected void fireProjectInsertFinished(boolean success, Throwable cause) { - for (InsertListener insertListener : insertListeners) { - insertListener.projectInsertFinished(project, success, cause); - } + projectInsertListeners.addInsertListener(insertListener); } /** @@ -291,12 +206,10 @@ public class ProjectInserter implements FileScannerListener, Runnable { * {@link ClientPutComplexDir#addFileEntry(FileEntry)}. * * @param file - * The name and hash of the file to insert - * @param edition - * The current edition + * The name and hash of the file to insert * @return A file entry for the given file */ - private FileEntry createFileEntry(ScannedFile file, int edition) { + private FileEntry createFileEntry(ScannedFile file) { String filename = file.getFilename(); FileOption fileOption = project.getFileOption(filename); if (fileOption.isInsert()) { @@ -424,7 +337,7 @@ public class ProjectInserter implements FileScannerListener, Runnable { */ @Override public void run() { - fireProjectInsertStarted(); + projectInsertListeners.fireProjectInsertStarted(project); List files = fileScanner.getFiles(); /* create connection to node */ @@ -441,7 +354,7 @@ public class ProjectInserter implements FileScannerListener, Runnable { } if (!connected || cancelled) { - fireProjectInsertFinished(false, cancelled ? new AbortedException() : cause); + projectInsertListeners.fireProjectInsertFinished(project, false, cancelled ? new AbortedException() : cause); return; } @@ -460,12 +373,12 @@ public class ProjectInserter implements FileScannerListener, Runnable { putDir.setPriorityClass(priority); putDir.setManifestPutter(manifestPutter); for (ScannedFile file : files) { - FileEntry fileEntry = createFileEntry(file, edition); + FileEntry fileEntry = createFileEntry(file); if (fileEntry != null) { try { putDir.addFileEntry(fileEntry); } catch (IOException ioe1) { - fireProjectInsertFinished(false, ioe1); + projectInsertListeners.fireProjectInsertFinished(project, false, ioe1); return; } } @@ -474,9 +387,9 @@ public class ProjectInserter implements FileScannerListener, Runnable { /* start request */ try { client.execute(putDir, progressListener); - fireProjectUploadFinished(); + projectInsertListeners.fireProjectUploadFinished(project); } catch (IOException ioe1) { - fireProjectInsertFinished(false, ioe1); + projectInsertListeners.fireProjectInsertFinished(project, false, ioe1); return; } @@ -494,7 +407,7 @@ public class ProjectInserter implements FileScannerListener, Runnable { String messageName = message.getName(); if ("URIGenerated".equals(messageName)) { finalURI = message.get("URI"); - fireProjectURIGenerated(finalURI); + projectInsertListeners.fireProjectURIGenerated(project, finalURI); } if ("SimpleProgress".equals(messageName)) { int total = Integer.parseInt(message.get("Total")); @@ -502,7 +415,7 @@ public class ProjectInserter implements FileScannerListener, Runnable { int fatal = Integer.parseInt(message.get("FatallyFailed")); int failed = Integer.parseInt(message.get("Failed")); boolean finalized = Boolean.parseBoolean(message.get("FinalizedTotal")); - fireProjectInsertProgress(succeeded, failed, fatal, total, finalized); + projectInsertListeners.fireProjectInsertProgress(project, succeeded, failed, fatal, total, finalized); } success |= "PutSuccessful".equals(messageName); finished = (success && (finalURI != null)) || "PutFailed".equals(messageName) || messageName.endsWith("Error"); @@ -518,7 +431,7 @@ public class ProjectInserter implements FileScannerListener, Runnable { project.setLastInsertionTime(System.currentTimeMillis()); project.onSuccessfulInsert(); } - fireProjectInsertFinished(success, cancelled ? new AbortedException() : (disconnected ? new IOException("Connection terminated") : null)); + projectInsertListeners.fireProjectInsertFinished(project, success, cancelled ? new AbortedException() : (disconnected ? new IOException("Connection terminated") : null)); } // @@ -533,7 +446,7 @@ public class ProjectInserter implements FileScannerListener, Runnable { if (!fileScanner.isError()) { new Thread(this).start(); } else { - fireProjectInsertFinished(false, null); + projectInsertListeners.fireProjectInsertFinished(project, false, null); } fileScanner.removeFileScannerListener(this); }