Author: alexsmirnov Date: 2007-07-03 16:13:44 -0400 (Tue, 03 Jul 2007) New Revision: 1450 Added: trunk/framework/api/src/main/java/org/ajax4jsf/component/ trunk/framework/api/src/main/java/org/ajax4jsf/component/AjaxChildrenEncoder.java trunk/framework/api/src/main/java/org/ajax4jsf/component/AjaxComponent.java trunk/framework/api/src/main/java/org/ajax4jsf/component/AjaxContainer.java trunk/framework/api/src/main/java/org/ajax4jsf/component/AjaxContainerBase.java trunk/framework/api/src/main/java/org/ajax4jsf/component/AjaxDataEncoder.java trunk/framework/api/src/main/java/org/ajax4jsf/component/AjaxOutput.java trunk/framework/api/src/main/java/org/ajax4jsf/component/AjaxSupport.java trunk/framework/api/src/main/java/org/ajax4jsf/model/ trunk/framework/api/src/main/java/org/ajax4jsf/model/DataComponentState.java trunk/framework/api/src/main/java/org/ajax4jsf/model/DataVisitor.java trunk/framework/api/src/main/java/org/ajax4jsf/model/ExtendedDataModel.java trunk/framework/api/src/main/java/org/ajax4jsf/model/Range.java trunk/framework/api/src/main/java/org/ajax4jsf/model/RepeatState.java trunk/framework/api/src/main/java/org/ajax4jsf/model/SequenceDataModel.java trunk/framework/api/src/main/java/org/ajax4jsf/model/SequenceRange.java trunk/framework/api/src/main/java/org/ajax4jsf/model/SerializableDataModel.java Removed: trunk/framework/api/src/main/java/org/ajax4jsf/ajax/repeat/AjaxDataEncoder.java trunk/framework/api/src/main/java/org/ajax4jsf/ajax/repeat/DataComponentState.java trunk/framework/api/src/main/java/org/ajax4jsf/ajax/repeat/DataVisitor.java trunk/framework/api/src/main/java/org/ajax4jsf/ajax/repeat/ExtendedDataModel.java trunk/framework/api/src/main/java/org/ajax4jsf/ajax/repeat/Range.java trunk/framework/api/src/main/java/org/ajax4jsf/ajax/repeat/RepeatState.java trunk/framework/api/src/main/java/org/ajax4jsf/ajax/repeat/SequenceDataModel.java trunk/framework/api/src/main/java/org/ajax4jsf/ajax/repeat/SequenceRange.java trunk/framework/api/src/main/java/org/ajax4jsf/ajax/repeat/SerializableDataModel.java trunk/framework/api/src/main/java/org/ajax4jsf/framework/ajax/AjaxChildrenEncoder.java trunk/framework/api/src/main/java/org/ajax4jsf/framework/ajax/AjaxComponent.java trunk/framework/api/src/main/java/org/ajax4jsf/framework/ajax/AjaxContainer.java trunk/framework/api/src/main/java/org/ajax4jsf/framework/ajax/AjaxContainerBase.java trunk/framework/api/src/main/java/org/ajax4jsf/framework/ajax/AjaxOutput.java trunk/framework/api/src/main/java/org/ajax4jsf/framework/ajax/AjaxSupport.java Modified: trunk/framework/api/src/main/java/org/richfaces/component/AbstractTreeDataModel.java trunk/framework/api/src/main/java/org/richfaces/component/TreeDataModel.java trunk/framework/api/src/main/java/org/richfaces/component/state/TreeRange.java trunk/framework/impl/src/main/java/org/ajax4jsf/ajax/repeat/UIDataAdaptor.java trunk/framework/impl/src/main/java/org/ajax4jsf/component/AjaxActionComponent.java trunk/framework/impl/src/main/java/org/ajax4jsf/component/AjaxInputComponent.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/AjaxContextImpl.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/AjaxRegionBrige.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/AjaxViewRoot.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/EventValueBinding.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/AjaxChildrenRenderer.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/AjaxContainerRenderer.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/AjaxRendererUtils.java trunk/ui/core/src/main/java/org/ajax4jsf/ajax/UIAjaxForm.java trunk/ui/core/src/main/java/org/ajax4jsf/ajax/UIAjaxOutputPanel.java trunk/ui/core/src/main/java/org/ajax4jsf/ajax/UIAjaxRegion.java trunk/ui/core/src/main/java/org/ajax4jsf/ajax/UIAjaxStatus.java trunk/ui/core/src/main/java/org/ajax4jsf/ajax/UIAjaxSupport.java trunk/ui/core/src/main/java/org/ajax4jsf/ajax/UIInclude.java trunk/ui/core/src/main/java/org/ajax4jsf/ajax/repeat/UIRepeat.java trunk/ui/core/src/main/java/org/ajax4jsf/ajax/repeat/UISelector.java trunk/ui/core/src/main/java/org/ajax4jsf/renderkit/html/AjaxPageRenderer.java trunk/ui/core/src/main/java/org/ajax4jsf/renderkit/html/RepeatRenderer.java trunk/ui/core/src/main/java/org/ajax4jsf/taglib/html/facelets/AjaxReRendrRule.java trunk/ui/core/src/main/java/org/ajax4jsf/taglib/html/jsp/AjaxRegionTag.java trunk/ui/dataTable/src/main/java/org/richfaces/component/UIDataTable.java trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractRowsRenderer.java trunk/ui/dataTable/src/test/java/org/richfaces/component/DataTableComponentTest.java trunk/ui/menu-components/src/main/java/org/richfaces/component/UIMenuItem.java trunk/ui/simpleTogglePanel/src/main/java/org/richfaces/component/UISimpleTogglePanel.java trunk/ui/suggestionbox/src/main/java/org/richfaces/component/UISuggestionBox.java trunk/ui/tabPanel/src/main/java/org/richfaces/component/UITab.java trunk/ui/togglePanel/src/main/java/org/richfaces/component/UIToggleControl.java trunk/ui/tree/src/main/java/org/richfaces/component/CacheableTreeDataModel.java trunk/ui/tree/src/main/java/org/richfaces/component/UITree.java trunk/ui/tree/src/main/java/org/richfaces/component/state/TreeState.java trunk/ui/tree/src/main/java/org/richfaces/renderkit/TreeRendererBase.java trunk/ui/tree/src/test/java/org/richfaces/component/TreeModelTest.java Log: packages and classes refactor Deleted: trunk/framework/api/src/main/java/org/ajax4jsf/ajax/repeat/AjaxDataEncoder.java =================================================================== --- trunk/framework/api/src/main/java/org/ajax4jsf/ajax/repeat/AjaxDataEncoder.java 2007-07-03 20:06:53 UTC (rev 1449) +++ trunk/framework/api/src/main/java/org/ajax4jsf/ajax/repeat/AjaxDataEncoder.java 2007-07-03 20:13:44 UTC (rev 1450) @@ -1,43 +0,0 @@ -/** - * License Agreement. - * - * Ajax4jsf 1.1 - 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.ajax4jsf.ajax.repeat; - -import java.util.Set; - -import org.ajax4jsf.framework.ajax.AjaxChildrenEncoder; - -/** - * Interface for iterable component, allowed for render given set of rows in ajax response. - * @author shura - * - */ -public interface AjaxDataEncoder extends AjaxChildrenEncoder { - - /** - * @return Set for values of {@link ExtendedDataModel} keys, encoded in ajax response by this component. - */ - public Set getAjaxKeys(); - - public void setAjaxKeys(Set ajaxKeys); - - -} Deleted: trunk/framework/api/src/main/java/org/ajax4jsf/ajax/repeat/DataComponentState.java =================================================================== --- trunk/framework/api/src/main/java/org/ajax4jsf/ajax/repeat/DataComponentState.java 2007-07-03 20:06:53 UTC (rev 1449) +++ trunk/framework/api/src/main/java/org/ajax4jsf/ajax/repeat/DataComponentState.java 2007-07-03 20:13:44 UTC (rev 1450) @@ -1,42 +0,0 @@ -/** - * License Agreement. - * - * Ajax4jsf 1.1 - 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.ajax4jsf.ajax.repeat; - -import javax.faces.component.StateHolder; - -/** - * Interface for classes keeped current iterable component state, as : - * active data objects range - * sorting order - * tree nodes expanded state - * - * @author shura - * - */ -public interface DataComponentState { - - /** - * Build used data objects range for iteration. - * @return - */ - public abstract Range getRange(); -} Deleted: trunk/framework/api/src/main/java/org/ajax4jsf/ajax/repeat/DataVisitor.java =================================================================== --- trunk/framework/api/src/main/java/org/ajax4jsf/ajax/repeat/DataVisitor.java 2007-07-03 20:06:53 UTC (rev 1449) +++ trunk/framework/api/src/main/java/org/ajax4jsf/ajax/repeat/DataVisitor.java 2007-07-03 20:13:44 UTC (rev 1450) @@ -1,45 +0,0 @@ -/** - * License Agreement. - * - * Ajax4jsf 1.1 - 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.ajax4jsf.ajax.repeat; - -import java.io.IOException; - -import javax.faces.context.FacesContext; - -/** - * Interface for classes, able to receive visitor processing calls from ExtendedDataModel - * @author shura - * - */ -public interface DataVisitor { - - /** - * This method called back ( as visitor ) from {@link ExtendedDataModel#walk(FacesContext, DataVisitor, Range)} for - * each row. - * @param context current JSF context. - * @param rowKey current row key of DataModel - * @param argument Implementation-specific argument - * @throws IOException - */ - public void process(FacesContext context,Object rowKey, Object argument) throws IOException; - -} Deleted: trunk/framework/api/src/main/java/org/ajax4jsf/ajax/repeat/ExtendedDataModel.java =================================================================== --- trunk/framework/api/src/main/java/org/ajax4jsf/ajax/repeat/ExtendedDataModel.java 2007-07-03 20:06:53 UTC (rev 1449) +++ trunk/framework/api/src/main/java/org/ajax4jsf/ajax/repeat/ExtendedDataModel.java 2007-07-03 20:13:44 UTC (rev 1450) @@ -1,83 +0,0 @@ -/** - * License Agreement. - * - * Ajax4jsf 1.1 - 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.ajax4jsf.ajax.repeat; - -import java.io.IOException; -import java.io.Serializable; - -import javax.faces.context.FacesContext; -import javax.faces.model.DataModel; - -/** - * Extesion for {@link DataModel} , for support complex data structure, like tree, spreadsheet etc - * in iterable components. - * @author shura - * - */ -public abstract class ExtendedDataModel extends DataModel { - - /** - * <p>Instead of simple <code>int</code> for current state selection, this model can use any object for - * select current data. Implementation depend on model, with any restrictions :</p> - * <ol> - * <li> key must be {@link Serializable}.</li> - * <li>{@link Object#toString()} method must return representation compatible with {@link javax.faces.component.UIComponent#getClientId(javax.faces.context.FacesContext)}, - * as far as this string will be appended to clientId of iterator component.</li> - * </ol> - * @param key key for select current data, or null for clear selection. - */ - public abstract void setRowKey(Object key); - - /** - * @return key for selected data or <code>null</code> - */ - public abstract Object getRowKey(); - - /** - * Iteration component can support save data for use at decoding/validation/update phases to avoid unnessesary calls to original models, - * for example - to avoid requests to database until all data is validated. - * @return - */ - public SerializableDataModel getSerializableModel(Range range){ - // By default, model not serializable. - return null; - } - - - /** - * Iterate over model by "visitor" pattern, for given range - * @param context current JSF context. - * @param visitor instance of {@link DataVisitor}, for process each row. - * @param range Implementation-specific range of data keys. - * @param argument Implementation-specific argument - * @throws IOException - */ - public abstract void walk(FacesContext context,DataVisitor visitor,Range range, Object argument) throws IOException; - - /** - * Create Iterator on all row keys for given range. - * @param range - Implementation-specific range of data keys. - * @return - */ -// public abstract Iterator dataIterator(Range range); - -} Deleted: trunk/framework/api/src/main/java/org/ajax4jsf/ajax/repeat/Range.java =================================================================== --- trunk/framework/api/src/main/java/org/ajax4jsf/ajax/repeat/Range.java 2007-07-03 20:06:53 UTC (rev 1449) +++ trunk/framework/api/src/main/java/org/ajax4jsf/ajax/repeat/Range.java 2007-07-03 20:13:44 UTC (rev 1450) @@ -1,33 +0,0 @@ -/** - * License Agreement. - * - * Ajax4jsf 1.1 - 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.ajax4jsf.ajax.repeat; - -/** - * Marker interface for building iterator over dataModel values. over {@link ExtendedDataModel} elements. - * It can be simple min/max values for data table, but also can provide set of expanded/collapsed nodes in tree, - * can provide sorting order, - * @author shura - * - */ -public interface Range { - -} Deleted: trunk/framework/api/src/main/java/org/ajax4jsf/ajax/repeat/RepeatState.java =================================================================== --- trunk/framework/api/src/main/java/org/ajax4jsf/ajax/repeat/RepeatState.java 2007-07-03 20:06:53 UTC (rev 1449) +++ trunk/framework/api/src/main/java/org/ajax4jsf/ajax/repeat/RepeatState.java 2007-07-03 20:13:44 UTC (rev 1450) @@ -1,81 +0,0 @@ -/** - * License Agreement. - * - * Ajax4jsf 1.1 - 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.ajax4jsf.ajax.repeat; - -import java.io.Serializable; - -import javax.faces.context.FacesContext; - -/** - * @author shura - * - */ -public class RepeatState implements DataComponentState,Serializable { - - /** - * - */ - private static final long serialVersionUID = -5552520123654180445L; - - private int _rows = -1; - - private int _first = 0; - - - /** - * @return the first - */ - public int getFirst() { - return _first; - } - - /** - * @param first the first to set - */ - public void setFirst(int first) { - this._first = first; - } - - /** - * @return the rows - */ - public int getRows() { - return _rows; - } - - /** - * @param rows the rows to set - */ - public void setRows(int rows) { - this._rows = rows; - } - - /* (non-Javadoc) - * @see org.ajax4jsf.ajax.repeat.DataComponentState#getRange() - */ - public Range getRange() { - // TODO Auto-generated method stub - return new SequenceRange(getFirst(),getRows()); - } - - -} Deleted: trunk/framework/api/src/main/java/org/ajax4jsf/ajax/repeat/SequenceDataModel.java =================================================================== --- trunk/framework/api/src/main/java/org/ajax4jsf/ajax/repeat/SequenceDataModel.java 2007-07-03 20:06:53 UTC (rev 1449) +++ trunk/framework/api/src/main/java/org/ajax4jsf/ajax/repeat/SequenceDataModel.java 2007-07-03 20:13:44 UTC (rev 1450) @@ -1,202 +0,0 @@ -/** - * License Agreement. - * - * Ajax4jsf 1.1 - 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.ajax4jsf.ajax.repeat; - -import java.io.IOException; - -import javax.faces.context.FacesContext; -import javax.faces.model.DataModel; - -/** - * @author shura - * - */ -public class SequenceDataModel extends ExtendedDataModel { - - private DataModel wrappedModel; - - /** - * @param wrapped - */ - public SequenceDataModel(DataModel wrapped) { - super(); - this.wrappedModel = wrapped; - } - - /* (non-Javadoc) - * @see org.ajax4jsf.ajax.repeat.ExtendedDataModel#dataIterator(org.ajax4jsf.ajax.repeat.Range) - */ -/* public Iterator dataIterator(Range range) { - final SequenceRange seqRange = (SequenceRange) range; - int rows = seqRange.getRows(); - int rowCount = wrapped.getRowCount(); - final int firstRow = seqRange.getFirstRow(); - if(rows > 0){ - rows += firstRow; - if(rowCount >=0){ - rows = Math.min(rows, rowCount); - } - } else if(rowCount >=0 ){ - rows = rowCount; - } - final int maxRow = rows; - return new Iterator(){ - - int rowIndex = firstRow; - - public boolean hasNext() { - // TODO Auto-generated method stub - return maxRow < 0 || rowIndex < maxRow; - } - - public Object next() { - // TODO Auto-generated method stub - return new Integer(rowIndex++); - } - - public void remove() { - throw new IllegalStateException(); - } - - }; - } -*/ - public void walk(FacesContext context, DataVisitor visitor, Range range, Object argument) throws IOException { - final SequenceRange seqRange = (SequenceRange) range; - int rows = seqRange.getRows(); - int rowCount = wrappedModel.getRowCount(); - int currentRow = seqRange.getFirstRow(); - if(rows > 0){ - rows += currentRow; - if(rowCount >=0){ - rows = Math.min(rows, rowCount); - } - } else if(rowCount >=0 ){ - rows = rowCount; - } else { - rows = -1; - } - while (rows < 0 || currentRow < rows) { - wrappedModel.setRowIndex(currentRow); - if(wrappedModel.isRowAvailable()){ - visitor.process(context, new Integer(currentRow), argument); - } else { - break; - } - currentRow++; - } - - } - - /* (non-Javadoc) - * @see org.ajax4jsf.ajax.repeat.ExtendedDataModel#getRowKey() - */ - public Object getRowKey() { - int index = wrappedModel.getRowIndex(); - if(index<0){ - return null; - } - return new Integer(index); - } - - - /* (non-Javadoc) - * @see org.ajax4jsf.ajax.repeat.ExtendedDataModel#setRowKey(java.lang.Object) - */ - public void setRowKey(Object key) { - if(null == key){ - wrappedModel.setRowIndex(-1); - } else { - Integer index = (Integer) key; - wrappedModel.setRowIndex(index.intValue()); - } - } - - /* (non-Javadoc) - * @see javax.faces.model.DataModel#getRowCount() - */ - public int getRowCount() { - // TODO Auto-generated method stub - return wrappedModel.getRowCount(); - } - - /* (non-Javadoc) - * @see javax.faces.model.DataModel#getRowData() - */ - public Object getRowData() { - // TODO Auto-generated method stub - return wrappedModel.getRowData(); - } - - /* (non-Javadoc) - * @see javax.faces.model.DataModel#getRowIndex() - */ - public int getRowIndex() { - // TODO Auto-generated method stub - return wrappedModel.getRowIndex(); - } - - /* (non-Javadoc) - * @see javax.faces.model.DataModel#getWrappedData() - */ - public Object getWrappedData() { - // TODO Auto-generated method stub - return wrappedModel.getWrappedData(); - } - - /* (non-Javadoc) - * @see javax.faces.model.DataModel#isRowAvailable() - */ - public boolean isRowAvailable() { - // TODO Auto-generated method stub - return wrappedModel.isRowAvailable(); - } - - /* (non-Javadoc) - * @see javax.faces.model.DataModel#setRowIndex(int) - */ - public void setRowIndex(int rowIndex) { - wrappedModel.setRowIndex(rowIndex); - } - - /* (non-Javadoc) - * @see javax.faces.model.DataModel#setWrappedData(java.lang.Object) - */ - public void setWrappedData(Object data) { - wrappedModel.setWrappedData(data); - } - - /** - * @return the wrappedModel - */ - protected DataModel getWrappedModel() { - return this.wrappedModel; - } - - /** - * @param wrappedModel the wrappedModel to set - */ - protected void setWrappedModel(DataModel wrappedModel) { - this.wrappedModel = wrappedModel; - } - -} Deleted: trunk/framework/api/src/main/java/org/ajax4jsf/ajax/repeat/SequenceRange.java =================================================================== --- trunk/framework/api/src/main/java/org/ajax4jsf/ajax/repeat/SequenceRange.java 2007-07-03 20:06:53 UTC (rev 1449) +++ trunk/framework/api/src/main/java/org/ajax4jsf/ajax/repeat/SequenceRange.java 2007-07-03 20:13:44 UTC (rev 1450) @@ -1,58 +0,0 @@ -/** - * License Agreement. - * - * Ajax4jsf 1.1 - 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.ajax4jsf.ajax.repeat; - -/** - * @author shura - * - */ -public class SequenceRange implements Range { - - private int firstRow = 0; - - private int rows = -1; - - /** - * @return the firstRow - */ - public int getFirstRow() { - return firstRow; - } - - /** - * @return the rows - */ - public int getRows() { - return rows; - } - - /** - * @param firstRow - * @param rows - */ - public SequenceRange(int firstRow, int rows) { - super(); - this.firstRow = firstRow; - this.rows = rows; - } - -} Deleted: trunk/framework/api/src/main/java/org/ajax4jsf/ajax/repeat/SerializableDataModel.java =================================================================== --- trunk/framework/api/src/main/java/org/ajax4jsf/ajax/repeat/SerializableDataModel.java 2007-07-03 20:06:53 UTC (rev 1449) +++ trunk/framework/api/src/main/java/org/ajax4jsf/ajax/repeat/SerializableDataModel.java 2007-07-03 20:13:44 UTC (rev 1450) @@ -1,39 +0,0 @@ -/** - * License Agreement. - * - * Ajax4jsf 1.1 - 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.ajax4jsf.ajax.repeat; - -import java.io.Serializable; - -/** - * Serializable version of {@link ExtendedDataModel}, for save lightweight version of data - * - * @author shura - * - */ -public abstract class SerializableDataModel extends ExtendedDataModel implements Serializable { - - /** - * Method called after update all model values. For example, developer can update - * database with new values of modified rows. - */ - public abstract void update(); -} Copied: trunk/framework/api/src/main/java/org/ajax4jsf/component/AjaxChildrenEncoder.java (from rev 1448, trunk/framework/api/src/main/java/org/ajax4jsf/framework/ajax/AjaxChildrenEncoder.java) =================================================================== --- trunk/framework/api/src/main/java/org/ajax4jsf/component/AjaxChildrenEncoder.java (rev 0) +++ trunk/framework/api/src/main/java/org/ajax4jsf/component/AjaxChildrenEncoder.java 2007-07-03 20:13:44 UTC (rev 1450) @@ -0,0 +1,55 @@ +/** + * License Agreement. + * + * Ajax4jsf 1.1 - 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.ajax4jsf.component; + +import java.io.IOException; +import java.util.Set; + +import javax.faces.context.FacesContext; + +/** + * Marker interface for components, have ability to manipulate rendering in case of Ajax responses. + * Such as ajax-enabled iterator, menus etc + * @author shura + * + */ +public interface AjaxChildrenEncoder { + + /** + * Iterate over all childs of components. If component id contains in list , + * or, if list is empty, compotents is submitted form - render it. + * TODO - Instead of calculate full path for every component, build current Path + * for componet and send as parameter. + * + * @param context - + * current context + * @param component - + * curent faces component. + * @param ids - + * list of Id to render. + * @throws IOException + */ + public void encodeAjaxChild(FacesContext context, + String path,Set ids,Set renderedAreas) throws IOException ; + + +} Copied: trunk/framework/api/src/main/java/org/ajax4jsf/component/AjaxComponent.java (from rev 1448, trunk/framework/api/src/main/java/org/ajax4jsf/framework/ajax/AjaxComponent.java) =================================================================== --- trunk/framework/api/src/main/java/org/ajax4jsf/component/AjaxComponent.java (rev 0) +++ trunk/framework/api/src/main/java/org/ajax4jsf/component/AjaxComponent.java 2007-07-03 20:13:44 UTC (rev 1450) @@ -0,0 +1,194 @@ +/** + * License Agreement. + * + * Ajax4jsf 1.1 - 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.ajax4jsf.component; + + +/** + * Base Interface for Ajax-enabled acting components. + * TODO - extend <code>ActionSource</code>??? + * @author shura (latest modification by $Author: alexsmirnov $) + * @version $Revision: 1.1.2.2 $ $Date: 2007/01/23 20:01:01 $ + * + */ +public interface AjaxComponent +{ + + public static final String AJAX_COMPONETT_PARAMETER = AjaxComponent.class.getName()+".parameter"; + + /** + * setter method for property + * @param new value of String, <code>Collection</code> or array of component's Id , updated in case of Ajax request by parent component. to set + */ + public abstract void setReRender(Object targetId); + + /** + * @return value or result of valueBinding of String, <code>Collection</code> or array of component's Id , updated in case of Ajax request by parent component. + */ + public abstract Object getReRender(); + + /** + * setter method for property + * @param new value of ajaxType of control component - link or input to set + */ +// public abstract void setAjaxType(String ajaxType); + + /** + * @return value or result of valueBinding of ajaxType of control component - link or input + */ +// public abstract String getAjaxType(); + + /** + * setter method for property + * @param new value of Id ( in format of UIComponent.findComponent() call ) of request status indicator to set + */ + public abstract void setStatus(String status); + + /** + * @return value or result of valueBinding of Id ( in format of UIComponent.findComponent() call ) of request status indicator + */ + public abstract String getStatus(); + + /** + * setter method for property + * @param new value of Name of JavaScript function, called on complete Ajax request to set + */ + public abstract void setOncomplete(String oncomplete); + + /** + * @return value or result of valueBinding of Name of JavaScript function, called on complete Ajax request + */ + public abstract String getOncomplete(); + + /** + * setter method for property + * @param new value of custom data translated to oncomplete function by AJAX + */ + public abstract void setData(Object data); + + /** + * @return value of custom data for translate to oncomplete function by AJAX + */ + public abstract Object getData(); + + /** + * setter method for property + * @param new value of Submit ( or not ) full form on Ajax action. to set + */ + public abstract void setLimitToList(boolean submitForm); + + /** + * @return value or result of valueBinding of Submit ( or not ) full form on Ajax action. + */ + public abstract boolean isLimitToList(); + + /** + * setter method for property + * @param new value of Submit ( or not ) full form on Ajax action. to set + */ + public abstract void setAjaxSingle(boolean single); + + /** + * @return value or result of valueBinding of Submit ( or not ) full form on Ajax action. + */ + public abstract boolean isAjaxSingle(); + + /** + * Getter for bypassUpdates bean property. Indicate that component must invoke listeners after Process Validators phase + * and force render response after it - since no values of components will be updated. Can be used to perform validation of client input + * using server-side validators. + * @return true if component must force render after validation phase. + */ + public abstract boolean isBypassUpdates(); + + /** + * Setter for bypassUpdates bean property. + * @param bypass true if component must force render after validation phase. + */ + public abstract void setBypassUpdates(boolean bypass); + + /** + * Getter for property name of events queue on client side - for avoid to send requests too frequnly ( on key events, for example ), implementation will be generated by + * componnents-generator + * @return property value + */ + public abstract String getEventsQueue(); + + /** + * Setter for flag indicated aborting unfinished ajax requests in queue. + * @param newvalue - new property value. If true, unfinished request in queue will be aborted on new events. + */ + public abstract void setIgnoreDupResponses(boolean newvalue); + + + /** + * Getter for property flag indicated aborting unfinished ajax requests in queue. + * componnents-generator + * @return property value + */ + public abstract boolean isIgnoreDupResponses(); + + /** + * Setter for property name of events queue on client side - for avoid to send requests too frequnly ( on key events, for example ), implementation will be generated by + * componnents-generator + * @param newvalue - new property value + */ + public abstract void setEventsQueue(String newvalue); + + /** + * Getter for property Delay ( in ms. ) for send ajax request on JavaScript event. In conjunction with events queue can reduce number of requests on keyboard or mouse move events., implementation will be generated by + * componnents-generator + * @return property value + */ + public abstract int getRequestDelay(); + + /** + * Setter for property Delay ( in ms. ) for send ajax request on JavaScript event. In conjunction with events queue can reduce number of requests on keyboard or mouse move events., implementation will be generated by + * componnents-generator + * @param newvalue - new property value + */ + public abstract void setRequestDelay(int newvalue); + + /** + * Getter for request timeout + * @return timeout in ms. + */ + public abstract int getTimeout(); + + /** + * Setter for request timeout + * @param timeout new value in ms. + */ + public abstract void setTimeout(int timeout); + + + /** + * Setter for a 'focus' bean property - id of component( or of DOM element ), to set focus after AJAX request. + * @param focus + */ + public abstract void setFocus(String focus); + + /** + * @return + */ + public abstract String getFocus(); + +} \ No newline at end of file Copied: trunk/framework/api/src/main/java/org/ajax4jsf/component/AjaxContainer.java (from rev 1448, trunk/framework/api/src/main/java/org/ajax4jsf/framework/ajax/AjaxContainer.java) =================================================================== --- trunk/framework/api/src/main/java/org/ajax4jsf/component/AjaxContainer.java (rev 0) +++ trunk/framework/api/src/main/java/org/ajax4jsf/component/AjaxContainer.java 2007-07-03 20:13:44 UTC (rev 1450) @@ -0,0 +1,56 @@ +/** + * License Agreement. + * + * Ajax4jsf 1.1 - 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.ajax4jsf.component; + +import java.io.IOException; + +import javax.faces.context.FacesContext; + +import org.ajax4jsf.framework.ajax.AjaxSource; + + +/** + * Extend Ajax-enabled region to support event listeners on Ajax requests. + * @author shura (latest modification by $Author: alexsmirnov $) + * @version $Revision: 1.1.2.1 $ $Date: 2007/01/09 18:57:39 $ + * + */ +public interface AjaxContainer extends AjaxContainerBase, AjaxSource +{ + + /** + * Is ajax container must re-render all output from page or only it's children ? + * @return true if all ajax-enabled to re-render araes on page must be checked for output. + */ + public abstract boolean isRenderRegionOnly(); + + public abstract void setRenderRegionOnly(boolean reRenderPage); + + /** + * Encode AJAX response from this container ( call encode methods for selected components only ) + * @param context + * @throws IOException + */ + public void encodeAjax(FacesContext context) throws IOException ; + + +} \ No newline at end of file Copied: trunk/framework/api/src/main/java/org/ajax4jsf/component/AjaxContainerBase.java (from rev 1448, trunk/framework/api/src/main/java/org/ajax4jsf/framework/ajax/AjaxContainerBase.java) =================================================================== --- trunk/framework/api/src/main/java/org/ajax4jsf/component/AjaxContainerBase.java (rev 0) +++ trunk/framework/api/src/main/java/org/ajax4jsf/component/AjaxContainerBase.java 2007-07-03 20:13:44 UTC (rev 1450) @@ -0,0 +1,94 @@ +/** + * License Agreement. + * + * Ajax4jsf 1.1 - 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.ajax4jsf.component; + +import java.util.Collection; +import java.util.Set; + +import javax.faces.el.MethodBinding; + +/** + * Base interface for controller component, managed AJAX Requests. + * Component, implemented this interface, must always return <code>true</code> for + * <code>javax.faces.component.UIComponent#getRendersChildren()</code> method. + * in common, set of components, rendered of current request, maintain by it. + * TODO - add capabilites for components, rendered in <code>PhaseListener</code> + * @author shura (latest modification by $Author: alexsmirnov $) + * @version $Revision: 1.1.2.2 $ $Date: 2007/02/06 16:23:20 $ + * + */ +public interface AjaxContainerBase { + /** + * getter for AjaxListener method. Same as for <code>ActionSource</code> + * + * @see javax.faces.component.ActionSource#getActionListener() + */ + public MethodBinding getAjaxListener(); + + /** + * setter for AjaxListener <code>MethodBinding</code> + * in case on AjaxRequest, component must call this method in + * <code>PhaseId.APPLY_REQUEST_VALUES</code> or + * <code>PhaseId.INVOKE_APPLICATION</code> phases, depend on immediate flag. + * + * @see javax.faces.component.ActionSource#setActionListener(javax.faces.el.MethodBinding) + */ + public void setAjaxListener(MethodBinding AjaxListener); + + /** + * getter for flag immediate call Listener's on PhaseId.APPLY_REQUEST_VALUES phase. + * + * @see javax.faces.component.ActionSource#isImmediate() + */ + public boolean isImmediate(); + + /** + * getter for render method flag of subview. If true, on AJAX-request component render it children + * after {@link com.sun.faces.lifecycle.Phase.INVOKE_APPLICATION } + * @return value of selfRendered flag + */ + public boolean isSelfRendered(); + + /** + * setter for self-render flag. + * @param selfRendered + */ + public void setSelfRendered(boolean selfRendered); + /** + * setter for immediate flag. + * + * @see javax.faces.component.ActionSource#setImmediate(boolean) + */ + public void setImmediate(boolean immediate); + + public boolean isSubmitted(); + + public void setSubmitted(boolean submitted); + + /** + * Render AJAX response for this container from stored View. + * @param context + * @throws FacesException + */ +// public void renderAjaxRegion(FacesContext context) throws FacesException ; + +} Copied: trunk/framework/api/src/main/java/org/ajax4jsf/component/AjaxDataEncoder.java (from rev 1448, trunk/framework/api/src/main/java/org/ajax4jsf/ajax/repeat/AjaxDataEncoder.java) =================================================================== --- trunk/framework/api/src/main/java/org/ajax4jsf/component/AjaxDataEncoder.java (rev 0) +++ trunk/framework/api/src/main/java/org/ajax4jsf/component/AjaxDataEncoder.java 2007-07-03 20:13:44 UTC (rev 1450) @@ -0,0 +1,43 @@ +/** + * License Agreement. + * + * Ajax4jsf 1.1 - 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.ajax4jsf.component; + +import java.util.Set; + +import org.ajax4jsf.model.ExtendedDataModel; + +/** + * Interface for iterable component, allowed for render given set of rows in ajax response. + * @author shura + * + */ +public interface AjaxDataEncoder extends AjaxChildrenEncoder { + + /** + * @return Set for values of {@link ExtendedDataModel} keys, encoded in ajax response by this component. + */ + public Set getAjaxKeys(); + + public void setAjaxKeys(Set ajaxKeys); + + +} Copied: trunk/framework/api/src/main/java/org/ajax4jsf/component/AjaxOutput.java (from rev 1448, trunk/framework/api/src/main/java/org/ajax4jsf/framework/ajax/AjaxOutput.java) =================================================================== --- trunk/framework/api/src/main/java/org/ajax4jsf/component/AjaxOutput.java (rev 0) +++ trunk/framework/api/src/main/java/org/ajax4jsf/component/AjaxOutput.java 2007-07-03 20:13:44 UTC (rev 1450) @@ -0,0 +1,55 @@ +/** + * License Agreement. + * + * Ajax4jsf 1.1 - 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.ajax4jsf.component; + +/** + * Marker interface for all JSF components, encoded ( or not ) on rendering + * Ajax request , depend on it self properties ( such as messages, help or like components ) + * @author shura (latest modification by $Author: alexsmirnov $) + * @version $Revision: 1.1.2.1 $ $Date: 2007/01/09 18:57:39 $ + * + */ +public interface AjaxOutput { + /** + * getter for ajax-rendered flag property. + * @return + */ + public boolean isAjaxRendered(); + /** + * Setter for ajax rendered property. + * @param ajaxRendered + */ + public void setAjaxRendered(boolean ajaxRendered); + + /** + * getter for ajax-rendered flag property. + * @return + */ + public boolean isKeepTransient(); + /** + * Setter for ajax rendered property. + * @param ajaxRendered + */ + public void setKeepTransient(boolean ajaxRendered); + + +} Copied: trunk/framework/api/src/main/java/org/ajax4jsf/component/AjaxSupport.java (from rev 1448, trunk/framework/api/src/main/java/org/ajax4jsf/framework/ajax/AjaxSupport.java) =================================================================== --- trunk/framework/api/src/main/java/org/ajax4jsf/component/AjaxSupport.java (rev 0) +++ trunk/framework/api/src/main/java/org/ajax4jsf/component/AjaxSupport.java 2007-07-03 20:13:44 UTC (rev 1450) @@ -0,0 +1,71 @@ +/** + * License Agreement. + * + * Ajax4jsf 1.1 - 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.ajax4jsf.component; + +import javax.faces.component.UIComponent; + +/** + * Version of {@link org.ajax4jsf.component.AjaxComponent} for append + * Ajax functions for non-ajax components + * @author asmirnov(a)exadel.com (latest modification by $Author: alexsmirnov $) + * @version $Revision: 1.1.2.1 $ $Date: 2007/01/09 18:57:34 $ + * + */ +public interface AjaxSupport extends AjaxComponent { + + /** + * @return JavaScript eventString. Rebuild on every call, since + * can be in loop ( as in dataTable ) with different parameters. + */ + public String getEventString(); + /** + * setter method for property + * @param new value of Name of event property of parent component for build JavaScript AJAX.Submit call to set + */ + public abstract void setEvent(String event); + + /** + * @return value or result of valueBinding of Name of event property of parent component for build JavaScript AJAX.Submit call + */ + public abstract String getEvent(); + + + /** + * Getter for property If true, disable default action for target event ( encode 'return false' to JavaScript ), implementation will be generated by + * componnents-generator + * @return property value + */ + public abstract boolean isDisableDefault(); + + /** + * Setter for property If true, disable default action for target event ( encode 'return false' to JavaScript ), implementation will be generated by + * componnents-generator + * @param newvalue - new property value + */ + public abstract void setDisableDefault(boolean newvalue); + + /** + * Set property for JavaScrept event generated by this component. + * @param parent + */ + public void setParentProperties(UIComponent parent); +} Deleted: trunk/framework/api/src/main/java/org/ajax4jsf/framework/ajax/AjaxChildrenEncoder.java =================================================================== --- trunk/framework/api/src/main/java/org/ajax4jsf/framework/ajax/AjaxChildrenEncoder.java 2007-07-03 20:06:53 UTC (rev 1449) +++ trunk/framework/api/src/main/java/org/ajax4jsf/framework/ajax/AjaxChildrenEncoder.java 2007-07-03 20:13:44 UTC (rev 1450) @@ -1,55 +0,0 @@ -/** - * License Agreement. - * - * Ajax4jsf 1.1 - 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.ajax4jsf.framework.ajax; - -import java.io.IOException; -import java.util.Set; - -import javax.faces.context.FacesContext; - -/** - * Marker interface for components, have ability to manipulate rendering in case of Ajax responses. - * Such as ajax-enabled iterator, menus etc - * @author shura - * - */ -public interface AjaxChildrenEncoder { - - /** - * Iterate over all childs of components. If component id contains in list , - * or, if list is empty, compotents is submitted form - render it. - * TODO - Instead of calculate full path for every component, build current Path - * for componet and send as parameter. - * - * @param context - - * current context - * @param component - - * curent faces component. - * @param ids - - * list of Id to render. - * @throws IOException - */ - public void encodeAjaxChild(FacesContext context, - String path,Set ids,Set renderedAreas) throws IOException ; - - -} Deleted: trunk/framework/api/src/main/java/org/ajax4jsf/framework/ajax/AjaxComponent.java =================================================================== --- trunk/framework/api/src/main/java/org/ajax4jsf/framework/ajax/AjaxComponent.java 2007-07-03 20:06:53 UTC (rev 1449) +++ trunk/framework/api/src/main/java/org/ajax4jsf/framework/ajax/AjaxComponent.java 2007-07-03 20:13:44 UTC (rev 1450) @@ -1,194 +0,0 @@ -/** - * License Agreement. - * - * Ajax4jsf 1.1 - 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.ajax4jsf.framework.ajax; - - -/** - * Base Interface for Ajax-enabled acting components. - * TODO - extend <code>ActionSource</code>??? - * @author shura (latest modification by $Author: alexsmirnov $) - * @version $Revision: 1.1.2.2 $ $Date: 2007/01/23 20:01:01 $ - * - */ -public interface AjaxComponent -{ - - public static final String AJAX_COMPONETT_PARAMETER = AjaxComponent.class.getName()+".parameter"; - - /** - * setter method for property - * @param new value of String, <code>Collection</code> or array of component's Id , updated in case of Ajax request by parent component. to set - */ - public abstract void setReRender(Object targetId); - - /** - * @return value or result of valueBinding of String, <code>Collection</code> or array of component's Id , updated in case of Ajax request by parent component. - */ - public abstract Object getReRender(); - - /** - * setter method for property - * @param new value of ajaxType of control component - link or input to set - */ -// public abstract void setAjaxType(String ajaxType); - - /** - * @return value or result of valueBinding of ajaxType of control component - link or input - */ -// public abstract String getAjaxType(); - - /** - * setter method for property - * @param new value of Id ( in format of UIComponent.findComponent() call ) of request status indicator to set - */ - public abstract void setStatus(String status); - - /** - * @return value or result of valueBinding of Id ( in format of UIComponent.findComponent() call ) of request status indicator - */ - public abstract String getStatus(); - - /** - * setter method for property - * @param new value of Name of JavaScript function, called on complete Ajax request to set - */ - public abstract void setOncomplete(String oncomplete); - - /** - * @return value or result of valueBinding of Name of JavaScript function, called on complete Ajax request - */ - public abstract String getOncomplete(); - - /** - * setter method for property - * @param new value of custom data translated to oncomplete function by AJAX - */ - public abstract void setData(Object data); - - /** - * @return value of custom data for translate to oncomplete function by AJAX - */ - public abstract Object getData(); - - /** - * setter method for property - * @param new value of Submit ( or not ) full form on Ajax action. to set - */ - public abstract void setLimitToList(boolean submitForm); - - /** - * @return value or result of valueBinding of Submit ( or not ) full form on Ajax action. - */ - public abstract boolean isLimitToList(); - - /** - * setter method for property - * @param new value of Submit ( or not ) full form on Ajax action. to set - */ - public abstract void setAjaxSingle(boolean single); - - /** - * @return value or result of valueBinding of Submit ( or not ) full form on Ajax action. - */ - public abstract boolean isAjaxSingle(); - - /** - * Getter for bypassUpdates bean property. Indicate that component must invoke listeners after Process Validators phase - * and force render response after it - since no values of components will be updated. Can be used to perform validation of client input - * using server-side validators. - * @return true if component must force render after validation phase. - */ - public abstract boolean isBypassUpdates(); - - /** - * Setter for bypassUpdates bean property. - * @param bypass true if component must force render after validation phase. - */ - public abstract void setBypassUpdates(boolean bypass); - - /** - * Getter for property name of events queue on client side - for avoid to send requests too frequnly ( on key events, for example ), implementation will be generated by - * componnents-generator - * @return property value - */ - public abstract String getEventsQueue(); - - /** - * Setter for flag indicated aborting unfinished ajax requests in queue. - * @param newvalue - new property value. If true, unfinished request in queue will be aborted on new events. - */ - public abstract void setIgnoreDupResponses(boolean newvalue); - - - /** - * Getter for property flag indicated aborting unfinished ajax requests in queue. - * componnents-generator - * @return property value - */ - public abstract boolean isIgnoreDupResponses(); - - /** - * Setter for property name of events queue on client side - for avoid to send requests too frequnly ( on key events, for example ), implementation will be generated by - * componnents-generator - * @param newvalue - new property value - */ - public abstract void setEventsQueue(String newvalue); - - /** - * Getter for property Delay ( in ms. ) for send ajax request on JavaScript event. In conjunction with events queue can reduce number of requests on keyboard or mouse move events., implementation will be generated by - * componnents-generator - * @return property value - */ - public abstract int getRequestDelay(); - - /** - * Setter for property Delay ( in ms. ) for send ajax request on JavaScript event. In conjunction with events queue can reduce number of requests on keyboard or mouse move events., implementation will be generated by - * componnents-generator - * @param newvalue - new property value - */ - public abstract void setRequestDelay(int newvalue); - - /** - * Getter for request timeout - * @return timeout in ms. - */ - public abstract int getTimeout(); - - /** - * Setter for request timeout - * @param timeout new value in ms. - */ - public abstract void setTimeout(int timeout); - - - /** - * Setter for a 'focus' bean property - id of component( or of DOM element ), to set focus after AJAX request. - * @param focus - */ - public abstract void setFocus(String focus); - - /** - * @return - */ - public abstract String getFocus(); - -} \ No newline at end of file Deleted: trunk/framework/api/src/main/java/org/ajax4jsf/framework/ajax/AjaxContainer.java =================================================================== --- trunk/framework/api/src/main/java/org/ajax4jsf/framework/ajax/AjaxContainer.java 2007-07-03 20:06:53 UTC (rev 1449) +++ trunk/framework/api/src/main/java/org/ajax4jsf/framework/ajax/AjaxContainer.java 2007-07-03 20:13:44 UTC (rev 1450) @@ -1,54 +0,0 @@ -/** - * License Agreement. - * - * Ajax4jsf 1.1 - 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.ajax4jsf.framework.ajax; - -import java.io.IOException; - -import javax.faces.context.FacesContext; - - -/** - * Extend Ajax-enabled region to support event listeners on Ajax requests. - * @author shura (latest modification by $Author: alexsmirnov $) - * @version $Revision: 1.1.2.1 $ $Date: 2007/01/09 18:57:39 $ - * - */ -public interface AjaxContainer extends AjaxContainerBase, AjaxSource -{ - - /** - * Is ajax container must re-render all output from page or only it's children ? - * @return true if all ajax-enabled to re-render araes on page must be checked for output. - */ - public abstract boolean isRenderRegionOnly(); - - public abstract void setRenderRegionOnly(boolean reRenderPage); - - /** - * Encode AJAX response from this container ( call encode methods for selected components only ) - * @param context - * @throws IOException - */ - public void encodeAjax(FacesContext context) throws IOException ; - - -} \ No newline at end of file Deleted: trunk/framework/api/src/main/java/org/ajax4jsf/framework/ajax/AjaxContainerBase.java =================================================================== --- trunk/framework/api/src/main/java/org/ajax4jsf/framework/ajax/AjaxContainerBase.java 2007-07-03 20:06:53 UTC (rev 1449) +++ trunk/framework/api/src/main/java/org/ajax4jsf/framework/ajax/AjaxContainerBase.java 2007-07-03 20:13:44 UTC (rev 1450) @@ -1,94 +0,0 @@ -/** - * License Agreement. - * - * Ajax4jsf 1.1 - 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.ajax4jsf.framework.ajax; - -import java.util.Collection; -import java.util.Set; - -import javax.faces.el.MethodBinding; - -/** - * Base interface for controller component, managed AJAX Requests. - * Component, implemented this interface, must always return <code>true</code> for - * <code>javax.faces.component.UIComponent#getRendersChildren()</code> method. - * in common, set of components, rendered of current request, maintain by it. - * TODO - add capabilites for components, rendered in <code>PhaseListener</code> - * @author shura (latest modification by $Author: alexsmirnov $) - * @version $Revision: 1.1.2.2 $ $Date: 2007/02/06 16:23:20 $ - * - */ -public interface AjaxContainerBase { - /** - * getter for AjaxListener method. Same as for <code>ActionSource</code> - * - * @see javax.faces.component.ActionSource#getActionListener() - */ - public MethodBinding getAjaxListener(); - - /** - * setter for AjaxListener <code>MethodBinding</code> - * in case on AjaxRequest, component must call this method in - * <code>PhaseId.APPLY_REQUEST_VALUES</code> or - * <code>PhaseId.INVOKE_APPLICATION</code> phases, depend on immediate flag. - * - * @see javax.faces.component.ActionSource#setActionListener(javax.faces.el.MethodBinding) - */ - public void setAjaxListener(MethodBinding AjaxListener); - - /** - * getter for flag immediate call Listener's on PhaseId.APPLY_REQUEST_VALUES phase. - * - * @see javax.faces.component.ActionSource#isImmediate() - */ - public boolean isImmediate(); - - /** - * getter for render method flag of subview. If true, on AJAX-request component render it children - * after {@link com.sun.faces.lifecycle.Phase.INVOKE_APPLICATION } - * @return value of selfRendered flag - */ - public boolean isSelfRendered(); - - /** - * setter for self-render flag. - * @param selfRendered - */ - public void setSelfRendered(boolean selfRendered); - /** - * setter for immediate flag. - * - * @see javax.faces.component.ActionSource#setImmediate(boolean) - */ - public void setImmediate(boolean immediate); - - public boolean isSubmitted(); - - public void setSubmitted(boolean submitted); - - /** - * Render AJAX response for this container from stored View. - * @param context - * @throws FacesException - */ -// public void renderAjaxRegion(FacesContext context) throws FacesException ; - -} Deleted: trunk/framework/api/src/main/java/org/ajax4jsf/framework/ajax/AjaxOutput.java =================================================================== --- trunk/framework/api/src/main/java/org/ajax4jsf/framework/ajax/AjaxOutput.java 2007-07-03 20:06:53 UTC (rev 1449) +++ trunk/framework/api/src/main/java/org/ajax4jsf/framework/ajax/AjaxOutput.java 2007-07-03 20:13:44 UTC (rev 1450) @@ -1,55 +0,0 @@ -/** - * License Agreement. - * - * Ajax4jsf 1.1 - 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.ajax4jsf.framework.ajax; - -/** - * Marker interface for all JSF components, encoded ( or not ) on rendering - * Ajax request , depend on it self properties ( such as messages, help or like components ) - * @author shura (latest modification by $Author: alexsmirnov $) - * @version $Revision: 1.1.2.1 $ $Date: 2007/01/09 18:57:39 $ - * - */ -public interface AjaxOutput { - /** - * getter for ajax-rendered flag property. - * @return - */ - public boolean isAjaxRendered(); - /** - * Setter for ajax rendered property. - * @param ajaxRendered - */ - public void setAjaxRendered(boolean ajaxRendered); - - /** - * getter for ajax-rendered flag property. - * @return - */ - public boolean isKeepTransient(); - /** - * Setter for ajax rendered property. - * @param ajaxRendered - */ - public void setKeepTransient(boolean ajaxRendered); - - -} Deleted: trunk/framework/api/src/main/java/org/ajax4jsf/framework/ajax/AjaxSupport.java =================================================================== --- trunk/framework/api/src/main/java/org/ajax4jsf/framework/ajax/AjaxSupport.java 2007-07-03 20:06:53 UTC (rev 1449) +++ trunk/framework/api/src/main/java/org/ajax4jsf/framework/ajax/AjaxSupport.java 2007-07-03 20:13:44 UTC (rev 1450) @@ -1,71 +0,0 @@ -/** - * License Agreement. - * - * Ajax4jsf 1.1 - 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.ajax4jsf.framework.ajax; - -import javax.faces.component.UIComponent; - -/** - * Version of {@link org.ajax4jsf.framework.ajax.AjaxComponent} for append - * Ajax functions for non-ajax components - * @author asmirnov(a)exadel.com (latest modification by $Author: alexsmirnov $) - * @version $Revision: 1.1.2.1 $ $Date: 2007/01/09 18:57:34 $ - * - */ -public interface AjaxSupport extends AjaxComponent { - - /** - * @return JavaScript eventString. Rebuild on every call, since - * can be in loop ( as in dataTable ) with different parameters. - */ - public String getEventString(); - /** - * setter method for property - * @param new value of Name of event property of parent component for build JavaScript AJAX.Submit call to set - */ - public abstract void setEvent(String event); - - /** - * @return value or result of valueBinding of Name of event property of parent component for build JavaScript AJAX.Submit call - */ - public abstract String getEvent(); - - - /** - * Getter for property If true, disable default action for target event ( encode 'return false' to JavaScript ), implementation will be generated by - * componnents-generator - * @return property value - */ - public abstract boolean isDisableDefault(); - - /** - * Setter for property If true, disable default action for target event ( encode 'return false' to JavaScript ), implementation will be generated by - * componnents-generator - * @param newvalue - new property value - */ - public abstract void setDisableDefault(boolean newvalue); - - /** - * Set property for JavaScrept event generated by this component. - * @param parent - */ - public void setParentProperties(UIComponent parent); -} Copied: trunk/framework/api/src/main/java/org/ajax4jsf/model/DataComponentState.java (from rev 1448, trunk/framework/api/src/main/java/org/ajax4jsf/ajax/repeat/DataComponentState.java) =================================================================== --- trunk/framework/api/src/main/java/org/ajax4jsf/model/DataComponentState.java (rev 0) +++ trunk/framework/api/src/main/java/org/ajax4jsf/model/DataComponentState.java 2007-07-03 20:13:44 UTC (rev 1450) @@ -0,0 +1,42 @@ +/** + * License Agreement. + * + * Ajax4jsf 1.1 - 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.ajax4jsf.model; + +import javax.faces.component.StateHolder; + +/** + * Interface for classes keeped current iterable component state, as : + * active data objects range + * sorting order + * tree nodes expanded state + * + * @author shura + * + */ +public interface DataComponentState { + + /** + * Build used data objects range for iteration. + * @return + */ + public abstract Range getRange(); +} Copied: trunk/framework/api/src/main/java/org/ajax4jsf/model/DataVisitor.java (from rev 1448, trunk/framework/api/src/main/java/org/ajax4jsf/ajax/repeat/DataVisitor.java) =================================================================== --- trunk/framework/api/src/main/java/org/ajax4jsf/model/DataVisitor.java (rev 0) +++ trunk/framework/api/src/main/java/org/ajax4jsf/model/DataVisitor.java 2007-07-03 20:13:44 UTC (rev 1450) @@ -0,0 +1,45 @@ +/** + * License Agreement. + * + * Ajax4jsf 1.1 - 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.ajax4jsf.model; + +import java.io.IOException; + +import javax.faces.context.FacesContext; + +/** + * Interface for classes, able to receive visitor processing calls from ExtendedDataModel + * @author shura + * + */ +public interface DataVisitor { + + /** + * This method called back ( as visitor ) from {@link ExtendedDataModel#walk(FacesContext, DataVisitor, Range)} for + * each row. + * @param context current JSF context. + * @param rowKey current row key of DataModel + * @param argument Implementation-specific argument + * @throws IOException + */ + public void process(FacesContext context,Object rowKey, Object argument) throws IOException; + +} Copied: trunk/framework/api/src/main/java/org/ajax4jsf/model/ExtendedDataModel.java (from rev 1448, trunk/framework/api/src/main/java/org/ajax4jsf/ajax/repeat/ExtendedDataModel.java) =================================================================== --- trunk/framework/api/src/main/java/org/ajax4jsf/model/ExtendedDataModel.java (rev 0) +++ trunk/framework/api/src/main/java/org/ajax4jsf/model/ExtendedDataModel.java 2007-07-03 20:13:44 UTC (rev 1450) @@ -0,0 +1,83 @@ +/** + * License Agreement. + * + * Ajax4jsf 1.1 - 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.ajax4jsf.model; + +import java.io.IOException; +import java.io.Serializable; + +import javax.faces.context.FacesContext; +import javax.faces.model.DataModel; + +/** + * Extesion for {@link DataModel} , for support complex data structure, like tree, spreadsheet etc + * in iterable components. + * @author shura + * + */ +public abstract class ExtendedDataModel extends DataModel { + + /** + * <p>Instead of simple <code>int</code> for current state selection, this model can use any object for + * select current data. Implementation depend on model, with any restrictions :</p> + * <ol> + * <li> key must be {@link Serializable}.</li> + * <li>{@link Object#toString()} method must return representation compatible with {@link javax.faces.component.UIComponent#getClientId(javax.faces.context.FacesContext)}, + * as far as this string will be appended to clientId of iterator component.</li> + * </ol> + * @param key key for select current data, or null for clear selection. + */ + public abstract void setRowKey(Object key); + + /** + * @return key for selected data or <code>null</code> + */ + public abstract Object getRowKey(); + + /** + * Iteration component can support save data for use at decoding/validation/update phases to avoid unnessesary calls to original models, + * for example - to avoid requests to database until all data is validated. + * @return + */ + public SerializableDataModel getSerializableModel(Range range){ + // By default, model not serializable. + return null; + } + + + /** + * Iterate over model by "visitor" pattern, for given range + * @param context current JSF context. + * @param visitor instance of {@link DataVisitor}, for process each row. + * @param range Implementation-specific range of data keys. + * @param argument Implementation-specific argument + * @throws IOException + */ + public abstract void walk(FacesContext context,DataVisitor visitor,Range range, Object argument) throws IOException; + + /** + * Create Iterator on all row keys for given range. + * @param range - Implementation-specific range of data keys. + * @return + */ +// public abstract Iterator dataIterator(Range range); + +} Copied: trunk/framework/api/src/main/java/org/ajax4jsf/model/Range.java (from rev 1448, trunk/framework/api/src/main/java/org/ajax4jsf/ajax/repeat/Range.java) =================================================================== --- trunk/framework/api/src/main/java/org/ajax4jsf/model/Range.java (rev 0) +++ trunk/framework/api/src/main/java/org/ajax4jsf/model/Range.java 2007-07-03 20:13:44 UTC (rev 1450) @@ -0,0 +1,33 @@ +/** + * License Agreement. + * + * Ajax4jsf 1.1 - 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.ajax4jsf.model; + +/** + * Marker interface for building iterator over dataModel values. over {@link ExtendedDataModel} elements. + * It can be simple min/max values for data table, but also can provide set of expanded/collapsed nodes in tree, + * can provide sorting order, + * @author shura + * + */ +public interface Range { + +} Copied: trunk/framework/api/src/main/java/org/ajax4jsf/model/RepeatState.java (from rev 1448, trunk/framework/api/src/main/java/org/ajax4jsf/ajax/repeat/RepeatState.java) =================================================================== --- trunk/framework/api/src/main/java/org/ajax4jsf/model/RepeatState.java (rev 0) +++ trunk/framework/api/src/main/java/org/ajax4jsf/model/RepeatState.java 2007-07-03 20:13:44 UTC (rev 1450) @@ -0,0 +1,81 @@ +/** + * License Agreement. + * + * Ajax4jsf 1.1 - 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.ajax4jsf.model; + +import java.io.Serializable; + +import javax.faces.context.FacesContext; + +/** + * @author shura + * + */ +public class RepeatState implements DataComponentState,Serializable { + + /** + * + */ + private static final long serialVersionUID = -5552520123654180445L; + + private int _rows = -1; + + private int _first = 0; + + + /** + * @return the first + */ + public int getFirst() { + return _first; + } + + /** + * @param first the first to set + */ + public void setFirst(int first) { + this._first = first; + } + + /** + * @return the rows + */ + public int getRows() { + return _rows; + } + + /** + * @param rows the rows to set + */ + public void setRows(int rows) { + this._rows = rows; + } + + /* (non-Javadoc) + * @see org.ajax4jsf.ajax.repeat.DataComponentState#getRange() + */ + public Range getRange() { + // TODO Auto-generated method stub + return new SequenceRange(getFirst(),getRows()); + } + + +} Copied: trunk/framework/api/src/main/java/org/ajax4jsf/model/SequenceDataModel.java (from rev 1448, trunk/framework/api/src/main/java/org/ajax4jsf/ajax/repeat/SequenceDataModel.java) =================================================================== --- trunk/framework/api/src/main/java/org/ajax4jsf/model/SequenceDataModel.java (rev 0) +++ trunk/framework/api/src/main/java/org/ajax4jsf/model/SequenceDataModel.java 2007-07-03 20:13:44 UTC (rev 1450) @@ -0,0 +1,202 @@ +/** + * License Agreement. + * + * Ajax4jsf 1.1 - 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.ajax4jsf.model; + +import java.io.IOException; + +import javax.faces.context.FacesContext; +import javax.faces.model.DataModel; + +/** + * @author shura + * + */ +public class SequenceDataModel extends ExtendedDataModel { + + private DataModel wrappedModel; + + /** + * @param wrapped + */ + public SequenceDataModel(DataModel wrapped) { + super(); + this.wrappedModel = wrapped; + } + + /* (non-Javadoc) + * @see org.ajax4jsf.ajax.repeat.ExtendedDataModel#dataIterator(org.ajax4jsf.ajax.repeat.Range) + */ +/* public Iterator dataIterator(Range range) { + final SequenceRange seqRange = (SequenceRange) range; + int rows = seqRange.getRows(); + int rowCount = wrapped.getRowCount(); + final int firstRow = seqRange.getFirstRow(); + if(rows > 0){ + rows += firstRow; + if(rowCount >=0){ + rows = Math.min(rows, rowCount); + } + } else if(rowCount >=0 ){ + rows = rowCount; + } + final int maxRow = rows; + return new Iterator(){ + + int rowIndex = firstRow; + + public boolean hasNext() { + // TODO Auto-generated method stub + return maxRow < 0 || rowIndex < maxRow; + } + + public Object next() { + // TODO Auto-generated method stub + return new Integer(rowIndex++); + } + + public void remove() { + throw new IllegalStateException(); + } + + }; + } +*/ + public void walk(FacesContext context, DataVisitor visitor, Range range, Object argument) throws IOException { + final SequenceRange seqRange = (SequenceRange) range; + int rows = seqRange.getRows(); + int rowCount = wrappedModel.getRowCount(); + int currentRow = seqRange.getFirstRow(); + if(rows > 0){ + rows += currentRow; + if(rowCount >=0){ + rows = Math.min(rows, rowCount); + } + } else if(rowCount >=0 ){ + rows = rowCount; + } else { + rows = -1; + } + while (rows < 0 || currentRow < rows) { + wrappedModel.setRowIndex(currentRow); + if(wrappedModel.isRowAvailable()){ + visitor.process(context, new Integer(currentRow), argument); + } else { + break; + } + currentRow++; + } + + } + + /* (non-Javadoc) + * @see org.ajax4jsf.ajax.repeat.ExtendedDataModel#getRowKey() + */ + public Object getRowKey() { + int index = wrappedModel.getRowIndex(); + if(index<0){ + return null; + } + return new Integer(index); + } + + + /* (non-Javadoc) + * @see org.ajax4jsf.ajax.repeat.ExtendedDataModel#setRowKey(java.lang.Object) + */ + public void setRowKey(Object key) { + if(null == key){ + wrappedModel.setRowIndex(-1); + } else { + Integer index = (Integer) key; + wrappedModel.setRowIndex(index.intValue()); + } + } + + /* (non-Javadoc) + * @see javax.faces.model.DataModel#getRowCount() + */ + public int getRowCount() { + // TODO Auto-generated method stub + return wrappedModel.getRowCount(); + } + + /* (non-Javadoc) + * @see javax.faces.model.DataModel#getRowData() + */ + public Object getRowData() { + // TODO Auto-generated method stub + return wrappedModel.getRowData(); + } + + /* (non-Javadoc) + * @see javax.faces.model.DataModel#getRowIndex() + */ + public int getRowIndex() { + // TODO Auto-generated method stub + return wrappedModel.getRowIndex(); + } + + /* (non-Javadoc) + * @see javax.faces.model.DataModel#getWrappedData() + */ + public Object getWrappedData() { + // TODO Auto-generated method stub + return wrappedModel.getWrappedData(); + } + + /* (non-Javadoc) + * @see javax.faces.model.DataModel#isRowAvailable() + */ + public boolean isRowAvailable() { + // TODO Auto-generated method stub + return wrappedModel.isRowAvailable(); + } + + /* (non-Javadoc) + * @see javax.faces.model.DataModel#setRowIndex(int) + */ + public void setRowIndex(int rowIndex) { + wrappedModel.setRowIndex(rowIndex); + } + + /* (non-Javadoc) + * @see javax.faces.model.DataModel#setWrappedData(java.lang.Object) + */ + public void setWrappedData(Object data) { + wrappedModel.setWrappedData(data); + } + + /** + * @return the wrappedModel + */ + protected DataModel getWrappedModel() { + return this.wrappedModel; + } + + /** + * @param wrappedModel the wrappedModel to set + */ + protected void setWrappedModel(DataModel wrappedModel) { + this.wrappedModel = wrappedModel; + } + +} Copied: trunk/framework/api/src/main/java/org/ajax4jsf/model/SequenceRange.java (from rev 1448, trunk/framework/api/src/main/java/org/ajax4jsf/ajax/repeat/SequenceRange.java) =================================================================== --- trunk/framework/api/src/main/java/org/ajax4jsf/model/SequenceRange.java (rev 0) +++ trunk/framework/api/src/main/java/org/ajax4jsf/model/SequenceRange.java 2007-07-03 20:13:44 UTC (rev 1450) @@ -0,0 +1,58 @@ +/** + * License Agreement. + * + * Ajax4jsf 1.1 - 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.ajax4jsf.model; + +/** + * @author shura + * + */ +public class SequenceRange implements Range { + + private int firstRow = 0; + + private int rows = -1; + + /** + * @return the firstRow + */ + public int getFirstRow() { + return firstRow; + } + + /** + * @return the rows + */ + public int getRows() { + return rows; + } + + /** + * @param firstRow + * @param rows + */ + public SequenceRange(int firstRow, int rows) { + super(); + this.firstRow = firstRow; + this.rows = rows; + } + +} Copied: trunk/framework/api/src/main/java/org/ajax4jsf/model/SerializableDataModel.java (from rev 1448, trunk/framework/api/src/main/java/org/ajax4jsf/ajax/repeat/SerializableDataModel.java) =================================================================== --- trunk/framework/api/src/main/java/org/ajax4jsf/model/SerializableDataModel.java (rev 0) +++ trunk/framework/api/src/main/java/org/ajax4jsf/model/SerializableDataModel.java 2007-07-03 20:13:44 UTC (rev 1450) @@ -0,0 +1,39 @@ +/** + * License Agreement. + * + * Ajax4jsf 1.1 - 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.ajax4jsf.model; + +import java.io.Serializable; + +/** + * Serializable version of {@link ExtendedDataModel}, for save lightweight version of data + * + * @author shura + * + */ +public abstract class SerializableDataModel extends ExtendedDataModel implements Serializable { + + /** + * Method called after update all model values. For example, developer can update + * database with new values of modified rows. + */ + public abstract void update(); +} Modified: trunk/framework/api/src/main/java/org/richfaces/component/AbstractTreeDataModel.java =================================================================== --- trunk/framework/api/src/main/java/org/richfaces/component/AbstractTreeDataModel.java 2007-07-03 20:06:53 UTC (rev 1449) +++ trunk/framework/api/src/main/java/org/richfaces/component/AbstractTreeDataModel.java 2007-07-03 20:13:44 UTC (rev 1450) @@ -26,9 +26,9 @@ import javax.faces.component.NamingContainer; import javax.faces.context.FacesContext; -import org.ajax4jsf.ajax.repeat.DataVisitor; -import org.ajax4jsf.ajax.repeat.ExtendedDataModel; -import org.ajax4jsf.ajax.repeat.Range; +import org.ajax4jsf.model.DataVisitor; +import org.ajax4jsf.model.ExtendedDataModel; +import org.ajax4jsf.model.Range; import org.richfaces.component.state.TreeRange; /** Modified: trunk/framework/api/src/main/java/org/richfaces/component/TreeDataModel.java =================================================================== --- trunk/framework/api/src/main/java/org/richfaces/component/TreeDataModel.java 2007-07-03 20:06:53 UTC (rev 1449) +++ trunk/framework/api/src/main/java/org/richfaces/component/TreeDataModel.java 2007-07-03 20:13:44 UTC (rev 1450) @@ -27,8 +27,8 @@ import javax.faces.context.FacesContext; -import org.ajax4jsf.ajax.repeat.DataVisitor; -import org.ajax4jsf.ajax.repeat.Range; +import org.ajax4jsf.model.DataVisitor; +import org.ajax4jsf.model.Range; import org.richfaces.component.state.TreeRange; /** Modified: trunk/framework/api/src/main/java/org/richfaces/component/state/TreeRange.java =================================================================== --- trunk/framework/api/src/main/java/org/richfaces/component/state/TreeRange.java 2007-07-03 20:06:53 UTC (rev 1449) +++ trunk/framework/api/src/main/java/org/richfaces/component/state/TreeRange.java 2007-07-03 20:13:44 UTC (rev 1450) @@ -21,7 +21,7 @@ package org.richfaces.component.state; -import org.ajax4jsf.ajax.repeat.Range; +import org.ajax4jsf.model.Range; import org.richfaces.component.TreeRowKey; /** Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/ajax/repeat/UIDataAdaptor.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/ajax/repeat/UIDataAdaptor.java 2007-07-03 20:06:53 UTC (rev 1449) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/ajax/repeat/UIDataAdaptor.java 2007-07-03 20:13:44 UTC (rev 1450) @@ -47,7 +47,12 @@ import javax.faces.model.ListDataModel; import javax.faces.render.Renderer; +import org.ajax4jsf.component.AjaxDataEncoder; import org.ajax4jsf.framework.renderer.AjaxChildrenRenderer; +import org.ajax4jsf.model.DataComponentState; +import org.ajax4jsf.model.DataVisitor; +import org.ajax4jsf.model.ExtendedDataModel; +import org.ajax4jsf.model.SerializableDataModel; /** * Base class for iterable components, like dataTable, Tomahawk dataList, Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/component/AjaxActionComponent.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/component/AjaxActionComponent.java 2007-07-03 20:06:53 UTC (rev 1449) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/component/AjaxActionComponent.java 2007-07-03 20:13:44 UTC (rev 1450) @@ -30,7 +30,6 @@ import javax.faces.event.PhaseId; import org.ajax4jsf.context.AjaxContext; -import org.ajax4jsf.framework.ajax.AjaxComponent; import org.ajax4jsf.framework.ajax.AjaxEvent; import org.ajax4jsf.framework.ajax.AjaxListener; import org.ajax4jsf.framework.ajax.AjaxSingleEvent; Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/component/AjaxInputComponent.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/component/AjaxInputComponent.java 2007-07-03 20:06:53 UTC (rev 1449) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/component/AjaxInputComponent.java 2007-07-03 20:13:44 UTC (rev 1450) @@ -30,7 +30,6 @@ import javax.faces.event.PhaseId; import org.ajax4jsf.context.AjaxContext; -import org.ajax4jsf.framework.ajax.AjaxComponent; import org.ajax4jsf.framework.ajax.AjaxEvent; Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/AjaxContextImpl.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/AjaxContextImpl.java 2007-07-03 20:06:53 UTC (rev 1449) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/AjaxContextImpl.java 2007-07-03 20:13:44 UTC (rev 1450) @@ -52,6 +52,7 @@ import javax.servlet.ServletRequest; import javax.servlet.ServletResponse; +import org.ajax4jsf.component.AjaxContainer; import org.ajax4jsf.context.AjaxContext; import org.ajax4jsf.framework.ajax.xmlfilter.BaseFilter; import org.ajax4jsf.framework.ajax.xmlfilter.FilterServletResponseWrapper; Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/AjaxRegionBrige.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/AjaxRegionBrige.java 2007-07-03 20:06:53 UTC (rev 1449) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/AjaxRegionBrige.java 2007-07-03 20:13:44 UTC (rev 1450) @@ -31,6 +31,7 @@ import javax.faces.event.AbortProcessingException; import javax.faces.event.FacesEvent; +import org.ajax4jsf.component.AjaxContainerBase; import org.ajax4jsf.context.AjaxContext; import org.ajax4jsf.framework.util.message.Messages; import org.apache.commons.logging.Log; Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/AjaxViewRoot.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/AjaxViewRoot.java 2007-07-03 20:06:53 UTC (rev 1449) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/AjaxViewRoot.java 2007-07-03 20:13:44 UTC (rev 1450) @@ -32,6 +32,7 @@ import javax.faces.event.FacesEvent; import javax.faces.event.PhaseId; +import org.ajax4jsf.component.AjaxContainer; import org.ajax4jsf.context.AjaxContext; import org.ajax4jsf.framework.renderer.AjaxContainerRenderer; import org.ajax4jsf.framework.util.message.Messages; Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/EventValueBinding.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/EventValueBinding.java 2007-07-03 20:06:53 UTC (rev 1449) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/EventValueBinding.java 2007-07-03 20:13:44 UTC (rev 1450) @@ -28,6 +28,8 @@ import javax.faces.el.PropertyNotFoundException; import javax.faces.el.ValueBinding; +import org.ajax4jsf.component.AjaxComponent; +import org.ajax4jsf.component.AjaxSupport; import org.ajax4jsf.framework.renderer.AjaxRendererUtils; import org.ajax4jsf.framework.util.message.Messages; Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/AjaxChildrenRenderer.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/AjaxChildrenRenderer.java 2007-07-03 20:06:53 UTC (rev 1449) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/AjaxChildrenRenderer.java 2007-07-03 20:13:44 UTC (rev 1450) @@ -31,8 +31,8 @@ import javax.faces.context.FacesContext; import org.ajax4jsf.ajax.UILoadBundle; -import org.ajax4jsf.framework.ajax.AjaxChildrenEncoder; -import org.ajax4jsf.framework.ajax.AjaxOutput; +import org.ajax4jsf.component.AjaxChildrenEncoder; +import org.ajax4jsf.component.AjaxOutput; import org.ajax4jsf.framework.util.message.Messages; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/AjaxContainerRenderer.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/AjaxContainerRenderer.java 2007-07-03 20:06:53 UTC (rev 1449) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/AjaxContainerRenderer.java 2007-07-03 20:13:44 UTC (rev 1450) @@ -29,8 +29,8 @@ import javax.faces.component.UIComponent; import javax.faces.context.FacesContext; +import org.ajax4jsf.component.AjaxContainer; import org.ajax4jsf.context.AjaxContext; -import org.ajax4jsf.framework.ajax.AjaxContainer; import org.ajax4jsf.framework.ajax.AjaxEvent; import org.ajax4jsf.framework.util.message.Messages; import org.apache.commons.logging.Log; Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/AjaxRendererUtils.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/AjaxRendererUtils.java 2007-07-03 20:06:53 UTC (rev 1449) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/AjaxRendererUtils.java 2007-07-03 20:13:44 UTC (rev 1450) @@ -44,10 +44,10 @@ import javax.servlet.http.HttpServletResponse; import org.ajax4jsf.ajax.UILoadBundle; +import org.ajax4jsf.component.AjaxComponent; +import org.ajax4jsf.component.AjaxContainer; +import org.ajax4jsf.component.AjaxSupport; import org.ajax4jsf.context.AjaxContext; -import org.ajax4jsf.framework.ajax.AjaxComponent; -import org.ajax4jsf.framework.ajax.AjaxContainer; -import org.ajax4jsf.framework.ajax.AjaxSupport; import org.ajax4jsf.framework.ajax.AjaxViewRoot; import org.ajax4jsf.framework.ajax.JavaScriptParameter; import org.ajax4jsf.framework.renderer.RendererUtils.HTML; @@ -645,18 +645,18 @@ * @param uiComponent * @return */ - public static org.ajax4jsf.framework.ajax.AjaxContainer findAjaxContainer( + public static org.ajax4jsf.component.AjaxContainer findAjaxContainer( FacesContext facesContext, UIComponent uiComponent) { UIComponent parent = uiComponent.getParent(); while (parent != null - && !(parent instanceof org.ajax4jsf.framework.ajax.AjaxContainer)) { + && !(parent instanceof org.ajax4jsf.component.AjaxContainer)) { parent = parent.getParent(); } - org.ajax4jsf.framework.ajax.AjaxContainer nestingContainer = null; + org.ajax4jsf.component.AjaxContainer nestingContainer = null; if (parent != null) { // link is nested inside a form - nestingContainer = (org.ajax4jsf.framework.ajax.AjaxContainer) parent; + nestingContainer = (org.ajax4jsf.component.AjaxContainer) parent; } else if (facesContext.getViewRoot() instanceof AjaxViewRoot) { nestingContainer = (AjaxContainer) facesContext.getViewRoot(); } Modified: trunk/ui/core/src/main/java/org/ajax4jsf/ajax/UIAjaxForm.java =================================================================== --- trunk/ui/core/src/main/java/org/ajax4jsf/ajax/UIAjaxForm.java 2007-07-03 20:06:53 UTC (rev 1449) +++ trunk/ui/core/src/main/java/org/ajax4jsf/ajax/UIAjaxForm.java 2007-07-03 20:13:44 UTC (rev 1450) @@ -29,8 +29,8 @@ import javax.faces.event.AbortProcessingException; import javax.faces.event.FacesEvent; +import org.ajax4jsf.component.AjaxComponent; import org.ajax4jsf.context.AjaxContext; -import org.ajax4jsf.framework.ajax.AjaxComponent; import org.ajax4jsf.framework.ajax.AjaxEvent; import org.ajax4jsf.framework.ajax.AjaxListener; import org.ajax4jsf.framework.ajax.AjaxSource; Modified: trunk/ui/core/src/main/java/org/ajax4jsf/ajax/UIAjaxOutputPanel.java =================================================================== --- trunk/ui/core/src/main/java/org/ajax4jsf/ajax/UIAjaxOutputPanel.java 2007-07-03 20:06:53 UTC (rev 1449) +++ trunk/ui/core/src/main/java/org/ajax4jsf/ajax/UIAjaxOutputPanel.java 2007-07-03 20:13:44 UTC (rev 1450) @@ -23,7 +23,7 @@ import javax.faces.component.UIPanel; -import org.ajax4jsf.framework.ajax.AjaxOutput; +import org.ajax4jsf.component.AjaxOutput; /** Modified: trunk/ui/core/src/main/java/org/ajax4jsf/ajax/UIAjaxRegion.java =================================================================== --- trunk/ui/core/src/main/java/org/ajax4jsf/ajax/UIAjaxRegion.java 2007-07-03 20:06:53 UTC (rev 1449) +++ trunk/ui/core/src/main/java/org/ajax4jsf/ajax/UIAjaxRegion.java 2007-07-03 20:13:44 UTC (rev 1450) @@ -34,8 +34,8 @@ import javax.faces.event.AbortProcessingException; import javax.faces.event.FacesEvent; +import org.ajax4jsf.component.AjaxContainer; import org.ajax4jsf.context.AjaxContext; -import org.ajax4jsf.framework.ajax.AjaxContainer; import org.ajax4jsf.framework.ajax.AjaxContextImpl; import org.ajax4jsf.framework.ajax.AjaxListener; import org.ajax4jsf.framework.ajax.AjaxRegionBrige; Modified: trunk/ui/core/src/main/java/org/ajax4jsf/ajax/UIAjaxStatus.java =================================================================== --- trunk/ui/core/src/main/java/org/ajax4jsf/ajax/UIAjaxStatus.java 2007-07-03 20:06:53 UTC (rev 1449) +++ trunk/ui/core/src/main/java/org/ajax4jsf/ajax/UIAjaxStatus.java 2007-07-03 20:13:44 UTC (rev 1450) @@ -29,7 +29,7 @@ import javax.faces.context.FacesContext; import javax.faces.el.ValueBinding; -import org.ajax4jsf.framework.ajax.AjaxContainer; +import org.ajax4jsf.component.AjaxContainer; import org.ajax4jsf.framework.renderer.AjaxRendererUtils; import org.ajax4jsf.framework.util.message.Messages; Modified: trunk/ui/core/src/main/java/org/ajax4jsf/ajax/UIAjaxSupport.java =================================================================== --- trunk/ui/core/src/main/java/org/ajax4jsf/ajax/UIAjaxSupport.java 2007-07-03 20:06:53 UTC (rev 1449) +++ trunk/ui/core/src/main/java/org/ajax4jsf/ajax/UIAjaxSupport.java 2007-07-03 20:13:44 UTC (rev 1450) @@ -29,7 +29,7 @@ import javax.faces.el.ValueBinding; import org.ajax4jsf.component.AjaxActionComponent; -import org.ajax4jsf.framework.ajax.AjaxSupport; +import org.ajax4jsf.component.AjaxSupport; import org.ajax4jsf.framework.ajax.EventValueBinding; import org.ajax4jsf.framework.renderer.AjaxRendererUtils; import org.ajax4jsf.framework.util.message.Messages; Modified: trunk/ui/core/src/main/java/org/ajax4jsf/ajax/UIInclude.java =================================================================== --- trunk/ui/core/src/main/java/org/ajax4jsf/ajax/UIInclude.java 2007-07-03 20:06:53 UTC (rev 1449) +++ trunk/ui/core/src/main/java/org/ajax4jsf/ajax/UIInclude.java 2007-07-03 20:13:44 UTC (rev 1450) @@ -33,8 +33,8 @@ import javax.faces.event.FacesListener; import javax.faces.event.PhaseId; +import org.ajax4jsf.component.AjaxOutput; import org.ajax4jsf.context.AjaxContext; -import org.ajax4jsf.framework.ajax.AjaxOutput; import org.ajax4jsf.framework.ajax.ViewIdHolder; /** Modified: trunk/ui/core/src/main/java/org/ajax4jsf/ajax/repeat/UIRepeat.java =================================================================== --- trunk/ui/core/src/main/java/org/ajax4jsf/ajax/repeat/UIRepeat.java 2007-07-03 20:06:53 UTC (rev 1449) +++ trunk/ui/core/src/main/java/org/ajax4jsf/ajax/repeat/UIRepeat.java 2007-07-03 20:13:44 UTC (rev 1450) @@ -34,6 +34,12 @@ import javax.faces.model.ResultSetDataModel; import javax.faces.model.ScalarDataModel; import javax.servlet.jsp.jstl.sql.Result; + +import org.ajax4jsf.model.DataComponentState; +import org.ajax4jsf.model.ExtendedDataModel; +import org.ajax4jsf.model.Range; +import org.ajax4jsf.model.SequenceDataModel; +import org.ajax4jsf.model.SequenceRange; /** * @author shura * Modified: trunk/ui/core/src/main/java/org/ajax4jsf/ajax/repeat/UISelector.java =================================================================== --- trunk/ui/core/src/main/java/org/ajax4jsf/ajax/repeat/UISelector.java 2007-07-03 20:06:53 UTC (rev 1449) +++ trunk/ui/core/src/main/java/org/ajax4jsf/ajax/repeat/UISelector.java 2007-07-03 20:13:44 UTC (rev 1450) @@ -31,6 +31,7 @@ import javax.faces.component.UIComponentBase; import javax.faces.context.FacesContext; +import org.ajax4jsf.component.AjaxDataEncoder; import org.ajax4jsf.framework.renderer.AjaxChildrenRenderer; import org.apache.commons.beanutils.PropertyUtils; Modified: trunk/ui/core/src/main/java/org/ajax4jsf/renderkit/html/AjaxPageRenderer.java =================================================================== --- trunk/ui/core/src/main/java/org/ajax4jsf/renderkit/html/AjaxPageRenderer.java 2007-07-03 20:06:53 UTC (rev 1449) +++ trunk/ui/core/src/main/java/org/ajax4jsf/renderkit/html/AjaxPageRenderer.java 2007-07-03 20:13:44 UTC (rev 1450) @@ -30,8 +30,8 @@ import javax.faces.context.FacesContext; import javax.faces.context.ResponseWriter; +import org.ajax4jsf.component.AjaxContainer; import org.ajax4jsf.context.AjaxContext; -import org.ajax4jsf.framework.ajax.AjaxContainer; import org.ajax4jsf.framework.ajax.AjaxViewRoot; import org.ajax4jsf.framework.ajax.xmlfilter.BaseFilter; import org.ajax4jsf.framework.renderer.AjaxContainerRenderer; Modified: trunk/ui/core/src/main/java/org/ajax4jsf/renderkit/html/RepeatRenderer.java =================================================================== --- trunk/ui/core/src/main/java/org/ajax4jsf/renderkit/html/RepeatRenderer.java 2007-07-03 20:06:53 UTC (rev 1449) +++ trunk/ui/core/src/main/java/org/ajax4jsf/renderkit/html/RepeatRenderer.java 2007-07-03 20:13:44 UTC (rev 1450) @@ -27,9 +27,9 @@ import javax.faces.component.UIComponent; import javax.faces.context.FacesContext; -import org.ajax4jsf.ajax.repeat.DataVisitor; import org.ajax4jsf.ajax.repeat.UIRepeat; import org.ajax4jsf.framework.renderer.RendererBase; +import org.ajax4jsf.model.DataVisitor; /** * @author shura Modified: trunk/ui/core/src/main/java/org/ajax4jsf/taglib/html/facelets/AjaxReRendrRule.java =================================================================== --- trunk/ui/core/src/main/java/org/ajax4jsf/taglib/html/facelets/AjaxReRendrRule.java 2007-07-03 20:06:53 UTC (rev 1449) +++ trunk/ui/core/src/main/java/org/ajax4jsf/taglib/html/facelets/AjaxReRendrRule.java 2007-07-03 20:13:44 UTC (rev 1450) @@ -23,7 +23,7 @@ import java.util.Set; -import org.ajax4jsf.framework.ajax.AjaxComponent; +import org.ajax4jsf.component.AjaxComponent; import org.ajax4jsf.framework.renderer.AjaxRendererUtils; import com.sun.facelets.FaceletContext; Modified: trunk/ui/core/src/main/java/org/ajax4jsf/taglib/html/jsp/AjaxRegionTag.java =================================================================== --- trunk/ui/core/src/main/java/org/ajax4jsf/taglib/html/jsp/AjaxRegionTag.java 2007-07-03 20:06:53 UTC (rev 1449) +++ trunk/ui/core/src/main/java/org/ajax4jsf/taglib/html/jsp/AjaxRegionTag.java 2007-07-03 20:13:44 UTC (rev 1450) @@ -25,7 +25,7 @@ import javax.faces.el.MethodBinding; import org.ajax4jsf.ajax.UIAjaxRegion; -import org.ajax4jsf.framework.ajax.AjaxContainer; +import org.ajax4jsf.component.AjaxContainer; import org.ajax4jsf.framework.ajax.AjaxListener; import org.ajax4jsf.framework.taglib.UIComponentTagBase; import org.ajax4jsf.framework.util.message.Messages; Modified: trunk/ui/dataTable/src/main/java/org/richfaces/component/UIDataTable.java =================================================================== --- trunk/ui/dataTable/src/main/java/org/richfaces/component/UIDataTable.java 2007-07-03 20:06:53 UTC (rev 1449) +++ trunk/ui/dataTable/src/main/java/org/richfaces/component/UIDataTable.java 2007-07-03 20:13:44 UTC (rev 1450) @@ -27,8 +27,8 @@ import javax.faces.component.UIComponent; import org.ajax4jsf.ajax.repeat.UIRepeat; +import org.ajax4jsf.component.AjaxSupport; import org.ajax4jsf.dnd.Dropzone; -import org.ajax4jsf.framework.ajax.AjaxSupport; import org.apache.commons.collections.Predicate; import org.apache.commons.collections.iterators.FilterIterator; import org.apache.commons.collections.iterators.IteratorChain; Modified: trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractRowsRenderer.java =================================================================== --- trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractRowsRenderer.java 2007-07-03 20:06:53 UTC (rev 1449) +++ trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractRowsRenderer.java 2007-07-03 20:13:44 UTC (rev 1450) @@ -28,12 +28,12 @@ import javax.faces.context.FacesContext; import javax.faces.context.ResponseWriter; -import org.ajax4jsf.ajax.repeat.DataVisitor; import org.ajax4jsf.ajax.repeat.UIDataAdaptor; import org.ajax4jsf.framework.renderer.HeaderResourcesRendererBase; import org.ajax4jsf.framework.renderer.RendererBase; import org.ajax4jsf.framework.renderer.RendererUtils; import org.ajax4jsf.framework.renderer.RendererUtils.HTML; +import org.ajax4jsf.model.DataVisitor; import org.richfaces.component.Row; /** Modified: trunk/ui/dataTable/src/test/java/org/richfaces/component/DataTableComponentTest.java =================================================================== --- trunk/ui/dataTable/src/test/java/org/richfaces/component/DataTableComponentTest.java 2007-07-03 20:06:53 UTC (rev 1449) +++ trunk/ui/dataTable/src/test/java/org/richfaces/component/DataTableComponentTest.java 2007-07-03 20:13:44 UTC (rev 1450) @@ -37,7 +37,7 @@ import javax.faces.model.ListDataModel; import org.ajax4jsf.ajax.UIAjaxSupport; -import org.ajax4jsf.framework.ajax.AjaxSupport; +import org.ajax4jsf.component.AjaxSupport; import org.ajax4jsf.tests.AbstractAjax4JsfTestCase; import org.apache.commons.collections.Predicate; Modified: trunk/ui/menu-components/src/main/java/org/richfaces/component/UIMenuItem.java =================================================================== --- trunk/ui/menu-components/src/main/java/org/richfaces/component/UIMenuItem.java 2007-07-03 20:06:53 UTC (rev 1449) +++ trunk/ui/menu-components/src/main/java/org/richfaces/component/UIMenuItem.java 2007-07-03 20:13:44 UTC (rev 1450) @@ -24,7 +24,7 @@ import javax.faces.component.ActionSource; import org.ajax4jsf.component.AjaxActionComponent; -import org.ajax4jsf.framework.ajax.AjaxComponent; +import org.ajax4jsf.component.AjaxComponent; import org.ajax4jsf.framework.ajax.AjaxSource; Modified: trunk/ui/simpleTogglePanel/src/main/java/org/richfaces/component/UISimpleTogglePanel.java =================================================================== --- trunk/ui/simpleTogglePanel/src/main/java/org/richfaces/component/UISimpleTogglePanel.java 2007-07-03 20:06:53 UTC (rev 1449) +++ trunk/ui/simpleTogglePanel/src/main/java/org/richfaces/component/UISimpleTogglePanel.java 2007-07-03 20:13:44 UTC (rev 1450) @@ -22,7 +22,7 @@ package org.richfaces.component; import org.ajax4jsf.component.AjaxActionComponent; -import org.ajax4jsf.framework.ajax.AjaxComponent; +import org.ajax4jsf.component.AjaxComponent; import org.ajax4jsf.framework.ajax.AjaxSource; import javax.faces.component.ActionSource; Modified: trunk/ui/suggestionbox/src/main/java/org/richfaces/component/UISuggestionBox.java =================================================================== --- trunk/ui/suggestionbox/src/main/java/org/richfaces/component/UISuggestionBox.java 2007-07-03 20:06:53 UTC (rev 1449) +++ trunk/ui/suggestionbox/src/main/java/org/richfaces/component/UISuggestionBox.java 2007-07-03 20:13:44 UTC (rev 1450) @@ -21,8 +21,8 @@ package org.richfaces.component; +import org.ajax4jsf.component.AjaxComponent; import org.ajax4jsf.context.AjaxContext; -import org.ajax4jsf.framework.ajax.AjaxComponent; import org.ajax4jsf.framework.ajax.AjaxEvent; import org.ajax4jsf.framework.ajax.AjaxListener; import org.ajax4jsf.framework.ajax.AjaxSource; Modified: trunk/ui/tabPanel/src/main/java/org/richfaces/component/UITab.java =================================================================== --- trunk/ui/tabPanel/src/main/java/org/richfaces/component/UITab.java 2007-07-03 20:06:53 UTC (rev 1449) +++ trunk/ui/tabPanel/src/main/java/org/richfaces/component/UITab.java 2007-07-03 20:13:44 UTC (rev 1450) @@ -22,7 +22,7 @@ package org.richfaces.component; import org.ajax4jsf.component.AjaxActionComponent; -import org.ajax4jsf.framework.ajax.AjaxComponent; +import org.ajax4jsf.component.AjaxComponent; import org.ajax4jsf.framework.ajax.AjaxSource; import org.ajax4jsf.framework.renderer.AjaxRendererUtils; Modified: trunk/ui/togglePanel/src/main/java/org/richfaces/component/UIToggleControl.java =================================================================== --- trunk/ui/togglePanel/src/main/java/org/richfaces/component/UIToggleControl.java 2007-07-03 20:06:53 UTC (rev 1449) +++ trunk/ui/togglePanel/src/main/java/org/richfaces/component/UIToggleControl.java 2007-07-03 20:13:44 UTC (rev 1450) @@ -32,7 +32,7 @@ import javax.faces.el.ValueBinding; import org.ajax4jsf.component.AjaxActionComponent; -import org.ajax4jsf.framework.ajax.AjaxComponent; +import org.ajax4jsf.component.AjaxComponent; import org.ajax4jsf.framework.ajax.AjaxSource; import org.ajax4jsf.framework.renderer.AjaxRendererUtils; import org.ajax4jsf.framework.renderer.RendererUtils; Modified: trunk/ui/tree/src/main/java/org/richfaces/component/CacheableTreeDataModel.java =================================================================== --- trunk/ui/tree/src/main/java/org/richfaces/component/CacheableTreeDataModel.java 2007-07-03 20:06:53 UTC (rev 1449) +++ trunk/ui/tree/src/main/java/org/richfaces/component/CacheableTreeDataModel.java 2007-07-03 20:13:44 UTC (rev 1450) @@ -25,8 +25,8 @@ import javax.faces.context.FacesContext; -import org.ajax4jsf.ajax.repeat.DataVisitor; -import org.ajax4jsf.ajax.repeat.Range; +import org.ajax4jsf.model.DataVisitor; +import org.ajax4jsf.model.Range; /** * @author Nick - mailto:nbelaevski@exadel.com created 08.01.2007 Modified: trunk/ui/tree/src/main/java/org/richfaces/component/UITree.java =================================================================== --- trunk/ui/tree/src/main/java/org/richfaces/component/UITree.java 2007-07-03 20:06:53 UTC (rev 1449) +++ trunk/ui/tree/src/main/java/org/richfaces/component/UITree.java 2007-07-03 20:13:44 UTC (rev 1450) @@ -35,10 +35,6 @@ import javax.faces.event.FacesListener; import javax.faces.event.PhaseId; -import org.ajax4jsf.ajax.repeat.DataComponentState; -import org.ajax4jsf.ajax.repeat.DataVisitor; -import org.ajax4jsf.ajax.repeat.ExtendedDataModel; -import org.ajax4jsf.ajax.repeat.Range; import org.ajax4jsf.ajax.repeat.UIDataAdaptor; import org.ajax4jsf.dnd.Draggable; import org.ajax4jsf.dnd.Dropzone; @@ -48,6 +44,10 @@ import org.ajax4jsf.dnd.event.DropListener; import org.ajax4jsf.framework.ajax.AjaxEvent; import org.ajax4jsf.framework.renderer.AjaxRendererUtils; +import org.ajax4jsf.model.DataComponentState; +import org.ajax4jsf.model.DataVisitor; +import org.ajax4jsf.model.ExtendedDataModel; +import org.ajax4jsf.model.Range; import org.apache.commons.collections.iterators.SingletonIterator; import org.richfaces.component.events.NodeExpandedEvent; import org.richfaces.component.events.NodeExpandedListener; Modified: trunk/ui/tree/src/main/java/org/richfaces/component/state/TreeState.java =================================================================== --- trunk/ui/tree/src/main/java/org/richfaces/component/state/TreeState.java 2007-07-03 20:06:53 UTC (rev 1449) +++ trunk/ui/tree/src/main/java/org/richfaces/component/state/TreeState.java 2007-07-03 20:13:44 UTC (rev 1450) @@ -29,9 +29,9 @@ import javax.faces.component.StateHolder; import javax.faces.context.FacesContext; -import org.ajax4jsf.ajax.repeat.DataComponentState; -import org.ajax4jsf.ajax.repeat.DataVisitor; -import org.ajax4jsf.ajax.repeat.Range; +import org.ajax4jsf.model.DataComponentState; +import org.ajax4jsf.model.DataVisitor; +import org.ajax4jsf.model.Range; import org.richfaces.component.TreeRowKey; import org.richfaces.component.UITree; import org.richfaces.component.state.events.TreeStateCommandsListener; Modified: trunk/ui/tree/src/main/java/org/richfaces/renderkit/TreeRendererBase.java =================================================================== --- trunk/ui/tree/src/main/java/org/richfaces/renderkit/TreeRendererBase.java 2007-07-03 20:06:53 UTC (rev 1449) +++ trunk/ui/tree/src/main/java/org/richfaces/renderkit/TreeRendererBase.java 2007-07-03 20:13:44 UTC (rev 1450) @@ -35,7 +35,6 @@ import javax.faces.context.ResponseWriter; import javax.faces.el.MethodBinding; -import org.ajax4jsf.ajax.repeat.DataVisitor; import org.ajax4jsf.framework.renderer.AjaxRendererUtils; import org.ajax4jsf.framework.renderer.ComponentVariables; import org.ajax4jsf.framework.renderer.ComponentsVariableResolver; @@ -43,6 +42,7 @@ import org.ajax4jsf.framework.util.javascript.JSFunction; import org.ajax4jsf.framework.util.javascript.JSReference; import org.ajax4jsf.framework.util.javascript.ScriptUtils; +import org.ajax4jsf.model.DataVisitor; import org.richfaces.component.LastElementAware; import org.richfaces.component.TreeRowKey; import org.richfaces.component.UITree; Modified: trunk/ui/tree/src/test/java/org/richfaces/component/TreeModelTest.java =================================================================== --- trunk/ui/tree/src/test/java/org/richfaces/component/TreeModelTest.java 2007-07-03 20:06:53 UTC (rev 1449) +++ trunk/ui/tree/src/test/java/org/richfaces/component/TreeModelTest.java 2007-07-03 20:13:44 UTC (rev 1450) @@ -31,7 +31,7 @@ import junit.framework.TestCase; -import org.ajax4jsf.ajax.repeat.DataVisitor; +import org.ajax4jsf.model.DataVisitor; import org.richfaces.component.xml.XmlNodeData; import org.richfaces.component.xml.XmlTreeDataBuilder; import org.xml.sax.InputSource;