svn commit: r990412 - /myfaces/tomahawk/trunk/core20/src/main/java/org/apache/myfaces/custom/tree2/HtmlTreeRenderer.java

[lu...@apache.org]

Author: lu4242
Date: Sat Aug 28 19:12:49 2010
New Revision: 990412

URL: http://svn.apache.org/viewvc?rev=990412&view=rev
Log:
TOMAHAWK-1472 Add Support for new Resource API in tomahawk 2.0 module (addResource calls should happen on rendering to work correctly NonBufferingAddResource)

Modified:
    myfaces/tomahawk/trunk/core20/src/main/java/org/apache/myfaces/custom/tree2/HtmlTreeRenderer.java

Modified: myfaces/tomahawk/trunk/core20/src/main/java/org/apache/myfaces/custom/tree2/HtmlTreeRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core20/src/main/java/org/apache/myfaces/custom/tree2/HtmlTreeRenderer.java?rev=990412&r1=990411&r2=990412&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/core20/src/main/java/org/apache/myfaces/custom/tree2/HtmlTreeRenderer.java (original)
+++ myfaces/tomahawk/trunk/core20/src/main/java/org/apache/myfaces/custom/tree2/HtmlTreeRenderer.java Sat Aug 28 19:12:49 2010
@@ -86,7 +86,7 @@ public class HtmlTreeRenderer extends Re
 
     public void processEvent(ComponentSystemEvent event)
     {
-        encodeJavascript(FacesContext.getCurrentInstance(), event.getComponent());
+        encodeJavascriptWithJSF2(FacesContext.getCurrentInstance(), event.getComponent());
     }
     
     // see superclass for documentation
@@ -170,7 +170,7 @@ public class HtmlTreeRenderer extends Re
         //}
 
         // write javascript functions
-        //encodeJavascript(context, component);
+        encodeJavascript(context, component);
     }
 
     /**
@@ -631,7 +631,7 @@ public class HtmlTreeRenderer extends Re
      * @param component UIComponent
      * @throws IOException
      */
-    private void encodeJavascript(FacesContext context, UIComponent component)
+    private void encodeJavascriptWithJSF2(FacesContext context, UIComponent component)
     {
         // render javascript function for client-side toggle (it won't be used if user has opted for server-side toggle)
         String javascriptLocation = ((HtmlTree) component).getJavascriptLocation();
@@ -663,7 +663,14 @@ public class HtmlTreeRenderer extends Re
                         "cookielib.js");
             }
         }
-        else
+    }
+    
+    private void encodeJavascript(FacesContext context, UIComponent component)
+    {
+        // render javascript function for client-side toggle (it won't be used if user has opted for server-side toggle)
+        String javascriptLocation = ((HtmlTree) component).getJavascriptLocation();
+
+        if (javascriptLocation != null)
         {
             AddResource addResource = AddResourceFactory.getInstance(context);
             addResource.addJavaScriptAtPosition(context, AddResource.HEADER_BEGIN, javascriptLocation + "/tree.js");