X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fde%2Ftodesbaum%2Fjsite%2Fapplication%2FFileOption.java;h=118eee2208b5e4eee87158ae0c0ba765a4189fa6;hb=d087e3fdc2e752bc073dee0dcaf5c970c3f1bc7d;hp=46396f6730ad9538a279c5fe02e11224ac815dea;hpb=d261320b9f6a902859a959dabdb16f2ed347dd09;p=jSite.git diff --git a/src/de/todesbaum/jsite/application/FileOption.java b/src/de/todesbaum/jsite/application/FileOption.java index 46396f6..118eee2 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,17 +28,14 @@ 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 container. */ - private static final String DEFAULT_CONTAINER = ""; - - /** The default edition range. */ - private static final int DEFAULT_EDITION_RANGE = 3; - - /** The default for the replace edition state. */ - private static final boolean DEFAULT_REPLACE_EDITION = false; + /** The default changed name. */ + private static final String DEFAULT_CHANGED_NAME = null; /** The insert state. */ private boolean insert; @@ -50,21 +46,15 @@ public class FileOption { /** The custom key. */ private String customKey; + /** The changed name. */ + private String changedName; + /** The default MIME type. */ private final String defaultMimeType; /** The current MIME type. */ private String mimeType; - /** The container. */ - private String container; - - /** The edition range. */ - private int editionRange; - - /** The replace edition state. */ - private boolean replaceEdition; - /** * Creates new file options. * @@ -73,12 +63,11 @@ 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; - editionRange = DEFAULT_EDITION_RANGE; - replaceEdition = DEFAULT_REPLACE_EDITION; } /** @@ -162,91 +151,61 @@ public class FileOption { } /** - * Sets the MIME type of the file. Setting the MIME type to - * null will set the MIME type to the default MIME type. + * Returns whether this file has a changed name. Use + * {@link #getChangedName()} is this method returns {@code true}. * - * @param mimeType - * The MIME type of the file + * @return {@code true} if this file has a changed name, {@code false} + * otherwise */ - public void setMimeType(String mimeType) { - if (mimeType == null) { - this.mimeType = defaultMimeType; - } else { - this.mimeType = mimeType; - } + public boolean hasChangedName() { + return (changedName != null) && (changedName.length() > 0); } /** - * Returns the MIME type of the file. If no custom MIME type has been set, - * the default MIME type is returned. + * Returns the changed name for this file. This method will return {@code + * null} or an empty {@link String} if this file should not be renamed. * - * @return The MIME type of the file + * @return The changed name, or {@code null} if this file should not be + * renamed */ - public String getMimeType() { - return mimeType; + public String getChangedName() { + return changedName; } /** - * Returns the name of the container this file should be put in. + * Sets the changed name for this file. Setting the changed file to {@code + * null} or an empty {@link String} will disable renaming. * - * @return The name of the container + * @param changedName + * The new changed name for this file */ - public String getContainer() { - return container; + public void setChangedName(String changedName) { + this.changedName = changedName; } /** - * Sets the name of the container this file should be put in. + * Sets the MIME type of the file. Setting the MIME type to + * null will set the MIME type to the default MIME type. * - * @param container - * The name of the container + * @param mimeType + * The MIME type of the file */ - public void setContainer(String container) { - if (container == null) { - this.container = DEFAULT_CONTAINER; + public void setMimeType(String mimeType) { + if (mimeType == null) { + this.mimeType = defaultMimeType; } else { - this.container = container; + this.mimeType = mimeType; } } /** - * Sets whether the file should have “$[EDITION+n]” tags replaced. - * - * @param replaceEdition - * true to replace tags, false not to - * replace - */ - public void setReplaceEdition(boolean replaceEdition) { - this.replaceEdition = replaceEdition; - } - - /** - * Returns whether the file should have “$[EDITION+n]” tags replaced. - * - * @return true if tags should be replaced, false - * otherwise - */ - public boolean getReplaceEdition() { - return replaceEdition; - } - - /** - * Sets the range of editions that should be replaced. - * - * @param editionRange - * The range editions to replace - */ - public void setEditionRange(int editionRange) { - this.editionRange = editionRange; - } - - /** - * Returns the range of editions that should be replaced. + * Returns the MIME type of the file. If no custom MIME type has been set, + * the default MIME type is returned. * - * @return The range of editions to replace + * @return The MIME type of the file */ - public int getEditionRange() { - return editionRange; + public String getMimeType() { + return mimeType; } /** @@ -263,16 +222,13 @@ public class FileOption { if (!customKey.equals(DEFAULT_CUSTOM_KEY)) { return true; } - if (!defaultMimeType.equals(mimeType)) { + if (((changedName != null) && !changedName.equals(DEFAULT_CHANGED_NAME)) || ((DEFAULT_CHANGED_NAME != null) && !DEFAULT_CHANGED_NAME.equals(changedName))) { return true; } - if (!DEFAULT_CONTAINER.equals(container)) { - return true; - } - if (replaceEdition != DEFAULT_REPLACE_EDITION) { + if (!defaultMimeType.equals(mimeType)) { return true; } - if (editionRange != DEFAULT_EDITION_RANGE) { + if (insertRedirect != DEFAULT_INSERT_REDIRECT) { return true; } return false;