You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lo...@apache.org on 2015/01/08 15:38:17 UTC

svn commit: r1650298 - in /myfaces/tobago/branches/tobago-3.0.x: tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/ tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/

Author: lofwyr
Date: Thu Jan  8 14:38:17 2015
New Revision: 1650298

URL: http://svn.apache.org/r1650298
Log:
TOBAGO-1434: Move Layout-Manager-Logic from Server to Client
- fixing layout manager call in tabGroup

Modified:
    myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITabGroup.java
    myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/TabGroupRenderer.java
    myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/TabRenderer.java

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITabGroup.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITabGroup.java?rev=1650298&r1=1650297&r2=1650298&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITabGroup.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITabGroup.java Thu Jan  8 14:38:17 2015
@@ -68,7 +68,7 @@ public abstract class AbstractUITabGroup
 
     super.encodeBegin(facesContext);
 
-    ((AbstractUILayoutBase) getLayoutManager()).encodeBegin(facesContext);
+//    ((AbstractUILayoutBase) getLayoutManager()).encodeBegin(facesContext);
   }
 
   @Override
@@ -80,7 +80,7 @@ public abstract class AbstractUITabGroup
   @Override
   public void encodeEnd(final FacesContext facesContext) throws IOException {
 
-    ((AbstractUILayoutBase) getLayoutManager()).encodeEnd(facesContext);
+//    ((AbstractUILayoutBase) getLayoutManager()).encodeEnd(facesContext);
 
     resetTabLayout();
     super.encodeEnd(facesContext);

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/TabGroupRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/TabGroupRenderer.java?rev=1650298&r1=1650297&r2=1650298&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/TabGroupRenderer.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/TabGroupRenderer.java Thu Jan  8 14:38:17 2015
@@ -360,7 +360,7 @@ public class TabGroupRenderer extends La
 
     writer.writeAttribute(HtmlAttributes.TABGROUPINDEX, index);
 
-    RenderUtils.encodeChildren(facesContext, tab);
+    RenderUtils.encode(facesContext, tab);
 
     writer.endElement(HtmlElements.DIV);
   }

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/TabRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/TabRenderer.java?rev=1650298&r1=1650297&r2=1650298&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/TabRenderer.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/TabRenderer.java Thu Jan  8 14:38:17 2015
@@ -27,4 +27,8 @@ public class TabRenderer extends LayoutC
 
   private static final Logger LOG = LoggerFactory.getLogger(TabRenderer.class);
 
+  @Override
+  public boolean getRendersChildren() {
+    return true;
+  }
 }