taylor 2004/12/01 19:13:53
Modified: components/jetspeed/src/java/org/apache/jetspeed/rewriter
WebContentRewriter.java RulesetRewriterImpl.java
Log:
inherit from rule rewriter, let it do the bulk of the work
Revision Changes Path
1.2 +9 -2
jakarta-jetspeed-2/components/jetspeed/src/java/org/apache/jetspeed/rewriter/WebContentRewriter.java
Index: WebContentRewriter.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/components/jetspeed/src/java/org/apache/jetspeed/rewriter/WebContentRewriter.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- WebContentRewriter.java 2 Dec 2004 01:09:19 -0000 1.1
+++ WebContentRewriter.java 2 Dec 2004 03:13:53 -0000 1.2
@@ -22,7 +22,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Roger Ruttimann</a>
* @version $Id$
*/
-public class WebContentRewriter extends AbstractRewriter implements Rewriter
{
+public class WebContentRewriter extends RulesetRewriterImpl implements
Rewriter {
/** WebContentURL */
public static final String ACTION_PARAMETER_URL = "WCURL";
@@ -70,9 +70,11 @@
return modifiedURL;
}
+
/* (non-Javadoc)
* @see
org.apache.jetspeed.rewriter.Rewriter#shouldRemoveTag(java.lang.String)
*/
+ /*
public boolean shouldRemoveTag(String tag) {
if (tag.equalsIgnoreCase("html"))
{
@@ -80,10 +82,12 @@
}
return false;
}
+ */
/* (non-Javadoc)
* @see
org.apache.jetspeed.rewriter.Rewriter#shouldStripTag(java.lang.String)
*/
+ /*
public boolean shouldStripTag(String tag) {
if (tag.equalsIgnoreCase("head"))
{
@@ -91,12 +95,15 @@
}
return false;
}
+ */
/* (non-Javadoc)
* @see org.apache.jetspeed.rewriter.Rewriter#shouldRemoveComments()
*/
+ /*
public boolean shouldRemoveComments() {
return true;
}
+ */
}
1.3 +2 -2
jakarta-jetspeed-2/components/jetspeed/src/java/org/apache/jetspeed/rewriter/RulesetRewriterImpl.java
Index: RulesetRewriterImpl.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/components/jetspeed/src/java/org/apache/jetspeed/rewriter/RulesetRewriterImpl.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- RulesetRewriterImpl.java 8 Mar 2004 00:44:40 -0000 1.2
+++ RulesetRewriterImpl.java 2 Dec 2004 03:13:53 -0000 1.3
@@ -139,7 +139,7 @@
continue;
}
- String rewritten = this.rewriteUrl(value, tag.getId(), name);
+ String rewritten = rewriteUrl(value, tag.getId(), name);
if (null != rewritten) // return null indicates "don't
rewrite"
{
if (rule.getSuffix() != null)
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
