Organize imports.

[jSite.git] / src / de / todesbaum / jsite / application / ProjectInserter.java

diff --git a/src/de/todesbaum/jsite/application/ProjectInserter.java b/src/de/todesbaum/jsite/application/ProjectInserter.java
index 10f3bf4..f9e2f79 100644 (file)
--- a/src/de/todesbaum/jsite/application/ProjectInserter.java
+++ b/src/de/todesbaum/jsite/application/ProjectInserter.java
@@ -28,8 +28,8 @@ import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 import java.util.Map.Entry;
+import java.util.Set;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -280,12 +280,13 @@ public class ProjectInserter implements FileScannerListener, Runnable {
                String filename = file.getFilename();
                FileOption fileOption = project.getFileOption(filename);
                if (fileOption.isInsert()) {
+                       fileOption.setCurrentHash(file.getHash());
                        /* check if file was modified. */
-                       if (file.getHash().equals(fileOption.getLastInsertHash())) {
+                       if (!fileOption.isForceInsert() && file.getHash().equals(fileOption.getLastInsertHash())) {
                                /* only insert a redirect. */
-                               return new RedirectFileEntry(filename, fileOption.getMimeType(), "SSK@" + project.getRequestURI() + "/" + project.getPath() + "-" + project.getEdition() + "/" + filename);
+                               logger.log(Level.FINE, String.format("Inserting redirect to edition %d for %s.", fileOption.getLastInsertEdition(), filename));
+                               return new RedirectFileEntry(filename, fileOption.getMimeType(), "SSK@" + project.getRequestURI() + "/" + project.getPath() + "-" + fileOption.getLastInsertEdition() + "/" + filename);
                        }
-                       fileOption.setCurrentHash(file.getHash());
                        try {
                                long[] fileLength = new long[1];
                                InputStream fileEntryInputStream = createFileInputStream(filename, fileOption, edition, fileLength);
@@ -296,8 +297,6 @@ public class ProjectInserter implements FileScannerListener, Runnable {
                } else {
                        if (fileOption.isInsertRedirect()) {
                                fileEntry = new RedirectFileEntry(filename, fileOption.getMimeType(), fileOption.getCustomKey());
-                       } else {
-                               fileOption.setLastInsertHash("");
                        }
                }
                return fileEntry;
@@ -465,7 +464,7 @@ public class ProjectInserter implements FileScannerListener, Runnable {
                        int newEdition = Integer.parseInt(editionPart);
                        project.setEdition(newEdition);
                        project.setLastInsertionTime(System.currentTimeMillis());
-                       project.copyHashes();
+                       project.onSuccessfulInsert();
                }
                fireProjectInsertFinished(success, cancelled ? new AbortedException() : (disconnected ? new IOException("Connection terminated") : null));
        }