Update of /var/cvs/src/org/mmbase/framework
In directory james.mmbase.org:/tmp/cvs-serv23836
Modified Files:
ConnectionRenderer.java JspRenderer.java ResourceRenderer.java
Log Message:
various details
See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/framework
Index: ConnectionRenderer.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/framework/ConnectionRenderer.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- ConnectionRenderer.java 16 Jan 2009 08:24:47 -0000 1.12
+++ ConnectionRenderer.java 17 Apr 2009 19:35:55 -0000 1.13
@@ -43,7 +43,7 @@
*
*
* @author Michiel Meeuwissen
- * @version $Id: ConnectionRenderer.java,v 1.12 2009/01/16 08:24:47 michiel
Exp $
+ * @version $Id: ConnectionRenderer.java,v 1.13 2009/04/17 19:35:55 michiel
Exp $
* @since MMBase-1.9
*/
public class ConnectionRenderer extends AbstractRenderer {
@@ -146,7 +146,7 @@
@Override public String toString() {
- return getUri(new Parameters(getParameters()), new RenderHints(this,
WindowState.NORMAL, null, null)).toString();
+ return getUri(new Parameters(getParameters()), new RenderHints(this,
WindowState.NORMAL, null, null, RenderHints.Mode.NORMAL)).toString();
}
@Override public URI getUri(Parameters blockParameter, RenderHints hints) {
Index: JspRenderer.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/framework/JspRenderer.java,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- JspRenderer.java 12 Jan 2009 21:12:10 -0000 1.32
+++ JspRenderer.java 17 Apr 2009 19:35:55 -0000 1.33
@@ -23,7 +23,7 @@
* A Renderer implementation based on a jsp in the /mmbase/components/
directory.
*
* @author Michiel Meeuwissen
- * @version $Id: JspRenderer.java,v 1.32 2009/01/12 21:12:10 michiel Exp $
+ * @version $Id: JspRenderer.java,v 1.33 2009/04/17 19:35:55 michiel Exp $
* @since MMBase-1.9
*/
public class JspRenderer extends AbstractRenderer {
@@ -54,7 +54,9 @@
try {
HttpServletResponse response =
blockParameters.get(Parameter.RESPONSE);
HttpServletRequest request =
blockParameters.get(Parameter.REQUEST);
- if (request == null) throw new NullPointerException("Request " +
request + " Response " + response);
+ if (request == null) {
+ throw new NullPointerException("Request " + request + "
Response " + response);
+ }
final Status status = new Status();
GenericResponseWrapper respw = new
GenericResponseWrapper(response) {
public void setStatus(int s) {
Index: ResourceRenderer.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/framework/ResourceRenderer.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- ResourceRenderer.java 16 Jan 2009 15:21:54 -0000 1.12
+++ ResourceRenderer.java 17 Apr 2009 19:35:55 -0000 1.13
@@ -25,7 +25,7 @@
*
* @author Michiel Meeuwissen
- * @version $Id: ResourceRenderer.java,v 1.12 2009/01/16 15:21:54 michiel Exp $
+ * @version $Id: ResourceRenderer.java,v 1.13 2009/04/17 19:35:55 michiel Exp $
* @since MMBase-1.9
*/
public class ResourceRenderer extends AbstractRenderer {
@@ -83,7 +83,7 @@
ResourceLoader loader =
ResourceLoader.Type.valueOf(type.toUpperCase()).get();
try {
InputStream is = loader.getResourceAsStream(name);
- if (is == null) throw new FrameworkException("No such resource " +
ResourceLoader.Type.valueOf(type.toUpperCase()).get().getResource(name));
+ if (is == null) throw new FrameworkException("No such resource " +
loader.getResource(name) + " in " + loader);
if (xsl == null) {
Reader r = loader.getReader(is, name);
char[] buf = new char[1000];
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
