Update of
/var/cvs/contributions/CMSContainer/cmsc/servicemanagement/src/java/com/finalist/cmsc/services/search
In directory
james.mmbase.org:/tmp/cvs-serv1370/cmsc/servicemanagement/src/java/com/finalist/cmsc/services/search
Modified Files:
Search.java SearchService.java PageInfo.java
Log Message:
Merge van 1.4 branch
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/servicemanagement/src/java/com/finalist/cmsc/services/search
Index: Search.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/servicemanagement/src/java/com/finalist/cmsc/services/search/Search.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- Search.java 28 Jan 2008 21:15:45 -0000 1.9
+++ Search.java 14 Mar 2008 12:52:30 -0000 1.10
@@ -116,11 +116,11 @@
}
- public static String getPortletWindow(int pageId, String elementNumber) {
+ public static PageInfo getPortletInformation(int pageId, String
elementNumber) {
if (cService == null) {
log.info("SearchService not started");
return null;
}
- return cService.getPortletWindow(pageId, elementNumber);
+ return cService.getPortletInformation(pageId, elementNumber);
}
}
Index: SearchService.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/servicemanagement/src/java/com/finalist/cmsc/services/search/SearchService.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- SearchService.java 28 Jan 2008 21:15:45 -0000 1.9
+++ SearchService.java 14 Mar 2008 12:52:30 -0000 1.10
@@ -48,5 +48,5 @@
public abstract Set<Node> findDetailContentElementsForPage(Node page);
- public abstract String getPortletWindow(int pageId, String elementNumber);
+ public abstract PageInfo getPortletInformation(int pageId, String
elementNumber);
}
Index: PageInfo.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/servicemanagement/src/java/com/finalist/cmsc/services/search/PageInfo.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- PageInfo.java 26 Nov 2007 16:14:59 -0000 1.8
+++ PageInfo.java 14 Mar 2008 12:52:30 -0000 1.9
@@ -9,6 +9,9 @@
*/
package com.finalist.cmsc.services.search;
+import java.util.HashMap;
+import java.util.Map;
+
public class PageInfo {
private int pageNumber;
@@ -21,6 +24,7 @@
private String layout;
private int priority = -1;
private boolean isSite;
+ private Map<String, String> urlParameters = new HashMap<String,String>();
public PageInfo(int pageNumber, String host, String path, String
windowName, String layout,
int priority, String parametername, String parametervalue, boolean
isSite) {
@@ -107,4 +111,12 @@
return true;
}
+ public void addParameterToUrl(String key, String value) {
+ urlParameters.put(key, value);
+ }
+
+ public Map<String,String> getUrlParameters() {
+ return urlParameters;
+ }
+
}
\ No newline at end of file
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
