10:25 a.m.
Author: akushunin
Date: 2007-08-23 11:25:35 -0400 (Thu, 23 Aug 2007)
New Revision: 2441
Modified:
trunk/ui/dataTable/skin/dataTable/dataTable.html
trunk/ui/dataTable/src/main/java/org/richfaces/component/UIColumn.java
trunk/ui/dataTable/src/main/java/org/richfaces/component/UIColumnGroup.java
trunk/ui/dataTable/src/main/java/org/richfaces/component/UIDataTable.java
trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractGridRenderer.java
trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractRowsRenderer.java
trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java
trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/html/ColgroupRenderer.java
trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/html/SubTableRenderer.java
trunk/ui/dataTable/src/main/templates/org/richfaces/htmlDataGrid.jspx
trunk/ui/dataTable/src/test/java/org/richfaces/component/DataTableComponentTest.java
trunk/ui/tooltip/
Log:
dataTable merged with revision 1406 to discard problems craeted by merging revision 1442.
Modified: trunk/ui/dataTable/skin/dataTable/dataTable.html
===================================================================
--- trunk/ui/dataTable/skin/dataTable/dataTable.html 2007-08-23 15:19:01 UTC (rev 2440)
+++ trunk/ui/dataTable/skin/dataTable/dataTable.html 2007-08-23 15:25:35 UTC (rev 2441)
@@ -1,348 +1,347 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-
-<html>
-<head>
+<html>
- <title>Untitled</title>
+<head>
-<style>
+ <title>Untitled</title>
-.dttbl_table{
+<style>
- border-top : 1px solid #c0c0c0; /*panelBorderColor*/
+.dttbl_table{
- border-left : 1px solid #c0c0c0; /*panelBorderColor*/
+ border-top : 1px solid #c0c0c0; /*panelBorderColor*/
- background-color : #ffffff; /*tableBackgroundColor*/
+ border-left : 1px solid #c0c0c0; /*panelBorderColor*/
-}
+ background-color : #ffffff; /*tableBackgroundColor*/
-
+}
-.dttbl_cell{
- border-right : 1px solid #c0c0c0; /*panelBorderColor*/
- border-bottom : 1px solid #c0c0c0; /*panelBorderColor*/
+.dttbl_cell{
- padding : 4px 4px 4px 4px;
+ border-right : 1px solid #c0c0c0; /*panelBorderColor*/
- font-size : 11px; /*generalSizeFont*/
+ border-bottom : 1px solid #c0c0c0; /*panelBorderColor*/
- color : #000000; /*generalTextColor*/
+ padding : 4px 4px 4px 4px;
- font-family : verdana; /*generalFamilyFont*/
+ font-size : 11px; /*generalSizeFont*/
-}
+ color : #000000; /*generalTextColor*/
-.dttbl_header{
+ font-family : verdana; /*generalFamilyFont*/
- color : #FFFFFF; /*headerTextColor*/
+}
- background-color : #4A75B5; /*headerBackgroundColor*/
+.dttbl_header{
- text-align : center;
+ color : #FFFFFF; /*headerTextColor*/
- font-weight : bold;
+ background-color : #4A75B5; /*headerBackgroundColor*/
- background-image : url(dttbl_header_bg.gif); /*from headerGradientColor to
headerBackgroundColor*/
+ text-align : center;
- background-position : top left;
+ font-weight : bold;
- background-repeat : repeat-x;
+ background-image : url(dttbl_header_bg.gif); /*from headerGradientColor to
headerBackgroundColor*/
-}
+ background-position : top left;
-.dttbl_subheader{
+ background-repeat : repeat-x;
- background-color : #EAF0F8; /*additionalBackgroundColor*/
+}
- text-align : center;
+.dttbl_subheader{
-}
+ background-color : #EAF0F8; /*additionalBackgroundColor*/
-
+ text-align : center;
-.dttbl_footer{
+}
- background-color : #cccccc; /*tableFooterBackgroundColor*/
-}
-.dttbl_subfooter{
+.dttbl_footer{
- background-color : #f1f1f1; /*tableSubfooterBackgroundColor*/
+ background-color : #cccccc; /*tableFooterBackgroundColor*/
-}
+}
-
+.dttbl_subfooter{
-</style>
+ background-color : #f1f1f1; /*tableSubfooterBackgroundColor*/
-</head>
+}
-
-<body style="margin : 20px">
-
+</style>
-<table border="0" cellpadding="0" cellspacing="0"
class="dttbl_table">
+</head>
-<thead>
- <colgroup>
- <col class="dttbl_col_odd dttbl_col_1">
+<body style="margin : 20px">
- <col class="dttbl_col_even dttbl_col_2">
- <col class="dttbl_col_odd dttbl_col_3">
- <col class="dttbl_col_even dttbl_col_4">
+<table border="0" cellpadding="0" cellspacing="0"
class="dttbl_table">
- </colgroup>
+<thead>
+ <colgroup>
-</thead>
+ <col class="dttbl_col_odd dttbl_col_1">
-<tbody>
+ <col class="dttbl_col_even dttbl_col_2">
- <tr class="dttbl_header">
+ <col class="dttbl_col_odd dttbl_col_3">
- <td class="dttbl_cell">
+ <col class="dttbl_col_even dttbl_col_4">
- Header
+ </colgroup>
- </td>
+</thead>
- <td class="dttbl_cell">
+<tbody>
- Header
+ <tr class="dttbl_header">
- </td>
+ <td class="dttbl_cell">
- <td class="dttbl_cell">
+ Header
- Header
+ </td>
- </td>
+ <td class="dttbl_cell">
- <td class="dttbl_cell">
+ Header
- Header
+ </td>
- </td>
+ <td class="dttbl_cell">
- </tr>
+ Header
- <tr class="dttbl_subheader">
+ </td>
- <td class="dttbl_cell">
+ <td class="dttbl_cell">
- SubHeader
+ Header
- </td>
+ </td>
- <td class="dttbl_cell">
+ </tr>
- SubHeader
+ <tr class="dttbl_subheader">
- </td>
+ <td class="dttbl_cell">
- <td class="dttbl_cell">
+ SubHeader
- SubHeader
+ </td>
- </td>
+ <td class="dttbl_cell">
- <td class="dttbl_cell">
+ SubHeader
- SubHeader
+ </td>
- </td>
+ <td class="dttbl_cell">
- </tr>
+ SubHeader
- <tr class="dttbl_row_odd dttbl_row_1">
+ </td>
- <td class="dttbl_cell">
+ <td class="dttbl_cell">
- Table cell content
+ SubHeader
- </td>
+ </td>
- <td class="dttbl_cell">
+ </tr>
- Table cell content
+ <tr class="dttbl_row_odd dttbl_row_1">
- </td>
+ <td class="dttbl_cell">
- <td class="dttbl_cell">
+ Table cell content
- Table cell content
+ </td>
- </td>
+ <td class="dttbl_cell">
- <td class="dttbl_cell">
+ Table cell content
- Table cell content
+ </td>
- </td>
+ <td class="dttbl_cell">
- </tr>
+ Table cell content
- <tr class="dttbl_row_even dttbl_row_2">
+ </td>
- <td class="dttbl_cell">
+ <td class="dttbl_cell">
- Table cell content
+ Table cell content
- </td>
+ </td>
- <td class="dttbl_cell">
+ </tr>
- Table cell content
+ <tr class="dttbl_row_even dttbl_row_2">
- </td>
+ <td class="dttbl_cell">
- <td class="dttbl_cell">
+ Table cell content
- Table cell content
+ </td>
- </td>
+ <td class="dttbl_cell">
- <td class="dttbl_cell">
+ Table cell content
- Table cell content
+ </td>
- </td>
+ <td class="dttbl_cell">
- </tr>
+ Table cell content
- <tr class="dttbl_row_odd dttbl_row_3">
+ </td>
- <td class="dttbl_cell">
+ <td class="dttbl_cell">
- Table cell content
+ Table cell content
- </td>
+ </td>
- <td class="dttbl_cell">
+ </tr>
- Table cell content
+ <tr class="dttbl_row_odd dttbl_row_3">
- </td>
+ <td class="dttbl_cell">
- <td class="dttbl_cell">
+ Table cell content
- Table cell content
+ </td>
- </td>
+ <td class="dttbl_cell">
- <td class="dttbl_cell">
+ Table cell content
- Table cell content
+ </td>
- </td>
+ <td class="dttbl_cell">
- </tr>
+ Table cell content
- <tr class="dttbl_row_even dttbl_row_4">
+ </td>
- <td class="dttbl_cell">
+ <td class="dttbl_cell">
- Table cell content
+ Table cell content
- </td>
+ </td>
- <td class="dttbl_cell">
+ </tr>
- Table cell content
+ <tr class="dttbl_row_even dttbl_row_4">
- </td>
+ <td class="dttbl_cell">
- <td class="dttbl_cell">
+ Table cell content
- Table cell content
+ </td>
- </td>
+ <td class="dttbl_cell">
- <td class="dttbl_cell">
+ Table cell content
- Table cell content
+ </td>
- </td>
+ <td class="dttbl_cell">
- </tr>
+ Table cell content
- <tr class="dttbl_subfooter">
+ </td>
- <td class="dttbl_cell">
+ <td class="dttbl_cell">
- SubFooter
+ Table cell content
- </td>
+ </td>
- <td class="dttbl_cell">
+ </tr>
- SubFooter
+ <tr class="dttbl_subfooter">
- </td>
+ <td class="dttbl_cell">
- <td class="dttbl_cell">
+ SubFooter
- SubFooter
+ </td>
- </td>
+ <td class="dttbl_cell">
- <td class="dttbl_cell">
+ SubFooter
- SubFooter
+ </td>
- </td>
+ <td class="dttbl_cell">
- </tr>
+ SubFooter
- <tr class="dttbl_footer">
+ </td>
- <td class="dttbl_cell">
+ <td class="dttbl_cell">
- Footer
+ SubFooter
- </td>
+ </td>
- <td class="dttbl_cell">
+ </tr>
- Footer
+ <tr class="dttbl_footer">
- </td>
+ <td class="dttbl_cell">
- <td class="dttbl_cell">
+ Footer
- Footer
+ </td>
- </td>
+ <td class="dttbl_cell">
- <td class="dttbl_cell">
+ Footer
- Footer
+ </td>
- </td>
+ <td class="dttbl_cell">
- </tr>
+ Footer
-</tbody>
+ </td>
-</table>
+ <td class="dttbl_cell">
-
+ Footer
-
+ </td>
-</body>
+ </tr>
-</html>
+</tbody>
+</table>
+
+
+
+
+
+</body>
+
+</html>
+
Modified: trunk/ui/dataTable/src/main/java/org/richfaces/component/UIColumn.java
===================================================================
--- trunk/ui/dataTable/src/main/java/org/richfaces/component/UIColumn.java 2007-08-23
15:19:01 UTC (rev 2440)
+++ trunk/ui/dataTable/src/main/java/org/richfaces/component/UIColumn.java 2007-08-23
15:25:35 UTC (rev 2441)
@@ -21,7 +21,9 @@
package org.richfaces.component;
+import java.util.Date;
+
/**
* JSF component class
*
Modified: trunk/ui/dataTable/src/main/java/org/richfaces/component/UIColumnGroup.java
===================================================================
--- trunk/ui/dataTable/src/main/java/org/richfaces/component/UIColumnGroup.java 2007-08-23
15:19:01 UTC (rev 2440)
+++ trunk/ui/dataTable/src/main/java/org/richfaces/component/UIColumnGroup.java 2007-08-23
15:25:35 UTC (rev 2441)
@@ -37,7 +37,7 @@
private static final String COMPONENT_FAMILY = "org.richfaces.Colgroup";
- public Iterator columns(){
+ public Iterator renderedColumns(){
return new FilterIterator(getChildren().iterator(),UIDataTable.isColumn);
}
Modified: trunk/ui/dataTable/src/main/java/org/richfaces/component/UIDataTable.java
===================================================================
--- trunk/ui/dataTable/src/main/java/org/richfaces/component/UIDataTable.java 2007-08-23
15:19:01 UTC (rev 2440)
+++ trunk/ui/dataTable/src/main/java/org/richfaces/component/UIDataTable.java 2007-08-23
15:25:35 UTC (rev 2441)
@@ -32,6 +32,7 @@
import org.apache.commons.collections.iterators.FilterIterator;
import org.apache.commons.collections.iterators.IteratorChain;
+
/**
* JSF component class
*
@@ -54,6 +55,14 @@
*/
private static final class ColumnPredicate implements Predicate {
public boolean evaluate(Object input) {
+ if (input instanceof UIComponent) {
+ UIComponent component = (UIComponent) input;
+
+ if (!component.isRendered()) {
+ return false;
+ }
+ }
+
return (input instanceof UIColumn || input instanceof Column);
}
}
@@ -83,8 +92,15 @@
IteratorChain dataChildren = new IteratorChain();
dataChildren.addIterator(new FilterIterator(getFacets().values()
.iterator(), isAjaxSupport));
+
+ dataChildren.addIterator(renderedColumns());
+
+
// Append all columns children.
- for (Iterator iter = columns(); iter.hasNext();) {
+ //dataChildren.addIterator(columns());
+
+
+/* for (Iterator iter = columns(); iter.hasNext();) {
UIComponent column = (UIComponent) iter.next();
if (column.isRendered()) {
dataChildren.addIterator(column.getChildren()
@@ -92,7 +108,7 @@
}
}
-
+*/
//commons-collections 2.x bug workaround
dataChildren.hasNext();
@@ -110,7 +126,7 @@
fixedChildren.addIterator(new FilterIterator(getChildren().iterator(),
isNotColumn));
// Append all columns facets.
- for (Iterator iter = columns(); iter.hasNext();) {
+ for (Iterator iter = renderedColumns(); iter.hasNext();) {
UIComponent column = (UIComponent) iter.next();
if (column.isRendered()) {
fixedChildren.addIterator(column.getFacets().values()
@@ -125,7 +141,7 @@
return fixedChildren;
}
- public Iterator columns() {
+ public Iterator renderedColumns() {
return new FilterIterator(getChildren().iterator(), isColumn);
}
@@ -133,4 +149,4 @@
private static final String COMPONENT_FAMILY = "org.richfaces.DataTable";
-}
+}
\ No newline at end of file
Modified:
trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractGridRenderer.java
===================================================================
---
trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractGridRenderer.java 2007-08-23
15:19:01 UTC (rev 2440)
+++
trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractGridRenderer.java 2007-08-23
15:25:35 UTC (rev 2441)
@@ -30,14 +30,15 @@
import org.ajax4jsf.component.UIDataAdaptor;
import org.ajax4jsf.renderkit.RendererUtils.HTML;
import org.richfaces.component.UIDataGrid;
+import org.richfaces.component.UIDataTable;
-
/**
* @author shura
*
*/
public abstract class AbstractGridRenderer extends AbstractRowsRenderer {
+
public void encodeHeader( FacesContext context,UIDataGrid table) throws IOException {
ResponseWriter writer = context.getResponseWriter();
UIComponent header = table.getHeader();
@@ -109,4 +110,5 @@
}
writer.endElement(HTML.TR_ELEMENT);
}
+
}
Modified:
trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractRowsRenderer.java
===================================================================
---
trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractRowsRenderer.java 2007-08-23
15:19:01 UTC (rev 2440)
+++
trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractRowsRenderer.java 2007-08-23
15:25:35 UTC (rev 2441)
@@ -34,6 +34,7 @@
import org.ajax4jsf.renderkit.RendererUtils;
import org.ajax4jsf.renderkit.RendererUtils.HTML;
import org.richfaces.component.Row;
+import org.richfaces.component.UIDataTable;
/**
* @author shura
@@ -134,7 +135,7 @@
encodeRows(context, component);
}
- public void encodeCaption(FacesContext context, UIDataAdaptor table)
+ public void encodeCaption(FacesContext context, UIDataTable table)
throws IOException {
ResponseWriter writer = context.getResponseWriter();
UIComponent caption = table.getFacet("caption");
Modified:
trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java
===================================================================
---
trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java 2007-08-23
15:19:01 UTC (rev 2440)
+++
trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java 2007-08-23
15:25:35 UTC (rev 2441)
@@ -185,7 +185,7 @@
throws IOException {
UIDataTable table = (UIDataTable) holder.getTable();
ResponseWriter writer = context.getResponseWriter();
- Iterator iter = table.columns();
+ Iterator iter = table.renderedColumns();
boolean first = true;
int currentColumn = 0;
UIComponent column = null;
@@ -287,7 +287,7 @@
* Changed by Alexej Kushunin
*/
protected Iterator columnFacets(UIDataTable table,final String name){
- return new FilterIterator(table.columns(), new Predicate() {
+ return new FilterIterator(table.renderedColumns(), new Predicate() {
public boolean evaluate(Object input) {
UIComponent component = (UIComponent) input;
@@ -316,7 +316,7 @@
count = span.intValue();
} else {
// calculate max html columns count for all columns/rows children.
- Iterator col = table.columns();
+ Iterator col = table.renderedColumns();
count = calculateRowColumns(col);
}
return count;
@@ -343,7 +343,7 @@
}
// Calculate number of columns in row.
currentLength = calculateRowColumns(((Row) column)
- .columns());
+ .renderedColumns());
// Store max calculated value
if (currentLength > count) {
count = currentLength;
@@ -379,4 +379,4 @@
}
return count;
}
-}
+}
\ No newline at end of file
Modified:
trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/html/ColgroupRenderer.java
===================================================================
---
trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/html/ColgroupRenderer.java 2007-08-23
15:19:01 UTC (rev 2440)
+++
trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/html/ColgroupRenderer.java 2007-08-23
15:25:35 UTC (rev 2441)
@@ -71,7 +71,7 @@
if (null != columnClasses) {
classes = columnClasses.split(",");
}
- Iterator iter = colgroup.columns();
+ Iterator iter = colgroup.renderedColumns();
boolean first = true;
int currentColumn = 0;
int currentRow = 0;
Modified:
trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/html/SubTableRenderer.java
===================================================================
---
trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/html/SubTableRenderer.java 2007-08-23
15:19:01 UTC (rev 2440)
+++
trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/html/SubTableRenderer.java 2007-08-23
15:25:35 UTC (rev 2441)
@@ -62,7 +62,7 @@
Iterator headers = columnFacets(dataTable,facetName);
String headerClass = (String) component.getAttributes().get(
facetName+"Class");
- if (headers.hasNext()&&findFacet(dataTable,facetName)) {
+ if (headers.hasNext()) {
encodeRowStart(context,"dr-subtable-"+facetName+"
rich-subtable-"+facetName ,headerClass, dataTable, writer);
encodeHeaderFacets(context, writer, headers,
"dr-subtable-"+facetName+"cell
rich-subtable-"+facetName+"cell", headerClass,
facetName, "td");
Modified: trunk/ui/dataTable/src/main/templates/org/richfaces/htmlDataGrid.jspx
===================================================================
--- trunk/ui/dataTable/src/main/templates/org/richfaces/htmlDataGrid.jspx 2007-08-23
15:19:01 UTC (rev 2440)
+++ trunk/ui/dataTable/src/main/templates/org/richfaces/htmlDataGrid.jspx 2007-08-23
15:25:35 UTC (rev 2441)
@@ -19,7 +19,6 @@
<colgroup
span="component.attributes['columns']">
</colgroup>
- <f:call name="encodeCaption"/>
<f:call name="encodeHeader"/>
<f:call name="encodeFooter"/>
<tbody>
Modified:
trunk/ui/dataTable/src/test/java/org/richfaces/component/DataTableComponentTest.java
===================================================================
---
trunk/ui/dataTable/src/test/java/org/richfaces/component/DataTableComponentTest.java 2007-08-23
15:19:01 UTC (rev 2440)
+++
trunk/ui/dataTable/src/test/java/org/richfaces/component/DataTableComponentTest.java 2007-08-23
15:25:35 UTC (rev 2441)
@@ -1,7 +1,7 @@
/**
* License Agreement.
*
- * JBoss RichFaces - Ajax4jsf Component Library
+ * JBoss RichFaces 3.0 - Ajax4jsf Component Library
*
* Copyright (C) 2007 Exadel, Inc.
*
@@ -27,7 +27,9 @@
import java.util.List;
import javax.faces.component.UIComponent;
+import javax.faces.component.UIForm;
import javax.faces.component.UIOutput;
+import javax.faces.component.html.HtmlForm;
import javax.faces.component.html.HtmlOutputLink;
import javax.faces.component.html.HtmlOutputText;
import javax.faces.context.FacesContext;
@@ -36,8 +38,6 @@
import javax.faces.el.ValueBinding;
import javax.faces.model.ListDataModel;
-import org.ajax4jsf.component.AjaxActionComponent;
-import org.ajax4jsf.component.AjaxSupport;
import org.ajax4jsf.tests.AbstractAjax4JsfTestCase;
import org.apache.commons.collections.Predicate;
@@ -49,174 +49,14 @@
*/
public class DataTableComponentTest extends AbstractAjax4JsfTestCase {
- public static final class MockAjaxSupport extends AjaxActionComponent implements
AjaxSupport {
- public Object getData() {
- // TODO Auto-generated method stub
- return null;
- }
+ private UIDataTable dataTable;
- public String getEventsQueue() {
- // TODO Auto-generated method stub
- return null;
- }
-
- public String getFocus() {
- // TODO Auto-generated method stub
- return null;
- }
-
- public String getOncomplete() {
- // TODO Auto-generated method stub
- return null;
- }
-
- public Object getReRender() {
- // TODO Auto-generated method stub
- return null;
- }
-
- public int getRequestDelay() {
- // TODO Auto-generated method stub
- return 0;
- }
-
- public String getStatus() {
- // TODO Auto-generated method stub
- return null;
- }
-
- public int getTimeout() {
- // TODO Auto-generated method stub
- return 0;
- }
-
- public boolean isAjaxSingle() {
- // TODO Auto-generated method stub
- return false;
- }
-
- public boolean isBypassUpdates() {
- // TODO Auto-generated method stub
- return false;
- }
-
- public boolean isIgnoreDupResponses() {
- // TODO Auto-generated method stub
- return false;
- }
-
- public boolean isLimitToList() {
- // TODO Auto-generated method stub
- return false;
- }
-
- public void setAjaxSingle(boolean single) {
- // TODO Auto-generated method stub
-
- }
-
- public void setBypassUpdates(boolean bypass) {
- // TODO Auto-generated method stub
-
- }
-
- public void setData(Object data) {
- // TODO Auto-generated method stub
-
- }
-
- public void setEventsQueue(String newvalue) {
- // TODO Auto-generated method stub
-
- }
-
- public void setFocus(String focus) {
- // TODO Auto-generated method stub
-
- }
-
- public void setIgnoreDupResponses(boolean newvalue) {
- // TODO Auto-generated method stub
-
- }
-
- public void setLimitToList(boolean submitForm) {
- // TODO Auto-generated method stub
-
- }
-
- public void setOncomplete(String oncomplete) {
- // TODO Auto-generated method stub
-
- }
-
- public void setReRender(Object targetId) {
- // TODO Auto-generated method stub
-
- }
-
- public void setRequestDelay(int newvalue) {
- // TODO Auto-generated method stub
-
- }
-
- public void setStatus(String status) {
- // TODO Auto-generated method stub
-
- }
-
- public void setTimeout(int timeout) {
- // TODO Auto-generated method stub
-
- }
-
- public String getEvent() {
- // TODO Auto-generated method stub
- return null;
- }
-
- public String getEventString() {
- // TODO Auto-generated method stub
- return null;
- }
-
- public boolean isDisableDefault() {
- // TODO Auto-generated method stub
- return false;
- }
-
- public void setDisableDefault(boolean newvalue) {
- // TODO Auto-generated method stub
-
- }
-
- public void setEvent(String event) {
- // TODO Auto-generated method stub
-
- }
-
- public void setParentProperties(UIComponent parent) {
- // TODO Auto-generated method stub
-
- }
-
- public String getBeforeUpdate() {
- // TODO Auto-generated method stub
- return null;
- }
-
- public void setBeforeUpdate(String beforeUpdate) {
- // TODO Auto-generated method stub
-
- }
- }
-
- private UIDataTable dataTable;
-
private UIColumn column1;
private UIColumn column2;
+ private UIForm form = null;
+
private UIColumnGroup columnGroup;
/**
@@ -236,7 +76,10 @@
*/
public void setUp() throws Exception {
super.setUp();
-
+
+ form = new HtmlForm();
+ form.setId("form");
+ facesContext.getViewRoot().getChildren().add(form);
dataTable = (UIDataTable) application
.createComponent("org.richfaces.DataTable");
dataTable.setId("dataTable");
@@ -305,10 +148,11 @@
}
});
column2.getChildren().add(cellElement2);
- columnGroup.getChildren().add(column2);
+ columnGroup.getChildren().add(column2);
+
+
+ form.getChildren().add(dataTable);
- facesContext.getViewRoot().getChildren().add(dataTable);
-
}
/*
@@ -486,7 +330,7 @@
tr = (HtmlElement) trs.get(0);
assertNotNull(tr);
classAttr = tr.getAttributeValue("class");
- System.out.println(classAttr);
+ //System.out.println(classAttr);
assertTrue(classAttr.contains("dr-table-footer rich-table-footer "));
tds = tr.getHtmlElementsByTagName("td");
@@ -494,7 +338,7 @@
td = (HtmlElement) tds.get(0);
assertNotNull(td);
classAttr = td.getAttributeValue("class");
- System.out.println(classAttr);
+ //System.out.println(classAttr);
assertTrue(classAttr.contains("dr-table-footercell rich-table-footercell
"));
Iterator fixedChildren = dataTable.fixedChildren();
@@ -568,13 +412,13 @@
UISubTable subTable = (UISubTable) application
.createComponent("org.richfaces.SubTable");
subTable.setId("subTable");
- dataTable.getChildren().add(subTable);
-
+
UIColumnGroup subTableColumnGroup = (UIColumnGroup) application
.createComponent("org.richfaces.ColumnGroup");
UIColumn column3 = (UIColumn) application
.createComponent("org.richfaces.Column");
+
subTableColumnGroup.getChildren().add(column3);
UIOutput text = (UIOutput) createComponent(
HtmlOutputText.COMPONENT_TYPE, HtmlOutputText.class.getName(),
@@ -610,7 +454,8 @@
HtmlOutputText.class.getName(), null, null, null));
subTable.getAttributes().put("columnClasses", "sub1,sub2");
-
+ dataTable.getChildren().add(subTable);
+
assertTrue(subTable.isBreakBefore());
try {
@@ -622,6 +467,8 @@
HtmlPage page = renderView();
assertNotNull(page);
+ // System.out.println(page.asXml());
+
// System.out.println(page.asXml());
}
@@ -656,15 +503,14 @@
HtmlOutputText.class.getName(), null, null, null);
UIComponent column = column1;
UIComponent notAjaxSupport = notColumn;
- UIComponent ajaxSupport = new MockAjaxSupport();
+
assertTrue(columnPredicate.evaluate(column));
assertTrue(!columnPredicate.evaluate(notColumn));
assertTrue(notColumnPredicate.evaluate(notColumn));
assertTrue(!notColumnPredicate.evaluate(column));
-
- assertTrue(ajaxSupportPredicate.evaluate(ajaxSupport));
+
assertTrue(!ajaxSupportPredicate.evaluate(notAjaxSupport));
}
-}
+}
\ No newline at end of file
Property changes on: trunk/ui/tooltip
___________________________________________________________________
Name: svn:ignore
- target
.classpath
.project
.settings
+ target
.classpath
.project
.settings
.clover