Author: mvitenkov Date: 2008-07-18 06:08:27 -0400 (Fri, 18 Jul 2008) New Revision: 9674 Modified: trunk/test-applications/jsp/src/main/webapp/Columns/Columns.jsp trunk/test-applications/jsp/src/main/webapp/Columns/ColumnsProperty.jsp Log: Modified: trunk/test-applications/jsp/src/main/webapp/Columns/Columns.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/Columns/Columns.jsp 2008-07-18 08:22:49 UTC (rev 9673) +++ trunk/test-applications/jsp/src/main/webapp/Columns/Columns.jsp 2008-07-18 10:08:27 UTC (rev 9674) @@ -36,7 +36,7 @@ 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" filterBy="#{d1.str0}" - filterValue="#{columns.filterValue[index]}"> + filterValue="#{columns.filterValue[index]}" filterMethod="#{columns.filterMethod}" filterEvent="#{columns.filterEvent}"> <f:facet name="header"> <h:outputText value="header #{d2.int0}"></h:outputText> </f:facet> Modified: trunk/test-applications/jsp/src/main/webapp/Columns/ColumnsProperty.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/Columns/ColumnsProperty.jsp 2008-07-18 08:22:49 UTC (rev 9673) +++ trunk/test-applications/jsp/src/main/webapp/Columns/ColumnsProperty.jsp 2008-07-18 10:08:27 UTC (rev 9674) @@ -21,11 +21,15 @@ <h:inputText value="#{columns.length2}" /> <h:commandButton action="#{columns.addNewItem2}" value="ok"></h:commandButton> </h:panelGroup> + + <h:outputText value="filterMethod"></h:outputText> + <h:inputText value="#{columns.filterInput}" + onchange="submit();" /> <h:outputText value="columns (*):"></h:outputText> <h:inputText value="#{columns.columns}" onchange="submit();"> </h:inputText> - + <%-- JSP comments paste here--%> <h:outputText value="rowspan:"></h:outputText> <h:inputText value="#{columns.rowspan}" onchange="submit();"> </h:inputText> @@ -45,7 +49,12 @@ <h:outputText value="width:"></h:outputText> <h:inputText value="#{columns.width}" onchange="submit();"> </h:inputText> - + + <h:outputText value="filterEvent" /> + <h:selectOneMenu value="#{columns.filterEvent}" onchange="submit();"> + <f:selectItems value="#{columns.filterEvents}"/> + </h:selectOneMenu> + <h:outputText value="breakBefore:"></h:outputText> <h:selectBooleanCheckbox value="#{columns.breakBefore}" onchange="submit();"> </h:selectBooleanCheckbox>