X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fde%2Ftodesbaum%2Fjsite%2Fmain%2FConfiguration.java;h=41eafdb3fa9efa29f334745c096557f1ddcab5c0;hb=755c2a82abdb528794d1ccc3f342bb3b6d1481a1;hp=4b49577235cdb7728ab351aa8cee8bae2a68f635;hpb=7e470976ab9d4d7430e43ba96c9c100f799240ed;p=jSite.git

diff --git a/src/main/java/de/todesbaum/jsite/main/Configuration.java b/src/main/java/de/todesbaum/jsite/main/Configuration.java
index 4b49577..41eafdb 100644
--- a/src/main/java/de/todesbaum/jsite/main/Configuration.java
+++ b/src/main/java/de/todesbaum/jsite/main/Configuration.java
@@ -1,5 +1,5 @@
 /*
- * jSite - Configuration.java - Copyright © 2006–2012 David Roden
+ * jSite - Configuration.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,8 +43,8 @@ import de.todesbaum.jsite.application.FileOption;
 import de.todesbaum.jsite.application.Node;
 import de.todesbaum.jsite.application.Project;
 import de.todesbaum.jsite.main.ConfigurationLocator.ConfigurationLocation;
-import de.todesbaum.util.freenet.fcp2.ClientPutDir.ManifestPutter;
 import de.todesbaum.util.freenet.fcp2.PriorityClass;
+import org.w3c.dom.Document;
 
 /**
  * The configuration.
@@ -129,7 +129,10 @@ public class Configuration {
 					StreamCopier.copy(fileInputStream, fileByteOutputStream, configurationFile.length());
 					fileByteOutputStream.close();
 					byte[] fileBytes = fileByteOutputStream.toByteArray();
-					rootNode = SimpleXML.fromDocument(XML.transformToDocument(fileBytes));
+					Document document = XML.transformToDocument(fileBytes);
+					if (document != null) {
+						rootNode = SimpleXML.fromDocument(document);
+					}
 					return;
 				} catch (FileNotFoundException e) {
 					/* ignore. */
@@ -430,7 +433,7 @@ public class Configuration {
 					fileOptionNode.append("insert", String.valueOf(fileOption.isInsert()));
 					fileOptionNode.append("insert-redirect", String.valueOf(fileOption.isInsertRedirect()));
 					fileOptionNode.append("custom-key", fileOption.getCustomKey());
-					fileOptionNode.append("changed-name", fileOption.getChangedName());
+					fileOptionNode.append("changed-name", fileOption.getChangedName().orElse(null));
 					fileOptionNode.append("mime-type", fileOption.getMimeType());
 				}
 			}
@@ -623,25 +626,4 @@ public class Configuration {
 		return this;
 	}
 
-	/**
-	 * Returns the manifest putter.
-	 *
-	 * @return The manifest putter
-	 */
-	public ManifestPutter getManifestPutter() {
-		return ManifestPutter.valueOf(getNodeValue(new String[] { "manifest-putter" }, "simple").toUpperCase());
-	}
-
-	/**
-	 * Sets the manifest putter.
-	 *
-	 * @param manifestPutter
-	 *            The manifest putter
-	 * @return This configuration
-	 */
-	public Configuration setManifestPutter(ManifestPutter manifestPutter) {
-		rootNode.replace("manifest-putter", manifestPutter.name().toLowerCase());
-		return this;
-	}
-
 }