Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-banner/src/java/com/finalist/portlets/banner/search
In directory
james.mmbase.org:/tmp/cvs-serv25081/portlets-banner/src/java/com/finalist/portlets/banner/search
Modified Files:
SearchBannerAction.java SearchBannerInitAction.java
Log Message:
CMSC-852 Cleanup java files
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-banner/src/java/com/finalist/portlets/banner/search
See also: http://www.mmbase.org/jira/browse/CMSC-852
Index: SearchBannerAction.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-banner/src/java/com/finalist/portlets/banner/search/SearchBannerAction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- SearchBannerAction.java 26 Nov 2007 11:42:56 -0000 1.2
+++ SearchBannerAction.java 12 Apr 2008 14:25:37 -0000 1.3
@@ -62,7 +62,7 @@
public ActionForward execute(ActionMapping mapping, ActionForm form,
HttpServletRequest request,
HttpServletResponse response, Cloud cld) throws Exception {
- List<Map> rows = new ArrayList<Map>();
+ List<Map<String, Object>> rows = new ArrayList<Map<String, Object>>();
BannerForm bannerForm = (BannerForm) form;
log.debug("Searching on remote cloud? " + bannerForm.isRemote());
@@ -86,7 +86,6 @@
maxNumber = MAX_NUMBER_EXPORT;
}
int queryOffset = maxNumber * offset;
- String direction = getParameterAsString(request, "direction", "up");
String action = request.getParameter("action");
String page = request.getParameter("pagepath");
@@ -126,8 +125,8 @@
}
- private List<Map> populateBannersAndPositions(NodeList nodes) {
- List<Map> rows = new ArrayList<Map>();
+ private List<Map<String, Object>> populateBannersAndPositions(NodeList
nodes) {
+ List<Map<String, Object>> rows = new ArrayList<Map<String, Object>>();
for (NodeIterator iter = nodes.nodeIterator(); iter.hasNext();) {
Node node = iter.nextNode();
@@ -186,16 +185,6 @@
return cloud;
}
-
- private String getParameterAsString(HttpServletRequest request, String
name, String defaultValue) {
- String value = request.getParameter(name);
- if (StringUtils.isBlank(value)) {
- return defaultValue;
- }
- return value;
- }
-
-
private void addConstraint(Query query, NodeManager manager, Step step,
String fieldName, String value) {
if (StringUtils.isBlank(value)) {
return;
Index: SearchBannerInitAction.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-banner/src/java/com/finalist/portlets/banner/search/SearchBannerInitAction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- SearchBannerInitAction.java 26 Nov 2007 11:42:56 -0000 1.2
+++ SearchBannerInitAction.java 12 Apr 2008 14:25:37 -0000 1.3
@@ -54,7 +54,7 @@
SearchUtil.addSortOrder(query, manager, "name", "up");
log.debug("Query: " + query.toSql());
NodeList nodes = query.getList();
- List<Map> customers = populateCustomersRows(nodes);
+ List<Map<String, Object>> customers = populateCustomersRows(nodes);
request.setAttribute("customers", customers);
@@ -79,8 +79,8 @@
}
- private List<Map> populateCustomersRows(NodeList nodes) {
- List<Map> rows = new ArrayList<Map>();
+ private List<Map<String, Object>> populateCustomersRows(NodeList nodes) {
+ List<Map<String, Object>> rows = new ArrayList<Map<String, Object>>();
for (NodeIterator iter = nodes.nodeIterator(); iter.hasNext();) {
Node node = iter.nextNode();
Map<String, Object> columns = new HashMap<String, Object>();
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
