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

[Thomas Draier]

tdraier     2005/10/06 16:50:36 CEST

  Modified files:
    core/src/java/org/jahia/engines/importexport 
                                                 ManageContentPicker.java 
  Log:
  fixed teaser in cp
  
  Revision  Changes    Path
  1.31      +6 -3      
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.30&r2=1.31&f=h
  
  
  
  Index: ManageContentPicker.java
  ===================================================================
  RCS file: 
/home/cvs/repository/jahia/core/src/java/org/jahia/engines/importexport/ManageContentPicker.java,v
  retrieving revision 1.30
  retrieving revision 1.31
  diff -u -r1.30 -r1.31
  --- ManageContentPicker.java  6 Oct 2005 14:27:22 -0000       1.30
  +++ ManageContentPicker.java  6 Oct 2005 14:50:36 -0000       1.31
  @@ -37,7 +37,7 @@
    *
    * @author Thomas Draier, joe Pillot
    * @author ${User}
  - * @version $Id: ManageContentPicker.java,v 1.30 2005/10/06 14:27:22 tdraier 
Exp $
  + * @version $Id: ManageContentPicker.java,v 1.31 2005/10/06 14:50:36 tdraier 
Exp $
    */
   public class ManageContentPicker {
       private static org.apache.log4j.Logger logger =
  @@ -319,7 +319,7 @@
                               for (Iterator iterator1 = l.iterator(); 
iterator1.hasNext();) {
                                   ContentField contentField = (ContentField) 
iterator1.next();
                                   if (contentField instanceof 
ContentSmallTextField) {
  -                                    t = ((ContentField) 
l.iterator().next()).getValue(processingContext, lr);
  +                                    t = 
contentField.getValue(processingContext, lr);
                                       pageID = contentField.getPageID();
                                       logger.debug("smalltext:" + t + " 
pageID" + pageID);
                                       break;
  @@ -330,7 +330,7 @@
                               for (Iterator iterator1 = l.iterator(); 
iterator1.hasNext();) {
                                   ContentField contentField = (ContentField) 
iterator1.next();
                                   if (contentField instanceof 
ContentPageField) {
  -                                    ContentPage contentPage = 
((ContentPageField) l.iterator().next()).getContentPage(lr);
  +                                    ContentPage contentPage = 
((ContentPageField) contentField).getContentPage(lr);
                                       t = contentPage.getTitle(lr);
                                       pageID = contentPage.getID();
                                       logger.debug("page:" + t + " pageID" + 
pageID);
  @@ -495,6 +495,9 @@
   }
   /**
    * $Log: ManageContentPicker.java,v $
  + * Revision 1.31  2005/10/06 14:50:36  tdraier
  + * fixed teaser in cp
  + *
    * Revision 1.30  2005/10/06 14:27:22  tdraier
    * added special page search
    *