You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tapestry.apache.org by hl...@apache.org on 2009/01/30 20:59:33 UTC
svn commit: r739396 -
/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/TapestryModule.java
Author: hlship
Date: Fri Jan 30 19:59:32 2009
New Revision: 739396
URL: http://svn.apache.org/viewvc?rev=739396&view=rev
Log:
TAP5-485: Tracking issue for changes required by com.formos.tapestry:tapestry-template
- Split injecting the default stylesheet into its own filter, so it may be overridden
Modified:
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/TapestryModule.java
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/TapestryModule.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/TapestryModule.java?rev=739396&r1=739395&r2=739396&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/TapestryModule.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/TapestryModule.java Fri Jan 30 19:59:32 2009
@@ -1515,10 +1515,11 @@
* service. Filters often provide {@link org.apache.tapestry5.annotations.Environmental} services needed by
* components as they render. <dl> <dt>DocumentLinker</dt> <dd>Provides {@link org.apache.tapestry5.internal.services.DocumentLinker}
* <dt>RenderSupport</dt> <dd>Provides {@link org.apache.tapestry5.RenderSupport}</dd>
- * <dt>ClientBehaviorSupport</dt> <dd>Provides {@link org.apache.tapestry5.internal.services.ClientBehaviorSupport}</dd>
- * <dt>Heartbeat</dt> <dd>Provides {@link org.apache.tapestry5.services.Heartbeat}</dd>
- * <dt>DefaultValidationDecorator</dt> <dd>Provides {@link org.apache.tapestry5.ValidationDecorator} (as an instance
- * of {@link org.apache.tapestry5.internal.DefaultValidationDecorator})</dd> </dl>
+ * <dt>InjectDefaultStyleheet</dt> <dd>Injects the default stylesheet</dd></dt> <dt>ClientBehaviorSupport</dt>
+ * <dd>Provides {@link org.apache.tapestry5.internal.services.ClientBehaviorSupport}</dd> <dt>Heartbeat</dt>
+ * <dd>Provides {@link org.apache.tapestry5.services.Heartbeat}</dd> <dt>DefaultValidationDecorator</dt>
+ * <dd>Provides {@link org.apache.tapestry5.ValidationDecorator} (as an instance of {@link
+ * org.apache.tapestry5.internal.DefaultValidationDecorator})</dd> </dl>
*/
public void contributeMarkupRenderer(OrderedConfiguration<MarkupRendererFilter> configuration,
@@ -1581,8 +1582,6 @@
"org/apache/tapestry5/tapestry.js");
- support.addStylesheetLink(stylesheetAsset, null);
-
environment.push(RenderSupport.class, support);
renderer.renderMarkup(writer);
@@ -1593,6 +1592,16 @@
}
};
+ MarkupRendererFilter injectDefaultStylesheet = new MarkupRendererFilter()
+ {
+ public void renderMarkup(MarkupWriter writer, MarkupRenderer renderer)
+ {
+ environment.peek(RenderSupport.class).addStylesheetLink(stylesheetAsset, null);
+
+ renderer.renderMarkup(writer);
+ }
+ };
+
MarkupRendererFilter clientBehaviorSupport = new MarkupRendererFilter()
{
public void renderMarkup(MarkupWriter writer, MarkupRenderer renderer)
@@ -1649,6 +1658,7 @@
configuration.add("DocumentLinker", documentLinker, "before:RenderSupport");
configuration.add("RenderSupport", renderSupport);
+ configuration.add("InjectDefaultStyleheet", injectDefaultStylesheet, "after:RenderSupport");
configuration.add("ClientBehaviorSupport", clientBehaviorSupport, "after:RenderSupport");
configuration.add("Heartbeat", heartbeat, "after:RenderSupport");
configuration.add("DefaultValidationDecorator", defaultValidationDecorator, "after:Heartbeat");