cziegeler 2004/03/19 03:10:07
Modified: src/java/org/apache/cocoon/environment/wrapper
EnvironmentWrapper.java
src/java/org/apache/cocoon/components/cprocessor
TreeProcessor.java
Log:
Remove unused variable
Revision Changes Path
1.21 +8 -14
cocoon-2.2/src/java/org/apache/cocoon/environment/wrapper/EnvironmentWrapper.java
Index: EnvironmentWrapper.java
===================================================================
RCS file:
/home/cvs/cocoon-2.2/src/java/org/apache/cocoon/environment/wrapper/EnvironmentWrapper.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- EnvironmentWrapper.java 18 Mar 2004 15:15:10 -0000 1.20
+++ EnvironmentWrapper.java 19 Mar 2004 11:10:06 -0000 1.21
@@ -23,7 +23,6 @@
import java.util.Map;
import org.apache.avalon.framework.logger.Logger;
-import org.apache.avalon.framework.service.ServiceManager;
import org.apache.cocoon.components.source.impl.SitemapSourceInfo;
import org.apache.cocoon.environment.AbstractEnvironment;
import org.apache.cocoon.environment.Environment;
@@ -71,9 +70,8 @@
public EnvironmentWrapper(Environment env,
String requestURI,
String queryString,
- Logger logger)
- throws MalformedURLException {
- this(env, requestURI, queryString, logger, null, false, null);
+ Logger logger) {
+ this(env, requestURI, queryString, logger, false, null);
}
/**
@@ -84,12 +82,10 @@
String requestURI,
String queryString,
Logger logger,
- ServiceManager manager,
boolean rawMode,
- String view)
- throws MalformedURLException {
+ String view) {
super(env.getURI(), view, env.getAction());
- init(env, requestURI, queryString, logger, manager, rawMode, view);
+ init(env, requestURI, queryString, logger, rawMode, view);
}
/**
@@ -100,12 +96,12 @@
* @param logger
* @throws MalformedURLException
*/
- public EnvironmentWrapper(Environment env, ServiceManager manager,
String uri, Logger logger) throws MalformedURLException {
+ public EnvironmentWrapper(Environment env, String uri, Logger logger)
throws MalformedURLException {
super(env.getURI(), env.getView(), env.getAction());
SitemapSourceInfo info = SitemapSourceInfo.parseURI(env, uri);
- this.init(env, info.requestURI, info.queryString, logger, manager,
info.rawMode, info.view);
+ this.init(env, info.requestURI, info.queryString, logger,
info.rawMode, info.view);
this.setURI(info.prefix, info.uri);
}
@@ -114,10 +110,8 @@
String requestURI,
String queryString,
Logger logger,
- ServiceManager manager,
boolean rawMode,
- String view)
- throws MalformedURLException {
+ String view){
this.enableLogging(logger);
this.environment = env;
1.27 +3 -3
cocoon-2.2/src/java/org/apache/cocoon/components/cprocessor/TreeProcessor.java
Index: TreeProcessor.java
===================================================================
RCS file:
/home/cvs/cocoon-2.2/src/java/org/apache/cocoon/components/cprocessor/TreeProcessor.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- TreeProcessor.java 18 Mar 2004 15:15:10 -0000 1.26
+++ TreeProcessor.java 19 Mar 2004 11:10:07 -0000 1.27
@@ -390,7 +390,7 @@
environment = facade.getDelegate();
}
- Environment newEnv = new ForwardEnvironmentWrapper(environment,
m_manager, uri, getLogger());
+ Environment newEnv = new ForwardEnvironmentWrapper(environment, uri,
getLogger());
((ForwardEnvironmentWrapper)newEnv).setInternalRedirect(true);
if (facade != null) {
@@ -556,8 +556,8 @@
private static final class ForwardEnvironmentWrapper extends
EnvironmentWrapper {
public ForwardEnvironmentWrapper(Environment env,
- ServiceManager manager, String uri, Logger logger) throws
MalformedURLException {
- super(env, manager, uri, logger);
+ String uri, Logger logger) throws MalformedURLException {
+ super(env, uri, logger);
}
public void setStatus(int statusCode) {
