X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fde%2Ftodesbaum%2Fjsite%2Fapplication%2FProject.java;h=807385a8410333db121d98f8a869360fe35f2527;hb=e4f461213da0e30faf9e9eb2e97626abff320618;hp=0f28ef3df794247580eacc60c4fe374c3acb79bd;hpb=6f1a8216cfba28add0ef365b46a08d16d4eb87fe;p=jSite.git

diff --git a/src/de/todesbaum/jsite/application/Project.java b/src/de/todesbaum/jsite/application/Project.java
index 0f28ef3..807385a 100644
--- a/src/de/todesbaum/jsite/application/Project.java
+++ b/src/de/todesbaum/jsite/application/Project.java
@@ -28,7 +28,7 @@ import de.todesbaum.util.mime.DefaultMIMETypes;
 
 /**
  * @author David Roden <dr@todesbaum.dyndns.org>
- * @version $Id: Project.java 357 2006-03-24 15:46:03Z bombe $
+ * @version $Id$
  */
 public abstract class Project implements Comparable {
 
@@ -77,7 +77,7 @@ public abstract class Project implements Comparable {
 	 *            The title to set.
 	 */
 	public void setName(String title) {
-		this.name = title;
+		name = title;
 	}
 
 	/**
@@ -137,7 +137,7 @@ public abstract class Project implements Comparable {
 	 *            The lastInserted to set.
 	 */
 	public void setLastInsertionTime(long lastInserted) {
-		this.lastInsertionTime = lastInserted;
+		lastInsertionTime = lastInserted;
 	}
 
 	/**
@@ -152,7 +152,7 @@ public abstract class Project implements Comparable {
 	 *            The name to set.
 	 */
 	public void setPath(String name) {
-		this.path = name;
+		path = name;
 	}
 
 	/**
@@ -167,7 +167,7 @@ public abstract class Project implements Comparable {
 	 *            The insertURI to set.
 	 */
 	public void setInsertURI(String insertURI) {
-		this.insertURI = insertURI;
+		this.insertURI = shortenURI(insertURI);
 	}
 
 	/**
@@ -182,12 +182,26 @@ public abstract class Project implements Comparable {
 	 *            The requestURI to set.
 	 */
 	public void setRequestURI(String requestURI) {
-		this.requestURI = requestURI;
+		this.requestURI = shortenURI(requestURI);
 	}
 
+	@Override
 	public String toString() {
 		return name;
 	}
+	
+	private String shortenURI(String uri) {
+		if (uri.startsWith("freenet:")) {
+			uri = uri.substring("freenet:".length());
+		}
+		if (uri.startsWith("SSK@")) {
+			uri = uri.substring("SSK@".length());
+		}
+		if (uri.endsWith("/")) {
+			uri = uri.substring(0, uri.length() - 1);
+		}
+		return uri;
+	}
 
 	public String shortenFilename(File file) {
 		String filename = file.getPath();
@@ -210,14 +224,18 @@ public abstract class Project implements Comparable {
 	}
 
 	public void setFileOption(String filename, FileOption fileOption) {
-		fileOptions.put(filename, fileOption);
+		if (fileOption != null) {
+			fileOptions.put(filename, fileOption);
+		} else {
+			fileOptions.remove(filename);
+		}
 	}
 
 	/**
 	 * @return Returns the fileOptions.
 	 */
 	public Map<String, FileOption> getFileOptions() {
-		return Collections.unmodifiableMap(fileOptions);
+		return Collections.unmodifiableMap(new HashMap<String, FileOption>(fileOptions));
 	}
 
 	/**
@@ -228,9 +246,9 @@ public abstract class Project implements Comparable {
 		this.fileOptions.clear();
 		this.fileOptions.putAll(fileOptions);
 	}
-
-	public String getFinalURI(int editionOffset) {
-		return requestURI + path + "/";
+	
+	public String getFinalRequestURI(int offset) {
+		return "freenet:USK@" + requestURI + "/" + path + "/";
 	}
 
 	/**