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

[Dominique Pillot]

dpillot     2005/11/23 18:33:27 CET

  Modified files:
    core/src/java/org/jahia/engines/importexport 
                                                 ManageContentPicker.java 
  Log:
  object type info for cp display
  
  Revision  Changes    Path
  1.52      +17 -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.51&r2=1.52&f=h
  
  
  
  Index: ManageContentPicker.java
  ===================================================================
  RCS file: 
/home/cvs/repository/jahia/core/src/java/org/jahia/engines/importexport/ManageContentPicker.java,v
  retrieving revision 1.51
  retrieving revision 1.52
  diff -u -r1.51 -r1.52
  --- ManageContentPicker.java  22 Nov 2005 15:30:28 -0000      1.51
  +++ ManageContentPicker.java  23 Nov 2005 17:33:26 -0000      1.52
  @@ -2,6 +2,7 @@
   
   import org.jahia.content.ContainerDefinitionKey;
   import org.jahia.content.ContentObject;
  +import org.jahia.content.ObjectKey;
   import org.jahia.data.containers.JahiaContainerDefinition;
   import org.jahia.data.search.JahiaContainerSearchHit;
   import org.jahia.data.search.JahiaSearchHit;
  @@ -41,7 +42,7 @@
    *
    * @author Thomas Draier, joe Pillot
    * @author ${User}
  - * @version $Id: ManageContentPicker.java,v 1.51 2005/11/22 15:30:28 tdraier 
Exp $
  + * @version $Id: ManageContentPicker.java,v 1.52 2005/11/23 17:33:26 dpillot 
Exp $
    */
   public class ManageContentPicker {
       private static org.apache.log4j.Logger logger =
  @@ -101,6 +102,17 @@
           //JahiaUser user = processingContext.getUser ();
           logger.debug("loading mode");
           engineMap.put("fieldsEditCallingEngineName", "contentpick_engine");
  +        // type of object
  +        ContainerDefinitionKey k = (ContainerDefinitionKey) 
object.getDefinitionKey(null);
  +        try {
  +            JahiaContainerDefinition def = (JahiaContainerDefinition) 
ContentObject.getInstance(k);
  +            engineMap.put("objecttype",def.getName());
  +        } catch (ClassNotFoundException e) {
  +            logger.debug(e);
  +        }
  +
  +
  +
           //engineMap.put("adminAccess", Boolean.TRUE);
   
           //check if we just need a sort on previous results
  @@ -535,7 +547,7 @@
               // destination object cdk & cdfn
               ContainerDefinitionKey cdk = (ContainerDefinitionKey) 
((ContentContainerList) object).getDefinitionKey(null);
               JahiaContainerDefinition thisJcd = (JahiaContainerDefinition) 
ContentObject.getInstance(cdk);
  -            logger.debug("destination cdk:" + cdk + " cdfn:" + thisJcd);
  +            logger.debug("destination cdk:" + cdk + " cdfn:" + 
thisJcd.getName());
   
   
               EntryLoadRequest lr = new 
EntryLoadRequest(EntryLoadRequest.ACTIVE_WORKFLOW_STATE, 0, 
processingContext.getLocaleList());
  @@ -849,6 +861,9 @@
   }
   /**
    * $Log: ManageContentPicker.java,v $
  + * Revision 1.52  2005/11/23 17:33:26  dpillot
  + * object type info for cp display
  + *
    * Revision 1.51  2005/11/22 15:30:28  tdraier
    * filter validated results, remove parents
    *