Author: abelevich Date: 2009-09-29 10:43:58 -0400 (Tue, 29 Sep 2009) New Revision: 15684 Removed: root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/DataIterator.java Modified: root/ui-sandbox/trunk/components/tables/api/src/main/java/org/richfaces/model/ScrollableTableDataModel.java root/ui-sandbox/trunk/components/tables/impl/src/main/java/org/richfaces/model/DataModelCache.java root/ui-sandbox/trunk/components/tables/impl/src/main/java/org/richfaces/model/ExtendedTableDataModel.java root/ui-sandbox/trunk/components/tables/impl/src/main/java/org/richfaces/model/ExtendedTableDataModifiableModel.java root/ui-sandbox/trunk/components/tables/impl/src/main/java/org/richfaces/model/ListSequenceDataModel.java root/ui-sandbox/trunk/components/tables/impl/src/main/java/org/richfaces/model/ModifiableModel.java root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/ColumnsIterator.java root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/UIColumn.java root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/UIExtendedDataTable.java root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/UISimpleDataTable.java root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/AbstractRowsRenderer.java root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/TableHolder.java Log: support new UIDataAdaptor API Modified: root/ui-sandbox/trunk/components/tables/api/src/main/java/org/richfaces/model/ScrollableTableDataModel.java =================================================================== --- root/ui-sandbox/trunk/components/tables/api/src/main/java/org/richfaces/model/ScrollableTableDataModel.java 2009-09-29 14:11:22 UTC (rev 15683) +++ root/ui-sandbox/trunk/components/tables/api/src/main/java/org/richfaces/model/ScrollableTableDataModel.java 2009-09-29 14:43:58 UTC (rev 15684) @@ -129,8 +129,7 @@ /** * Load data range, and iterate over it */ - public void walk(FacesContext context, DataVisitor visitor, Range range, - Object argument) throws IOException { + public void walk(FacesContext context, DataVisitor visitor, Range range, Object argument) { if (log.isTraceEnabled()) { log.trace("Starting walk"); Modified: root/ui-sandbox/trunk/components/tables/impl/src/main/java/org/richfaces/model/DataModelCache.java =================================================================== --- root/ui-sandbox/trunk/components/tables/impl/src/main/java/org/richfaces/model/DataModelCache.java 2009-09-29 14:11:22 UTC (rev 15683) +++ root/ui-sandbox/trunk/components/tables/impl/src/main/java/org/richfaces/model/DataModelCache.java 2009-09-29 14:43:58 UTC (rev 15684) @@ -194,8 +194,10 @@ return scrollableTableDataModel.getId(o); } +// public void walk(FacesContext context, DataVisitor visitor, Range range, +// Object argument) throws IOException { public void walk(FacesContext context, DataVisitor visitor, Range range, - Object argument) throws IOException { + Object argument) { // TODO Auto-generated method stub super.walk(context, visitor, range, argument); } Modified: root/ui-sandbox/trunk/components/tables/impl/src/main/java/org/richfaces/model/ExtendedTableDataModel.java =================================================================== --- root/ui-sandbox/trunk/components/tables/impl/src/main/java/org/richfaces/model/ExtendedTableDataModel.java 2009-09-29 14:11:22 UTC (rev 15683) +++ root/ui-sandbox/trunk/components/tables/impl/src/main/java/org/richfaces/model/ExtendedTableDataModel.java 2009-09-29 14:43:58 UTC (rev 15684) @@ -92,8 +92,10 @@ * (non-Javadoc) * @see org.ajax4jsf.model.ExtendedDataModel#walk(javax.faces.context.FacesContext, org.ajax4jsf.model.DataVisitor, org.ajax4jsf.model.Range, java.lang.Object) */ +// public void walk(FacesContext context, DataVisitor visitor, Range range, +// Object argument) throws IOException { public void walk(FacesContext context, DataVisitor visitor, Range range, - Object argument) throws IOException { + Object argument) { int rowC = getRowCount(); int firstRow = ((SequenceRange) range).getFirstRow(); int numberOfRows = ((SequenceRange) range).getRows(); Modified: root/ui-sandbox/trunk/components/tables/impl/src/main/java/org/richfaces/model/ExtendedTableDataModifiableModel.java =================================================================== --- root/ui-sandbox/trunk/components/tables/impl/src/main/java/org/richfaces/model/ExtendedTableDataModifiableModel.java 2009-09-29 14:11:22 UTC (rev 15683) +++ root/ui-sandbox/trunk/components/tables/impl/src/main/java/org/richfaces/model/ExtendedTableDataModifiableModel.java 2009-09-29 14:43:58 UTC (rev 15684) @@ -68,9 +68,11 @@ originalModel.setRowKey(key); } - @Override +// @Override +// public void walk(FacesContext context, DataVisitor visitor, Range range, +// Object argument) throws IOException { public void walk(FacesContext context, DataVisitor visitor, Range range, - Object argument) throws IOException { + Object argument){ final SequenceRange seqRange = (SequenceRange) range; int rows = seqRange.getRows(); int rowCount = getRowCount(); Modified: root/ui-sandbox/trunk/components/tables/impl/src/main/java/org/richfaces/model/ListSequenceDataModel.java =================================================================== --- root/ui-sandbox/trunk/components/tables/impl/src/main/java/org/richfaces/model/ListSequenceDataModel.java 2009-09-29 14:11:22 UTC (rev 15683) +++ root/ui-sandbox/trunk/components/tables/impl/src/main/java/org/richfaces/model/ListSequenceDataModel.java 2009-09-29 14:43:58 UTC (rev 15684) @@ -70,8 +70,10 @@ * @see org.ajax4jsf.model.ExtendedDataModel#walk(javax.faces.context.FacesContext, org.ajax4jsf.model.DataVisitor, org.ajax4jsf.model.Range, java.lang.Object) */ @Override - public void walk(FacesContext context, DataVisitor visitor, Range range, - Object argument) throws IOException { +// public void walk(FacesContext context, DataVisitor visitor, Range range, +// Object argument) throws IOException { + public void walk(FacesContext context, DataVisitor visitor, Range range, + Object argument) { final SequenceRange seqRange = (SequenceRange) range; int rows = seqRange.getRows(); int rowCount = list !=null ? list.size() : -1; Modified: root/ui-sandbox/trunk/components/tables/impl/src/main/java/org/richfaces/model/ModifiableModel.java =================================================================== --- root/ui-sandbox/trunk/components/tables/impl/src/main/java/org/richfaces/model/ModifiableModel.java 2009-09-29 14:11:22 UTC (rev 15683) +++ root/ui-sandbox/trunk/components/tables/impl/src/main/java/org/richfaces/model/ModifiableModel.java 2009-09-29 14:43:58 UTC (rev 15684) @@ -140,8 +140,10 @@ } @Override +// public void walk(FacesContext context, DataVisitor visitor, Range range, +// Object argument) throws IOException { public void walk(FacesContext context, DataVisitor visitor, Range range, - Object argument) throws IOException { + Object argument) { final SequenceRange seqRange = (SequenceRange) range; int rows = seqRange.getRows(); int rowCount = getRowCount(); @@ -221,7 +223,7 @@ } FacesContext context = FacesContext.getCurrentInstance(); - try { +/* try { originalModel.walk(context, new DataVisitor() { public void process(FacesContext context, Object rowKey, @@ -235,7 +237,7 @@ null); } catch (IOException e) { log.error(e.getMessage(), e); - } + } */ filter(filterFields); sort(sortFields); Modified: root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/ColumnsIterator.java =================================================================== --- root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/ColumnsIterator.java 2009-09-29 14:11:22 UTC (rev 15683) +++ root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/ColumnsIterator.java 2009-09-29 14:43:58 UTC (rev 15684) @@ -23,7 +23,6 @@ import java.util.Iterator; import java.util.NoSuchElementException; -import javax.faces.component.UIColumn; import javax.faces.component.UIComponent; /** @@ -31,16 +30,16 @@ * @author asmirnov * */ -class ColumnsIterator implements Iterator<UIComponent>{ +class ColumnsIterator implements Iterator<UIColumn>{ - private UIComponent next; + private UIColumn next; private boolean initialized = false; protected Iterator<UIComponent> childrenIterator; - public ColumnsIterator(UIComponent dataTable) { + public ColumnsIterator(UISimpleDataTable dataTable) { this.childrenIterator = dataTable.getChildren().iterator(); } @@ -52,11 +51,11 @@ return null != next; } - public UIComponent next() { + public UIColumn next() { if (!hasNext()) { throw new NoSuchElementException(); } - UIComponent result = next; + UIColumn result = next; next = nextColumn(); return result; } @@ -65,12 +64,12 @@ throw new UnsupportedOperationException("Iterator is read-only"); } - protected UIComponent nextColumn(){ - UIComponent nextColumn = null; - while (childrenIterator.hasNext()) { + protected UIColumn nextColumn(){ + UIColumn nextColumn = null; + while (childrenIterator != null && childrenIterator.hasNext()) { UIComponent child = childrenIterator.next(); - if(child instanceof UIColumn || child instanceof Column){ - nextColumn = child; + if(child instanceof UIColumn){ + nextColumn = (UIColumn)child; break; } } Deleted: root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/DataIterator.java =================================================================== --- root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/DataIterator.java 2009-09-29 14:11:22 UTC (rev 15683) +++ root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/DataIterator.java 2009-09-29 14:43:58 UTC (rev 15684) @@ -1,77 +0,0 @@ -/** - * License Agreement. - * - * Rich Faces - Natural Ajax for Java Server Faces (JSF) - * - * Copyright (C) 2007 Exadel, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License version 2.1 as published by the Free Software Foundation. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ -package org.richfaces.component; - -import java.util.Iterator; - -import javax.faces.component.UIColumn; -import javax.faces.component.UIComponent; - -class DataIterator extends ColumnsIterator { - - protected Iterator<UIComponent> facetsIterator; - - public DataIterator(UIComponent dataTable) { - super(dataTable); - facetsIterator = dataTable.getFacets().values().iterator(); - } - - @Override - protected UIComponent nextColumn() { - UIComponent nextColumn = null; - while (null == nextColumn && childrenIterator.hasNext()) { - UIComponent child = childrenIterator.next(); - if (child.isRendered()) { - if (child instanceof UIColumn || child instanceof Column) { - nextColumn = child; - } else if (checkAjaxComponent(child)) { - nextColumn = child; - } - } - } - while (null == nextColumn && facetsIterator.hasNext()) { - UIComponent child = facetsIterator.next(); - if (checkAjaxComponent(child)) { - nextColumn = child; - break; - } - } - return nextColumn; - } - - /** - * @param child - * @return - */ - protected Iterator<UIComponent> getColumnChildrenIterator(UIComponent child) { - return child.getChildren().iterator(); - } - - /** - * @param child - * @return - */ - protected boolean checkAjaxComponent(UIComponent child) { -// return child instanceof AjaxSupport || child instanceof Dropzone; - return false; - } - -} Modified: root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/UIColumn.java =================================================================== --- root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/UIColumn.java 2009-09-29 14:11:22 UTC (rev 15683) +++ root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/UIColumn.java 2009-09-29 14:43:58 UTC (rev 15684) @@ -1,6 +1,10 @@ package org.richfaces.component; +/** + * @author Anton Belevich + * + */ public class UIColumn extends javax.faces.component.UIColumn { } Modified: root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/UIExtendedDataTable.java =================================================================== --- root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/UIExtendedDataTable.java 2009-09-29 14:11:22 UTC (rev 15683) +++ root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/UIExtendedDataTable.java 2009-09-29 14:43:58 UTC (rev 15684) @@ -1,5 +1,9 @@ package org.richfaces.component; +/** + * @author Anton Belevich + * + */ public abstract class UIExtendedDataTable extends UISimpleDataTable { } Modified: root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/UISimpleDataTable.java =================================================================== --- root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/UISimpleDataTable.java 2009-09-29 14:11:22 UTC (rev 15683) +++ root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/UISimpleDataTable.java 2009-09-29 14:43:58 UTC (rev 15684) @@ -2,28 +2,17 @@ import java.util.Iterator; -import javax.faces.component.UIComponent; -import org.ajax4jsf.component.SequenceDataAdaptor; + /** * @author Anton Belevich * */ -public abstract class UISimpleDataTable extends SequenceDataAdaptor { - - @Override - protected Iterator<UIComponent> dataChildren() { - return new DataIterator(this); - } - - @Override - protected Iterator<UIComponent> fixedChildren() { - return null; - } +public abstract class UISimpleDataTable extends UISequence { - public Iterator<UIComponent> getColumnsIterator (){ - return new ColumnsIterator(this); - } -} + public Iterator<UIColumn> columns() { + return new ColumnsIterator(this); + } +} \ No newline at end of file Modified: root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/AbstractRowsRenderer.java =================================================================== --- root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/AbstractRowsRenderer.java 2009-09-29 14:11:22 UTC (rev 15683) +++ root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/AbstractRowsRenderer.java 2009-09-29 14:43:58 UTC (rev 15684) @@ -22,18 +22,16 @@ package org.richfaces.renderkit; import java.io.IOException; -import java.util.Map; import javax.faces.component.UIComponent; import javax.faces.context.FacesContext; import javax.faces.context.ResponseWriter; -import org.ajax4jsf.component.SequenceDataAdaptor; -import org.ajax4jsf.component.UIDataAdaptor; +import org.ajax4jsf.model.DataVisitResult; import org.ajax4jsf.model.DataVisitor; import org.ajax4jsf.renderkit.RendererBase; -import org.ajax4jsf.renderkit.RendererUtils; import org.ajax4jsf.renderkit.RendererUtils.HTML; +import org.richfaces.component.UIDataAdaptor; /** * @author shura @@ -51,7 +49,7 @@ {"onmouseout","onRowMouseOut"} }; - +/* public static final String ROW_CLASS_KEY = AbstractRowsRenderer.class.getName() + ".rowClass"; @@ -66,30 +64,38 @@ public static final String SKIN_FIRST_ROW_CLASS_KEY = AbstractRowsRenderer.class.getName() + ".firstRowSkinClass"; - +*/ /* * (non-Javadoc) * * @see org.ajax4jsf.ajax.repeat.DataVisitor#process(javax.faces.context.FacesContext, * java.lang.Object, java.lang.Object) */ - public void process(FacesContext facesContext, Object rowKey, Object argument) - throws IOException { - + + public DataVisitResult process(FacesContext facesContext, Object rowKey, Object argument) { TableHolder holder = (TableHolder) argument; UIDataAdaptor table = holder.getTable(); table.setRowKey(facesContext, rowKey); + ResponseWriter writer = facesContext.getResponseWriter(); + try { writer.startElement(HTML.TR_ELEMENT, table); encodeOneRow(facesContext, holder); writer.endElement(HTML.TR_ELEMENT); + }catch (IOException e) { + //??? + } holder.nextRow(); + + return DataVisitResult.CONTINUE; } - + public void encodeRows(FacesContext facesContext, UIComponent component) throws IOException { encodeRows(facesContext, component, new TableHolder((UIDataAdaptor) component)); } + + /** * Iterate over all rows for this table. * @@ -124,7 +130,6 @@ public abstract void encodeOneRow(FacesContext context, TableHolder holder) throws IOException; - /* * (non-Javadoc) * @@ -139,8 +144,9 @@ encodeRows(context, component); } - public void encodeCaption(FacesContext context, SequenceDataAdaptor table) - throws IOException { + public void encodeCaption(FacesContext context, UIDataAdaptor table) throws IOException { + /* + UIComponent caption = table.getFacet("caption"); if (caption == null) { return; @@ -165,6 +171,7 @@ renderChild(context, caption); writer.endElement("caption"); + */ } /** @@ -172,14 +179,16 @@ * @param table * @throws IOException */ - protected void encodeRowEvents(FacesContext context, UIDataAdaptor table) - throws IOException { + + protected void encodeRowEvents(FacesContext context, UIDataAdaptor table) throws IOException { + /* RendererUtils utils2 = getUtils(); for (int i = 0; i < TABLE_EVENT_ATTRS.length; i++) { String[] attrs = TABLE_EVENT_ATTRS[i]; utils2.encodeAttribute(context, table, attrs[1], attrs[0]); } - } + */ + } /** * Encode HTML "class" attribute, if is not empty. Classes combined from @@ -196,8 +205,10 @@ * custom classes. * @throws IOException */ - protected void encodeStyleClass(ResponseWriter writer, Object parentPredefined, - Object predefined, Object parent, Object custom) throws IOException { + + protected void encodeStyleClass(ResponseWriter writer, Object parentPredefined, Object predefined, + Object parent, Object custom) throws IOException { + /* StringBuffer styleClass = new StringBuffer(); // Construct predefined classes @@ -216,10 +227,12 @@ } if (styleClass.length() > 0) { writer.writeAttribute(HTML.class_ATTRIBUTE, styleClass, "styleClass"); - } + } */ } + protected void encodeStyle(ResponseWriter writer, Object parentPredefined, Object predefined, Object parent, Object custom) throws IOException { + /* StringBuffer style = new StringBuffer(); // Construct predefined styles if (null != parentPredefined) { @@ -237,7 +250,8 @@ if (style.length() > 0) { writer.writeAttribute("style", style, "style"); } - } + */ + } /** @@ -255,10 +269,11 @@ * @param cellClass * @throws IOException */ + protected void encodeCellChildren(FacesContext context, UIComponent cell, String skinFirstRowClass, String skinRowClass, String rowClass, String skinCellClass, String cellClass) throws IOException { - + /* Map<String, Object> requestMap = context.getExternalContext().getRequestMap(); // Save top level class parameters ( if any ), and put new for this // component @@ -295,9 +310,9 @@ requestMap.put(SKIN_FIRST_ROW_CLASS_KEY, savedSkinFirstRowClass); requestMap.put(SKIN_ROW_CLASS_KEY, savedSkinRowClass); requestMap.put(SKIN_CELL_CLASS_KEY, savedSkinCellClass); + */ + } - } - protected void encodeTableHeaderFacet(FacesContext context, int columns, ResponseWriter writer, UIComponent footer, String skinFirstRowClass, String skinRowClass, String skinCellClass, String footerClass, String element) throws IOException { // boolean isColgroup = footer instanceof Row; // if (!isColgroup) { Modified: root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java =================================================================== --- root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java 2009-09-29 14:11:22 UTC (rev 15683) +++ root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java 2009-09-29 14:43:58 UTC (rev 15684) @@ -9,9 +9,9 @@ import javax.faces.context.FacesContext; import javax.faces.context.ResponseWriter; -import org.ajax4jsf.component.UIDataAdaptor; import org.ajax4jsf.renderkit.RendererUtils.HTML; import org.richfaces.component.UIColumn; +import org.richfaces.component.UIDataAdaptor; import org.richfaces.component.UISimpleDataTable; @ResourceDependencies({ @@ -40,18 +40,31 @@ writer.endElement("tbody"); } + @Override public void encodeOneRow(FacesContext facesContext, TableHolder holder) throws IOException { + ResponseWriter writer = facesContext.getResponseWriter(); UISimpleDataTable table = (UISimpleDataTable)holder.getTable(); - ResponseWriter writer = facesContext.getResponseWriter(); - Iterator<UIComponent> columns = table.getColumnsIterator(); + Iterator<UIColumn> columns = table.columns(); while (columns.hasNext()) { - UIComponent child = columns.next(); - if((child instanceof UIColumn) && child.isRendered()) { - writer.startElement(HTML.td_ELEM, child); - renderChildren(facesContext, child); - writer.endElement(HTML.td_ELEM); + UIColumn column = columns.next(); + if(column.isRendered()) { + encodeRowStart(writer, column); + encodeRow(facesContext, writer, column); + encodeRowEnd(writer, column); } } } + + private void encodeRowStart(ResponseWriter writer, UIColumn column) throws IOException { + writer.startElement(HTML.td_ELEM, column); + } + + private void encodeRowEnd(ResponseWriter writer, UIColumn column) throws IOException { + writer.endElement(HTML.td_ELEM); + } + + private void encodeRow(FacesContext facesContext, ResponseWriter writer, UIColumn column) throws IOException { + renderChildren(facesContext, column); + } } Modified: root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/TableHolder.java =================================================================== --- root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/TableHolder.java 2009-09-29 14:11:22 UTC (rev 15683) +++ root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/TableHolder.java 2009-09-29 14:43:58 UTC (rev 15684) @@ -23,7 +23,7 @@ import java.util.Map; -import org.ajax4jsf.component.UIDataAdaptor; +import org.richfaces.component.UIDataAdaptor; /** * Private class for keep reference to table and intermediate iteration values ( current row styles, events etc )