Use a project’s “always force insert” setting when inserting the project.

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

diff --git a/src/main/java/de/todesbaum/jsite/application/ProjectInserter.java b/src/main/java/de/todesbaum/jsite/application/ProjectInserter.java
index a9ea8d1..30d4d7a 100644 (file)
--- a/src/main/java/de/todesbaum/jsite/application/ProjectInserter.java
+++ b/src/main/java/de/todesbaum/jsite/application/ProjectInserter.java
@@ -324,7 +324,7 @@ public class ProjectInserter implements FileScannerListener, Runnable {
                if (fileOption.isInsert()) {
                        fileOption.setCurrentHash(file.getHash());
                        /* check if file was modified. */
-                       if (!fileOption.isForceInsert() && file.getHash().equals(fileOption.getLastInsertHash())) {
+                       if (!project.isAlwaysForceInsert() && !fileOption.isForceInsert() && file.getHash().equals(fileOption.getLastInsertHash())) {
                                /* only insert a redirect. */
                                logger.log(Level.FINE, String.format("Inserting redirect to edition %d for %s.", fileOption.getLastInsertEdition(), filename));
                                return new RedirectFileEntry(fileOption.hasChangedName() ? fileOption.getChangedName() : filename, fileOption.getMimeType(), "SSK@" + project.getRequestURI() + "/" + project.getPath() + "-" + fileOption.getLastInsertEdition() + "/" + fileOption.getLastInsertFilename());
@@ -443,6 +443,7 @@ public class ProjectInserter implements FileScannerListener, Runnable {
        /**
         * {@inheritDoc}
         */
+       @Override
        public void run() {
                fireProjectInsertStarted();
                List<ScannedFile> files = fileScanner.getFiles();
@@ -548,6 +549,7 @@ public class ProjectInserter implements FileScannerListener, Runnable {
        /**
         * {@inheritDoc}
         */
+       @Override
        public void fileScannerFinished(FileScanner fileScanner) {
                if (!fileScanner.isError()) {
                        new Thread(this).start();
@@ -597,6 +599,7 @@ public class ProjectInserter implements FileScannerListener, Runnable {
                /**
                 * {@inheritDoc}
                 */
+               @Override
                public Iterator<Issue> iterator() {
                        return issues.iterator();
                }