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 2006/12/09 19:14:13 UTC
svn commit: r485021 - in
/cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon:
environment/ environment/background/ transformation/
transformation/helpers/ transformation/pagination/
Author: cziegeler
Date: Sat Dec 9 10:14:12 2006
New Revision: 485021
URL: http://svn.apache.org/viewvc?view=rev&rev=485021
Log:
Code cleanup
Modified:
cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/environment/ForwardRedirector.java
cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/environment/background/BackgroundRequest.java
cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/transformation/AbstractDOMTransformer.java
cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/transformation/AbstractSAXTransformer.java
cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/transformation/AbstractTransformer.java
cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/transformation/ServiceableTransformer.java
cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/transformation/helpers/ParametersRecorder.java
cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/transformation/pagination/ItemGroup.java
Modified: cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/environment/ForwardRedirector.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/environment/ForwardRedirector.java?view=diff&rev=485021&r1=485020&r2=485021
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/environment/ForwardRedirector.java (original)
+++ cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/environment/ForwardRedirector.java Sat Dec 9 10:14:12 2006
@@ -149,9 +149,10 @@
if (getLogger().isDebugEnabled()) {
getLogger().debug("redirect session mode: unable to get session object!");
}
- }
- if (getLogger().isDebugEnabled()) {
- getLogger().debug ("redirect: session mode completed, id = " + session.getId() );
+ } else {
+ if (getLogger().isDebugEnabled()) {
+ getLogger().debug ("redirect: session mode completed, id = " + session.getId() );
+ }
}
}
// redirect
Modified: cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/environment/background/BackgroundRequest.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/environment/background/BackgroundRequest.java?view=diff&rev=485021&r1=485020&r2=485021
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/environment/background/BackgroundRequest.java (original)
+++ cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/environment/background/BackgroundRequest.java Sat Dec 9 10:14:12 2006
@@ -45,7 +45,10 @@
*/
public class BackgroundRequest extends AbstractRequest {
- private class EmptyEnumeration implements Enumeration {
+ private static final class EmptyEnumeration implements Enumeration {
+ public EmptyEnumeration() {
+ // nothing to do};
+ }
public boolean hasMoreElements() {
return false;
}
@@ -54,6 +57,8 @@
}
}
+ private static final EmptyEnumeration SHARED_EMPTY_ENUMERATION = new EmptyEnumeration();
+
private Environment env;
private String contextPath;
private String servletPath;
@@ -267,14 +272,14 @@
public Enumeration getHeaders(String name) {
// FIXME
- return new EmptyEnumeration();
+ return SHARED_EMPTY_ENUMERATION;
}
public Enumeration getHeaderNames() {
if (headers != null) {
return IteratorUtils.asEnumeration(headers.keySet().iterator());
}
- return new EmptyEnumeration();
+ return SHARED_EMPTY_ENUMERATION;
}
public String getCharacterEncoding() { return characterEncoding; }
Modified: cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/transformation/AbstractDOMTransformer.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/transformation/AbstractDOMTransformer.java?view=diff&rev=485021&r1=485020&r2=485021
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/transformation/AbstractDOMTransformer.java (original)
+++ cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/transformation/AbstractDOMTransformer.java Sat Dec 9 10:14:12 2006
@@ -80,15 +80,14 @@
public AbstractDOMTransformer() {
- super();
this.builder = new DOMBuilder(this);
}
- /* (non-Javadoc)
+ /**
* @see org.apache.avalon.framework.service.Serviceable#service(org.apache.avalon.framework.service.ServiceManager)
*/
- public void service(ServiceManager manager) throws ServiceException {
- this.manager = manager;
+ public void service(ServiceManager aManager) throws ServiceException {
+ this.manager = aManager;
}
/**
Modified: cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/transformation/AbstractSAXTransformer.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/transformation/AbstractSAXTransformer.java?view=diff&rev=485021&r1=485020&r2=485021
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/transformation/AbstractSAXTransformer.java (original)
+++ cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/transformation/AbstractSAXTransformer.java Sat Dec 9 10:14:12 2006
@@ -238,8 +238,8 @@
/**
* @see org.apache.avalon.framework.service.Serviceable#service(ServiceManager)
*/
- public void service(ServiceManager manager) throws ServiceException {
- this.manager = manager;
+ public void service(ServiceManager aManager) throws ServiceException {
+ this.manager = aManager;
}
/**
@@ -766,38 +766,38 @@
* End recording of parameters
* If source is null a new parameters object is created, otherwise
* the parameters are added to this object.
- * @param source An optional parameters object.
+ * @param additionalParameters An optional parameters object.
* @return The object containing all parameters.
*/
- public SourceParameters endParametersRecording(Parameters source)
+ public SourceParameters endParametersRecording(Parameters additionalParameters)
throws SAXException {
sendEndPrefixMapping();
- ParametersRecorder recorder = (ParametersRecorder) this.removeRecorder();
- SourceParameters parameters = recorder.getParameters(source);
+ final ParametersRecorder recorder = (ParametersRecorder) this.removeRecorder();
+ final SourceParameters sourceParameters = recorder.getParameters(additionalParameters);
if (getLogger().isDebugEnabled()) {
- getLogger().debug("End parameters recording. Parameters=" + parameters);
+ getLogger().debug("End parameters recording. Parameters=" + sourceParameters);
}
- return parameters;
+ return sourceParameters;
}
/**
* End recording of parameters
* If source is null a new parameters object is created, otherwise
* the parameters are added to this object.
- * @param source An optional parameters object.
+ * @param additionalParameters An optional parameters object.
* @return The object containing all parameters.
*/
- public SourceParameters endParametersRecording(SourceParameters source)
+ public SourceParameters endParametersRecording(SourceParameters additionalParameters)
throws SAXException {
sendEndPrefixMapping();
- ParametersRecorder recorder = (ParametersRecorder) removeRecorder();
- SourceParameters parameters = recorder.getParameters(source);
+ final ParametersRecorder recorder = (ParametersRecorder) removeRecorder();
+ final SourceParameters sourceParameters = recorder.getParameters(additionalParameters);
if (getLogger().isDebugEnabled()) {
- getLogger().debug("End parameters recording. Parameters=" + parameters);
+ getLogger().debug("End parameters recording. Parameters=" + sourceParameters);
}
- return parameters;
+ return sourceParameters;
}
/**
Modified: cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/transformation/AbstractTransformer.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/transformation/AbstractTransformer.java?view=diff&rev=485021&r1=485020&r2=485021
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/transformation/AbstractTransformer.java (original)
+++ cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/transformation/AbstractTransformer.java Sat Dec 9 10:14:12 2006
@@ -23,4 +23,6 @@
* @version $Id$
*/
-public abstract class AbstractTransformer extends AbstractXMLPipe implements Transformer {}
+public abstract class AbstractTransformer extends AbstractXMLPipe implements Transformer {
+ // nothing do add here
+}
Modified: cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/transformation/ServiceableTransformer.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/transformation/ServiceableTransformer.java?view=diff&rev=485021&r1=485020&r2=485021
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/transformation/ServiceableTransformer.java (original)
+++ cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/transformation/ServiceableTransformer.java Sat Dec 9 10:14:12 2006
@@ -76,8 +76,8 @@
/* (non-Javadoc)
* @see org.apache.avalon.framework.service.Serviceable#service(org.apache.avalon.framework.service.ServiceManager)
*/
- public void service(ServiceManager manager) throws ServiceException {
- this.manager = manager;
+ public void service(ServiceManager aManager) throws ServiceException {
+ this.manager = aManager;
}
/* (non-Javadoc)
Modified: cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/transformation/helpers/ParametersRecorder.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/transformation/helpers/ParametersRecorder.java?view=diff&rev=485021&r1=485020&r2=485021
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/transformation/helpers/ParametersRecorder.java (original)
+++ cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/transformation/helpers/ParametersRecorder.java Sat Dec 9 10:14:12 2006
@@ -51,15 +51,9 @@
public SourceParameters getParameters(Parameters source) {
if (source != null) {
String[] names = source.getNames();
-// Iterator names = source.getParameterNames();
- if (names != null) {
- String currentParameterName;
- for(int i=0; i<names.length; i++) {
- currentParameterName = names[i];
-// while (names.hasNext() == true) {
-// currentParameterName = (String)names.next();
- this.parameters.setParameter(currentParameterName, source.getParameter(currentParameterName, ""));
- }
+ for(int i=0; i<names.length; i++) {
+ final String currentParameterName = names[i];
+ this.parameters.setParameter(currentParameterName, source.getParameter(currentParameterName, ""));
}
}
return parameters;
Modified: cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/transformation/pagination/ItemGroup.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/transformation/pagination/ItemGroup.java?view=diff&rev=485021&r1=485020&r2=485021
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/transformation/pagination/ItemGroup.java (original)
+++ cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/transformation/pagination/ItemGroup.java Sat Dec 9 10:14:12 2006
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.cocoon.transformation.pagination;
/**
@@ -23,17 +22,17 @@
* @version $Id$
*/
public class ItemGroup {
-
+
private String name;
private String elementName;
private String elementURI;
-
+
public ItemGroup (String name, String elementURI, String elementName) {
this.name = name;
this.elementURI = elementURI;
this.elementName = elementName;
}
-
+
public boolean match(String elementName, String elementURI) {
return (this.elementName.equals(elementName) && this.elementURI.equals(elementURI));
}
@@ -49,7 +48,7 @@
public String getElementURI() {
return this.elementURI;
}
-
+
public String getElementName() {
return this.elementName;
}