Update of
/var/cvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/forms
In directory
james.mmbase.org:/tmp/cvs-serv4180/community/src/java/com/finalist/cmsc/community/forms
Modified Files:
PreferenceAction.java PreferenceForm.java
Log Message:
CMSC-1008 tags moved to edit-webapp,mve preference to new tag.
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/forms
See also: http://www.mmbase.org/jira/browse/CMSC-1008
Index: PreferenceAction.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/forms/PreferenceAction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- PreferenceAction.java 11 Jun 2008 03:10:53 -0000 1.2
+++ PreferenceAction.java 15 Jul 2008 09:24:31 -0000 1.3
@@ -18,6 +18,8 @@
import com.finalist.cmsc.mmbase.PropertiesUtil;
import com.finalist.cmsc.services.community.domain.PreferenceVO;
import com.finalist.cmsc.services.community.preferences.PreferenceService;
+import com.finalist.cmsc.paging.PagingUtils;
+import com.finalist.cmsc.paging.PagingStatusHolder;
public class PreferenceAction extends DispatchAction {
@@ -26,15 +28,15 @@
private PreferenceService preferenceService;
- public void setPreferenceService(PreferenceService preferenceService){
+ public void setPreferenceService(PreferenceService preferenceService) {
this.preferenceService = preferenceService;
}
public ActionForward add(ActionMapping mapping, ActionForm form,
HttpServletRequest request, HttpServletResponse response)
throws Exception {
- PreferenceForm preferenceForm = (PreferenceForm)form;
- PreferenceVO preference= new PreferenceVO();
+ PreferenceForm preferenceForm = (PreferenceForm) form;
+ PreferenceVO preference = new PreferenceVO();
BeanUtils.copyProperties(preference, preferenceForm);
setNull(preferenceForm);
preferenceService.createPreference(preference);
@@ -61,7 +63,7 @@
public ActionForward init(ActionMapping mapping, ActionForm form,
HttpServletRequest request, HttpServletResponse response)
throws Exception {
- PreferenceForm preferenceForm = (PreferenceForm)form;
+ PreferenceForm preferenceForm = (PreferenceForm) form;
setNull(preferenceForm);
return mapping.findForward("success");
}
@@ -70,7 +72,7 @@
HttpServletRequest request, HttpServletResponse response)
throws Exception {
String id = request.getParameter("id");
- if(id != null) {
+ if (id != null) {
preferenceService.deletePreference(id);
}
return mapping.findForward("list");
@@ -79,7 +81,7 @@
public ActionForward modify(ActionMapping mapping, ActionForm form,
HttpServletRequest request, HttpServletResponse response)
throws Exception {
- PreferenceVO preference= new PreferenceVO();
+ PreferenceVO preference = new PreferenceVO();
preference.setId(request.getParameter("id"));
preference.setKey(request.getParameter("key"));
preference.setValue(request.getParameter("value"));
@@ -90,21 +92,23 @@
public ActionForward list(ActionMapping mapping, ActionForm form,
HttpServletRequest request, HttpServletResponse response)
throws Exception {
- PreferenceForm preferenceForm = (PreferenceForm)form;
- PreferenceVO preference= new PreferenceVO();
+
+ PreferenceForm preferenceForm = (PreferenceForm) form;
+ PreferenceVO preference = new PreferenceVO();
BeanUtils.copyProperties(preference, preferenceForm);
- int pageSize = 12;
-
if(StringUtils.isNotEmpty(PropertiesUtil.getProperty("repository.search.results.per.page")))
{
- pageSize =
Integer.parseInt(PropertiesUtil.getProperty("repository.search.results.per.page"));
- }
- List<PreferenceVO> preferences =
preferenceService.getPreferences(preference,
Integer.parseInt(preferenceForm.getOffset())*pageSize,
pageSize,preferenceForm.getOrder(),preferenceForm.getDirection());
- int totalCount = preferenceService.getTotalCount(preference) ;
- request.setAttribute("offset", preferenceForm.getOffset());
- if(preferences == null || preferences.size() ==0) {
- if(Integer.parseInt(preferenceForm.getOffset()) >= 1) {
- preferences = preferenceService.getPreferences(preference,
(Integer.parseInt(preferenceForm.getOffset())-1)*pageSize,
pageSize,preferenceForm.getOrder(),preferenceForm.getDirection());
- request.setAttribute("offset",
(Integer.parseInt(preferenceForm.getOffset())-1));
-
preferenceForm.setOffset(String.valueOf((Integer.parseInt(preferenceForm.getOffset())-1)));
+
+ PagingStatusHolder pagingHolder = PagingUtils.getStatusHolder(request);
+
+ int offset = pagingHolder.getOffset();
+ int pagesize = pagingHolder.getPageSize();
+
+ List<PreferenceVO> preferences =
preferenceService.getPreferences(preference, offset,
+ pagesize, preferenceForm.getOrder(),
preferenceForm.getDirection());
+ int totalCount = preferenceService.getTotalCount(preference);
+ if (preferences == null || preferences.size() == 0) {
+ if (pagingHolder.getPage() >= 1) {
+ preferences = preferenceService.getPreferences(preference,
pagingHolder.getOffset(),
+ pagingHolder.getPageSize(), preferenceForm.getOrder(),
preferenceForm.getDirection());
}
}
request.setAttribute("totalCount", totalCount);
Index: PreferenceForm.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/forms/PreferenceForm.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- PreferenceForm.java 10 Jun 2008 11:53:11 -0000 1.1
+++ PreferenceForm.java 15 Jul 2008 09:24:31 -0000 1.2
@@ -14,8 +14,6 @@
private String value;
- private String offset;
-
private String order;
private String direction;
@@ -54,14 +52,6 @@
this.value = value;
}
- public String getOffset() {
- return offset;
- }
-
- public void setOffset(String offset) {
- this.offset = offset;
- }
-
public String getOrder() {
return order;
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
