X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fde%2Ftodesbaum%2Fjsite%2Fapplication%2FProjectInserter.java;h=35a2452e30b691aee24cc5c9c1a09881c37c67c5;hb=db47bd203d7adacccea6c83da15acec21f793675;hp=df09ff0f6d73db3c8e4d545f7fd10498df6dd7d3;hpb=06f1d210888120605ad968f5f5797205b0234a92;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 df09ff0..35a2452 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
@@ -206,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()) {
@@ -367,7 +365,13 @@ 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);
@@ -375,7 +379,7 @@ 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);