Update of
/var/cvs/contributions/CMSContainer/cmsc/portal/src/java/com/finalist/pluto/portalImpl/aggregation
In directory
james.mmbase.org:/tmp/cvs-serv20030/cmsc/portal/src/java/com/finalist/pluto/portalImpl/aggregation
Modified Files:
ScreenFragment.java
Added Files:
FragmentResouceRenderFactory.java FragmentResouceRender.java
Log Message:
CMSC-1335,support tiles 2.1 in layout
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/portal/src/java/com/finalist/pluto/portalImpl/aggregation
See also: http://www.mmbase.org/jira/browse/CMSC-1335
FragmentResouceRenderFactory.java is new
FragmentResouceRender.java is new
Index: ScreenFragment.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/portal/src/java/com/finalist/pluto/portalImpl/aggregation/ScreenFragment.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- ScreenFragment.java 11 Feb 2009 23:12:25 -0000 1.14
+++ ScreenFragment.java 20 Mar 2009 10:24:37 -0000 1.15
@@ -94,11 +94,17 @@
log.debug("using layout:'" + layout.getResource() + "' for page:'"
+ page.getTitle() + "'");
request.setAttribute(PortalConstants.FRAGMENT, this);
+
+ FragmentResouceRender render =
FragmentResouceRenderFactory.getRender(layout.getResource());
+
+ if (null != render) {
+ render.render(layout.getResource(), request, response);
+ } else {
RequestDispatcher rd =
getMainRequestDispatcher(layout.getResource(), response.getContentType());
rd.include(request, response);
- request.removeAttribute(PortalConstants.FRAGMENT);
}
- else {
+ request.removeAttribute(PortalConstants.FRAGMENT);
+ } else {
log.error("No layout for Screen");
}
}
@@ -159,4 +165,12 @@
log.debug("getFragment: '" + id + "':'" + fragment + "'");
return fragment;
}
+
+ @Override
+ public String toString() {
+ return String.format(
+ "Screen[page:%s(%s) layout:%s(%s)]",
+ page.getTitle(), page.getId(), layout.getNames(),
layout.getId()
+ );
+ }
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
