Update of /var/cvs/src/org/mmbase/framework/basic
In directory james.mmbase.org:/tmp/cvs-serv17861/basic
Modified Files:
BasicFramework.java BasicUrlConverter.java
BlockUrlConverter.java ChainedUrlConverter.java
DirectoryUrlConverter.java MMBaseUrlConverter.java
UrlConverter.java
Log Message:
Using more generic types for getUrl Map's is handier. They should be not
modified any way.
See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/framework/basic
Index: BasicFramework.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/framework/basic/BasicFramework.java,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -b -r1.43 -r1.44
--- BasicFramework.java 5 Jan 2009 18:53:23 -0000 1.43
+++ BasicFramework.java 16 Jan 2009 22:21:13 -0000 1.44
@@ -33,7 +33,7 @@
* are configured is the order in which they are processed.
*
* @author Michiel Meeuwissen
- * @version $Id: BasicFramework.java,v 1.43 2009/01/05 18:53:23 michiel Exp $
+ * @version $Id: BasicFramework.java,v 1.44 2009/01/16 22:21:13 michiel Exp $
* @since MMBase-1.9
*/
public class BasicFramework extends Framework {
@@ -67,7 +67,7 @@
public String getUrl(String path,
- Map<String, Object> parameters,
+ Map<String, ?> parameters,
Parameters frameworkParameters, boolean escapeAmps)
throws FrameworkException {
Url link = urlConverter.getUrl(path, parameters, frameworkParameters,
escapeAmps);
log.debug("got " + link + " from " + urlConverter);
@@ -80,7 +80,7 @@
}
- public String getProcessUrl(String path, Map<String, Object> parameters,
+ public String getProcessUrl(String path, Map<String, ?> parameters,
Parameters frameworkParameters, boolean
escapeAmps) throws FrameworkException {
HttpServletRequest request =
BasicUrlConverter.getUserRequest(frameworkParameters.get(Parameter.REQUEST));
State state = State.getState(request);
@@ -95,7 +95,7 @@
}
}
- public String getInternalUrl(String page, Map<String, Object> params,
Parameters frameworkParameters) throws FrameworkException {
+ public String getInternalUrl(String page, Map<String, ?> params,
Parameters frameworkParameters) throws FrameworkException {
if (log.isDebugEnabled()) {
log.debug("calling urlConverter " + urlConverter);
}
Index: BasicUrlConverter.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/framework/basic/BasicUrlConverter.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- BasicUrlConverter.java 29 Oct 2008 19:42:42 -0000 1.23
+++ BasicUrlConverter.java 16 Jan 2009 22:21:13 -0000 1.24
@@ -25,7 +25,7 @@
*
*
* @author Michiel Meeuwissen
- * @version $Id: BasicUrlConverter.java,v 1.23 2008/10/29 19:42:42 michiel Exp
$
+ * @version $Id: BasicUrlConverter.java,v 1.24 2009/01/16 22:21:13 michiel Exp
$
* @since MMBase-1.9
*/
public final class BasicUrlConverter implements UrlConverter {
@@ -46,7 +46,7 @@
* in (X)HTML.
* @return An URL relative to the root of this web application (i.e.
without a context path),
*/
- public static String getUrl(String page, Map<String, Object> params,
HttpServletRequest req, boolean escapeamp) {
+ public static String getUrl(String page, Map<String, ?> params,
HttpServletRequest req, boolean escapeamp) {
if (log.isDebugEnabled()) {
if (log.isTraceEnabled()) {
log.trace("(static) constructing " + page + params + " because
", new Exception());
@@ -152,7 +152,7 @@
protected String getUrl(String path,
- Map<String, Object> parameters,
+ Map<String, ?> parameters,
Parameters frameworkParameters, boolean
escapeAmps, boolean action) {
HttpServletRequest request =
getUserRequest(frameworkParameters.get(Parameter.REQUEST));
State state = State.getState(request);
@@ -160,7 +160,7 @@
if (log.isDebugEnabled()) {
log.debug("path '" + path + "' p:" + parameters + " fwp:" +
frameworkParameters + " " + state + " rp:" + request.getParameterMap());
}
- for (Map.Entry<String, Object> e : parameters.entrySet()) {
+ for (Map.Entry<String, ?> e : parameters.entrySet()) {
map.put(e.getKey(), e.getValue());
}
if (state.isRendering()) {
@@ -209,17 +209,17 @@
public Url getUrl(String path,
- Map<String, Object> parameters,
+ Map<String, ?> parameters,
Parameters frameworkParameters, boolean
escapeAmps) {
return new BasicUrl(this, getUrl(path, parameters,
frameworkParameters, escapeAmps, false));
}
public Url getProcessUrl(String path,
- Map<String, Object> parameters,
+ Map<String, ?> parameters,
Parameters frameworkParameters, boolean
escapeAmps) {
return new BasicUrl(this, getUrl(path, parameters,
frameworkParameters, escapeAmps, true));
}
- public Url getInternalUrl(String page, Map<String, Object> params,
Parameters frameworkParameters) {
+ public Url getInternalUrl(String page, Map<String, ?> params, Parameters
frameworkParameters) {
HttpServletRequest request =
frameworkParameters.get(Parameter.REQUEST);
return new BasicUrl(this, BasicUrlConverter.getUrl(page, params,
request, false));
}
Index: BlockUrlConverter.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/framework/basic/BlockUrlConverter.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- BlockUrlConverter.java 5 Jan 2009 18:36:02 -0000 1.16
+++ BlockUrlConverter.java 16 Jan 2009 22:21:13 -0000 1.17
@@ -25,7 +25,7 @@
* URLConverters would probably like this, and can extend from this.
*
* @author Michiel Meeuwissen
- * @version $Id: BlockUrlConverter.java,v 1.16 2009/01/05 18:36:02 michiel Exp
$
+ * @version $Id: BlockUrlConverter.java,v 1.17 2009/01/16 22:21:13 michiel Exp
$
* @since MMBase-1.9
* @todo EXPERIMENTAL
*/
@@ -161,7 +161,7 @@
*
*/
protected final Url getUrl(String path,
- Map<String, Object> parameters,
+ Map<String, ?> parameters,
Parameters frameworkParameters, boolean
escapeAmps, boolean action) throws FrameworkException {
Block block = getBlock(path, frameworkParameters);
if (block != null) {
@@ -209,13 +209,13 @@
public Url getUrl(String path,
- Map<String, Object> parameters,
+ Map<String, ?> parameters,
Parameters frameworkParameters, boolean escapeAmps)
throws FrameworkException {
return getUrl(path, parameters, frameworkParameters, escapeAmps,
false);
}
public Url getProcessUrl(String path,
- Map<String, Object> parameters,
+ Map<String, ?> parameters,
Parameters frameworkParameters, boolean
escapeAmps) throws FrameworkException {
return getUrl(path, parameters, frameworkParameters, escapeAmps, true);
}
@@ -239,7 +239,7 @@
- public final Url getInternalUrl(String path, Map<String, Object> params,
Parameters frameworkParameters) throws FrameworkException {
+ public final Url getInternalUrl(String path, Map<String, ?> params,
Parameters frameworkParameters) throws FrameworkException {
if (isFilteredMode(frameworkParameters)) {
return getFilteredInternalUrl(path, params, frameworkParameters);
} else {
@@ -252,7 +252,7 @@
* <code>null</code>. IOW it is certain that the current URL is 'nice'
according to this URL
* Converter.
*/
- protected abstract Url getFilteredInternalUrl(String path, Map<String,
Object> params, Parameters frameworkParameters) throws FrameworkException;
+ protected abstract Url getFilteredInternalUrl(String path, Map<String, ?>
params, Parameters frameworkParameters) throws FrameworkException;
}
Index: ChainedUrlConverter.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/framework/basic/ChainedUrlConverter.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- ChainedUrlConverter.java 5 Jan 2009 18:36:02 -0000 1.21
+++ ChainedUrlConverter.java 16 Jan 2009 22:21:13 -0000 1.22
@@ -28,7 +28,7 @@
* outcome of a converter can be added to the outcome of its preceder.
*
* @author André van Toly
- * @version $Id: ChainedUrlConverter.java,v 1.21 2009/01/05 18:36:02 michiel
Exp $
+ * @version $Id: ChainedUrlConverter.java,v 1.22 2009/01/16 22:21:13 michiel
Exp $
* @since MMBase-1.9
*/
public class ChainedUrlConverter implements UrlConverter {
@@ -134,7 +134,7 @@
* The URL to be printed in a page
*/
public Url getUrl(String path,
- Map<String, Object> params,
+ Map<String, ?> params,
Parameters frameworkParameters, boolean escapeAmps)
throws FrameworkException {
Url result = Url.NOT;
if (log.isDebugEnabled()) {
@@ -153,7 +153,7 @@
}
public Url getProcessUrl(String path,
- Map<String, Object> params,
+ Map<String, ?> params,
Parameters frameworkParameters, boolean
escapeAmps) throws FrameworkException {
Url result = Url.NOT;
if (log.isDebugEnabled()) {
@@ -173,7 +173,7 @@
* The 'technical' url
*/
public Url getInternalUrl(String path,
- Map<String, Object> params,
+ Map<String, ?> params,
Parameters frameworkParameters) throws
FrameworkException {
Url result = Url.NOT;
for (UrlConverter uc : uclist) {
Index: DirectoryUrlConverter.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/framework/basic/DirectoryUrlConverter.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- DirectoryUrlConverter.java 29 Oct 2008 20:22:49 -0000 1.19
+++ DirectoryUrlConverter.java 16 Jan 2009 22:21:13 -0000 1.20
@@ -28,7 +28,7 @@
* It is also assumed that the niceness of the URL's is basicly about one
block.
*
* @author Michiel Meeuwissen
- * @version $Id: DirectoryUrlConverter.java,v 1.19 2008/10/29 20:22:49 michiel
Exp $
+ * @version $Id: DirectoryUrlConverter.java,v 1.20 2009/01/16 22:21:13 michiel
Exp $
* @since MMBase-1.9
* @todo EXPERIMENTAL
*/
@@ -83,7 +83,7 @@
- @Override final public Url getFilteredInternalUrl(String pa, Map<String,
Object> params, Parameters frameworkParameters) throws FrameworkException {
+ @Override final public Url getFilteredInternalUrl(String pa, Map<String,
?> params, Parameters frameworkParameters) throws FrameworkException {
List<String> path = new ArrayList<String>();
for (String p: pa.split("/")) {
path.add(p);
@@ -96,7 +96,7 @@
path.size()),
params, frameworkParameters);
}
- protected abstract Url getFilteredInternalDirectoryUrl(List<String> path,
Map<String, Object> params, Parameters frameworkParameters) throws
FrameworkException;
+ protected abstract Url getFilteredInternalDirectoryUrl(List<String> path,
Map<String, ?> params, Parameters frameworkParameters) throws
FrameworkException;
Index: MMBaseUrlConverter.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/framework/basic/MMBaseUrlConverter.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- MMBaseUrlConverter.java 29 Oct 2008 19:59:36 -0000 1.22
+++ MMBaseUrlConverter.java 16 Jan 2009 22:21:13 -0000 1.23
@@ -20,7 +20,7 @@
* was configured for this prefix).
*
* @author Michiel Meeuwissen
- * @version $Id: MMBaseUrlConverter.java,v 1.22 2008/10/29 19:59:36 michiel
Exp $
+ * @version $Id: MMBaseUrlConverter.java,v 1.23 2009/01/16 22:21:13 michiel
Exp $
* @since MMBase-1.9
*/
public class MMBaseUrlConverter extends DirectoryUrlConverter {
@@ -89,7 +89,7 @@
}
- @Override protected Url getFilteredInternalDirectoryUrl(List<String> path,
Map<String, Object> blockParameters, Parameters frameworkParameters) {
+ @Override protected Url getFilteredInternalDirectoryUrl(List<String> path,
Map<String, ?> blockParameters, Parameters frameworkParameters) {
if (path.size() == 0) {
// nothing indicated after /mmbase/, don't know what to do,
leaving unfiltered
return Url.NOT;
Index: UrlConverter.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/framework/basic/UrlConverter.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- UrlConverter.java 3 Nov 2008 13:09:36 -0000 1.14
+++ UrlConverter.java 16 Jan 2009 22:21:13 -0000 1.15
@@ -23,7 +23,7 @@
* chained one after another.
*
* @author Michiel Meeuwissen
- * @version $Id: UrlConverter.java,v 1.14 2008/11/03 13:09:36 andre Exp $
+ * @version $Id: UrlConverter.java,v 1.15 2009/01/16 22:21:13 michiel Exp $
* @since MMBase-1.9
* @todo EXPERIMENTAL
*/
@@ -60,7 +60,7 @@
* @throws FrameworkException thrown when something goes wrong in the
Framework
*/
Url getUrl(String path,
- Map<String, Object> parameters,
+ Map<String, ?> parameters,
Parameters frameworkParameters,
boolean escapeAmps) throws FrameworkException;
@@ -68,7 +68,7 @@
* @return An URL relative to the root of this web application (i.e.
without a context path). Never <code>null</code>
*/
Url getProcessUrl(String path,
- Map<String, Object> parameters,
+ Map<String, ?> parameters,
Parameters frameworkParameters,
boolean escapeAmps) throws FrameworkException;
@@ -86,7 +86,7 @@
* @throws FrameworkException thrown when something goes wrong in the
Framework
*/
Url getInternalUrl(String path,
- Map<String, Object> params,
+ Map<String, ?> params,
Parameters frameworkParameters) throws
FrameworkException;
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
