X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fde%2Ftodesbaum%2Fjsite%2Fapplication%2FProjectInserter.java;h=1504a9fb7891868d7af617d2e962565ec73fbc45;hb=f936411037a6ec1afbc5efbb17dc9b0136adda76;hp=42b6b24fe959c88e534259852da8a88b929327bf;hpb=6216aa546b33277568785f7b6759b52ce50fe320;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 42b6b24..1504a9f 100644
--- a/src/main/java/de/todesbaum/jsite/application/ProjectInserter.java
+++ b/src/main/java/de/todesbaum/jsite/application/ProjectInserter.java
@@ -1,5 +1,5 @@
 /*
- * jSite - ProjectInserter.java - Copyright © 2006–2012 David Roden
+ * jSite - ProjectInserter.java - Copyright © 2006–2014 David Roden
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -43,7 +43,6 @@ import de.todesbaum.jsite.gui.FileScanner.ScannedFile;
 import de.todesbaum.jsite.gui.FileScannerListener;
 import de.todesbaum.util.freenet.fcp2.Client;
 import de.todesbaum.util.freenet.fcp2.ClientPutComplexDir;
-import de.todesbaum.util.freenet.fcp2.ClientPutDir.ManifestPutter;
 import de.todesbaum.util.freenet.fcp2.Connection;
 import de.todesbaum.util.freenet.fcp2.DirectFileEntry;
 import de.todesbaum.util.freenet.fcp2.FileEntry;
@@ -100,9 +99,6 @@ public class ProjectInserter implements FileScannerListener, Runnable {
 	/** The insert priority. */
 	private PriorityClass priority;
 
-	/** The manifest putter. */
-	private ManifestPutter manifestPutter;
-
 	/**
 	 * Adds a listener to the list of registered listeners.
 	 *
@@ -166,16 +162,6 @@ public class ProjectInserter implements FileScannerListener, Runnable {
 	}
 
 	/**
-	 * Sets the manifest putter to use for inserts.
-	 *
-	 * @param manifestPutter
-	 *            The manifest putter to use
-	 */
-	public void setManifestPutter(ManifestPutter manifestPutter) {
-		this.manifestPutter = manifestPutter;
-	}
-
-	/**
 	 * Starts the insert.
 	 *
 	 * @param progressListener
@@ -365,13 +351,18 @@ public class ProjectInserter implements FileScannerListener, Runnable {
 		String dirURI = "USK@" + project.getInsertURI() + "/" + project.getPath() + "/" + edition + "/";
 		ClientPutComplexDir putDir = new ClientPutComplexDir("dir-" + counter++, dirURI, tempDirectory);
 		if ((project.getIndexFile() != null) && (project.getIndexFile().length() > 0)) {
-			putDir.setDefaultName(project.getIndexFile());
+			FileOption indexFileOption = project.getFileOption(project.getIndexFile());
+			Optional<String> changedName = indexFileOption.getChangedName();
+			if (changedName.isPresent()) {
+				putDir.setDefaultName(changedName.get());
+			} else {
+				putDir.setDefaultName(project.getIndexFile());
+			}
 		}
 		putDir.setVerbosity(Verbosity.ALL);
 		putDir.setMaxRetries(-1);
 		putDir.setEarlyEncode(useEarlyEncode);
 		putDir.setPriorityClass(priority);
-		putDir.setManifestPutter(manifestPutter);
 		for (ScannedFile file : files) {
 			FileEntry fileEntry = createFileEntry(file);
 			if (fileEntry != null) {