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 2011/06/09 13:18:28 UTC

svn commit: r1133791 - in /myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main: java/org/apache/myfaces/tobago/example/demo/ webapp/content/04/ webapp/content/04/00-client/ webapp/content/04/01-ajax/ webapp/content/04/02-server/

Author: lofwyr
Date: Thu Jun  9 11:18:27 2011
New Revision: 1133791

URL: http://svn.apache.org/viewvc?rev=1133791&view=rev
Log:
Demo: splitting tab page into different pages.

Added:
    myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/04/00-client/
    myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/04/00-client/tab-client.xhtml
      - copied, changed from r1133562, myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/04/tab.xhtml
    myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/04/01-ajax/
    myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/04/01-ajax/tab-ajax.xhtml
      - copied, changed from r1133562, myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/04/tab.xhtml
    myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/04/02-server/
    myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/04/02-server/tab-server.xhtml
      - copied, changed from r1133562, myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/04/tab.xhtml
Modified:
    myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/Navigation.java
    myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/04/tab.xhtml

Modified: myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/Navigation.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/Navigation.java?rev=1133791&r1=1133790&r2=1133791&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/Navigation.java (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/Navigation.java Thu Jun  9 11:18:27 2011
@@ -50,12 +50,35 @@ public class Navigation {
   private Node currentNode;
 
   public Navigation() {
-    this((ServletContext) FacesContext.getCurrentInstance().getExternalContext().getContext());
-    currentNode = tree;
-  }
+    final ServletContext servletContext
+        = (ServletContext) FacesContext.getCurrentInstance().getExternalContext().getContext();
+    final List<String> list = locateResourcesInWar(servletContext, "/content", new ArrayList<String>());
+    list.add("/content/root.xhtml");
+    List<Node> nodes = new ArrayList<Node>();
+    for (String path : list) {
+      try {
+        nodes.add(new Node(path));
+      } catch (IllegalStateException e) {
+        LOG.error("Found file with wrong pattern: '{}'", path);
+      }
+    }
+
+    Collections.sort(nodes);
+
+    // after sorting the first node is the root node.
+    tree = nodes.get(0);
+
+    Map<String, Node> map = new HashMap<String, Node>();
+//    map.put(tree.getBranch(), tree);
 
-  protected Navigation(ServletContext servletContext) {
-    this(locateResourcesInWar(servletContext, "/content", new ArrayList<String>()));
+    for (Node node : nodes) {
+      map.put(node.getBranch(), node);
+      String parent = node.getBranch().substring(0, node.getBranch().lastIndexOf('/'));
+      if (! parent.equals("")) { // is root
+        map.get(parent).add(node);
+      }
+    }
+    currentNode = tree;
   }
 
   private static List<String> locateResourcesInWar(
@@ -88,29 +111,6 @@ public class Navigation {
     return result;
   }
 
-  protected Navigation(List<String> list) {
-    List<Node> nodes = new ArrayList<Node>();
-    for (String path : list) {
-      try {
-        nodes.add(new Node(path));
-      } catch (IllegalStateException e) {
-        LOG.error("Found file with wrong pattern: '{}'", path);
-      }
-    }
-
-    Collections.sort(nodes);
-
-    Map<String, Node> map = new HashMap<String, Node>();
-    tree = new Node();
-    map.put(tree.getBranch(), tree);
-
-    for (Node node : nodes) {
-      map.put(node.getBranch(), node);
-      String parent = node.getBranch().substring(0, Math.max(node.getBranch().length() - 3, 0));
-      map.get(parent).add(node);
-    }
-  }
-
   public void selectByViewId(String viewId) {
     Enumeration enumeration = tree.depthFirstEnumeration();
     while (enumeration.hasMoreElements()) {
@@ -197,15 +197,11 @@ public class Navigation {
     private String outcome;
     private boolean expanded;
 
-    public Node() {
-      name = "root";
-      branch = "";
-    }
-
     public Node(String path) {
 
       outcome = path;
-      final Pattern pattern = Pattern.compile("([\\d\\d/]*\\d\\d)/([^/]*)\\.(xhtml)");
+      final Pattern pattern = Pattern.compile("(.*)/([^/]*)\\.(xhtml)");
+//      final Pattern pattern = Pattern.compile("([\\d\\d/]*\\d\\d[^/]*)/([^/]*)\\.(xhtml)");
       final Matcher matcher = pattern.matcher(path);
       matcher.find();
       branch = matcher.group(1);
@@ -288,5 +284,10 @@ public class Navigation {
     public void setExpanded(boolean expanded) {
       this.expanded = expanded;
     }
+
+    @Override
+    public String toString() {
+      return outcome;
+    }
   }
 }

Copied: myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/04/00-client/tab-client.xhtml (from r1133562, myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/04/tab.xhtml)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/04/00-client/tab-client.xhtml?p2=myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/04/00-client/tab-client.xhtml&p1=myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/04/tab.xhtml&r1=1133562&r2=1133791&rev=1133791&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/04/tab.xhtml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/04/00-client/tab-client.xhtml Thu Jun  9 11:18:27 2011
@@ -21,156 +21,63 @@
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
                 xmlns:tx="http://myfaces.apache.org/tobago/extension"
                 xmlns:ui="http://java.sun.com/jsf/facelets"
-                xmlns:h="http://java.sun.com/jsf/html"
                 xmlns:f="http://java.sun.com/jsf/core">
-  <ui:param name="title" value="#{overviewBundle.tab}"/>
+
+  <ui:param name="title" value="#{overviewBundle.tabSwitchTypeClient}"/>
+
   <tc:panel>
     <f:facet name="layout">
-      <tc:gridLayout rows="1*;4*"/>
+      <tc:gridLayout rows="*;auto"/>
     </f:facet>
 
-    <tc:out escape="false" value="#{overviewBundle.tab_text}"/>
-
-    <tc:tabGroup id="tabs" selectedIndex="#{demo.tabState0}">
-
-      <tc:tab label="#{overviewBundle.tabSwitchTypeClient}">
-        <f:facet name="layout"><tc:gridLayout/></f:facet>
-        <tc:tabGroup id="tabMarsOuterForm" selectedIndex="#{demo.tabState1}">
-          <tc:tab label="#{overviewBundle.tabPlanet}">
-            <f:facet name="layout"><tc:gridLayout rows="1*;fixed;fixed;1*"/></f:facet>
-            <tc:image value="image/feather-leaf.png"/>
-            <tx:in value="#{demo.solar.planets[0].diameter}"
-                   label="#{overviewBundle.solarPlanetDiameter}"/>
-            <tx:in value="#{demo.solar.planets[0].mass}"
-                   label="#{overviewBundle.solarPlanetMass}"/>
-            <tc:cell/>
-          </tc:tab>
-          <tc:tab label="#{overviewBundle.tabInsolar}">
-            <f:facet name="layout"><tc:gridLayout rows="1*;fixed;fixed;1*"/></f:facet>
-            <tc:image value="image/feather-leaf.png"/>
-            <tx:in value="#{demo.solar.planets[0].sunDistance}"
-                   label="#{overviewBundle.solarPlanetSunDistance}"/>
-            <tx:in value="#{demo.solar.planets[0].timeOfCirculation}"
-                   label="#{overviewBundle.solarPlanetTimeOfCirculation}"/>
-            <tc:cell/>
-          </tc:tab>
-          <tc:tab label="#{overviewBundle.tabMoons}">
-            <f:facet name="layout"><tc:gridLayout/></f:facet>
-            <tc:sheet value="#{demo.solar.planets[0].moons}"
-                      columns="2*;1*;2*;2*" var="moon">
-              <tc:column label="#{overviewBundle.solarArrayName}" id="name" sortable="true">
-                <tc:out value="#{moon.name}" id="t_name"/>
-              </tc:column>
-              <tc:column label="#{overviewBundle.solarArrayNumber}" id="number" sortable="false" align="center">
-                <tc:out value="#{moon.number}" id="t_number"/>
-              </tc:column>
-              <tc:column label="#{overviewBundle.solarArrayDistance}" sortable="true" align="right">
-                <tc:out value="#{moon.distance}" id="t_distance"/>
-              </tc:column>
-              <tc:column label="#{overviewBundle.solarArrayPeriod}" sortable="true" align="right">
-                <tc:out value="#{moon.period}" id="t_period"/>
-              </tc:column>
-            </tc:sheet>
-          </tc:tab>
-        </tc:tabGroup>
-
+    <tc:tabGroup id="tabMarsOuterForm" selectedIndex="#{demo.tabState1}">
+      <tc:tab label="#{overviewBundle.tabPlanet}">
+        <f:facet name="layout"><tc:gridLayout rows="1*;fixed;fixed;1*"/></f:facet>
+        <tc:image value="image/feather-leaf.png"/>
+        <tx:in value="#{demo.solar.planets[0].diameter}" required="true"
+               label="#{overviewBundle.solarPlanetDiameter}"/>
+        <tx:in value="#{demo.solar.planets[0].mass}"
+               label="#{overviewBundle.solarPlanetMass}"/>
+        <tc:cell/>
       </tc:tab>
-
-      <tc:tab label="#{overviewBundle.tabSwitchTypeReloadTag}">
-        <f:facet name="layout"><tc:gridLayout/></f:facet>
-        <tc:tabGroup id="tabMarsOuterForm2" switchType="reloadTab" selectedIndex="#{demo.tabState2}">
-
-          <tc:tabChangeListener type="org.apache.myfaces.tobago.example.demo.actionlistener.SimpleTabChangeListener"
-                                binding="#{demo.tabChangeListener}"/>
-
-          <tc:tab label="#{overviewBundle.tabPlanet}">
-            <f:facet name="layout"><tc:gridLayout rows="1*;fixed;fixed;1*"/></f:facet>
-            <tc:image value="image/feather-leaf.png"/>
-            <tx:in value="#{demo.solar.planets[0].diameter}"
-                   label="#{overviewBundle.solarPlanetDiameter}"/>
-            <tx:in value="#{demo.solar.planets[0].mass}"
-                   label="#{overviewBundle.solarPlanetMass}"/>
-            <tc:cell/>
-          </tc:tab>
-          <tc:tab label="#{overviewBundle.tabInsolar}">
-            <f:facet name="layout"><tc:gridLayout rows="1*;fixed;fixed;1*"/></f:facet>
-            <tc:image value="image/feather-leaf.png"/>
-            <tx:in value="#{demo.solar.planets[0].sunDistance}"
-                   label="#{overviewBundle.solarPlanetSunDistance}"/>
-            <tx:in value="#{demo.solar.planets[0].timeOfCirculation}"
-                   label="#{overviewBundle.solarPlanetTimeOfCirculation}"/>
-            <tc:cell/>
-          </tc:tab>
-          <tc:tab label="#{overviewBundle.tabMoons}">
-            <f:facet name="layout"><tc:gridLayout/></f:facet>
-            <tc:sheet value="#{demo.solar.planets[0].moons}"
-                      columns="2*;1*;2*;2*" var="moon">
-              <tc:column label="#{overviewBundle.solarArrayName}" id="name" sortable="true">
-                <tc:out value="#{moon.name}" id="t_name"/>
-              </tc:column>
-              <tc:column label="#{overviewBundle.solarArrayNumber}" id="number" sortable="false" align="center">
-                <tc:out value="#{moon.number}" id="t_number"/>
-              </tc:column>
-              <tc:column label="#{overviewBundle.solarArrayDistance}" sortable="true" align="right">
-                <tc:out value="#{moon.distance}" id="t_distance"/>
-              </tc:column>
-              <tc:column label="#{overviewBundle.solarArrayPeriod}" sortable="true" align="right">
-                <tc:out value="#{moon.period}" id="t_period"/>
-              </tc:column>
-            </tc:sheet>
-          </tc:tab>
-        </tc:tabGroup>
-
+      <tc:tab label="#{overviewBundle.tabInsolar}">
+        <f:facet name="layout"><tc:gridLayout rows="1*;fixed;fixed;1*"/></f:facet>
+        <tc:image value="image/feather-leaf.png"/>
+        <tx:in value="#{demo.solar.planets[0].sunDistance}"
+               label="#{overviewBundle.solarPlanetSunDistance}"/>
+        <tx:in value="#{demo.solar.planets[0].timeOfCirculation}"
+               label="#{overviewBundle.solarPlanetTimeOfCirculation}"/>
+        <tc:cell/>
       </tc:tab>
-
-      <tc:tab label="#{overviewBundle.tabSwitchTypeReloadPage}">
+      <tc:tab label="#{overviewBundle.tabMoons}">
         <f:facet name="layout"><tc:gridLayout/></f:facet>
-        <tc:tabGroup id="tabMarsOuterForm3" switchType="reloadPage" selectedIndex="#{demo.tabState3}">
-
-          <tc:tabChangeListener type="org.apache.myfaces.tobago.example.demo.actionlistener.SimpleTabChangeListener"
-                                binding="#{demo.tabChangeListener}"/>
-
-          <tc:tab label="#{overviewBundle.tabPlanet}">
-            <f:facet name="layout"><tc:gridLayout rows="1*;fixed;fixed;1*"/></f:facet>
-            <tc:cell/>
-            <tx:in value="#{demo.solar.planets[0].diameter}"
-                   label="#{overviewBundle.solarPlanetDiameter}"/>
-            <tx:in value="#{demo.solar.planets[0].mass}"
-                   label="#{overviewBundle.solarPlanetMass}"/>
-            <tc:cell/>
-          </tc:tab>
-          <tc:tab label="#{overviewBundle.tabInsolar}">
-            <f:facet name="layout"><tc:gridLayout rows="1*;fixed;fixed;1*"/></f:facet>
-            <tc:cell/>
-            <tx:in value="#{demo.solar.planets[0].sunDistance}"
-                   label="#{overviewBundle.solarPlanetSunDistance}"/>
-            <tx:in value="#{demo.solar.planets[0].timeOfCirculation}"
-                   label="#{overviewBundle.solarPlanetTimeOfCirculation}"/>
-            <tc:cell/>
-          </tc:tab>
-          <tc:tab label="#{overviewBundle.tabMoons}">
-            <f:facet name="layout"><tc:gridLayout/></f:facet>
-            <tc:sheet value="#{demo.solar.planets[0].moons}"
-                      columns="2*;1*;2*;2*" var="moon">
-              <tc:column label="#{overviewBundle.solarArrayName}" id="name" sortable="true">
-                <tc:out value="#{moon.name}" id="t_name"/>
-              </tc:column>
-              <tc:column label="#{overviewBundle.solarArrayNumber}" id="number" sortable="false" align="center">
-                <tc:out value="#{moon.number}" id="t_number"/>
-              </tc:column>
-              <tc:column label="#{overviewBundle.solarArrayDistance}" sortable="true" align="right">
-                <tc:out value="#{moon.distance}" id="t_distance"/>
-              </tc:column>
-              <tc:column label="#{overviewBundle.solarArrayPeriod}" sortable="true" align="right">
-                <tc:out value="#{moon.period}" id="t_period"/>
-              </tc:column>
-            </tc:sheet>
-          </tc:tab>
-        </tc:tabGroup>
-
+        <tc:sheet value="#{demo.solar.planets[0].moons}"
+                  columns="2*;1*;2*;2*" var="moon">
+          <tc:column label="#{overviewBundle.solarArrayName}" id="name" sortable="true">
+            <tc:out value="#{moon.name}" id="t_name"/>
+          </tc:column>
+          <tc:column label="#{overviewBundle.solarArrayNumber}" id="number" sortable="false" align="center">
+            <tc:out value="#{moon.number}" id="t_number"/>
+          </tc:column>
+          <tc:column label="#{overviewBundle.solarArrayDistance}" sortable="true" align="right">
+            <tc:out value="#{moon.distance}" id="t_distance"/>
+          </tc:column>
+          <tc:column label="#{overviewBundle.solarArrayPeriod}" sortable="true" align="right">
+            <tc:out value="#{moon.period}" id="t_period"/>
+          </tc:column>
+        </tc:sheet>
       </tc:tab>
-
     </tc:tabGroup>
 
+    <tc:panel>
+      <f:facet name="layout">
+        <tc:gridLayout columns="*;auto"/>
+      </f:facet>
+
+      <tc:panel/>
+      <tc:button label="OK"/>
+    </tc:panel>
+
   </tc:panel>
+
 </ui:composition>

Copied: myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/04/01-ajax/tab-ajax.xhtml (from r1133562, myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/04/tab.xhtml)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/04/01-ajax/tab-ajax.xhtml?p2=myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/04/01-ajax/tab-ajax.xhtml&p1=myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/04/tab.xhtml&r1=1133562&r2=1133791&rev=1133791&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/04/tab.xhtml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/04/01-ajax/tab-ajax.xhtml Thu Jun  9 11:18:27 2011
@@ -21,156 +21,68 @@
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
                 xmlns:tx="http://myfaces.apache.org/tobago/extension"
                 xmlns:ui="http://java.sun.com/jsf/facelets"
-                xmlns:h="http://java.sun.com/jsf/html"
                 xmlns:f="http://java.sun.com/jsf/core">
-  <ui:param name="title" value="#{overviewBundle.tab}"/>
+  <ui:param name="title" value="#{overviewBundle.tabSwitchTypeReloadTag}"/>
+
   <tc:panel>
     <f:facet name="layout">
-      <tc:gridLayout rows="1*;4*"/>
+      <tc:gridLayout rows="*;auto"/>
     </f:facet>
 
-    <tc:out escape="false" value="#{overviewBundle.tab_text}"/>
-
-    <tc:tabGroup id="tabs" selectedIndex="#{demo.tabState0}">
+    <tc:tabGroup id="tabMarsOuterForm2" switchType="reloadTab" selectedIndex="#{demo.tabState2}" immediate="true">
 
-      <tc:tab label="#{overviewBundle.tabSwitchTypeClient}">
-        <f:facet name="layout"><tc:gridLayout/></f:facet>
-        <tc:tabGroup id="tabMarsOuterForm" selectedIndex="#{demo.tabState1}">
-          <tc:tab label="#{overviewBundle.tabPlanet}">
-            <f:facet name="layout"><tc:gridLayout rows="1*;fixed;fixed;1*"/></f:facet>
-            <tc:image value="image/feather-leaf.png"/>
-            <tx:in value="#{demo.solar.planets[0].diameter}"
-                   label="#{overviewBundle.solarPlanetDiameter}"/>
-            <tx:in value="#{demo.solar.planets[0].mass}"
-                   label="#{overviewBundle.solarPlanetMass}"/>
-            <tc:cell/>
-          </tc:tab>
-          <tc:tab label="#{overviewBundle.tabInsolar}">
-            <f:facet name="layout"><tc:gridLayout rows="1*;fixed;fixed;1*"/></f:facet>
-            <tc:image value="image/feather-leaf.png"/>
-            <tx:in value="#{demo.solar.planets[0].sunDistance}"
-                   label="#{overviewBundle.solarPlanetSunDistance}"/>
-            <tx:in value="#{demo.solar.planets[0].timeOfCirculation}"
-                   label="#{overviewBundle.solarPlanetTimeOfCirculation}"/>
-            <tc:cell/>
-          </tc:tab>
-          <tc:tab label="#{overviewBundle.tabMoons}">
-            <f:facet name="layout"><tc:gridLayout/></f:facet>
-            <tc:sheet value="#{demo.solar.planets[0].moons}"
-                      columns="2*;1*;2*;2*" var="moon">
-              <tc:column label="#{overviewBundle.solarArrayName}" id="name" sortable="true">
-                <tc:out value="#{moon.name}" id="t_name"/>
-              </tc:column>
-              <tc:column label="#{overviewBundle.solarArrayNumber}" id="number" sortable="false" align="center">
-                <tc:out value="#{moon.number}" id="t_number"/>
-              </tc:column>
-              <tc:column label="#{overviewBundle.solarArrayDistance}" sortable="true" align="right">
-                <tc:out value="#{moon.distance}" id="t_distance"/>
-              </tc:column>
-              <tc:column label="#{overviewBundle.solarArrayPeriod}" sortable="true" align="right">
-                <tc:out value="#{moon.period}" id="t_period"/>
-              </tc:column>
-            </tc:sheet>
-          </tc:tab>
-        </tc:tabGroup>
+      <tc:tabChangeListener type="org.apache.myfaces.tobago.example.demo.actionlistener.SimpleTabChangeListener"
+                            binding="#{demo.tabChangeListener}"/>
 
+      <tc:tab label="#{overviewBundle.tabPlanet}">
+        <f:facet name="layout">
+          <tc:gridLayout rows="1*;fixed;fixed;1*"/>
+        </f:facet>
+        <tc:image value="image/feather-leaf.png"/>
+        <tx:in value="#{demo.solar.planets[0].diameter}" required="true"
+               label="#{overviewBundle.solarPlanetDiameter}"/>
+        <tx:in value="#{demo.solar.planets[0].mass}"
+               label="#{overviewBundle.solarPlanetMass}"/>
+        <tc:cell/>
       </tc:tab>
-
-      <tc:tab label="#{overviewBundle.tabSwitchTypeReloadTag}">
-        <f:facet name="layout"><tc:gridLayout/></f:facet>
-        <tc:tabGroup id="tabMarsOuterForm2" switchType="reloadTab" selectedIndex="#{demo.tabState2}">
-
-          <tc:tabChangeListener type="org.apache.myfaces.tobago.example.demo.actionlistener.SimpleTabChangeListener"
-                                binding="#{demo.tabChangeListener}"/>
-
-          <tc:tab label="#{overviewBundle.tabPlanet}">
-            <f:facet name="layout"><tc:gridLayout rows="1*;fixed;fixed;1*"/></f:facet>
-            <tc:image value="image/feather-leaf.png"/>
-            <tx:in value="#{demo.solar.planets[0].diameter}"
-                   label="#{overviewBundle.solarPlanetDiameter}"/>
-            <tx:in value="#{demo.solar.planets[0].mass}"
-                   label="#{overviewBundle.solarPlanetMass}"/>
-            <tc:cell/>
-          </tc:tab>
-          <tc:tab label="#{overviewBundle.tabInsolar}">
-            <f:facet name="layout"><tc:gridLayout rows="1*;fixed;fixed;1*"/></f:facet>
-            <tc:image value="image/feather-leaf.png"/>
-            <tx:in value="#{demo.solar.planets[0].sunDistance}"
-                   label="#{overviewBundle.solarPlanetSunDistance}"/>
-            <tx:in value="#{demo.solar.planets[0].timeOfCirculation}"
-                   label="#{overviewBundle.solarPlanetTimeOfCirculation}"/>
-            <tc:cell/>
-          </tc:tab>
-          <tc:tab label="#{overviewBundle.tabMoons}">
-            <f:facet name="layout"><tc:gridLayout/></f:facet>
-            <tc:sheet value="#{demo.solar.planets[0].moons}"
-                      columns="2*;1*;2*;2*" var="moon">
-              <tc:column label="#{overviewBundle.solarArrayName}" id="name" sortable="true">
-                <tc:out value="#{moon.name}" id="t_name"/>
-              </tc:column>
-              <tc:column label="#{overviewBundle.solarArrayNumber}" id="number" sortable="false" align="center">
-                <tc:out value="#{moon.number}" id="t_number"/>
-              </tc:column>
-              <tc:column label="#{overviewBundle.solarArrayDistance}" sortable="true" align="right">
-                <tc:out value="#{moon.distance}" id="t_distance"/>
-              </tc:column>
-              <tc:column label="#{overviewBundle.solarArrayPeriod}" sortable="true" align="right">
-                <tc:out value="#{moon.period}" id="t_period"/>
-              </tc:column>
-            </tc:sheet>
-          </tc:tab>
-        </tc:tabGroup>
-
+      <tc:tab label="#{overviewBundle.tabInsolar}">
+        <f:facet name="layout"><tc:gridLayout rows="1*;fixed;fixed;1*"/></f:facet>
+        <tc:image value="image/feather-leaf.png"/>
+        <tx:in value="#{demo.solar.planets[0].sunDistance}"
+               label="#{overviewBundle.solarPlanetSunDistance}"/>
+        <tx:in value="#{demo.solar.planets[0].timeOfCirculation}"
+               label="#{overviewBundle.solarPlanetTimeOfCirculation}"/>
+        <tc:cell/>
       </tc:tab>
-
-      <tc:tab label="#{overviewBundle.tabSwitchTypeReloadPage}">
+      <tc:tab label="#{overviewBundle.tabMoons}">
         <f:facet name="layout"><tc:gridLayout/></f:facet>
-        <tc:tabGroup id="tabMarsOuterForm3" switchType="reloadPage" selectedIndex="#{demo.tabState3}">
-
-          <tc:tabChangeListener type="org.apache.myfaces.tobago.example.demo.actionlistener.SimpleTabChangeListener"
-                                binding="#{demo.tabChangeListener}"/>
-
-          <tc:tab label="#{overviewBundle.tabPlanet}">
-            <f:facet name="layout"><tc:gridLayout rows="1*;fixed;fixed;1*"/></f:facet>
-            <tc:cell/>
-            <tx:in value="#{demo.solar.planets[0].diameter}"
-                   label="#{overviewBundle.solarPlanetDiameter}"/>
-            <tx:in value="#{demo.solar.planets[0].mass}"
-                   label="#{overviewBundle.solarPlanetMass}"/>
-            <tc:cell/>
-          </tc:tab>
-          <tc:tab label="#{overviewBundle.tabInsolar}">
-            <f:facet name="layout"><tc:gridLayout rows="1*;fixed;fixed;1*"/></f:facet>
-            <tc:cell/>
-            <tx:in value="#{demo.solar.planets[0].sunDistance}"
-                   label="#{overviewBundle.solarPlanetSunDistance}"/>
-            <tx:in value="#{demo.solar.planets[0].timeOfCirculation}"
-                   label="#{overviewBundle.solarPlanetTimeOfCirculation}"/>
-            <tc:cell/>
-          </tc:tab>
-          <tc:tab label="#{overviewBundle.tabMoons}">
-            <f:facet name="layout"><tc:gridLayout/></f:facet>
-            <tc:sheet value="#{demo.solar.planets[0].moons}"
-                      columns="2*;1*;2*;2*" var="moon">
-              <tc:column label="#{overviewBundle.solarArrayName}" id="name" sortable="true">
-                <tc:out value="#{moon.name}" id="t_name"/>
-              </tc:column>
-              <tc:column label="#{overviewBundle.solarArrayNumber}" id="number" sortable="false" align="center">
-                <tc:out value="#{moon.number}" id="t_number"/>
-              </tc:column>
-              <tc:column label="#{overviewBundle.solarArrayDistance}" sortable="true" align="right">
-                <tc:out value="#{moon.distance}" id="t_distance"/>
-              </tc:column>
-              <tc:column label="#{overviewBundle.solarArrayPeriod}" sortable="true" align="right">
-                <tc:out value="#{moon.period}" id="t_period"/>
-              </tc:column>
-            </tc:sheet>
-          </tc:tab>
-        </tc:tabGroup>
-
+        <tc:sheet value="#{demo.solar.planets[0].moons}"
+                  columns="2*;1*;2*;2*" var="moon">
+          <tc:column label="#{overviewBundle.solarArrayName}" id="name" sortable="true">
+            <tc:out value="#{moon.name}" id="t_name"/>
+          </tc:column>
+          <tc:column label="#{overviewBundle.solarArrayNumber}" id="number" sortable="false" align="center">
+            <tc:out value="#{moon.number}" id="t_number"/>
+          </tc:column>
+          <tc:column label="#{overviewBundle.solarArrayDistance}" sortable="true" align="right">
+            <tc:out value="#{moon.distance}" id="t_distance"/>
+          </tc:column>
+          <tc:column label="#{overviewBundle.solarArrayPeriod}" sortable="true" align="right">
+            <tc:out value="#{moon.period}" id="t_period"/>
+          </tc:column>
+        </tc:sheet>
       </tc:tab>
-
     </tc:tabGroup>
 
+    <tc:panel>
+      <f:facet name="layout">
+        <tc:gridLayout columns="*;auto"/>
+      </f:facet>
+
+      <tc:panel/>
+      <tc:button label="OK"/>
+    </tc:panel>
+
   </tc:panel>
+
 </ui:composition>

Copied: myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/04/02-server/tab-server.xhtml (from r1133562, myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/04/tab.xhtml)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/04/02-server/tab-server.xhtml?p2=myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/04/02-server/tab-server.xhtml&p1=myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/04/tab.xhtml&r1=1133562&r2=1133791&rev=1133791&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/04/tab.xhtml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/04/02-server/tab-server.xhtml Thu Jun  9 11:18:27 2011
@@ -21,156 +21,66 @@
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
                 xmlns:tx="http://myfaces.apache.org/tobago/extension"
                 xmlns:ui="http://java.sun.com/jsf/facelets"
-                xmlns:h="http://java.sun.com/jsf/html"
                 xmlns:f="http://java.sun.com/jsf/core">
-  <ui:param name="title" value="#{overviewBundle.tab}"/>
+  <ui:param name="title" value="#{overviewBundle.tabSwitchTypeReloadPage}"/>
+
   <tc:panel>
     <f:facet name="layout">
-      <tc:gridLayout rows="1*;4*"/>
+      <tc:gridLayout rows="*;auto"/>
     </f:facet>
 
-    <tc:out escape="false" value="#{overviewBundle.tab_text}"/>
-
-    <tc:tabGroup id="tabs" selectedIndex="#{demo.tabState0}">
+    <tc:tabGroup id="tabMarsOuterForm3" switchType="reloadPage" selectedIndex="#{demo.tabState3}" immediate="true">
 
-      <tc:tab label="#{overviewBundle.tabSwitchTypeClient}">
-        <f:facet name="layout"><tc:gridLayout/></f:facet>
-        <tc:tabGroup id="tabMarsOuterForm" selectedIndex="#{demo.tabState1}">
-          <tc:tab label="#{overviewBundle.tabPlanet}">
-            <f:facet name="layout"><tc:gridLayout rows="1*;fixed;fixed;1*"/></f:facet>
-            <tc:image value="image/feather-leaf.png"/>
-            <tx:in value="#{demo.solar.planets[0].diameter}"
-                   label="#{overviewBundle.solarPlanetDiameter}"/>
-            <tx:in value="#{demo.solar.planets[0].mass}"
-                   label="#{overviewBundle.solarPlanetMass}"/>
-            <tc:cell/>
-          </tc:tab>
-          <tc:tab label="#{overviewBundle.tabInsolar}">
-            <f:facet name="layout"><tc:gridLayout rows="1*;fixed;fixed;1*"/></f:facet>
-            <tc:image value="image/feather-leaf.png"/>
-            <tx:in value="#{demo.solar.planets[0].sunDistance}"
-                   label="#{overviewBundle.solarPlanetSunDistance}"/>
-            <tx:in value="#{demo.solar.planets[0].timeOfCirculation}"
-                   label="#{overviewBundle.solarPlanetTimeOfCirculation}"/>
-            <tc:cell/>
-          </tc:tab>
-          <tc:tab label="#{overviewBundle.tabMoons}">
-            <f:facet name="layout"><tc:gridLayout/></f:facet>
-            <tc:sheet value="#{demo.solar.planets[0].moons}"
-                      columns="2*;1*;2*;2*" var="moon">
-              <tc:column label="#{overviewBundle.solarArrayName}" id="name" sortable="true">
-                <tc:out value="#{moon.name}" id="t_name"/>
-              </tc:column>
-              <tc:column label="#{overviewBundle.solarArrayNumber}" id="number" sortable="false" align="center">
-                <tc:out value="#{moon.number}" id="t_number"/>
-              </tc:column>
-              <tc:column label="#{overviewBundle.solarArrayDistance}" sortable="true" align="right">
-                <tc:out value="#{moon.distance}" id="t_distance"/>
-              </tc:column>
-              <tc:column label="#{overviewBundle.solarArrayPeriod}" sortable="true" align="right">
-                <tc:out value="#{moon.period}" id="t_period"/>
-              </tc:column>
-            </tc:sheet>
-          </tc:tab>
-        </tc:tabGroup>
+      <tc:tabChangeListener type="org.apache.myfaces.tobago.example.demo.actionlistener.SimpleTabChangeListener"
+                            binding="#{demo.tabChangeListener}"/>
 
+      <tc:tab label="#{overviewBundle.tabPlanet}">
+        <f:facet name="layout"><tc:gridLayout rows="1*;fixed;fixed;1*"/></f:facet>
+        <tc:cell/>
+        <tx:in value="#{demo.solar.planets[0].diameter}" required="true"
+               label="#{overviewBundle.solarPlanetDiameter}"/>
+        <tx:in value="#{demo.solar.planets[0].mass}"
+               label="#{overviewBundle.solarPlanetMass}"/>
+        <tc:cell/>
       </tc:tab>
-
-      <tc:tab label="#{overviewBundle.tabSwitchTypeReloadTag}">
-        <f:facet name="layout"><tc:gridLayout/></f:facet>
-        <tc:tabGroup id="tabMarsOuterForm2" switchType="reloadTab" selectedIndex="#{demo.tabState2}">
-
-          <tc:tabChangeListener type="org.apache.myfaces.tobago.example.demo.actionlistener.SimpleTabChangeListener"
-                                binding="#{demo.tabChangeListener}"/>
-
-          <tc:tab label="#{overviewBundle.tabPlanet}">
-            <f:facet name="layout"><tc:gridLayout rows="1*;fixed;fixed;1*"/></f:facet>
-            <tc:image value="image/feather-leaf.png"/>
-            <tx:in value="#{demo.solar.planets[0].diameter}"
-                   label="#{overviewBundle.solarPlanetDiameter}"/>
-            <tx:in value="#{demo.solar.planets[0].mass}"
-                   label="#{overviewBundle.solarPlanetMass}"/>
-            <tc:cell/>
-          </tc:tab>
-          <tc:tab label="#{overviewBundle.tabInsolar}">
-            <f:facet name="layout"><tc:gridLayout rows="1*;fixed;fixed;1*"/></f:facet>
-            <tc:image value="image/feather-leaf.png"/>
-            <tx:in value="#{demo.solar.planets[0].sunDistance}"
-                   label="#{overviewBundle.solarPlanetSunDistance}"/>
-            <tx:in value="#{demo.solar.planets[0].timeOfCirculation}"
-                   label="#{overviewBundle.solarPlanetTimeOfCirculation}"/>
-            <tc:cell/>
-          </tc:tab>
-          <tc:tab label="#{overviewBundle.tabMoons}">
-            <f:facet name="layout"><tc:gridLayout/></f:facet>
-            <tc:sheet value="#{demo.solar.planets[0].moons}"
-                      columns="2*;1*;2*;2*" var="moon">
-              <tc:column label="#{overviewBundle.solarArrayName}" id="name" sortable="true">
-                <tc:out value="#{moon.name}" id="t_name"/>
-              </tc:column>
-              <tc:column label="#{overviewBundle.solarArrayNumber}" id="number" sortable="false" align="center">
-                <tc:out value="#{moon.number}" id="t_number"/>
-              </tc:column>
-              <tc:column label="#{overviewBundle.solarArrayDistance}" sortable="true" align="right">
-                <tc:out value="#{moon.distance}" id="t_distance"/>
-              </tc:column>
-              <tc:column label="#{overviewBundle.solarArrayPeriod}" sortable="true" align="right">
-                <tc:out value="#{moon.period}" id="t_period"/>
-              </tc:column>
-            </tc:sheet>
-          </tc:tab>
-        </tc:tabGroup>
-
+      <tc:tab label="#{overviewBundle.tabInsolar}">
+        <f:facet name="layout"><tc:gridLayout rows="1*;fixed;fixed;1*"/></f:facet>
+        <tc:cell/>
+        <tx:in value="#{demo.solar.planets[0].sunDistance}"
+               label="#{overviewBundle.solarPlanetSunDistance}"/>
+        <tx:in value="#{demo.solar.planets[0].timeOfCirculation}"
+               label="#{overviewBundle.solarPlanetTimeOfCirculation}"/>
+        <tc:cell/>
       </tc:tab>
-
-      <tc:tab label="#{overviewBundle.tabSwitchTypeReloadPage}">
+      <tc:tab label="#{overviewBundle.tabMoons}">
         <f:facet name="layout"><tc:gridLayout/></f:facet>
-        <tc:tabGroup id="tabMarsOuterForm3" switchType="reloadPage" selectedIndex="#{demo.tabState3}">
-
-          <tc:tabChangeListener type="org.apache.myfaces.tobago.example.demo.actionlistener.SimpleTabChangeListener"
-                                binding="#{demo.tabChangeListener}"/>
-
-          <tc:tab label="#{overviewBundle.tabPlanet}">
-            <f:facet name="layout"><tc:gridLayout rows="1*;fixed;fixed;1*"/></f:facet>
-            <tc:cell/>
-            <tx:in value="#{demo.solar.planets[0].diameter}"
-                   label="#{overviewBundle.solarPlanetDiameter}"/>
-            <tx:in value="#{demo.solar.planets[0].mass}"
-                   label="#{overviewBundle.solarPlanetMass}"/>
-            <tc:cell/>
-          </tc:tab>
-          <tc:tab label="#{overviewBundle.tabInsolar}">
-            <f:facet name="layout"><tc:gridLayout rows="1*;fixed;fixed;1*"/></f:facet>
-            <tc:cell/>
-            <tx:in value="#{demo.solar.planets[0].sunDistance}"
-                   label="#{overviewBundle.solarPlanetSunDistance}"/>
-            <tx:in value="#{demo.solar.planets[0].timeOfCirculation}"
-                   label="#{overviewBundle.solarPlanetTimeOfCirculation}"/>
-            <tc:cell/>
-          </tc:tab>
-          <tc:tab label="#{overviewBundle.tabMoons}">
-            <f:facet name="layout"><tc:gridLayout/></f:facet>
-            <tc:sheet value="#{demo.solar.planets[0].moons}"
-                      columns="2*;1*;2*;2*" var="moon">
-              <tc:column label="#{overviewBundle.solarArrayName}" id="name" sortable="true">
-                <tc:out value="#{moon.name}" id="t_name"/>
-              </tc:column>
-              <tc:column label="#{overviewBundle.solarArrayNumber}" id="number" sortable="false" align="center">
-                <tc:out value="#{moon.number}" id="t_number"/>
-              </tc:column>
-              <tc:column label="#{overviewBundle.solarArrayDistance}" sortable="true" align="right">
-                <tc:out value="#{moon.distance}" id="t_distance"/>
-              </tc:column>
-              <tc:column label="#{overviewBundle.solarArrayPeriod}" sortable="true" align="right">
-                <tc:out value="#{moon.period}" id="t_period"/>
-              </tc:column>
-            </tc:sheet>
-          </tc:tab>
-        </tc:tabGroup>
-
+        <tc:sheet value="#{demo.solar.planets[0].moons}"
+                  columns="2*;1*;2*;2*" var="moon">
+          <tc:column label="#{overviewBundle.solarArrayName}" id="name" sortable="true">
+            <tc:out value="#{moon.name}" id="t_name"/>
+          </tc:column>
+          <tc:column label="#{overviewBundle.solarArrayNumber}" id="number" sortable="false" align="center">
+            <tc:out value="#{moon.number}" id="t_number"/>
+          </tc:column>
+          <tc:column label="#{overviewBundle.solarArrayDistance}" sortable="true" align="right">
+            <tc:out value="#{moon.distance}" id="t_distance"/>
+          </tc:column>
+          <tc:column label="#{overviewBundle.solarArrayPeriod}" sortable="true" align="right">
+            <tc:out value="#{moon.period}" id="t_period"/>
+          </tc:column>
+        </tc:sheet>
       </tc:tab>
-
     </tc:tabGroup>
 
+    <tc:panel>
+      <f:facet name="layout">
+        <tc:gridLayout columns="*;auto"/>
+      </f:facet>
+
+      <tc:panel/>
+      <tc:button label="OK"/>
+    </tc:panel>
+
   </tc:panel>
+
 </ui:composition>

Modified: myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/04/tab.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/04/tab.xhtml?rev=1133791&r1=1133790&r2=1133791&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/04/tab.xhtml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/04/tab.xhtml Thu Jun  9 11:18:27 2011
@@ -31,146 +31,5 @@
 
     <tc:out escape="false" value="#{overviewBundle.tab_text}"/>
 
-    <tc:tabGroup id="tabs" selectedIndex="#{demo.tabState0}">
-
-      <tc:tab label="#{overviewBundle.tabSwitchTypeClient}">
-        <f:facet name="layout"><tc:gridLayout/></f:facet>
-        <tc:tabGroup id="tabMarsOuterForm" selectedIndex="#{demo.tabState1}">
-          <tc:tab label="#{overviewBundle.tabPlanet}">
-            <f:facet name="layout"><tc:gridLayout rows="1*;fixed;fixed;1*"/></f:facet>
-            <tc:image value="image/feather-leaf.png"/>
-            <tx:in value="#{demo.solar.planets[0].diameter}"
-                   label="#{overviewBundle.solarPlanetDiameter}"/>
-            <tx:in value="#{demo.solar.planets[0].mass}"
-                   label="#{overviewBundle.solarPlanetMass}"/>
-            <tc:cell/>
-          </tc:tab>
-          <tc:tab label="#{overviewBundle.tabInsolar}">
-            <f:facet name="layout"><tc:gridLayout rows="1*;fixed;fixed;1*"/></f:facet>
-            <tc:image value="image/feather-leaf.png"/>
-            <tx:in value="#{demo.solar.planets[0].sunDistance}"
-                   label="#{overviewBundle.solarPlanetSunDistance}"/>
-            <tx:in value="#{demo.solar.planets[0].timeOfCirculation}"
-                   label="#{overviewBundle.solarPlanetTimeOfCirculation}"/>
-            <tc:cell/>
-          </tc:tab>
-          <tc:tab label="#{overviewBundle.tabMoons}">
-            <f:facet name="layout"><tc:gridLayout/></f:facet>
-            <tc:sheet value="#{demo.solar.planets[0].moons}"
-                      columns="2*;1*;2*;2*" var="moon">
-              <tc:column label="#{overviewBundle.solarArrayName}" id="name" sortable="true">
-                <tc:out value="#{moon.name}" id="t_name"/>
-              </tc:column>
-              <tc:column label="#{overviewBundle.solarArrayNumber}" id="number" sortable="false" align="center">
-                <tc:out value="#{moon.number}" id="t_number"/>
-              </tc:column>
-              <tc:column label="#{overviewBundle.solarArrayDistance}" sortable="true" align="right">
-                <tc:out value="#{moon.distance}" id="t_distance"/>
-              </tc:column>
-              <tc:column label="#{overviewBundle.solarArrayPeriod}" sortable="true" align="right">
-                <tc:out value="#{moon.period}" id="t_period"/>
-              </tc:column>
-            </tc:sheet>
-          </tc:tab>
-        </tc:tabGroup>
-
-      </tc:tab>
-
-      <tc:tab label="#{overviewBundle.tabSwitchTypeReloadTag}">
-        <f:facet name="layout"><tc:gridLayout/></f:facet>
-        <tc:tabGroup id="tabMarsOuterForm2" switchType="reloadTab" selectedIndex="#{demo.tabState2}">
-
-          <tc:tabChangeListener type="org.apache.myfaces.tobago.example.demo.actionlistener.SimpleTabChangeListener"
-                                binding="#{demo.tabChangeListener}"/>
-
-          <tc:tab label="#{overviewBundle.tabPlanet}">
-            <f:facet name="layout"><tc:gridLayout rows="1*;fixed;fixed;1*"/></f:facet>
-            <tc:image value="image/feather-leaf.png"/>
-            <tx:in value="#{demo.solar.planets[0].diameter}"
-                   label="#{overviewBundle.solarPlanetDiameter}"/>
-            <tx:in value="#{demo.solar.planets[0].mass}"
-                   label="#{overviewBundle.solarPlanetMass}"/>
-            <tc:cell/>
-          </tc:tab>
-          <tc:tab label="#{overviewBundle.tabInsolar}">
-            <f:facet name="layout"><tc:gridLayout rows="1*;fixed;fixed;1*"/></f:facet>
-            <tc:image value="image/feather-leaf.png"/>
-            <tx:in value="#{demo.solar.planets[0].sunDistance}"
-                   label="#{overviewBundle.solarPlanetSunDistance}"/>
-            <tx:in value="#{demo.solar.planets[0].timeOfCirculation}"
-                   label="#{overviewBundle.solarPlanetTimeOfCirculation}"/>
-            <tc:cell/>
-          </tc:tab>
-          <tc:tab label="#{overviewBundle.tabMoons}">
-            <f:facet name="layout"><tc:gridLayout/></f:facet>
-            <tc:sheet value="#{demo.solar.planets[0].moons}"
-                      columns="2*;1*;2*;2*" var="moon">
-              <tc:column label="#{overviewBundle.solarArrayName}" id="name" sortable="true">
-                <tc:out value="#{moon.name}" id="t_name"/>
-              </tc:column>
-              <tc:column label="#{overviewBundle.solarArrayNumber}" id="number" sortable="false" align="center">
-                <tc:out value="#{moon.number}" id="t_number"/>
-              </tc:column>
-              <tc:column label="#{overviewBundle.solarArrayDistance}" sortable="true" align="right">
-                <tc:out value="#{moon.distance}" id="t_distance"/>
-              </tc:column>
-              <tc:column label="#{overviewBundle.solarArrayPeriod}" sortable="true" align="right">
-                <tc:out value="#{moon.period}" id="t_period"/>
-              </tc:column>
-            </tc:sheet>
-          </tc:tab>
-        </tc:tabGroup>
-
-      </tc:tab>
-
-      <tc:tab label="#{overviewBundle.tabSwitchTypeReloadPage}">
-        <f:facet name="layout"><tc:gridLayout/></f:facet>
-        <tc:tabGroup id="tabMarsOuterForm3" switchType="reloadPage" selectedIndex="#{demo.tabState3}">
-
-          <tc:tabChangeListener type="org.apache.myfaces.tobago.example.demo.actionlistener.SimpleTabChangeListener"
-                                binding="#{demo.tabChangeListener}"/>
-
-          <tc:tab label="#{overviewBundle.tabPlanet}">
-            <f:facet name="layout"><tc:gridLayout rows="1*;fixed;fixed;1*"/></f:facet>
-            <tc:cell/>
-            <tx:in value="#{demo.solar.planets[0].diameter}"
-                   label="#{overviewBundle.solarPlanetDiameter}"/>
-            <tx:in value="#{demo.solar.planets[0].mass}"
-                   label="#{overviewBundle.solarPlanetMass}"/>
-            <tc:cell/>
-          </tc:tab>
-          <tc:tab label="#{overviewBundle.tabInsolar}">
-            <f:facet name="layout"><tc:gridLayout rows="1*;fixed;fixed;1*"/></f:facet>
-            <tc:cell/>
-            <tx:in value="#{demo.solar.planets[0].sunDistance}"
-                   label="#{overviewBundle.solarPlanetSunDistance}"/>
-            <tx:in value="#{demo.solar.planets[0].timeOfCirculation}"
-                   label="#{overviewBundle.solarPlanetTimeOfCirculation}"/>
-            <tc:cell/>
-          </tc:tab>
-          <tc:tab label="#{overviewBundle.tabMoons}">
-            <f:facet name="layout"><tc:gridLayout/></f:facet>
-            <tc:sheet value="#{demo.solar.planets[0].moons}"
-                      columns="2*;1*;2*;2*" var="moon">
-              <tc:column label="#{overviewBundle.solarArrayName}" id="name" sortable="true">
-                <tc:out value="#{moon.name}" id="t_name"/>
-              </tc:column>
-              <tc:column label="#{overviewBundle.solarArrayNumber}" id="number" sortable="false" align="center">
-                <tc:out value="#{moon.number}" id="t_number"/>
-              </tc:column>
-              <tc:column label="#{overviewBundle.solarArrayDistance}" sortable="true" align="right">
-                <tc:out value="#{moon.distance}" id="t_distance"/>
-              </tc:column>
-              <tc:column label="#{overviewBundle.solarArrayPeriod}" sortable="true" align="right">
-                <tc:out value="#{moon.period}" id="t_period"/>
-              </tc:column>
-            </tc:sheet>
-          </tc:tab>
-        </tc:tabGroup>
-
-      </tc:tab>
-
-    </tc:tabGroup>
-
   </tc:panel>
 </ui:composition>