Author: ekoneil
Date: Mon Apr 11 07:46:00 2005
New Revision: 160891
URL: http://svn.apache.org/viewcvs?view=rev&rev=160891
Log:
Tweaks:
- add JSP function for building a sort URL parameter map
- fix the getLastRowForPage() method which was still broken in one case and
should be entirely fixed now
BB: self
DRT: NetUI pass
BVT: NetUI pass (1 failure)
Modified:
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/pager/PagerModel.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/util/JspFunctions.java
Modified:
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/pager/PagerModel.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/pager/PagerModel.java?view=diff&r1=160890&r2=160891
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/pager/PagerModel.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/pager/PagerModel.java
Mon Apr 11 07:46:00 2005
@@ -122,9 +122,11 @@
}
public int getLastRowForPage() {
- if(_dataSetSize != null && _dataSetSize < getPageSize())
- /* the dataSet size is absolute, so this value needs to be
adjusted by 1 to be zero based */
- return _dataSetSize-1;
+ if(_dataSetSize != null) {
+ if(_dataSetSize - _currentRow < getPageSize())
+ return _currentRow + (_dataSetSize - _currentRow) - 1;
+ else return _currentRow + getPageSize() -1;
+ }
else return _currentRow + getPageSize() - 1;
}
Modified:
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/util/JspFunctions.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/util/JspFunctions.java?view=diff&r1=160890&r2=160891
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/util/JspFunctions.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/util/JspFunctions.java
Mon Apr 11 07:46:00 2005
@@ -19,10 +19,12 @@
import java.util.List;
import java.util.ArrayList;
+import java.util.Map;
import javax.servlet.jsp.JspContext;
import org.apache.beehive.netui.databinding.datagrid.api.filter.Filter;
import org.apache.beehive.netui.databinding.datagrid.api.DataGridConfigFactory;
+import org.apache.beehive.netui.databinding.datagrid.api.DataGridURLBuilder;
import org.apache.beehive.netui.databinding.datagrid.api.sort.SortModel;
import org.apache.beehive.netui.databinding.datagrid.api.sort.Sort;
import org.apache.beehive.netui.databinding.datagrid.api.sort.SortDirection;
@@ -79,6 +81,22 @@
if(sort != null && sort.getDirection() == SortDirection.DESCENDING)
return true;
else return false;
+ }
+
+ /**
+ *
+ * @param urlBuilder
+ * @param sortExpression
+ * @return
+ * @netui:jspfunction
+ * name="buildQueryParamsMapForSortExpression"
+ * signature="java.util.Map
buildQueryParamsMapForSortExpression(org.apache.beehive.netui.databinding.datagrid.api.DataGridURLBuilder,java.lang.String)"
+ */
+ public static Map buildQueryParamsMapForSortExpression(DataGridURLBuilder
urlBuilder, String sortExpression) {
+ if(urlBuilder == null || sortExpression == null)
+ return null;
+
+ return urlBuilder.buildSortQueryParamsMap(sortExpression);
}
/**
