X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fde%2Ftodesbaum%2Fjsite%2Fapplication%2FFileOption.java;h=6b979a6ef0fd73c2c10bf4a25fd1cd6b1c40a36f;hb=3a538c657652e408b4507d59a8c3c48bbf00caad;hp=c1d201a7e2892229bf2c9bbad906caead7972d0d;hpb=bbfa208695e2a7f1bb555f841623945767f296e7;p=jSite.git

diff --git a/src/de/todesbaum/jsite/application/FileOption.java b/src/de/todesbaum/jsite/application/FileOption.java
index c1d201a..6b979a6 100644
--- a/src/de/todesbaum/jsite/application/FileOption.java
+++ b/src/de/todesbaum/jsite/application/FileOption.java
@@ -1,20 +1,20 @@
 /*
- * jSite - a tool for uploading websites into Freenet
- * Copyright (C) 2006 David Roden
+ * jSite - a tool for uploading websites into Freenet Copyright (C) 2006 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 Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * 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
+ * Foundation; either version 2 of the License, or (at your option) any later
+ * version.
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 59 Temple
+ * Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 package de.todesbaum.jsite.application;
@@ -97,9 +97,10 @@ public class FileOption {
 	 */
 	public void setCustomKey(String customKey) {
 		if (customKey == null) {
-			customKey = "";
+			this.customKey = "";
+		} else {
+			this.customKey = customKey;
 		}
-		this.customKey = customKey;
 	}
 
 	/**
@@ -135,9 +136,10 @@ public class FileOption {
 	 */
 	public void setMimeType(String mimeType) {
 		if (mimeType == null) {
-			mimeType = defaultMimeType;
+			this.mimeType = defaultMimeType;
+		} else {
+			this.mimeType = mimeType;
 		}
-		this.mimeType = mimeType;
 	}
 
 	/**
@@ -167,28 +169,28 @@ public class FileOption {
 	 */
 	public void setContainer(String container) {
 		if (container == null) {
-			container = DEFAULT_CONTAINER;
+			this.container = DEFAULT_CONTAINER;
+		} else {
+			this.container = container;
 		}
-		this.container = container;
 	}
 
 	/**
 	 * Sets whether the file should have “$[EDITION+<i>n</i>]” tags replaced.
 	 *
 	 * @param replaceEdition
-	 *            <code>true</code> to replace tags, <code>false</code> not
-	 *            to replace
+	 *            <code>true</code> to replace tags, <code>false</code> not to
+	 *            replace
 	 */
 	public void setReplaceEdition(boolean replaceEdition) {
 		this.replaceEdition = replaceEdition;
 	}
 
 	/**
-	 * Returns whether the file should have “$[EDITION+<i>n</i>]” tags
-	 * replaced.
+	 * Returns whether the file should have “$[EDITION+<i>n</i>]” tags replaced.
 	 *
-	 * @return <code>true</code> if tags should be replaced,
-	 *         <code>false</code> otherwise
+	 * @return <code>true</code> if tags should be replaced, <code>false</code>
+	 *         otherwise
 	 */
 	public boolean getReplaceEdition() {
 		return replaceEdition;
@@ -242,4 +244,4 @@ public class FileOption {
 		return false;
 	}
 
-}
\ No newline at end of file
+}