[richfaces-svn-commits] JBoss Rich Faces SVN: r7715 - in trunk: framework/impl/src/main/java/org/ajax4jsf/context and 1 other directory.
Author: alexsmirnov
Date: 2008-04-09 13:51:54 -0400 (Wed, 09 Apr 2008)
New Revision: 7715
Modified:
trunk/docs/userguide/pom.xml
trunk/framework/impl/src/main/java/org/ajax4jsf/context/AjaxContextImpl.java
Log:
Fix xml plugin version for a documentation builds.
Move common css after all comonents styles.
Modified: trunk/docs/userguide/pom.xml
===================================================================
--- trunk/docs/userguide/pom.xml 2008-04-09 16:41:09 UTC (rev 7714)
+++ trunk/docs/userguide/pom.xml 2008-04-09 17:51:54 UTC (rev 7715)
@@ -560,6 +560,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>xml-maven-plugin</artifactId>
+ <version>1.0-beta-2</version>
<executions>
<execution>
<id>transformTld</id>
Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/context/AjaxContextImpl.java
===================================================================
---
trunk/framework/impl/src/main/java/org/ajax4jsf/context/AjaxContextImpl.java 2008-04-09
16:41:09 UTC (rev 7714)
+++
trunk/framework/impl/src/main/java/org/ajax4jsf/context/AjaxContextImpl.java 2008-04-09
17:51:54 UTC (rev 7715)
@@ -284,17 +284,12 @@
}
UIViewRoot root = context.getViewRoot();
ViewResources viewResources = new ViewResources();
+ String skinStyleSheetUri = null;
try {
Skin skin = SkinFactory.getInstance().getSkin(context);
// Set default style sheet for current skin.
- String styleSheetUri = (String) skin.getParameter(context,
+ skinStyleSheetUri = (String) skin.getParameter(context,
Skin.generalStyleSheet);
- if (null != styleSheetUri) {
- String resourceURL = context.getApplication()
- .getViewHandler().getResourceURL(context,
- styleSheetUri);
- viewResources.addStyle(resourceURL);
- }
// For a "NULL" skin, do not collect components stylesheets
if ("false".equals(skin.getParameter(context,
Skin.loadStyleSheets))) {
@@ -441,6 +436,13 @@
}
Set<String> styles = viewResources.getStyles();
+ // Append Skin StyleSheet after a
+ if (null != skinStyleSheetUri) {
+ String resourceURL = context.getApplication()
+ .getViewHandler().getResourceURL(context,
+ skinStyleSheetUri);
+ styles.add(resourceURL);
+ }
if (styles.size() > 0) {
if (log.isDebugEnabled()) {
StringBuffer buff = new StringBuffer(