myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lu4...@apache.org
Subject svn commit: r955450 - /myfaces/tomahawk/trunk/core20/src/main/java/org/apache/myfaces/renderkit/html/ext/HtmlTableRenderer.java
Date Thu, 17 Jun 2010 01:57:28 GMT
Author: lu4242
Date: Thu Jun 17 01:57:27 2010
New Revision: 955450

URL: http://svn.apache.org/viewvc?rev=955450&view=rev
Log:
TOMAHAWK-1474 Behavior support for components that contains event aware properties in jsf
2.0 module

Modified:
    myfaces/tomahawk/trunk/core20/src/main/java/org/apache/myfaces/renderkit/html/ext/HtmlTableRenderer.java

Modified: myfaces/tomahawk/trunk/core20/src/main/java/org/apache/myfaces/renderkit/html/ext/HtmlTableRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core20/src/main/java/org/apache/myfaces/renderkit/html/ext/HtmlTableRenderer.java?rev=955450&r1=955449&r2=955450&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/core20/src/main/java/org/apache/myfaces/renderkit/html/ext/HtmlTableRenderer.java
(original)
+++ myfaces/tomahawk/trunk/core20/src/main/java/org/apache/myfaces/renderkit/html/ext/HtmlTableRenderer.java
Thu Jun 17 01:57:27 2010
@@ -100,7 +100,41 @@ public class HtmlTableRenderer extends H
     public static final String ROW_ONMOUSEMOVE_ATTR = "rowOnMouseMove";
     public static final String ROW_ONMOUSEOUT_ATTR = "rowOnMouseOut";
     public static final String ROW_ONMOUSEOVER_ATTR = "rowOnMouseOver";
-    public static final String ROW_ONMOUSEUP_ATTR = "rowOnMouseUp";    
+    public static final String ROW_ONMOUSEUP_ATTR = "rowOnMouseUp";
+    
+    private static final String[] EVENTS = {
+        ClientBehaviorEvents.CLICK,
+        ClientBehaviorEvents.DBLCLICK,
+        ClientBehaviorEvents.KEYDOWN,
+        ClientBehaviorEvents.KEYPRESS,
+        ClientBehaviorEvents.KEYUP,
+        ClientBehaviorEvents.MOUSEDOWN,
+        ClientBehaviorEvents.MOUSEMOVE,
+        ClientBehaviorEvents.MOUSEOUT,
+        ClientBehaviorEvents.MOUSEOVER,
+        ClientBehaviorEvents.MOUSEUP
+    };
+    
+    private static final String[] EVENTS_ATTRIBUTES =
+    {
+        HTML.ONCLICK_ATTR,
+        HTML.ONDBLCLICK_ATTR,
+        HTML.ONKEYDOWN_ATTR,
+        HTML.ONKEYPRESS_ATTR,
+        HTML.ONKEYUP_ATTR,
+        HTML.ONMOUSEDOWN_ATTR,
+        HTML.ONMOUSEMOVE_ATTR,
+        HTML.ONMOUSEOUT_ATTR,
+        HTML.ONMOUSEOVER_ATTR,
+        HTML.ONMOUSEUP_ATTR,
+    };
+    
+    private static final String[] COLUMN_ATTRIBUTES_WITHOUT_EVENTS = (String [])
+        ArrayUtils.concat(HTML.UNIVERSAL_ATTRIBUTES_WITHOUT_STYLE, new String[]{HTML.COLSPAN_ATTR});
+
+    private static final String[] COLUMN_ATTRIBUTES = (String [])
+        (String[]) ArrayUtils.concat(HTML.COMMON_PASSTROUGH_ATTRIBUTES_WITHOUT_STYLE, new
String[]{HTML.COLSPAN_ATTR});
+
 
     /**
      * @param component dataTable
@@ -764,7 +798,7 @@ public class HtmlTableRenderer extends H
                 }
             }
 
-            renderHtmlColumnAttributes(writer, component, null);
+            renderHtmlColumnAttributes(facesContext, writer, component, null);
 
             RendererUtils.renderChild(facesContext, component);
             writer.endElement(HTML.TD_ELEM);
@@ -783,7 +817,7 @@ public class HtmlTableRenderer extends H
             if (styleClass != null) {
                 writer.writeAttribute(HTML.CLASS_ATTR, styleClass, null);
             }
-            renderHtmlColumnAttributes(writer, component, null);
+            renderHtmlColumnAttributes(facesContext, writer, component, null);
 
             RendererUtils.renderChild(facesContext, component);
             writer.endElement(HTML.TD_ELEM);
@@ -873,7 +907,7 @@ public class HtmlTableRenderer extends H
             if (styleClass != null) {
                 writer.writeAttribute(HTML.CLASS_ATTR, styleClass, null);
             }
-            renderHtmlColumnAttributes(writer, uiComponent, "header");
+            renderHtmlColumnAttributes(facesContext, writer, uiComponent, "header");
             if (facet != null) {
                 RendererUtils.renderChild(facesContext, facet);
             }
@@ -909,7 +943,7 @@ public class HtmlTableRenderer extends H
             if (styleClass != null) {
                 writer.writeAttribute(HTML.CLASS_ATTR, styleClass, null);
             }
-            renderHtmlColumnAttributes(writer, uiComponent, "footer");
+            renderHtmlColumnAttributes(facesContext, writer, uiComponent, "footer");
             if (facet != null) {
                 RendererUtils.renderChild(facesContext, facet);
             }
@@ -921,7 +955,7 @@ public class HtmlTableRenderer extends H
         }
     }
 
-    protected void renderHtmlColumnAttributes(ResponseWriter writer,
+    protected void renderHtmlColumnAttributes(FacesContext facesContext, ResponseWriter writer,
                                               UIComponent uiComponent, String prefix) throws
IOException {
         
         Map<String, List<ClientBehavior>> behaviors = null;
@@ -932,22 +966,26 @@ public class HtmlTableRenderer extends H
         
         if (behaviors != null && !behaviors.isEmpty())
         {
-            String[] attrs = (String[]) ArrayUtils.concat(HTML.UNIVERSAL_ATTRIBUTES_WITHOUT_STYLE,
new String[]{HTML.COLSPAN_ATTR});
-            for (int i = 0, size = attrs.length; i < size; i++) {
-                String attributeName = attrs[i];
+            for (int i = 0, size = COLUMN_ATTRIBUTES_WITHOUT_EVENTS.length; i < size;
i++) {
+                String attributeName = COLUMN_ATTRIBUTES_WITHOUT_EVENTS[i];
                 String compAttrName = prefix != null ? prefix + attributeName : attributeName;
                 HtmlRendererUtils.renderHTMLAttribute(writer, uiComponent,
                     compAttrName, attributeName);
             }
             
-            //TODO: behavior stuff
-            
+            for (int i = 0, size = EVENTS.length; i < size; i++)
+            {
+                String attributeName = EVENTS_ATTRIBUTES[i];
+                String eventName = prefix != null ? prefix + EVENTS[i] : EVENTS[i];
+                String compAttrName = prefix != null ? prefix + attributeName : attributeName;
+                HtmlRendererUtils.renderBehaviorizedAttribute(facesContext, writer,
+                        compAttrName, uiComponent, eventName, behaviors, attributeName);
+            }
         }
         else
         {
-            String[] attrs = (String[]) ArrayUtils.concat(HTML.COMMON_PASSTROUGH_ATTRIBUTES_WITHOUT_STYLE,
new String[]{HTML.COLSPAN_ATTR});
-            for (int i = 0, size = attrs.length; i < size; i++) {
-                String attributeName = attrs[i];
+            for (int i = 0, size = COLUMN_ATTRIBUTES.length; i < size; i++) {
+                String attributeName = COLUMN_ATTRIBUTES[i];
                 String compAttrName = prefix != null ? prefix + attributeName : attributeName;
                 HtmlRendererUtils.renderHTMLAttribute(writer, uiComponent,
                     compAttrName, attributeName);



Mime
View raw message