cvs commit: jahia/core/src/java/org/jahia/engines/addcontainer AddContainer_Engine.java

[Cedric Mailleux]

cmailleux    2005/08/10 11:05:23 CEST

  Modified files:
    core/src/java/org/jahia/engines/addcontainer 
                                                 AddContainer_Engine.java 
  Log:
  Correct bugs in case the containerList doesn't exist yet
  
  Revision  Changes    Path
  1.16      +3 -9      
jahia/core/src/java/org/jahia/engines/addcontainer/AddContainer_Engine.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/engines/addcontainer/AddContainer_Engine.java.diff?r1=1.15&r2=1.16&f=h
  
  
  
  Index: AddContainer_Engine.java
  ===================================================================
  RCS file: 
/home/cvs/repository/jahia/core/src/java/org/jahia/engines/addcontainer/AddContainer_Engine.java,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- AddContainer_Engine.java  10 Aug 2005 08:26:59 -0000      1.15
  +++ AddContainer_Engine.java  10 Aug 2005 09:05:23 -0000      1.16
  @@ -36,17 +36,13 @@
   import org.jahia.engines.EngineToolBox;
   import org.jahia.engines.JahiaEngine;
   import org.jahia.engines.JahiaEngineTools;
  -import org.jahia.engines.timebasedpublishing.TimeBasedPublishingEngine;
  -import org.jahia.engines.workflow.ManageWorkflow;
  -import org.jahia.engines.validation.EngineValidationHelper;
  -import org.jahia.engines.validation.ValidationErrorSorter;
  -import org.jahia.engines.validation.ValidationError;
   import org.jahia.engines.categories.ManageCategories;
   import org.jahia.engines.importexport.ManageContentPicker;
   import org.jahia.engines.importexport.ManageImportExport;
   import org.jahia.engines.lock.LockEngine;
   import org.jahia.engines.metadata.Metadata_Engine;
   import org.jahia.engines.rights.ManageRights;
  +import org.jahia.engines.timebasedpublishing.TimeBasedPublishingEngine;
   import org.jahia.engines.validation.EngineValidationHelper;
   import org.jahia.engines.validation.ValidationError;
   import org.jahia.engines.validation.ValidationErrorSorter;
  @@ -63,7 +59,6 @@
   import org.jahia.services.lock.LockKey;
   import org.jahia.services.lock.LockService;
   import org.jahia.services.pages.JahiaPage;
  -import org.jahia.services.pages.ContentPage;
   import org.jahia.services.usermanager.JahiaUser;
   import org.jahia.services.version.EntryLoadRequest;
   import org.jahia.utils.LanguageCodeConverters;
  @@ -371,10 +366,9 @@
   //            }
           } else if (lastScreen.equals ("importexport")) {
               JahiaContainer theContainer = (JahiaContainer) 
engineMap.get("theContainer");
  +            JahiaContainerList list = ensureContainerList(theContainer, 
engineMap, jParams);
               ManageImportExport.getInstance ().handleActions (jParams, mode,
  -                    engineMap,  ServicesRegistry.getInstance().
  -                    getJahiaContainersService().
  -                    
loadContainerListInfo(theContainer.getListID()).getContentContainerList());
  +                    engineMap,  list.getContentContainerList());
           }
           
           return evh;