svn commit: r803173 - in /wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table: DataTable.html DataTable.java

[iv...@apache.org]

Author: ivaynberg
Date: Tue Aug 11 15:53:11 2009
New Revision: 803173

URL: http://svn.apache.org/viewvc?rev=803173&view=rev
Log:
WICKET-2422 DefaultDataTable hides NavigationToolbar once and forever
Issue: WICKET-2422

Modified:
    wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/DataTable.html
    wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/DataTable.java

Modified: wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/DataTable.html
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/DataTable.html?rev=803173&r1=803172&r2=803173&view=diff
==============================================================================
--- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/DataTable.html (original)
+++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/DataTable.html Tue Aug 11 15:53:11 2009
@@ -15,20 +15,13 @@
    limitations under the License.
 -->
 <wicket:panel>
-<wicket:enclosure child="topToolbars">
-<thead>
-	<span wicket:id="topToolbars">
-		<span wicket:id="toolbar"></span>
-	</span>
-</thead>
-</wicket:enclosure>
-<wicket:enclosure child="bottomToolbars">
-<tfoot>
-	<span wicket:id="bottomToolbars">
-		<span wicket:id="toolbar"></span>
-	</span>
-</tfoot>
-</wicket:enclosure>
+
+<wicket:container wicket:id="topToolbars">
+	<thead wicket:id="toolbar"></thead>
+</wicket:container>
+<wicket:container wicket:id="bottomToolbars">
+	<tfoot wicket:id="toolbar"></tfoot>
+</wicket:container>
 <tbody>
 	<tr wicket:id="rows">
 		<td wicket:id="cells">

Modified: wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/DataTable.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/DataTable.java?rev=803173&r1=803172&r2=803173&view=diff
==============================================================================
--- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/DataTable.java (original)
+++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/DataTable.java Tue Aug 11 15:53:11 2009
@@ -304,8 +304,6 @@
 				"Toolbar must have component id equal to AbstractDataTable.TOOLBAR_COMPONENT_ID");
 		}
 
-		toolbar.setRenderBodyOnly(true);
-
 		// create a container item for the toolbar (required by repeating view)
 		WebMarkupContainer item = new ToolbarContainer(container.newChildId());
 		item.setRenderBodyOnly(true);
@@ -377,8 +375,7 @@
 	}
 
 	/**
-	 * Acts as a container item for a single toolbar. The main feature it implements is the
-	 * visibility check, this item is visible only if the toolbar placed into it is visible.
+	 * Acts as a container item for a single toolbar.
 	 * 
 	 * TODO 1.5 optimization: this can probably be removed and items can be added directly to the
 	 * toolbarcontainer
@@ -399,20 +396,10 @@
 		{
 			super(id);
 		}
-
-		/** {@inheritDoc} */
-		@Override
-		public boolean isVisible()
-		{
-			return ((Component)iterator().next()).isVisible();
-		}
 	}
 
 	/**
-	 * This class acts as a repeater that will contain the toolbar. The key feature it implements is
-	 * the visibility check, this container is only visible if at least one child is visible. This
-	 * helps to properly hide <code>thead/tfoot</code> sections if no toolbars will be visible
-	 * because those sections cannot be empty according to html spec.
+	 * This class acts as a repeater that will contain the toolbar.
 	 * 
 	 * @author igor.vaynberg
 	 */
@@ -430,31 +417,7 @@
 			super(id);
 		}
 
-		/** {@inheritDoc} */
-		@Override
-		public boolean isVisible()
-		{
-			// only visible if at least one child is visible
-			final boolean[] visible = new boolean[] { false };
-			visitChildren(new IVisitor()
-			{
 
-				public Object component(Component component)
-				{
-					if (component.isVisible())
-					{
-						visible[0] = true;
-						return STOP_TRAVERSAL;
-					}
-					else
-					{
-						return CONTINUE_TRAVERSAL_BUT_DONT_GO_DEEPER;
-					}
-				}
-
-			});
-			return visible[0];
-		}
 	}
 
 }