cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject svn commit: r314865 - in /cocoon/blocks/portal/trunk/java/org/apache/cocoon: components/modules/input/ components/variables/ environment/portlet/ portal/layout/renderer/aspect/impl/
Date Wed, 12 Oct 2005 12:45:08 GMT
Author: cziegeler
Date: Wed Oct 12 05:44:59 2005
New Revision: 314865

URL: http://svn.apache.org/viewcvs?rev=314865&view=rev
Log:
Fix possible ClassCastException in DefaultVariableResolverFactory
Code formatting

Modified:
    cocoon/blocks/portal/trunk/java/org/apache/cocoon/components/modules/input/PortletURLModule.java
    cocoon/blocks/portal/trunk/java/org/apache/cocoon/components/variables/DefaultVariableResolverFactory.java
    cocoon/blocks/portal/trunk/java/org/apache/cocoon/components/variables/NOPVariableResolver.java
    cocoon/blocks/portal/trunk/java/org/apache/cocoon/components/variables/PreparedVariableResolver.java
    cocoon/blocks/portal/trunk/java/org/apache/cocoon/components/variables/VariableResolver.java
    cocoon/blocks/portal/trunk/java/org/apache/cocoon/components/variables/VariableResolverFactory.java
    cocoon/blocks/portal/trunk/java/org/apache/cocoon/environment/portlet/ActionRequest.java
    cocoon/blocks/portal/trunk/java/org/apache/cocoon/environment/portlet/ActionResponse.java
    cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/XSLTAspect.java

Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/components/modules/input/PortletURLModule.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/components/modules/input/PortletURLModule.java?rev=314865&r1=314864&r2=314865&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/components/modules/input/PortletURLModule.java
(original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/components/modules/input/PortletURLModule.java
Wed Oct 12 05:44:59 2005
@@ -1,12 +1,12 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
+ * Copyright 1999-2005 The Apache Software Foundation.
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -49,7 +49,7 @@
  * <code>portlet:render:</code>, <code>portlet:resource:</code>)
are omitted.
  *
  * @author <a href="mailto:vgritsenko@apache.org">Vadim Gritsenko</a>
- * @version CVS $Id$
+ * @version $Id$
  */
 public class PortletURLModule extends AbstractInputModule implements ThreadSafe {
 
@@ -71,10 +71,16 @@
         returnNames = tmp;
     }
 
+    /**
+     * @see org.apache.cocoon.components.modules.input.InputModule#getAttributeNames(org.apache.avalon.framework.configuration.Configuration,
java.util.Map)
+     */
     public Iterator getAttributeNames(Configuration modeConf, Map objectModel) throws ConfigurationException
{
         return PortletURLModule.returnNames.iterator();
     }
 
+    /**
+     * @see org.apache.cocoon.components.modules.input.InputModule#getAttribute(java.lang.String,
org.apache.avalon.framework.configuration.Configuration, java.util.Map)
+     */
     public Object getAttribute(String name, Configuration modeConf, Map objectModel) throws
ConfigurationException {
         if (name == null) {
             throw new NullPointerException("Attribute name is null");
@@ -136,6 +142,9 @@
         }
     }
 
+    /**
+     * @see org.apache.cocoon.components.modules.input.InputModule#getAttributeValues(java.lang.String,
org.apache.avalon.framework.configuration.Configuration, java.util.Map)
+     */
     public Object[] getAttributeValues(String name, Configuration modeConf, Map objectModel)
throws ConfigurationException {
         Object result = getAttribute(name, modeConf, objectModel);
         if (result != null) {

Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/components/variables/DefaultVariableResolverFactory.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/components/variables/DefaultVariableResolverFactory.java?rev=314865&r1=314864&r2=314865&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/components/variables/DefaultVariableResolverFactory.java
(original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/components/variables/DefaultVariableResolverFactory.java
Wed Oct 12 05:44:59 2005
@@ -1,12 +1,12 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
+ * Copyright 1999-2005 The Apache Software Foundation.
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -15,7 +15,7 @@
  */
 package org.apache.cocoon.components.variables;
 
-import org.apache.avalon.framework.activity.Disposable;
+import org.apache.avalon.framework.container.ContainerUtil;
 import org.apache.avalon.framework.context.Context;
 import org.apache.avalon.framework.context.ContextException;
 import org.apache.avalon.framework.context.Contextualizable;
@@ -34,16 +34,16 @@
  *
  * @author <a href="mailto:cziegeler@apache.org">Carsten Ziegeler</a>
  *
- * @version CVS $Id$
+ * @version $Id$
  */
 public class DefaultVariableResolverFactory 
     extends AbstractLogEnabled
     implements ThreadSafe, VariableResolverFactory, Serviceable, Contextualizable {
-    
+
     protected ServiceManager manager;
     protected Context        context;
-    
-    /* (non-Javadoc)
+
+    /**
      * @see org.apache.avalon.framework.service.Serviceable#service(org.apache.avalon.framework.service.ServiceManager)
      */
     public void service(ServiceManager manager) throws ServiceException {
@@ -63,12 +63,13 @@
         return new NOPVariableResolver( expression );
     }
 
+    /**
+     * @see org.apache.cocoon.components.variables.VariableResolverFactory#release(org.apache.cocoon.components.variables.VariableResolver)
+     */
     public void release(VariableResolver resolver) {
-        if ( resolver != null ) {
-            ((Disposable)resolver).dispose();
-        }
+        ContainerUtil.dispose(resolver);
     }
-    
+
     /**
      * Does an expression need resolving (i.e. contain {...} patterns) ?
      */
@@ -100,13 +101,12 @@
         return false;
     }
 
-    /* (non-Javadoc)
+    /**
      * @see org.apache.avalon.framework.context.Contextualizable#contextualize(org.apache.avalon.framework.context.Context)
      */
     public void contextualize(Context context) throws ContextException {
         this.context = context;
     }
-
 }
 
 

Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/components/variables/NOPVariableResolver.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/components/variables/NOPVariableResolver.java?rev=314865&r1=314864&r2=314865&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/components/variables/NOPVariableResolver.java
(original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/components/variables/NOPVariableResolver.java
Wed Oct 12 05:44:59 2005
@@ -1,12 +1,12 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
+ * Copyright 1999-2006 The Apache Software Foundation.
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -21,8 +21,8 @@
  * No-op implementation of {@link VariableResolver} for constant expressions
  *
  * @author <a href="mailto:cziegeler@apache.org">Carsten Ziegeler</a>
- * 
- * @version CVS $Id$
+ *
+ * @version $Id$
  */
 public class NOPVariableResolver 
     implements VariableResolver {
@@ -57,11 +57,10 @@
         return buf.toString();
     }
 
-    /* (non-Javadoc)
+    /**
      * @see org.apache.cocoon.components.variables.VariableResolver#resolve()
      */
     public String resolve() throws PatternException {
         return this.expression;
     }
-
 }

Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/components/variables/PreparedVariableResolver.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/components/variables/PreparedVariableResolver.java?rev=314865&r1=314864&r2=314865&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/components/variables/PreparedVariableResolver.java
(original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/components/variables/PreparedVariableResolver.java
Wed Oct 12 05:44:59 2005
@@ -1,12 +1,12 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
+ * Copyright 1999-2005 The Apache Software Foundation.
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -35,16 +35,16 @@
  * @author <a href="mailto:sylvain@apache.org">Sylvain Wallez</a>
  * @author <a href="mailto:tcurdt@apache.org">Torsten Curdt</a>
  * @author <a href="mailto:cziegeler@apache.org">Carsten Ziegeler</a>
- * @version CVS $Id$
+ * @version $Id$
  */
 public class PreparedVariableResolver 
     extends NOPVariableResolver
     implements Disposable {
-    
+
     protected ServiceManager  manager;
     protected ServiceSelector selector;
     protected Context           context;
-        
+
     protected List items = new ArrayList();
 
     // Special constants used for levels
@@ -55,15 +55,14 @@
     private static final Integer LITERAL_OBJ = new Integer(LITERAL);
     private static final Integer THREADSAFE_MODULE_OBJ = new Integer(THREADSAFE_MODULE);
     private static final Integer STATEFUL_MODULE_OBJ = new Integer(STATEFUL_MODULE);
-    
+
     public PreparedVariableResolver(String expr, ServiceManager manager, Context context)

     throws PatternException {
-        
         super(null);
         this.expression = expr;
         this.manager = manager;
         this.context = context;
-                
+
         int length = expr.length();
         int prev = 0; // position after last closing brace
 
@@ -99,7 +98,7 @@
 
             int colon = expr.indexOf(':', pos);
             if (colon != -1 && colon < end) {
-                    
+
                 String module = expr.substring(pos, colon);
                 String variable = expr.substring(colon + 1, end);
 
@@ -112,12 +111,11 @@
             prev = end + 1;
         }
     }
-    
+
     protected void addLiteral(String litteral) {
         this.items.add(LITERAL_OBJ);
         this.items.add(litteral);
     }
-    
 
     protected void addModuleVariable(String moduleName, String variable) throws PatternException
{
         if (this.selector == null) {
@@ -128,7 +126,7 @@
                 throw new PatternException("Cannot access input modules selector", ce);
             }
         }
-        
+
         // Get the module
         InputModule module;
         try {
@@ -137,7 +135,7 @@
             throw new PatternException("Cannot get InputModule named '" + moduleName +
                 "' in expression '" + this.expression + "'", ce);
         }
-        
+
         // Is this module threadsafe ?
         if (module instanceof ThreadSafe) {
             this.items.add(THREADSAFE_MODULE_OBJ);
@@ -151,15 +149,17 @@
             this.items.add(variable);
         }
     }
-    
+
+    /**
+     * @see org.apache.cocoon.components.variables.VariableResolver#resolve()
+     */
     public String resolve() 
     throws PatternException {
-
         StringBuffer result = new StringBuffer();
-        
+
         for (int i = 0; i < this.items.size(); i++) {
             int type = ((Integer)this.items.get(i)).intValue();
-            
+
             switch(type) {
                 case LITERAL :
                     result.append(items.get(++i));
@@ -169,7 +169,7 @@
                 {
                     InputModule module = (InputModule)items.get(++i);
                     String variable = (String)items.get(++i);
-                    
+
                     try {                    
                         Object value = module.getAttribute(variable, null, ContextHelper.getObjectModel(this.context));
                         
@@ -183,7 +183,7 @@
                     }
                 }
                 break;
-                
+
                 case STATEFUL_MODULE :
                 {
                     InputModule module = null;
@@ -191,9 +191,9 @@
                     String variableName = (String)items.get(++i);
                     try {
                         module = (InputModule)this.selector.select(moduleName);
-                        
+
                         Object value = module.getAttribute(variableName, null, ContextHelper.getObjectModel(this.context));
-                        
+
                         if (value != null) {
                             result.append(value);
                         }
@@ -213,12 +213,10 @@
                 break;
             }
         }
-        
         return result.toString();
-        
     }
-    
-    /* (non-Javadoc)
+
+    /**
      * @see org.apache.avalon.framework.activity.Disposable#dispose()
      */
     public void dispose() {

Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/components/variables/VariableResolver.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/components/variables/VariableResolver.java?rev=314865&r1=314864&r2=314865&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/components/variables/VariableResolver.java
(original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/components/variables/VariableResolver.java
Wed Oct 12 05:44:59 2005
@@ -1,12 +1,12 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
+ * Copyright 1999-2005 The Apache Software Foundation.
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -22,10 +22,10 @@
  *
  * NOTE: This interface is work in progress, so chances are that it will
  * change.
- * 
+ *
  * @author <a href="mailto:cziegeler@apache.org">Carsten Ziegeler</a>
  *
- * @version CVS $Id: VariableResolver.java,v 1.2 2004/03/05 13:02:07 bdelacretaz Exp $
+ * @version $Id$
  */
 public interface VariableResolver {
 

Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/components/variables/VariableResolverFactory.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/components/variables/VariableResolverFactory.java?rev=314865&r1=314864&r2=314865&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/components/variables/VariableResolverFactory.java
(original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/components/variables/VariableResolverFactory.java
Wed Oct 12 05:44:59 2005
@@ -1,12 +1,12 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
+ * Copyright 1999-2005 The Apache Software Foundation.
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -28,12 +28,12 @@
  *
  * @author <a href="mailto:cziegeler@apache.org">Carsten Ziegeler</a>
  *
- * @version CVS $Id: VariableResolverFactory.java,v 1.2 2004/03/05 13:02:07 bdelacretaz Exp
$
+ * @version $Id$
  */
 public interface VariableResolverFactory {
-    
+
     String ROLE = VariableResolverFactory.class.getName();
-    
+
     /**
      * Get a resolver for a given expression. Chooses the most efficient implementation
      * depending on <code>expression</code>.

Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/environment/portlet/ActionRequest.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/environment/portlet/ActionRequest.java?rev=314865&r1=314864&r2=314865&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/environment/portlet/ActionRequest.java
(original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/environment/portlet/ActionRequest.java
Wed Oct 12 05:44:59 2005
@@ -1,5 +1,5 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
+ * Copyright 1999-2005 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,7 +23,7 @@
  * Implements the {@link org.apache.cocoon.environment.Request} interface for the
  * JSR-168 (Portlet) environment.
  *
- * @version CVS $Id$
+ * @version $Id$
  * @author <a href="mailto:alex.rudnev@dc.gov">Alex Rudnev</a>
  * @author <a href="mailto:vadim.gritsenko@dc.gov">Vadim Gritsenko</a>
  */
@@ -41,6 +41,9 @@
 
     // Request API methods
 
+    /**
+     * @see org.apache.cocoon.environment.Request#getCharacterEncoding()
+     */
     public String getCharacterEncoding() {
         if (super.getCharacterEncoding() == null) {
             return getActionRequest().getCharacterEncoding();
@@ -55,7 +58,6 @@
         return "POST";
     }
 
-
     // ActionRequest API methods
 
     /**
@@ -67,6 +69,9 @@
         return (javax.portlet.ActionRequest) getPortletRequest();
     }
 
+    /**
+     * @see org.apache.cocoon.environment.Request#getInputStream()
+     */
     public InputStream getInputStream() throws IOException {
         return getActionRequest().getPortletInputStream();
     }

Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/environment/portlet/ActionResponse.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/environment/portlet/ActionResponse.java?rev=314865&r1=314864&r2=314865&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/environment/portlet/ActionResponse.java
(original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/environment/portlet/ActionResponse.java
Wed Oct 12 05:44:59 2005
@@ -1,6 +1,6 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
+ * Copyright 1999-2005 The Apache Software Foundation.
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at

Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/XSLTAspect.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/XSLTAspect.java?rev=314865&r1=314864&r2=314865&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/XSLTAspect.java
(original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/XSLTAspect.java
Wed Oct 12 05:44:59 2005
@@ -1,12 +1,12 @@
 /*
- * Copyright 1999-2002,2004 The Apache Software Foundation.
- * 
+ * Copyright 1999-2002,2004-2005 The Apache Software Foundation.
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -53,13 +53,12 @@
  * Apply a XSLT stylesheet to the contained layout. All following renderer aspects
  * are applied first before the XML is fed into the XSLT. All configuration and layout
  * parameters are made available to the stylesheet.
- * 
+ *
  * <h2>Example XML:</h2>
  * <pre>
  *  &lt;-- result from output of following renderers transformed by stylesheet --&gt;
  * </pre>
  *
- *
  * The parameter values may contain Strings and/or references to input modules which will
be resolved each
  * time the aspect is rendered.
  * <h2>Applicable to:</h2>
@@ -85,8 +84,8 @@
  *
  * @author <a href="mailto:cziegeler@s-und-n.de">Carsten Ziegeler</a>
  * @author <a href="mailto:volker.schmitt@basf-it-services.com">Volker Schmitt</a>
- * 
- * @version CVS $Id$
+ *
+ * @version $Id$
  */
 public class XSLTAspect 
     extends AbstractAspect
@@ -94,11 +93,11 @@
 
     protected List variables = new ArrayList();
 
-    protected Parameters parameters = null;
+    protected Parameters parameters;
 
     protected VariableResolverFactory variableFactory;
-    
-    /* (non-Javadoc)
+
+    /**
      * @see org.apache.avalon.framework.service.Serviceable#service(org.apache.avalon.framework.service.ServiceManager)
      */
     public void service(ServiceManager manager) throws ServiceException {
@@ -106,10 +105,9 @@
         this.variableFactory = (VariableResolverFactory) this.manager.lookup(VariableResolverFactory.ROLE);
     }
 
-
-    /* (non-Javadoc)
-    * @see org.apache.avalon.framework.configuration.Configurable#configure(org.apache.avalon.framework.configuration.Configuration)
-    */
+    /**
+     * @see org.apache.avalon.framework.configuration.Configurable#configure(org.apache.avalon.framework.configuration.Configuration)
+     */
     public void configure(Configuration config) throws ConfigurationException {
         Configuration parameterItems = config.getChild("parameters", false);
 
@@ -118,7 +116,7 @@
         }
     }
 
-    /* (non-Javadoc)
+    /**
 	 * @see org.apache.cocoon.portal.layout.renderer.RendererAspect#toSAX(org.apache.cocoon.portal.layout.renderer.RendererAspectContext,
org.apache.cocoon.portal.layout.Layout, org.apache.cocoon.portal.PortalService, org.xml.sax.ContentHandler)
 	 */
 	public void toSAX(RendererAspectContext context,
@@ -200,7 +198,6 @@
         }
     }
 
-
     protected static class PreparedConfiguration {
         public VariableResolver stylesheet;
         public String xsltRole;
@@ -212,8 +209,8 @@
             this.parameters = from.parameters;
         }
     }
-    
-    /* (non-Javadoc)
+
+    /**
      * @see org.apache.cocoon.portal.layout.renderer.aspect.RendererAspect#prepareConfiguration(org.apache.avalon.framework.parameters.Parameters)
      */
     public Object prepareConfiguration(Parameters configuration) 
@@ -243,7 +240,7 @@
         return pc;
     }
 
-    /* (non-Javadoc)
+    /**
      * @see org.apache.avalon.framework.activity.Disposable#dispose()
      */
     public void dispose() {



Mime
View raw message