Author: abelevich Date: 2007-05-28 14:12:13 -0400 (Mon, 28 May 2007) New Revision: 903 Added: trunk/sandbox/scrollable-grid/src/main/java/org/richfaces/event/sort/SortListener.java trunk/sandbox/scrollable-grid/src/main/java/org/richfaces/event/sort/SortSource.java Removed: trunk/sandbox/scrollable-grid/src/main/java/org/richfaces/event/sort/SortEventWrapper.java trunk/sandbox/scrollable-grid/src/main/java/org/richfaces/event/sort/SortListener.java trunk/sandbox/scrollable-grid/src/main/java/org/richfaces/event/sort/SortSource.java Modified: trunk/sandbox/scrollable-grid/src/main/java/org/richfaces/event/sort/SortEvent.java Log: Modified: trunk/sandbox/scrollable-grid/src/main/java/org/richfaces/event/sort/SortEvent.java =================================================================== --- trunk/sandbox/scrollable-grid/src/main/java/org/richfaces/event/sort/SortEvent.java 2007-05-28 18:12:02 UTC (rev 902) +++ trunk/sandbox/scrollable-grid/src/main/java/org/richfaces/event/sort/SortEvent.java 2007-05-28 18:12:13 UTC (rev 903) @@ -16,39 +16,33 @@ /** * @author Maksim Kaszynski + * @modified by Anton Belevich * */ public class SortEvent extends FacesEvent { private static final long serialVersionUID = -1453867412542792281L; - private int sortColumnIndex; + private int sortColumn; - private boolean sortAsc; + private int startRow; - /** - * @param component - * @param sortField - * @param sortAscending - */ + private int dataIndex; + + private boolean asc; + + public SortEvent( - UIComponent component, - int sortColumnIndex, - boolean sortAsc) { - + UIComponent component, int sortColumn, int startRow, int dataIndex, boolean asc) { + super(component); - this.sortColumnIndex = sortColumnIndex; - this.sortAsc = sortAsc; + this.asc = asc; + this.sortColumn = sortColumn; + this.startRow = startRow; + this.dataIndex = dataIndex; + } - public boolean isSortAsc() { - return sortAsc; - } - - public void setSortAsc(boolean sortAsc) { - this.sortAsc = sortAsc; - } - public boolean isAppropriateListener(FacesListener listener) { return (listener instanceof SortListener); } @@ -60,14 +54,42 @@ /** * @return the sortField */ - public int getSortField() { - return sortColumnIndex; + public int getSortColumn() { + return sortColumn; } /** * @see java.util.EventObject#toString() */ public String toString() { - return "SortEvent: {sortField: " + sortColumnIndex + "}"; + return "SortEvent: {sortColumn: " + sortColumn + "}"; } + + public boolean isAsc() { + return asc; + } + + public void setAsc(boolean asc) { + this.asc = asc; + } + + public int getDataIndex() { + return dataIndex; + } + + public void setDataIndex(int dataIndex) { + this.dataIndex = dataIndex; + } + + public int getStartRow() { + return startRow; + } + + public void setStartRow(int startRow) { + this.startRow = startRow; + } + + public void setSortColumn(int sortColumn) { + this.sortColumn = sortColumn; + } } Deleted: trunk/sandbox/scrollable-grid/src/main/java/org/richfaces/event/sort/SortEventWrapper.java =================================================================== --- trunk/sandbox/scrollable-grid/src/main/java/org/richfaces/event/sort/SortEventWrapper.java 2007-05-28 18:12:02 UTC (rev 902) +++ trunk/sandbox/scrollable-grid/src/main/java/org/richfaces/event/sort/SortEventWrapper.java 2007-05-28 18:12:13 UTC (rev 903) @@ -1,42 +0,0 @@ -/* - * Copyright - * Copyright (c) Exadel,Inc. 2006 - * All rights reserved. - * - * History - * $Source: /cvs-master/intralinks-jsf-comps/components/data-view-grid/src/component/com/exadel/jsf/event/sort/SortEventWrapper.java,v $ - * $Revision: 1.2 $ - */ - -package org.richfaces.event.sort; - -import javax.faces.component.UIComponent; -import javax.faces.event.FacesEvent; -import javax.faces.event.FacesListener; - -/** - * @author Maksim Kaszynski - * - */ -public class SortEventWrapper extends FacesEvent { - - private static final long serialVersionUID = -2882390997635668899L; - private SortEvent wrapped; - - public SortEventWrapper(UIComponent component, SortEvent wrapped) { - super(component); - this.wrapped = wrapped;; - } - - public boolean isAppropriateListener(FacesListener listener) { - return wrapped.isAppropriateListener(listener); - } - - public void processListener(FacesListener listener) { - wrapped.processListener(listener); - } - - public SortEvent getWrapped() { - return wrapped; - } -} Deleted: trunk/sandbox/scrollable-grid/src/main/java/org/richfaces/event/sort/SortListener.java =================================================================== --- trunk/sandbox/scrollable-grid/src/main/java/org/richfaces/event/sort/SortListener.java 2007-05-28 18:12:02 UTC (rev 902) +++ trunk/sandbox/scrollable-grid/src/main/java/org/richfaces/event/sort/SortListener.java 2007-05-28 18:12:13 UTC (rev 903) @@ -1,21 +0,0 @@ -/* - * Copyright - * Copyright (c) Exadel,Inc. 2006 - * All rights reserved. - * - * History - * $Source: /cvs-master/intralinks-jsf-comps/components/data-view-grid/src/component/com/exadel/jsf/event/sort/SortListener.java,v $ - * $Revision: 1.1 $ - */ - -package org.richfaces.event.sort; - -import javax.faces.event.FacesListener; - -/** - * @author Maksim Kaszynski - * - */ -public interface SortListener extends FacesListener { - public void processSort(SortEvent e); -} Added: trunk/sandbox/scrollable-grid/src/main/java/org/richfaces/event/sort/SortListener.java =================================================================== --- trunk/sandbox/scrollable-grid/src/main/java/org/richfaces/event/sort/SortListener.java (rev 0) +++ trunk/sandbox/scrollable-grid/src/main/java/org/richfaces/event/sort/SortListener.java 2007-05-28 18:12:13 UTC (rev 903) @@ -0,0 +1,21 @@ +/* + * Copyright + * Copyright (c) Exadel,Inc. 2006 + * All rights reserved. + * + * History + * $Source: /cvs-master/intralinks-jsf-comps/components/data-view-grid/src/component/com/exadel/jsf/event/sort/SortListener.java,v $ + * $Revision: 1.1 $ + */ + +package org.richfaces.event.sort; + +import javax.faces.event.FacesListener; + +/** + * @author Maksim Kaszynski + * + */ +public interface SortListener extends FacesListener { + public void processSort(SortEvent e); +} Deleted: trunk/sandbox/scrollable-grid/src/main/java/org/richfaces/event/sort/SortSource.java =================================================================== --- trunk/sandbox/scrollable-grid/src/main/java/org/richfaces/event/sort/SortSource.java 2007-05-28 18:12:02 UTC (rev 902) +++ trunk/sandbox/scrollable-grid/src/main/java/org/richfaces/event/sort/SortSource.java 2007-05-28 18:12:13 UTC (rev 903) @@ -1,21 +0,0 @@ -/* - * Copyright - * Copyright (c) Exadel,Inc. 2006 - * All rights reserved. - * - * History - * $Source: /cvs-master/intralinks-jsf-comps/components/data-view-grid/src/component/com/exadel/jsf/event/sort/SortSource.java,v $ - * $Revision: 1.1 $ - */ - -package org.richfaces.event.sort; - -/** - * @author Maksim Kaszynski - * - */ -public interface SortSource { - public void addSortListener(SortListener listener); - public void removeSortListener(SortListener listener); - public SortListener[] getSortListeners(); -} Added: trunk/sandbox/scrollable-grid/src/main/java/org/richfaces/event/sort/SortSource.java =================================================================== --- trunk/sandbox/scrollable-grid/src/main/java/org/richfaces/event/sort/SortSource.java (rev 0) +++ trunk/sandbox/scrollable-grid/src/main/java/org/richfaces/event/sort/SortSource.java 2007-05-28 18:12:13 UTC (rev 903) @@ -0,0 +1,21 @@ +/* + * Copyright + * Copyright (c) Exadel,Inc. 2006 + * All rights reserved. + * + * History + * $Source: /cvs-master/intralinks-jsf-comps/components/data-view-grid/src/component/com/exadel/jsf/event/sort/SortSource.java,v $ + * $Revision: 1.1 $ + */ + +package org.richfaces.event.sort; + +/** + * @author Maksim Kaszynski + * + */ +public interface SortSource { + public void addSortListener(SortListener listener); + public void removeSortListener(SortListener listener); + public SortListener[] getSortListeners(); +}