X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Fnet%2Fpterodactylus%2Fjsite%2Fcore%2FFileOverride.java;h=259ecc7ead0911a4763af45e3b348379305a809a;hb=36a9e6e7134485038f739181e2edaac044c32176;hp=806d538abcf3df75f7051d324169748fd97eab36;hpb=954a1a33392ef83e007b1045e2aaeac173361289;p=jSite2.git
diff --git a/src/net/pterodactylus/jsite/core/FileOverride.java b/src/net/pterodactylus/jsite/core/FileOverride.java
index 806d538..259ecc7 100644
--- a/src/net/pterodactylus/jsite/core/FileOverride.java
+++ b/src/net/pterodactylus/jsite/core/FileOverride.java
@@ -27,9 +27,8 @@ import net.pterodactylus.util.logging.Logging;
/**
* An override is used to enter other information about a file than the defaults
* would have yielded. It is also used to add redirects to a project.
- *
+ *
* @author David âBombeâ Roden <bombe@freenetproject.org>
- * @version $Id$
*/
public class FileOverride {
@@ -47,7 +46,7 @@ public class FileOverride {
/**
* Checks whether this override has any content.
- *
+ *
* @return true
if this override does not have any effects,
* false
otherwise
*/
@@ -57,7 +56,7 @@ public class FileOverride {
/**
* Returns the insert override.
- *
+ *
* @return true
if the entry should be inserted,
* false
if it should not be inserted,
* null
if the default should not be overridden
@@ -68,7 +67,7 @@ public class FileOverride {
/**
* Sets the insert override.
- *
+ *
* @param insert
* true
if the entry should be inserted,
* false
if it should not be inserted,
@@ -80,7 +79,7 @@ public class FileOverride {
/**
* Returns the override content type.
- *
+ *
* @return The override content type, or null
to not override
* the default
*/
@@ -90,7 +89,7 @@ public class FileOverride {
/**
* Sets the override content type.
- *
+ *
* @param contentType
* The override content type, or null
to not
* override the default
@@ -101,7 +100,7 @@ public class FileOverride {
/**
* Returns the target of a redirect.
- *
+ *
* @return The target URI of the redirect, or null
if no
* redirect should be created
*/
@@ -111,7 +110,7 @@ public class FileOverride {
/**
* Sets the target of a redirect.
- *
+ *
* @param redirectTarget
* The target URI of the redirect, or null
if no
* redirect should be created
@@ -123,7 +122,7 @@ public class FileOverride {
/**
* @see java.lang.Object#toString()
*/
- @java.lang.Override
+ @Override
public String toString() {
return ((insert != null) ? String.valueOf(insert) : "") + "|" + ((contentType != null) ? contentType : "") + "|" + ((redirectTarget != null) ? redirectTarget : "");
}
@@ -131,7 +130,7 @@ public class FileOverride {
/**
* Converts an override string created by {@link #toString()} back to an
* {@link FileOverride} object.
- *
+ *
* @param overrideString
* The textual representation of the override
* @return The parsed override, or null
if the string could