cvs commit: jahia/core/src/java/org/jahia/hibernate/dao JahiaContainerDefinitionDAO.java jahia/core/src/java/org/jahia/hibernate/manager JahiaContainerDefinitionManager.java

[Cedric Mailleux]

cmailleux    2005/07/13 17:39:40 CEST

  Modified files:
    core/src/java/org/jahia/hibernate/dao 
                                          JahiaContainerDefinitionDAO.java 
    core/src/java/org/jahia/hibernate/manager 
                                              
JahiaContainerDefinitionManager.java 
  Log:
  Adda method to load jahiacontainer definition from a template id
  
  Revision  Changes    Path
  1.4       +16 -3     
jahia/core/src/java/org/jahia/hibernate/dao/JahiaContainerDefinitionDAO.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/hibernate/dao/JahiaContainerDefinitionDAO.java.diff?r1=1.3&r2=1.4&f=h
  1.4       +11 -0     
jahia/core/src/java/org/jahia/hibernate/manager/JahiaContainerDefinitionManager.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/hibernate/manager/JahiaContainerDefinitionManager.java.diff?r1=1.3&r2=1.4&f=h
  
  
  
  Index: JahiaContainerDefinitionDAO.java
  ===================================================================
  RCS file: 
/home/cvs/repository/jahia/core/src/java/org/jahia/hibernate/dao/JahiaContainerDefinitionDAO.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- JahiaContainerDefinitionDAO.java  12 Jul 2005 13:52:52 -0000      1.3
  +++ JahiaContainerDefinitionDAO.java  13 Jul 2005 15:39:40 -0000      1.4
  @@ -3,12 +3,9 @@
    */
   package org.jahia.hibernate.dao;
   
  -import org.hibernate.type.Type;
  -import org.hibernate.type.TypeFactory;
   import org.jahia.hibernate.model.*;
   import org.springframework.orm.hibernate3.HibernateTemplate;
   import org.springframework.orm.hibernate3.support.HibernateDaoSupport;
  -import org.springframework.dao.DataAccessException;
   
   import java.util.Iterator;
   import java.util.List;
  @@ -166,5 +163,21 @@
               }
           }
       }
  +
  +    public List fullyLoadContainerDefinitionInTemplate(Integer templateId) {
  +        final HibernateTemplate template = getHibernateTemplate();
  +            template.setCacheQueries(true);
  +        StringBuffer hql = new StringBuffer("from JahiaCtnDef def ");
  +        hql.append("where def.subDefinitions.pageDefinitionId=? ");
  +        List retList = null;
  +        if (templateId != null) {
  +            retList = template.find(hql.toString(), new 
Object[]{templateId});
  +            for (int i = 0; i < retList.size(); i++) {
  +                JahiaCtnDef jahiaCtnDef = (JahiaCtnDef) retList.get(i);
  +                fullyloadSubComponent(jahiaCtnDef, template);
  +            }
  +        }
  +        return retList;
  +    }
   }
   
  
  
  
  Index: JahiaContainerDefinitionManager.java
  ===================================================================
  RCS file: 
/home/cvs/repository/jahia/core/src/java/org/jahia/hibernate/manager/JahiaContainerDefinitionManager.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- JahiaContainerDefinitionManager.java      12 Jul 2005 13:52:54 -0000      
1.3
  +++ JahiaContainerDefinitionManager.java      13 Jul 2005 15:39:40 -0000      
1.4
  @@ -4,6 +4,7 @@
   package org.jahia.hibernate.manager;
   
   import org.apache.commons.collections.FastHashMap;
  +import org.apache.commons.collections.FastArrayList;
   import org.apache.commons.logging.Log;
   import org.apache.commons.logging.LogFactory;
   import org.jahia.data.containers.JahiaContainerDefinition;
  @@ -93,6 +94,16 @@
           return convertToJahiaContainerDefinition(ctnDef);  //To change body 
of created methods use File | Settings | File Templates.
       }
   
  +    public List loadContainerDefinitionInTemplate(int definitionId) {
  +        List list = dao.fullyLoadContainerDefinitionInTemplate(new 
Integer(definitionId));
  +        List retList = new FastArrayList(list.size());
  +        for (int i = 0; i < list.size(); i++) {
  +            JahiaCtnDef jahiaCtnDef = (JahiaCtnDef) list.get(i);
  +            retList.add(convertToJahiaContainerDefinition(jahiaCtnDef));
  +        }
  +        return retList;
  +    }
  +
       public void updateContainerDefinition(JahiaContainerDefinition 
theDefinition) {
           log.debug("update container definition "+theDefinition.getName()+" 
with id "+theDefinition.getID());
           JahiaCtnDef ctnDef = new JahiaCtnDef();