You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by bo...@apache.org on 2008/11/12 14:50:57 UTC
svn commit: r713372 - /myfaces/tobago/branches/tobago-1.0.x/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SheetRenderer.java

Author: bommel
Date: Wed Nov 12 05:50:57 2008
New Revision: 713372

URL: http://svn.apache.org/viewvc?rev=713372&view=rev
Log:
(TOBAGO-721) UIColumnEvent should respect attribute rendered

Modified:
    myfaces/tobago/branches/tobago-1.0.x/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SheetRenderer.java

Modified: myfaces/tobago/branches/tobago-1.0.x/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SheetRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-1.0.x/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SheetRenderer.java?rev=713372&r1=713371&r2=713372&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-1.0.x/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SheetRenderer.java (original)
+++ myfaces/tobago/branches/tobago-1.0.x/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SheetRenderer.java Wed Nov 12 05:50:57 2008
@@ -138,14 +138,16 @@
     for (UIComponent child : (List<UIComponent>) data.getChildren()) {
       if (child instanceof UIColumnEvent) {
         UIColumnEvent columnEvent = (UIColumnEvent) child;
-        UIComponent selectionChild = (UIComponent) child.getChildren().get(0);
-        if (selectionChild != null && selectionChild instanceof UICommand && selectionChild.isRendered()) {
-          UICommand action = (UICommand) selectionChild;
-          if ("click".equals(columnEvent.getEvent())) {
-            clickAction = action;
-          }
-          if ("dblclick".equals(columnEvent.getEvent())) {
-            dblClickAction = action;
+        if (columnEvent.isRendered()) {
+          UIComponent selectionChild = (UIComponent) child.getChildren().get(0);
+          if (selectionChild != null && selectionChild instanceof UICommand && selectionChild.isRendered()) {
+            UICommand action = (UICommand) selectionChild;
+            if ("click".equals(columnEvent.getEvent())) {
+              clickAction = action;
+            }
+            if ("dblclick".equals(columnEvent.getEvent())) {
+              dblClickAction = action;
+            }
           }
         }
       } else if (child instanceof UIColumnSelector) {
@@ -1126,14 +1128,16 @@
       for (UIComponent child : (List<UIComponent>) component.getChildren()) {
         if (child instanceof UIColumnEvent) {
           UIColumnEvent columnEvent = (UIColumnEvent) child;
-          UIComponent selectionChild = (UIComponent) child.getChildren().get(0);
-          if (selectionChild != null && selectionChild instanceof UICommand && selectionChild.isRendered()) {
-            UICommand action = (UICommand) selectionChild;
-            if ("click".equals(columnEvent.getEvent())) {
-              clickAction = action;
-            }
-            if ("dblclick".equals(columnEvent.getEvent())) {
-              dblClickAction = action;
+          if (columnEvent.isRendered()) {
+            UIComponent selectionChild = (UIComponent) child.getChildren().get(0);
+            if (selectionChild != null && selectionChild instanceof UICommand && selectionChild.isRendered()) {
+              UICommand action = (UICommand) selectionChild;
+              if ("click".equals(columnEvent.getEvent())) {
+                clickAction = action;
+              }
+              if ("dblclick".equals(columnEvent.getEvent())) {
+                dblClickAction = action;
+              }
             }
           }
         }