jford       2004/03/25 14:25:38

  Modified:    portal/src/java/org/apache/jetspeed/om/page/psml
                        PageImpl.java
  Added:       portal/src/java/org/apache/jetspeed/om/page/psml
                        PageLocalizedFieldImpl.java PageMetadataImpl.java
  Log:
  Added metadata to the page om
  
  Revision  Changes    Path
  1.5       +48 -1     
jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/om/page/psml/PageImpl.java
  
  Index: PageImpl.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/om/page/psml/PageImpl.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- PageImpl.java     8 Mar 2004 00:28:51 -0000       1.4
  +++ PageImpl.java     25 Mar 2004 22:25:38 -0000      1.5
  @@ -16,8 +16,12 @@
   
   package org.apache.jetspeed.om.page.psml;
   
  +import org.apache.jetspeed.om.common.GenericMetadata;
   import org.apache.jetspeed.om.page.Page;
   import org.apache.jetspeed.om.page.Fragment;
  +
  +import java.util.ArrayList;
  +import java.util.Collection;
   import java.util.Stack;
   import java.util.Iterator;
   
  @@ -29,6 +33,8 @@
       private Defaults defaults = new Defaults();
   
       private Fragment root = null;
  +    
  +    private Collection metadataFields = null;
   
       public PageImpl()
       {
  @@ -116,5 +122,46 @@
   
           return cloned;
       }
  +
  +     /* (non-Javadoc)
  +      * @see org.apache.jetspeed.om.page.Page#getMetadata()
  +      */
  +     public GenericMetadata getMetadata()
  +     {
  +             if(metadataFields == null)
  +        {
  +            metadataFields = new ArrayList();
  +        }
  +             
  +             GenericMetadata metadata = new PageMetadataImpl();
  +         metadata.setFields(metadataFields);
  +         return metadata;
  +     }
  +
  +     /* (non-Javadoc)
  +      * @see 
org.apache.jetspeed.om.page.Page#setMetadata(org.apache.jetspeed.om.common.GenericMetadata)
  +      */
  +     public void setMetadata(GenericMetadata metadata)
  +     {
  +        this.metadataFields = metadata.getFields();
  +     }
  +
  +     /**
  +      * This should only be used during castor marshalling 
  +      * @see org.apache.jetspeed.om.page.Page#getMetadataFields()
  +      */
  +     public Collection getMetadataFields()
  +     {
  +             return metadataFields;
  +     }
  +
  +     /**
  +      * This should only be used during castor unmarshalling 
  +      * @see 
org.apache.jetspeed.om.page.Page#setMetadataFields(java.util.Collection)
  +      */
  +     public void setMetadataFields(Collection metadataFields)
  +     {
  +             this.metadataFields = metadataFields;
  +     }
   }
   
  
  
  
  1.1                  
jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/om/page/psml/PageLocalizedFieldImpl.java
  
  Index: PageLocalizedFieldImpl.java
  ===================================================================
  /*
   * Copyright 2000-2004 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.
   * See the License for the specific language governing permissions and
   * limitations under the License.
   */
  package org.apache.jetspeed.om.page.psml;
  
  import org.apache.jetspeed.om.common.impl.LocalizedFieldImpl;
  
  /**
   * @author <a href="mailto:[EMAIL PROTECTED]">Jeremy Ford</a>
   * @version $Id: PageLocalizedFieldImpl.java,v 1.1 2004/03/25 22:25:38 jford Exp $
   */
  public class PageLocalizedFieldImpl extends LocalizedFieldImpl
  {
  
  }
  
  
  
  1.1                  
jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/om/page/psml/PageMetadataImpl.java
  
  Index: PageMetadataImpl.java
  ===================================================================
  /*
   * Copyright 2000-2004 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.
   * See the License for the specific language governing permissions and
   * limitations under the License.
   */
  package org.apache.jetspeed.om.page.psml;
  
  import org.apache.jetspeed.om.common.LocalizedField;
  import org.apache.jetspeed.om.common.impl.GenericMetadataImpl;
  
  /**
   * @author <a href="mailto:[EMAIL PROTECTED]">Jeremy Ford</a>
   * @version $Id: PageMetadataImpl.java,v 1.1 2004/03/25 22:25:38 jford Exp $
   */
  public class PageMetadataImpl extends GenericMetadataImpl
  {
  
      /* (non-Javadoc)
       * @see org.apache.jetspeed.om.common.GenericMetadata#createLocalizedField()
       */
      public LocalizedField createLocalizedField()
      {
          return new PageLocalizedFieldImpl();
      }
  
  }
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to