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

[Dominique Pillot]

dpillot     2005/10/20 18:55:54 CEST

  Modified files:
    core/src/java/org/jahia/engines/importexport 
                                                 ManageContentPicker.java 
  Log:
  internationalization & bug NFE fix
  
  Revision  Changes    Path
  1.42      +5 -1      
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.41&r2=1.42&f=h
  
  
  
  Index: ManageContentPicker.java
  ===================================================================
  RCS file: 
/home/cvs/repository/jahia/core/src/java/org/jahia/engines/importexport/ManageContentPicker.java,v
  retrieving revision 1.41
  retrieving revision 1.42
  diff -u -r1.41 -r1.42
  --- ManageContentPicker.java  20 Oct 2005 13:04:40 -0000      1.41
  +++ ManageContentPicker.java  20 Oct 2005 16:55:54 -0000      1.42
  @@ -34,7 +34,7 @@
    *
    * @author Thomas Draier, joe Pillot
    * @author ${User}
  - * @version $Id: ManageContentPicker.java,v 1.41 2005/10/20 13:04:40 tdraier 
Exp $
  + * @version $Id: ManageContentPicker.java,v 1.42 2005/10/20 16:55:54 dpillot 
Exp $
    */
   public class ManageContentPicker {
       private static org.apache.log4j.Logger logger =
  @@ -394,7 +394,11 @@
           //domain scope
           String scope = (String) processingContext.getParameter("searchSite");
           if (scope == null && siteService.getNbSites() > 1) scope = "all"; 
//default
  -        else if (siteService.getNbSites() == 1) scope = "" + ((JahiaSite) 
siteService.getSites().nextElement()).getID();
  +        else if (siteService.getNbSites() == 1) {
  +            int siteid= ((JahiaSite) 
siteService.getSites().nextElement()).getID();
  +            scope = "" + siteid;
  +            logger.debug("siteid:"+siteid);
  +        }
   
           // transform main query(only if not empty)
           searchString=searchString.trim();
  @@ -784,8 +788,8 @@
   }
   /**
    * $Log: ManageContentPicker.java,v $
  - * Revision 1.41  2005/10/20 13:04:40  tdraier
  - * fixed scope attribute
  + * Revision 1.42  2005/10/20 16:55:54  dpillot
  + * internationalization & bug NFE fix
    *
    * Revision 1.40  2005/10/19 14:24:53  dpillot
    * content pick final enhancements