cvs commit: jahia/core/src/java/org/jahia/engines/importexport ManageContentPicker.java

[Khue Nguyen]

knguyen     2005/10/11 16:21:07 CEST

  Modified files:
    core/src/java/org/jahia/engines/importexport 
                                                 ManageContentPicker.java 
  Log:
  - take care to retrieve ContentField child only  ( not ContentContainerList 
child ) from ContentContainer.getChilds(...)
  
  Revision  Changes    Path
  1.36      +21 -2     
jahia/core/src/java/org/jahia/engines/importexport/ManageContentPicker.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/engines/importexport/ManageContentPicker.java.diff?r1=1.35&r2=1.36&f=h
  
  
  
  Index: ManageContentPicker.java
  ===================================================================
  RCS file: 
/home/cvs/repository/jahia/core/src/java/org/jahia/engines/importexport/ManageContentPicker.java,v
  retrieving revision 1.35
  retrieving revision 1.36
  diff -u -r1.35 -r1.36
  --- ManageContentPicker.java  10 Oct 2005 15:34:00 -0000      1.35
  +++ ManageContentPicker.java  11 Oct 2005 14:21:07 -0000      1.36
  @@ -35,7 +35,7 @@
    *
    * @author Thomas Draier, joe Pillot
    * @author ${User}
  - * @version $Id: ManageContentPicker.java,v 1.35 2005/10/10 15:34:00 tdraier 
Exp $
  + * @version $Id: ManageContentPicker.java,v 1.36 2005/10/11 14:21:07 knguyen 
Exp $
    */
   public class ManageContentPicker {
       private static org.apache.log4j.Logger logger =
  @@ -311,7 +311,7 @@
                               int pageID = contentContainer.getPageID();
                               logger.debug("found compatible?" + key);
                               String t = key;
  -                            List l = contentContainer.getChilds(null, lr, 
null);
  +                            List l =  
getChildFieldsOnly(contentContainer.getChilds(null, lr, null));
   
                               for (Iterator iterator1 = l.iterator(); 
iterator1.hasNext();) {
                                   ContentField contentField = (ContentField) 
iterator1.next();
  @@ -435,6 +435,22 @@
           }
       }
   
  +    private List getChildFieldsOnly(List childs){
  +        List results = new ArrayList();
  +        if ( childs == null || childs.isEmpty() ){
  +            return results;
  +        }
  +        Iterator iterator = childs.iterator();
  +        ContentObject contentObject = null;
  +        while (iterator.hasNext()){
  +            contentObject = (ContentObject)iterator.next();
  +            if ( contentObject instanceof ContentField ){
  +                results.add(contentObject);
  +            }
  +        }
  +        return results;
  +    }
  +
       /**
        * @param fields
        * @param container
  @@ -536,6 +552,9 @@
   }
   /**
    * $Log: ManageContentPicker.java,v $
  + * Revision 1.36  2005/10/11 14:21:07  knguyen
  + * - take care to retrieve ContentField child only  ( not 
ContentContainerList child ) from ContentContainer.getChilds(...)
  + *
    * Revision 1.35  2005/10/10 15:34:00  tdraier
    * fixed empty teaser
    *