Author: mvitenkov Date: 2008-05-19 13:31:51 -0400 (Mon, 19 May 2008) New Revision: 8639 Modified: trunk/test-applications/jsp/src/main/java/columns/Columns.java trunk/test-applications/jsp/src/main/webapp/Columns/Columns.jsp Log: Filtering feature was added. Modified: trunk/test-applications/jsp/src/main/java/columns/Columns.java =================================================================== --- trunk/test-applications/jsp/src/main/java/columns/Columns.java 2008-05-19 16:56:44 UTC (rev 8638) +++ trunk/test-applications/jsp/src/main/java/columns/Columns.java 2008-05-19 17:31:51 UTC (rev 8639) @@ -28,6 +28,24 @@ private boolean breakBefore; private boolean sortable; private boolean dataTableRendered; + private boolean selfSorted; + private String[] filterValue; + public String[] getFilterValue() { + return filterValue; + } + + public void setFilterValue(String[] filterValue) { + this.filterValue = filterValue; + } + + public boolean isSelfSorted() { + return selfSorted; + } + + public void setSelfSorted(boolean selfSorted) { + this.selfSorted = selfSorted; + } + public Columns() { this.columns = "3"; this.begin = "0"; @@ -39,10 +57,12 @@ this.breakBefore = false; this.sortable = true; this.dataTableRendered = true; + this.selfSorted = true; this.length1 = 5; this.length2 = 5; this.data1 = new ArrayList<Data>(); this.data2 = new ArrayList<Data>(); + this.filterValue = new String[length2]; for (int i = 0; i < length1; i++) { data1.add(new Data(i, "data 1 [" + i + "]", "Button " + i, "Link " + i, "select" + (i % 5))); data2.add(new Data(i, "data 2 [" + i + "]", "Button " + i, "Link " + i, statusIcon[i % 5])); Modified: trunk/test-applications/jsp/src/main/webapp/Columns/Columns.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/Columns/Columns.jsp 2008-05-19 16:56:44 UTC (rev 8638) +++ trunk/test-applications/jsp/src/main/webapp/Columns/Columns.jsp 2008-05-19 17:31:51 UTC (rev 8639) @@ -35,7 +35,8 @@ <rich:columns value="#{columns.data2}" var="d2" footerClass="#{style.footerClass}" headerClass="#{style.headerClass}" breakBefore="#{columns.breakBefore}" colspan="#{columns.colspan}" columns="#{columns.columns}" index="index" rowspan="#{columns.rowspan}" begin="#{columns.begin}" end="#{columns.end}" width="#{columns.width}" style="#{style.style}" styleClass="#{style.styleClass}" - comparator="#{columns}" sortBy="#{d2.str0}" selfSorted="true" sortOrder="#{columns.orderings[index]}"dir="LTR"> + comparator="#{columns}" sortBy="#{d2.str0}" selfSorted="true" sortOrder="#{columns.orderings[index]}" dir="LTR" filterBy="#{d1.str0}" + filterValue="#{columns.filterValue[index]}"> <f:facet name="header"> <h:outputText value="header #{d2.int0}"></h:outputText> </f:facet>