rename Override to FileOverride

[jSite2.git] / src / net / pterodactylus / jsite / project / Project.java

diff --git a/src/net/pterodactylus/jsite/project/Project.java b/src/net/pterodactylus/jsite/project/Project.java
index 265eeff..7391ebf 100644 (file)
--- a/src/net/pterodactylus/jsite/project/Project.java
+++ b/src/net/pterodactylus/jsite/project/Project.java
@@ -32,7 +32,7 @@ import net.pterodactylus.util.beans.AbstractBean;
 /**
  * Container for project information. A Project is capable of notifying
  * {@link PropertyChangeListener}s if any of the contained properties change.
- * 
+ *
  * @author David ‘Bombe’ Roden <bombe@freenetproject.org>
  */
 public class Project extends AbstractBean {
@@ -77,7 +77,7 @@ public class Project extends AbstractBean {
        private String defaultFile;
 
        /** The overrides. */
-       private final Map<String, Override> overrides = new HashMap<String, Override>();
+       private final Map<String, FileOverride> fileOverrides = new HashMap<String, FileOverride>();
 
        /**
         * Creates a new project.
@@ -88,7 +88,7 @@ public class Project extends AbstractBean {
 
        /**
         * Clones the given project.
-        * 
+        *
         * @param project
         */
        Project(Project project) {
@@ -101,7 +101,7 @@ public class Project extends AbstractBean {
 
        /**
         * Returns the internal ID.
-        * 
+        *
         * @return The internal ID
         */
        String getId() {
@@ -110,7 +110,7 @@ public class Project extends AbstractBean {
 
        /**
         * Sets the internal ID.
-        * 
+        *
         * @param id
         *            The internal ID
         */
@@ -120,7 +120,7 @@ public class Project extends AbstractBean {
 
        /**
         * Returns the name of the project.
-        * 
+        *
         * @return The name of the project
         */
        public String getName() {
@@ -129,7 +129,7 @@ public class Project extends AbstractBean {
 
        /**
         * Sets the name of the project.
-        * 
+        *
         * @param name
         *            The name of the project
         */
@@ -141,7 +141,7 @@ public class Project extends AbstractBean {
 
        /**
         * Returns the description of the project.
-        * 
+        *
         * @return The description of the project
         */
        public String getDescription() {
@@ -150,7 +150,7 @@ public class Project extends AbstractBean {
 
        /**
         * Sets the description of the project
-        * 
+        *
         * @param description
         *            The description of the project
         */
@@ -162,7 +162,7 @@ public class Project extends AbstractBean {
 
        /**
         * Returns the public key of the project.
-        * 
+        *
         * @return The public key of the project
         */
        public String getPublicKey() {
@@ -171,7 +171,7 @@ public class Project extends AbstractBean {
 
        /**
         * Sets the public key of the project.
-        * 
+        *
         * @param publicKey
         *            The public key of the project
         */
@@ -183,7 +183,7 @@ public class Project extends AbstractBean {
 
        /**
         * Returns the private key of the project.
-        * 
+        *
         * @return The private key of the project
         */
        public String getPrivateKey() {
@@ -192,7 +192,7 @@ public class Project extends AbstractBean {
 
        /**
         * Sets the private key of the project.
-        * 
+        *
         * @param privateKey
         *            The private key of the project
         */
@@ -204,7 +204,7 @@ public class Project extends AbstractBean {
 
        /**
         * Returns the base path of the project.
-        * 
+        *
         * @return The base path of the project
         */
        public String getBasePath() {
@@ -213,7 +213,7 @@ public class Project extends AbstractBean {
 
        /**
         * Sets the base path of the project.
-        * 
+        *
         * @param basePath
         *            The base path of the project
         */
@@ -225,7 +225,7 @@ public class Project extends AbstractBean {
 
        /**
         * Returns the default file.
-        * 
+        *
         * @return The default file
         */
        public String getDefaultFile() {
@@ -234,7 +234,7 @@ public class Project extends AbstractBean {
 
        /**
         * Sets the default file.
-        * 
+        *
         * @param defaultFile
         *            The default file
         */
@@ -245,34 +245,34 @@ public class Project extends AbstractBean {
        }
 
        /**
-        * Adds an override for the given file.
-        * 
+        * Adds a file override for the given file.
+        *
         * @param filePath
         *            The file path
         * @param override
         *            The override for the file
         */
-       public void addOverride(String filePath, Override override) {
-               overrides.put(filePath, override);
+       public void addFileOverride(String filePath, FileOverride override) {
+               fileOverrides.put(filePath, override);
        }
 
        /**
-        * Removes the override for the given file.
-        * 
+        * Removes the file override for the given file.
+        *
         * @param filePath
         *            The file path for which to remove the override
         */
-       public void removeOverride(String filePath) {
-               overrides.remove(filePath);
+       public void removeFileOverride(String filePath) {
+               fileOverrides.remove(filePath);
        }
 
        /**
-        * Returns the list of {@link Override}s.
-        * 
-        * @return All overrides
+        * Returns the list of {@link FileOverride}s.
+        *
+        * @return All file overrides
         */
-       public Map<String, Override> getOverrides() {
-               return overrides;
+       public Map<String, FileOverride> getFileOverrides() {
+               return fileOverrides;
        }
 
        /**
@@ -280,7 +280,7 @@ public class Project extends AbstractBean {
         * base path. From this file it is possible to reach all files in the base
         * path. This method is disk-intensive and may take some time on larger
         * directories!
-        * 
+        *
         * @return The file for the base path, or <code>null</code> if the base
         *         path does not denote an existing directory
         */
@@ -301,7 +301,7 @@ public class Project extends AbstractBean {
        /**
         * Scans the given directory and recreates the file and directory structure
         * in the given project file.
-        * 
+        *
         * @param directory
         *            The directory to scan
         * @param projectFile
@@ -323,7 +323,7 @@ public class Project extends AbstractBean {
 
        /**
         * Implementation of a {@link ProjectFile}.
-        * 
+        *
         * @author David ‘Bombe’ Roden &lt;bombe@freenetproject.org&gt;
         */
        private static class ProjectFileImpl implements ProjectFile, Comparable<ProjectFileImpl> {
@@ -348,7 +348,7 @@ public class Project extends AbstractBean {
 
                /**
                 * Creates a new project fie.
-                * 
+                *
                 * @param parentProjectFile
                 *            The parent of the project file, or <code>null</code> if
                 *            the new project file does not have a parent
@@ -449,7 +449,7 @@ public class Project extends AbstractBean {
 
                /**
                 * Adds a new project file as child to this project file.
-                * 
+                *
                 * @param name
                 *            The name of the file
                 * @param size