You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ma...@apache.org on 2009/11/16 15:21:26 UTC
svn commit: r880763 - in /myfaces/trinidad/branches/trinidad-2.0.x:
trinidad-api/src/main/java/org/apache/myfaces/trinidad/render/
trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/
Author: matzew
Date: Mon Nov 16 14:21:26 2009
New Revision: 880763
URL: http://svn.apache.org/viewvc?rev=880763&view=rev
Log:
TRINIDAD-1610 - Relocatable Resources support in Trinidad
added api to core renderer, to be called by other renderers of interest
Modified:
myfaces/trinidad/branches/trinidad-2.0.x/trinidad-api/src/main/java/org/apache/myfaces/trinidad/render/CoreRenderer.java
myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/BodyRenderer.java
myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/FormRenderer.java
myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/HeadRenderer.java
Modified: myfaces/trinidad/branches/trinidad-2.0.x/trinidad-api/src/main/java/org/apache/myfaces/trinidad/render/CoreRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/trinidad-2.0.x/trinidad-api/src/main/java/org/apache/myfaces/trinidad/render/CoreRenderer.java?rev=880763&r1=880762&r2=880763&view=diff
==============================================================================
--- myfaces/trinidad/branches/trinidad-2.0.x/trinidad-api/src/main/java/org/apache/myfaces/trinidad/render/CoreRenderer.java (original)
+++ myfaces/trinidad/branches/trinidad-2.0.x/trinidad-api/src/main/java/org/apache/myfaces/trinidad/render/CoreRenderer.java Mon Nov 16 14:21:26 2009
@@ -377,6 +377,27 @@
if (getRendersChildren())
throw new IllegalStateException();
}
+
+ /**
+ * Hook for rendering the component resources for the <code>target</code>.
+ * @param context Current <code>FacesContext</code> object for this request.
+ * @param target The target for the resources (e.g. head/body/form)
+ *
+ * @throws IOException
+ */
+ protected final void encodeComponentResources(
+ FacesContext context,
+ String target) throws IOException
+ {
+ if(target != null)
+ {
+ UIViewRoot viewRoot = context.getViewRoot();
+ for(UIComponent componentResource : viewRoot.getComponentResources(context, target))
+ {
+ componentResource.encodeAll(context);
+ }
+ }
+ }
/**
* Hook for rendering the end of a component; only
Modified: myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/BodyRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/BodyRenderer.java?rev=880763&r1=880762&r2=880763&view=diff
==============================================================================
--- myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/BodyRenderer.java (original)
+++ myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/BodyRenderer.java Mon Nov 16 14:21:26 2009
@@ -88,6 +88,10 @@
{
_encodeServiceScripts(context);
+ // trigger the rendering of targeted resource
+ // for the BODY, on UIViewRoot - if there are
+ // any...
+ encodeComponentResources(context, "body");
context.getResponseWriter().endElement("body");
_renderInitialFocusScript(context, arc);
Modified: myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/FormRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/FormRenderer.java?rev=880763&r1=880762&r2=880763&view=diff
==============================================================================
--- myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/FormRenderer.java (original)
+++ myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/FormRenderer.java Mon Nov 16 14:21:26 2009
@@ -363,6 +363,10 @@
if (pprContext == null)
_renderSubmitFormCheck(context, arc);
+ // trigger the rendering of targeted resource
+ // for the FORM, on UIViewRoot - if there are
+ // any...
+ encodeComponentResources(context, "form");
// Close up the form
writer.endElement("form");
Modified: myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/HeadRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/HeadRenderer.java?rev=880763&r1=880762&r2=880763&view=diff
==============================================================================
--- myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/HeadRenderer.java (original)
+++ myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/HeadRenderer.java Mon Nov 16 14:21:26 2009
@@ -88,6 +88,12 @@
FacesBean bean) throws IOException
{
ResponseWriter rw = context.getResponseWriter();
+
+ // trigger the rendering of targeted resource
+ // for the HEAD, on UIViewRoot - if there are
+ // any...
+ encodeComponentResources(context, "head");
+
rw.endElement("head");
}