Update of /var/cvs/src/org/mmbase/framework
In directory james.mmbase.org:/tmp/cvs-serv4425
Modified Files:
ResourceRenderer.java
Log Message:
made relative resolving, similar to JspREnderer possible
See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/framework
Index: ResourceRenderer.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/framework/ResourceRenderer.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- ResourceRenderer.java 6 Aug 2008 12:00:11 -0000 1.4
+++ ResourceRenderer.java 6 Aug 2008 15:47:19 -0000 1.5
@@ -29,7 +29,7 @@
*
* @author Michiel Meeuwissen
- * @version $Id: ResourceRenderer.java,v 1.4 2008/08/06 12:00:11 michiel Exp $
+ * @version $Id: ResourceRenderer.java,v 1.5 2008/08/06 15:47:19 michiel Exp $
* @since MMBase-1.9
*/
public class ResourceRenderer extends AbstractRenderer {
@@ -39,6 +39,14 @@
protected String resource;
protected String type = "web";
+ public String getResource() {
+ if (type.equals("web")) {
+ return resource.charAt(0) == '/' ? resource : JspRenderer.JSP_ROOT
+ getBlock().getComponent().getName() + '/' + resource;
+ } else {
+ return resource;
+ }
+ }
+
public ResourceRenderer(String t, Block parent) {
super(t, parent);
}
@@ -64,8 +72,8 @@
try {
- Reader r =
ResourceLoader.Type.valueOf(type.toUpperCase()).get().getReader(resource);
- if (r == null) throw new FrameworkException("No such resource " +
ResourceLoader.Type.valueOf(type.toUpperCase()).get().getResource(resource));
+ Reader r =
ResourceLoader.Type.valueOf(type.toUpperCase()).get().getReader(getResource());
+ if (r == null) throw new FrameworkException("No such resource " +
ResourceLoader.Type.valueOf(type.toUpperCase()).get().getResource(getResource()));
char[] buf = new char[1000];
int c;
while ((c = r.read(buf, 0, 1000)) > 0) {
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
