[richfaces-svn-commits] JBoss Rich Faces SVN: r16251 - in root/ui-sandbox/trunk/components/tables/api/src/main/java/org/richfaces: component and 4 other directories.

Author: abelevich Date: 2010-01-11 08:30:11 -0500 (Mon, 11 Jan 2010) New Revision: 16251 Added: root/ui-sandbox/trunk/components/tables/api/src/main/java/org/richfaces/component/Expandable.java root/ui-sandbox/trunk/components/tables/api/src/main/java/org/richfaces/event/ root/ui-sandbox/trunk/components/tables/api/src/main/java/org/richfaces/event/ToggleEvent.java root/ui-sandbox/trunk/components/tables/api/src/main/java/org/richfaces/event/ToggleListener.java root/ui-sandbox/trunk/components/tables/api/src/main/java/org/richfaces/model/visual/ root/ui-sandbox/trunk/components/tables/api/src/main/java/org/richfaces/model/visual/ColumnVisualModel.java root/ui-sandbox/trunk/components/tables/api/src/main/java/org/richfaces/model/visual/DataTableVisualModel.java root/ui-sandbox/trunk/components/tables/api/src/main/java/org/richfaces/model/visual/SortingFilteringVisualModel.java root/ui-sandbox/trunk/components/tables/api/src/main/java/org/richfaces/model/visual/SubTableVisualModel.java root/ui-sandbox/trunk/components/tables/api/src/main/java/org/richfaces/renderkit/ root/ui-sandbox/trunk/components/tables/api/src/main/java/org/richfaces/renderkit/RowHolderBase.java Modified: root/ui-sandbox/trunk/components/tables/api/src/main/java/org/richfaces/component/Column.java Log: move from the ui Modified: root/ui-sandbox/trunk/components/tables/api/src/main/java/org/richfaces/component/Column.java =================================================================== --- root/ui-sandbox/trunk/components/tables/api/src/main/java/org/richfaces/component/Column.java 2010-01-08 07:02:13 UTC (rev 16250) +++ root/ui-sandbox/trunk/components/tables/api/src/main/java/org/richfaces/component/Column.java 2010-01-11 13:30:11 UTC (rev 16251) @@ -21,69 +21,11 @@ package org.richfaces.component; -import javax.el.MethodExpression; -import org.richfaces.model.Ordering; - /** * Marker interface for all components used as column in UIDataTable * @author shura * */ public interface Column { - - - /** - * The column allows data sorting - * @return - */ - //TODO nick - deprecate this? - public abstract boolean isSortable(); - public abstract void setSortable(boolean sortable); - - /** - * expression used for column sorting. - * literal value is treated as property of data object - * EL-expression is evaluated on every data row - * @param sortExpression - */ - //TODO nick - use ValueExpression - public abstract void setSortExpression(String sortExpression); - public abstract String getSortExpression(); - - /** - * SortOrder is an enumeration of the possible sort orderings. - * - * @param sortOrder - */ - //TODO nick - use annotation from Swing? - public abstract void setSortOrder(Ordering sortOrder); - public abstract Ordering getSortOrder(); - - //TODO nick - "filterExpression" is missing - //TODO nick - "selfSorted" is missing - - public abstract void setFilterMethod(MethodExpression methodExpression); - public abstract MethodExpression getFilterMethod(); - - //TODO nick - make this java.lang.Object. Use case: Long or Enum used as filtering criteria - public abstract void setFilterValue(String filterValue); - public abstract String getFilterValue(); - - public abstract boolean isSelfSorted(); - public abstract void setSelfSorted(boolean selfSorted); - - - /** - * Out this column on new row - * @parameter - * @return the acceptClass - */ - public abstract boolean isBreakBefore(); - - /** - * @param newBreakBefore the value to set - */ - public abstract void setBreakBefore(boolean breakBefore); - } Added: root/ui-sandbox/trunk/components/tables/api/src/main/java/org/richfaces/component/Expandable.java =================================================================== --- root/ui-sandbox/trunk/components/tables/api/src/main/java/org/richfaces/component/Expandable.java (rev 0) +++ root/ui-sandbox/trunk/components/tables/api/src/main/java/org/richfaces/component/Expandable.java 2010-01-11 13:30:11 UTC (rev 16251) @@ -0,0 +1,23 @@ +package org.richfaces.component; + +import javax.el.MethodExpression; + +import org.richfaces.event.ToggleListener; + +//TODO nick - move to API +public interface Expandable { + + //TODO nick - setExpanded() + public boolean isExpanded(); + + public void addToggleListener(ToggleListener listener); + + public void removeToggleListener(ToggleListener listener); + + public ToggleListener[] getToggleListeners(); + + public void setToggleListener(MethodExpression toggleExpression); + + public MethodExpression getToggleListener(); + +} Added: root/ui-sandbox/trunk/components/tables/api/src/main/java/org/richfaces/event/ToggleEvent.java =================================================================== --- root/ui-sandbox/trunk/components/tables/api/src/main/java/org/richfaces/event/ToggleEvent.java (rev 0) +++ root/ui-sandbox/trunk/components/tables/api/src/main/java/org/richfaces/event/ToggleEvent.java 2010-01-11 13:30:11 UTC (rev 16251) @@ -0,0 +1,44 @@ +package org.richfaces.event; + +import javax.faces.component.UIComponent; +import javax.faces.event.FacesEvent; +import javax.faces.event.FacesListener; + +/** + * @author Anton Belevich + * + */ +//TODO nick - move to api +public class ToggleEvent extends FacesEvent { + + private static final long serialVersionUID = 2916560585918250885L; + + private boolean expanded; + + private UIComponent target; + + public ToggleEvent(UIComponent source, UIComponent target, boolean expanded) { + super(source); + this.target = target; + this.expanded = expanded; + } + + public boolean isExpanded() { + return this.expanded; + } + + @Override + public boolean isAppropriateListener(FacesListener listener) { + return (listener instanceof ToggleListener); + } + + @Override + public void processListener(FacesListener listener) { + ((ToggleListener) listener).processToggle(this); + } + + @Override + public UIComponent getComponent() { + return this.target; + } +} Added: root/ui-sandbox/trunk/components/tables/api/src/main/java/org/richfaces/event/ToggleListener.java =================================================================== --- root/ui-sandbox/trunk/components/tables/api/src/main/java/org/richfaces/event/ToggleListener.java (rev 0) +++ root/ui-sandbox/trunk/components/tables/api/src/main/java/org/richfaces/event/ToggleListener.java 2010-01-11 13:30:11 UTC (rev 16251) @@ -0,0 +1,14 @@ +package org.richfaces.event; + +import javax.faces.event.FacesListener; + +/** + * @author Anton Belevich + * + */ +//TODO nick - move to api +public interface ToggleListener extends FacesListener { + + public void processToggle(ToggleEvent event); + +} Added: root/ui-sandbox/trunk/components/tables/api/src/main/java/org/richfaces/model/visual/ColumnVisualModel.java =================================================================== --- root/ui-sandbox/trunk/components/tables/api/src/main/java/org/richfaces/model/visual/ColumnVisualModel.java (rev 0) +++ root/ui-sandbox/trunk/components/tables/api/src/main/java/org/richfaces/model/visual/ColumnVisualModel.java 2010-01-11 13:30:11 UTC (rev 16251) @@ -0,0 +1,15 @@ +package org.richfaces.model.visual; + +import org.richfaces.model.Ordering; + +/** + * @author Anton Belevich + * + */ +public interface ColumnVisualModel { + + public void setSortOrdering(Ordering sortOrder); + + public Ordering getSortOder(); + +} Added: root/ui-sandbox/trunk/components/tables/api/src/main/java/org/richfaces/model/visual/DataTableVisualModel.java =================================================================== --- root/ui-sandbox/trunk/components/tables/api/src/main/java/org/richfaces/model/visual/DataTableVisualModel.java (rev 0) +++ root/ui-sandbox/trunk/components/tables/api/src/main/java/org/richfaces/model/visual/DataTableVisualModel.java 2010-01-11 13:30:11 UTC (rev 16251) @@ -0,0 +1,13 @@ +package org.richfaces.model.visual; + +/** + * @author Anton Belevich + * + */ +public interface DataTableVisualModel { + + public SortingFilteringVisualModel getSortingFilteringVisualModel(); + + public void setSortingFilteringVisualModel(SortingFilteringVisualModel sortingFilteringVisualModel); + +} Added: root/ui-sandbox/trunk/components/tables/api/src/main/java/org/richfaces/model/visual/SortingFilteringVisualModel.java =================================================================== --- root/ui-sandbox/trunk/components/tables/api/src/main/java/org/richfaces/model/visual/SortingFilteringVisualModel.java (rev 0) +++ root/ui-sandbox/trunk/components/tables/api/src/main/java/org/richfaces/model/visual/SortingFilteringVisualModel.java 2010-01-11 13:30:11 UTC (rev 16251) @@ -0,0 +1,16 @@ +package org.richfaces.model.visual; + +import java.util.Collection; + +public interface SortingFilteringVisualModel { + + //TODO nick - make this Enum + public String getSortMode(); + + public void setSortMode(String sortMode); + + public Collection<String> getSortPriority(); + + public void setSortPriority(Collection<String> sortPriority); + +} Added: root/ui-sandbox/trunk/components/tables/api/src/main/java/org/richfaces/model/visual/SubTableVisualModel.java =================================================================== --- root/ui-sandbox/trunk/components/tables/api/src/main/java/org/richfaces/model/visual/SubTableVisualModel.java (rev 0) +++ root/ui-sandbox/trunk/components/tables/api/src/main/java/org/richfaces/model/visual/SubTableVisualModel.java 2010-01-11 13:30:11 UTC (rev 16251) @@ -0,0 +1,13 @@ +package org.richfaces.model.visual; + +/** + * @author Anton Belevich + * + */ +public interface SubTableVisualModel { + + public boolean isExpanded(); + + public void setExpanded(boolean expand); + +} Added: root/ui-sandbox/trunk/components/tables/api/src/main/java/org/richfaces/renderkit/RowHolderBase.java =================================================================== --- root/ui-sandbox/trunk/components/tables/api/src/main/java/org/richfaces/renderkit/RowHolderBase.java (rev 0) +++ root/ui-sandbox/trunk/components/tables/api/src/main/java/org/richfaces/renderkit/RowHolderBase.java 2010-01-11 13:30:11 UTC (rev 16251) @@ -0,0 +1,43 @@ +package org.richfaces.renderkit; + +import javax.faces.context.FacesContext; + +import org.richfaces.component.Row; + +public abstract class RowHolderBase { + + private FacesContext context; + + private int currentRow; + + public RowHolderBase(FacesContext context) { + this(context, 0); + } + + public RowHolderBase(FacesContext context, int currentRow) { + this.context = context; + currentRow = 0; + } + + public FacesContext getContext() { + return context; + } + + public abstract Row getRow(); + + public int getCurrentRow() { + return currentRow; + } + + public int nextRow() { + return ++currentRow; + } + + public void setCurrentRow(int currentRow) { + this.currentRow = currentRow; + } + + public void resetCurrentRow() { + this.currentRow = 0; + } +}