svn commit: r649644 - in /myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag: MenuBarRenderer.java SheetRenderer.java

[bo...@apache.org]

Author: bommel
Date: Fri Apr 18 11:23:29 2008
New Revision: 649644

URL: http://svn.apache.org/viewvc?rev=649644&view=rev
Log:
(TOBAGO-652) Move tobago-menu.css and tobago-sheet.css content to style.css

Modified:
    myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/MenuBarRenderer.java
    myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SheetRenderer.java

Modified: myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/MenuBarRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/MenuBarRenderer.java?rev=649644&r1=649643&r2=649644&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/MenuBarRenderer.java (original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/MenuBarRenderer.java Fri Apr 18 11:23:29 2008
@@ -145,13 +145,10 @@
                                      String scriptBlock) throws IOException {
     final AbstractUIPage page = ComponentUtil.findPage(facesContext, component);
     page.getScriptFiles().add("script/tobago-menu.js");
-    page.getStyleFiles().add("style/tobago-menu.css");
     String function = setupFunction + "('" + clientId + "', '"
         + page.getClientId(facesContext) + "');";
 
     if (TobagoConfig.getInstance(facesContext).isAjaxEnabled()) {
-      HtmlRendererUtil.writeStyleLoader(
-          facesContext, new String[] {"style/tobago-menu.css"});
       StringTokenizer st = new StringTokenizer(scriptBlock, "\n");
       ArrayList<String>  lines = new ArrayList<String>();
       while (st.hasMoreTokens()) {

Modified: myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SheetRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SheetRenderer.java?rev=649644&r1=649643&r2=649644&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SheetRenderer.java (original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SheetRenderer.java Fri Apr 18 11:23:29 2008
@@ -176,7 +176,6 @@
     String checked = contextPath + resourceManager.getImage(viewRoot, "image/sheetChecked.gif");
     boolean ajaxEnabled = TobagoConfig.getInstance(facesContext).isAjaxEnabled();
 
-    final String[] styles = new String[]{"style/tobago-sheet.css"};
     final String[] scripts = new String[]{"script/tobago-sheet.js"};
     Integer frequency = null;
     UIComponent facetReload = data.getFacet(FACET_RELOAD);
@@ -195,13 +194,11 @@
             + ");"
     };
     AbstractUIPage page = ComponentUtil.findPage(facesContext, data);
-    page.getStyleFiles().add(styles[0]);
     page.getScriptFiles().add(scripts[0]);
 
     if (!ajaxEnabled) {
       page.getOnloadScripts().add(cmds[0]);
     } else {
-      HtmlRendererUtil.writeStyleLoader(facesContext, styles);
       HtmlRendererUtil.writeScriptLoader(facesContext, scripts, cmds);
     }
   }