cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject cvs commit: cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/layout AbstractLayout.java AbstractParameters.java
Date Thu, 22 May 2003 06:55:16 GMT
cziegeler    2003/05/21 23:55:16

  Modified:    src/blocks/portal/java/org/apache/cocoon/portal/layout
                        AbstractLayout.java AbstractParameters.java
  Log:
  Removing dependency
  
  Revision  Changes    Path
  1.8       +17 -3     cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/layout/AbstractLayout.java
  
  Index: AbstractLayout.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/layout/AbstractLayout.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- AbstractLayout.java	21 May 2003 13:06:04 -0000	1.7
  +++ AbstractLayout.java	22 May 2003 06:55:15 -0000	1.8
  @@ -50,6 +50,11 @@
   */
   package org.apache.cocoon.portal.layout;
   
  +import java.util.Map;
  +
  +import org.apache.cocoon.portal.factory.impl.AbstractProducible;
  +import org.apache.commons.collections.SequencedHashMap;
  +
   
   
   /**
  @@ -60,8 +65,8 @@
    * @version CVS $Id$
    */
   public abstract class AbstractLayout 
  -    extends AbstractParameters 
  -    implements Layout {
  +    extends AbstractProducible 
  +    implements Layout, Parameters {
       
       protected String rendererName;
       
  @@ -69,6 +74,15 @@
       
       protected boolean _static;
       
  +    protected Map parameters = new SequencedHashMap();
  +     
  +    /* (non-Javadoc)
  +     * @see org.apache.cocoon.portal.layout.Parameters#getParameters()
  +     */
  +    public final Map getParameters() {
  +        return parameters;
  +    }
  +
       /**
        * @see org.apache.cocoon.portal.layout.Layout#getRendererName()
        */
  
  
  
  1.3       +1 -3      cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/layout/AbstractParameters.java
  
  Index: AbstractParameters.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/layout/AbstractParameters.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- AbstractParameters.java	20 May 2003 14:06:43 -0000	1.2
  +++ AbstractParameters.java	22 May 2003 06:55:15 -0000	1.3
  @@ -52,7 +52,6 @@
   
   import java.util.Map;
   
  -import org.apache.cocoon.portal.factory.impl.AbstractProducible;
   import org.apache.commons.collections.SequencedHashMap;
   
   /**
  @@ -63,7 +62,6 @@
    * @version CVS $Id$
    */
   public abstract class AbstractParameters 
  -    extends AbstractProducible
       implements Parameters {
   
       protected Map parameters = new SequencedHashMap();
  
  
  

Mime
View raw message