cvs commit: jahia/src/java/org/jahia/content/comparators PageByTitleComparator.java PageComparator.java jahia/src/java/org/jahia/data/beans CategoryBean.java

[Cedric Mailleux]

cmailleux    2005/02/28 15:25:24 CET

  Modified files:        (Branch: JAHIA-4-0-BRANCH)
    src/java/org/jahia/data/beans CategoryBean.java 
  Added files:           (Branch: JAHIA-4-0-BRANCH)
    src/java/org/jahia/content/comparators 
                                           PageByTitleComparator.java 
                                           PageComparator.java 
  Log:
  Add a comparator in catagory to order categorized pages by title

  Modify category bean to test if the container categorized really exist and 
avoid added non existing container to list of found container
  
  Revision  Changes    Path
  1.1.2.1   +69 -0     
jahia/src/java/org/jahia/content/comparators/PageByTitleComparator.java (new)
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/java/org/jahia/content/comparators/PageByTitleComparator.java?rev=1.1.2.1&content-type=text/plain
  1.1.2.1   +26 -0     
jahia/src/java/org/jahia/content/comparators/PageComparator.java (new)
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/java/org/jahia/content/comparators/PageComparator.java?rev=1.1.2.1&content-type=text/plain
  1.4.4.1   +7 -6      jahia/src/java/org/jahia/data/beans/CategoryBean.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/java/org/jahia/data/beans/CategoryBean.java.diff?r1=1.4&r2=1.4.4.1&f=h
  
  
  
  
  
  
  
  
  
  Index: CategoryBean.java
  ===================================================================
  RCS file: 
/home/cvs/repository/jahia/src/java/org/jahia/data/beans/Attic/CategoryBean.java,v
  retrieving revision 1.4
  retrieving revision 1.4.4.1
  diff -u -r1.4 -r1.4.4.1
  --- CategoryBean.java 9 Sep 2003 16:30:42 -0000       1.4
  +++ CategoryBean.java 28 Feb 2005 14:25:24 -0000      1.4.4.1
  @@ -4,22 +4,19 @@
   import java.util.Collections;
   import java.util.Iterator;
   
  -import org.jahia.content.ContentContainerKey;
  -import org.jahia.content.ContentContainerListKey;
  -import org.jahia.content.JahiaObject;
  -import org.jahia.content.ObjectKey;
   import org.jahia.content.comparators.ContainerComparator;
   import org.jahia.content.comparators.ContainerListComparator;
   import org.jahia.content.comparators.ObjectTypeDispatcherComparator;
  +import org.jahia.content.comparators.PageByTitleComparator;
   import org.jahia.exceptions.JahiaException;
   import org.jahia.params.ParamBean;
   import org.jahia.services.categories.Category;
  -import org.jahia.content.PropertiesInterface;
  +
   import java.util.Properties;
   import org.jahia.services.fields.ContentField;
   import org.jahia.services.containers.ContentContainer;
   import org.jahia.services.containers.ContentContainerList;
  -import org.jahia.content.ContentObject;
  +import org.jahia.content.*;
   import org.jahia.services.version.ContentObjectEntryState;
   import org.jahia.registries.ServicesRegistry;
   import org.jahia.data.fields.JahiaField;
  @@ -259,6 +256,8 @@
                   // we have found a matching type object.
                   JahiaObject curObject = JahiaObject.getInstance(
                       curObjectKey);
  +                // Workaround for deleted container not removed from 
category but removed from container
  +                if(curObject!=null)
                   childJahiaObjects.add(curObject);
               }
           }
  @@ -274,6 +273,8 @@
           comparator.addTypeComparator(ContentContainerListKey.
                                        CONTAINERLIST_TYPE,
                                        new ContainerListComparator());
  +        comparator.addTypeComparator(ContentPageKey.PAGE_TYPE,
  +                                     new PageByTitleComparator(paramBean));
           Collections.sort(childJahiaObjects, comparator);
           return childJahiaObjects;
       }