X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fde%2Ftodesbaum%2Fjsite%2Fapplication%2FFileOption.java;h=71809c96fe1c4808b88bbdc76f24ba7997f85b36;hb=a6bda7a82aa1b2cfd0313fb28d3dcca68ca516c5;hp=dd3d208234506c238eeeefae322915ab0edc308d;hpb=40306446465d854ab5732e4289302b94cffd00a5;p=jSite.git

diff --git a/src/de/todesbaum/jsite/application/FileOption.java b/src/de/todesbaum/jsite/application/FileOption.java
index dd3d208..71809c9 100644
--- a/src/de/todesbaum/jsite/application/FileOption.java
+++ b/src/de/todesbaum/jsite/application/FileOption.java
@@ -1,6 +1,5 @@
 /*
- * jSite - a tool for uploading websites into Freenet Copyright (C) 2006 David
- * Roden
+ * jSite - FileOption.java - Copyright © 2006–2011 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 the Free Software
@@ -29,9 +28,15 @@ public class FileOption {
 	/** The default for the insert state. */
 	private static final boolean DEFAULT_INSERT = true;
 
+	/** The default for the insert redirect state. */
+	private static final boolean DEFAULT_INSERT_REDIRECT = true;
+
 	/** The default for the custom key. */
 	private static final String DEFAULT_CUSTOM_KEY = "CHK@";
 
+	/** The default changed name. */
+	private static final String DEFAULT_CHANGED_NAME = null;
+
 	/** The default container. */
 	private static final String DEFAULT_CONTAINER = "";
 
@@ -76,7 +81,9 @@ public class FileOption {
 	 */
 	public FileOption(String defaultMimeType) {
 		insert = DEFAULT_INSERT;
+		insertRedirect = DEFAULT_INSERT_REDIRECT;
 		customKey = DEFAULT_CUSTOM_KEY;
+		changedName = DEFAULT_CHANGED_NAME;
 		this.defaultMimeType = defaultMimeType;
 		mimeType = defaultMimeType;
 		container = DEFAULT_CONTAINER;
@@ -299,6 +306,9 @@ public class FileOption {
 		if (!customKey.equals(DEFAULT_CUSTOM_KEY)) {
 			return true;
 		}
+		if (((changedName != null) && !changedName.equals(DEFAULT_CHANGED_NAME)) || ((DEFAULT_CHANGED_NAME != null) && !DEFAULT_CHANGED_NAME.equals(changedName))) {
+			return true;
+		}
 		if (!defaultMimeType.equals(mimeType)) {
 			return true;
 		}
@@ -311,6 +321,9 @@ public class FileOption {
 		if (editionRange != DEFAULT_EDITION_RANGE) {
 			return true;
 		}
+		if (insertRedirect != DEFAULT_INSERT_REDIRECT) {
+			return true;
+		}
 		return false;
 	}