You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@labs.apache.org by si...@apache.org on 2009/01/02 17:27:01 UTC

svn commit: r730770 - /labs/magma/trunk/foundation-website/src/main/java/org/apache/magma/website/Head.java

Author: simoneg
Date: Fri Jan  2 08:27:00 2009
New Revision: 730770

URL: http://svn.apache.org/viewvc?rev=730770&view=rev
Log:
LABS-266 : use relative URL instead of filename to avoid duplicates

Modified:
    labs/magma/trunk/foundation-website/src/main/java/org/apache/magma/website/Head.java

Modified: labs/magma/trunk/foundation-website/src/main/java/org/apache/magma/website/Head.java
URL: http://svn.apache.org/viewvc/labs/magma/trunk/foundation-website/src/main/java/org/apache/magma/website/Head.java?rev=730770&r1=730769&r2=730770&view=diff
==============================================================================
--- labs/magma/trunk/foundation-website/src/main/java/org/apache/magma/website/Head.java (original)
+++ labs/magma/trunk/foundation-website/src/main/java/org/apache/magma/website/Head.java Fri Jan  2 08:27:00 2009
@@ -12,13 +12,17 @@
 
 public class Head {
 
-	private OutputStream stream = null;
-	private OutputStreamWriter writer = null;
+	protected OutputStream stream = null;
+	protected OutputStreamWriter writer = null;
+	protected URLRewritingStream rewriting;
 	
 	public Set<String> components = new HashSet<String>();
 	
 	public Head(OutputStream stream) {
 		this.stream = stream;
+		if (stream instanceof URLRewritingStream) {
+			this.rewriting = (URLRewritingStream)stream;
+		}
 		try {
 			this.writer = new OutputStreamWriter(stream, "UTF-8");
 		} catch (UnsupportedEncodingException e) {
@@ -57,10 +61,12 @@
 	}
 
 	public boolean containsComponent(String name) {
+		if (rewriting != null) name = rewriting.localurl(name);
 		return components.contains(name);
 	}
 
 	protected void added(String name) {
+		if (rewriting != null) name = rewriting.localurl(name);
 		this.components.add(name);
 	}
 	



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@labs.apache.org
For additional commands, e-mail: commits-help@labs.apache.org