knguyen 2005/04/26 15:45:32 CEST
Modified files: (Branch: JAHIA-4-1-BRANCH)
src/java/org/jahia/data/containers ContainerSorterBean.java
ContainerSorterByContainerDefinition.java
Log:
- container filter by category filter by container definition name too
- sorterbean use Collator for string comparison
Revision Changes Path
1.14.4.7.2.2 +3 -0
jahia/src/java/org/jahia/data/containers/ContainerSorterBean.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/java/org/jahia/data/containers/ContainerSorterBean.java.diff?r1=1.14.4.7.2.1&r2=1.14.4.7.2.2&f=h
1.4.4.7.2.2 +3 -0
jahia/src/java/org/jahia/data/containers/ContainerSorterByContainerDefinition.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/java/org/jahia/data/containers/ContainerSorterByContainerDefinition.java.diff?r1=1.4.4.7.2.1&r2=1.4.4.7.2.2&f=h
Index: ContainerSorterBean.java
===================================================================
RCS file:
/home/cvs/repository/jahia/src/java/org/jahia/data/containers/Attic/ContainerSorterBean.java,v
retrieving revision 1.14.4.7.2.1
retrieving revision 1.14.4.7.2.2
diff -u -r1.14.4.7.2.1 -r1.14.4.7.2.2
--- ContainerSorterBean.java 26 Apr 2005 13:30:47 -0000 1.14.4.7.2.1
+++ ContainerSorterBean.java 26 Apr 2005 13:45:32 -0000 1.14.4.7.2.2
@@ -773,6 +773,9 @@
{
this.ASC_Ordering = ASC_Ordering;
this.collator = collator;
+ if ( this.collator == null ){
+ this.collator = Collator.getInstance();
+ }
}
public int compare(Object obj1, Object obj2) throws
ClassCastException {
Index: ContainerSorterByContainerDefinition.java
===================================================================
RCS file:
/home/cvs/repository/jahia/src/java/org/jahia/data/containers/Attic/ContainerSorterByContainerDefinition.java,v
retrieving revision 1.4.4.7.2.1
retrieving revision 1.4.4.7.2.2
diff -u -r1.4.4.7.2.1 -r1.4.4.7.2.2
--- ContainerSorterByContainerDefinition.java 26 Apr 2005 13:30:47 -0000
1.4.4.7.2.1
+++ ContainerSorterByContainerDefinition.java 26 Apr 2005 13:45:32 -0000
1.4.4.7.2.2
@@ -625,6 +625,9 @@
{
this.ASC_Ordering = ASC_Ordering;
this.collator = collator;
+ if ( this.collator == null ){
+ this.collator = Collator.getInstance();
+ }
}
public int compare(Object obj1, Object obj2) throws
ClassCastException {
