You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by cz...@apache.org on 2003/10/30 14:48:46 UTC
cvs commit: cocoon-2.2/src/java/org/apache/cocoon/sitemap SitemapComponentSelector.java SitemapRedirector.java
cziegeler 2003/10/30 05:48:46
Modified: src/java/org/apache/cocoon/sitemap
SitemapComponentSelector.java
SitemapRedirector.java
Log:
Making this package compilable
Revision Changes Path
1.2 +2 -4 cocoon-2.2/src/java/org/apache/cocoon/sitemap/SitemapComponentSelector.java
Index: SitemapComponentSelector.java
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/sitemap/SitemapComponentSelector.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SitemapComponentSelector.java 9 Mar 2003 00:09:38 -0000 1.1
+++ SitemapComponentSelector.java 30 Oct 2003 13:48:45 -0000 1.2
@@ -50,8 +50,6 @@
*/
package org.apache.cocoon.sitemap;
-import org.apache.avalon.framework.component.ComponentSelector;
-
import org.apache.cocoon.components.pipeline.OutputComponentSelector;
/**
@@ -59,7 +57,7 @@
*
* @version CVS $Id$
*/
-public interface SitemapComponentSelector extends ComponentSelector, OutputComponentSelector {
+public interface SitemapComponentSelector extends OutputComponentSelector {
boolean hasLabel(Object hint, String label);
1.4 +7 -8 cocoon-2.2/src/java/org/apache/cocoon/sitemap/SitemapRedirector.java
Index: SitemapRedirector.java
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/sitemap/SitemapRedirector.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SitemapRedirector.java 24 Oct 2003 13:45:10 -0000 1.3
+++ SitemapRedirector.java 30 Oct 2003 13:48:46 -0000 1.4
@@ -51,8 +51,8 @@
package org.apache.cocoon.sitemap;
import org.apache.cocoon.environment.Environment;
+import org.apache.cocoon.environment.EnvironmentHelper;
import org.apache.cocoon.environment.Redirector;
-import org.apache.cocoon.environment.wrapper.EnvironmentWrapper;
import java.io.IOException;
@@ -63,6 +63,7 @@
* @version CVS $Id$
*/
public class SitemapRedirector implements Redirector {
+
private boolean hasRedirected = false;
private Environment e;
@@ -77,16 +78,14 @@
* Perform actual redirection
*/
public void redirect(boolean sessionMode, String url) throws IOException {
- e.redirect(sessionMode, url);
+ EnvironmentHelper.getCurrentProcessor()
+ .getEnvironmentHelper().redirect(this.e, sessionMode, url);
this.hasRedirected = true;
}
public void globalRedirect(boolean sessionMode, String url) throws IOException {
- if (e instanceof EnvironmentWrapper) {
- ((EnvironmentWrapper)e).globalRedirect(sessionMode,url);
- } else {
- e.redirect(sessionMode, url);
- }
+ EnvironmentHelper.getCurrentProcessor()
+ .getEnvironmentHelper().globalRedirect(this.e, sessionMode, url);
this.hasRedirected = true;
}