mcardle 2005/05/27 17:08:02 CEST
Modified files:
core/src/java/org/jahia/data/containers
ContainerSorterBean.java
Log:
adds support to sort over multiple fieldnames at the same time
Revision Changes Path
1.12 +6 -5
jahia/core/src/java/org/jahia/data/containers/ContainerSorterBean.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/data/containers/ContainerSorterBean.java.diff?r1=1.11&r2=1.12&f=h
Index: ContainerSorterBean.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/data/containers/ContainerSorterBean.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ContainerSorterBean.java 28 Apr 2005 14:57:36 -0000 1.11
+++ ContainerSorterBean.java 27 May 2005 15:08:02 -0000 1.12
@@ -291,7 +291,7 @@
if ( this.isValid ){
// get all container ids
- logger.debug("Sorting : On field : " +
getSortingFieldName());
+ logger.debug("Sorting : On field : " +
getSortingFieldNames());
if ( this.numberSort )
{
this.result = doNumberSort(bits);
@@ -402,11 +402,12 @@
/**
* Return the sorting field.
*
- * @return int ctnListID, the container list id.
+ * Only first element is defined for @see ContainerSorterBean (and the
extending @see ContainerMetadataSorterBean)
+ * but more can be defined for @see ContainerSorterByContainerDefinition.
*/
- public String getSortingFieldName()
+ public String[] getSortingFieldNames()
{
- return this.fieldName;
+ return new String[]{this.fieldName};
}
//--------------------------------------------------------------------------
@@ -632,7 +633,7 @@
Vector datas =
this.getFieldValues(this.ctnListID,this.fieldName,this.isNumberOrdering(),bits);
Collator collator = this.getCollator();
-
+
// sort the datas
if ( datas.size()>1 ){
// a dummy dataBean
