Author: ayanul Date: 2007-12-05 06:42:31 -0500 (Wed, 05 Dec 2007) New Revision: 4484 Modified: branches/3.1.x/test-applications/facelets/src/main/java/listShuttle/ListShuttle.java branches/3.1.x/test-applications/facelets/src/main/java/orderingList/OrderingList.java branches/3.1.x/test-applications/facelets/src/main/java/util/data/Data.java branches/3.1.x/test-applications/facelets/src/main/webapp/ListShuttle/ListShuttle.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/ListShuttle/ListShuttleProperty.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/ListShuttle/ListShuttleStraightforward.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/OrderingList/OrderingListProperty.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/OrderingList/OrderingListStraightforward.xhtml Log: update (add attribute, fix bug) Modified: branches/3.1.x/test-applications/facelets/src/main/java/listShuttle/ListShuttle.java =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/java/listShuttle/ListShuttle.java 2007-12-05 02:27:08 UTC (rev 4483) +++ branches/3.1.x/test-applications/facelets/src/main/java/listShuttle/ListShuttle.java 2007-12-05 11:42:31 UTC (rev 4484) @@ -20,6 +20,7 @@ private boolean showSelect; private boolean showAllSourceData; private boolean showAllTargetData; + private boolean switchByClick; private ArrayList<Data> sourceValue; private ArrayList<Data> targetValue; private ArrayList<String> info; @@ -33,8 +34,11 @@ private String removeControlLabel; private String topControlLabel; private String upControlLabel; - - + private String targetListWidth; + private String sourceListWidth; + private String listsHeight; + private String sourceCaptionLabel; + private String targetCaptionLabel; public ListShuttle() { this.first = 1; @@ -56,10 +60,15 @@ this.topControlLabel = "top"; this.upControlLabel = "up"; this.info = new ArrayList<String>(); + this.switchByClick = false; + this.targetListWidth = "300"; + this.sourceListWidth = "300"; + this.listsHeight = "400"; + this.sourceCaptionLabel = "sourceCaptionLabel"; + this.targetCaptionLabel = "targetCaptionLabel"; this.targetValue = new ArrayList<Data>(); this.sourceValue = new ArrayList<Data>(); - for(int i = 0; i < lenght; i++) - sourceValue.add(new Data(i, "Button " + i, "Link " + i, "select" +(i % 5), statusIcon[i % 5])); + addNewItem(); } public int getFirst() { @@ -205,6 +214,9 @@ } public ArrayList<String> getInfo() { + info.clear(); + addSelection(getSourceSelection(), "1. sourceSelection"); + addSelection(getTargetSelection(), "2. targetSelection"); return info; } @@ -255,7 +267,6 @@ } public void setSourceSelection(Collection sourceSelection) { - addSourceSelection(targetSelection); this.sourceSelection = sourceSelection; } @@ -264,27 +275,64 @@ } public void setTargetSelection(Collection targetSelection) { - addTargetSelection(targetSelection); this.targetSelection = targetSelection; } - private void addTargetSelection(Collection<Data> selection) { - if(selection == null) return; - Iterator<Data> inter = selection.iterator(); - Data data = new Data(); - while (inter.hasNext()) { - data = inter.next(); - info.add("targetSelection:" + data.getInt0() + "; " + data.getStr0() + "; " + data.getStr1() + "; " + data.getStr2() + "; " + data.getStr3()); - } + public boolean isSwitchByClick() { + return switchByClick; } + + public void setSwitchByClick(boolean switchByClick) { + this.switchByClick = switchByClick; + } + + public String getTargetListWidth() { + return targetListWidth; + } + + public void setTargetListWidth(String targetListWidth) { + this.targetListWidth = targetListWidth; + } + + public String getSourceListWidth() { + return sourceListWidth; + } + + public void setSourceListWidth(String sourceListWidth) { + this.sourceListWidth = sourceListWidth; + } + + public String getListsHeight() { + return listsHeight; + } + + public void setListsHeight(String listsHeight) { + this.listsHeight = listsHeight; + } + + public String getSourceCaptionLabel() { + return sourceCaptionLabel; + } + + public void setSourceCaptionLabel(String sourceCaptionLabel) { + this.sourceCaptionLabel = sourceCaptionLabel; + } + + public String getTargetCaptionLabel() { + return targetCaptionLabel; + } + + public void setTargetCaptionLabel(String targetCaptionLabel) { + this.targetCaptionLabel = targetCaptionLabel; + } - private void addSourceSelection(Collection<Data> selection) { + private void addSelection(Collection<Data> selection, String description) { if(selection == null) return; Iterator<Data> inter = selection.iterator(); Data data = new Data(); while (inter.hasNext()) { data = inter.next(); - info.add("sourceSelection:" + data.getInt0() + "; " + data.getStr0() + "; " + data.getStr1() + "; " + data.getStr2() + "; " + data.getStr3()); + info.add(description + ": " + data.getInt0() + "; " + data.getStr0() + "; " + data.getStr0() + "submit(); " + data.getStr1() + "; " + data.getStr1() + "submit(); " + data.getStr2() + "; " + data.getStr3()); } } } Modified: branches/3.1.x/test-applications/facelets/src/main/java/orderingList/OrderingList.java =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/java/orderingList/OrderingList.java 2007-12-05 02:27:08 UTC (rev 4483) +++ branches/3.1.x/test-applications/facelets/src/main/java/orderingList/OrderingList.java 2007-12-05 11:42:31 UTC (rev 4484) @@ -91,8 +91,7 @@ this.showAllData = true; this.showSelect = true; this.list = new ArrayList<Data>(); - for(int i = 1; i <= lenght; i++) - list.add(new Data(i, "Button " + i, "Link " + i, "select" +(i % 5), statusIcon[i % 5])); + addNewItem(); } public String getListHeight() { Modified: branches/3.1.x/test-applications/facelets/src/main/java/util/data/Data.java =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/java/util/data/Data.java 2007-12-05 02:27:08 UTC (rev 4483) +++ branches/3.1.x/test-applications/facelets/src/main/java/util/data/Data.java 2007-12-05 11:42:31 UTC (rev 4484) @@ -173,7 +173,7 @@ public int hashCode() { final int prime = 31; int result = 1; - result = prime * result + ((str3 == null) ? 0 : str3.hashCode()); + result = prime * result + int0; return result; } @@ -186,11 +186,9 @@ if (getClass() != obj.getClass()) return false; final Data other = (Data) obj; - if (str3 == null) { - if (other.str3 != null) - return false; - } else if (!str3.equals(other.str3)) + if (int0 != other.int0) return false; return true; } + } Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/ListShuttle/ListShuttle.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/ListShuttle/ListShuttle.xhtml 2007-12-05 02:27:08 UTC (rev 4483) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/ListShuttle/ListShuttle.xhtml 2007-12-05 11:42:31 UTC (rev 4484) @@ -7,8 +7,11 @@ fastOrderControlsVisible="#{listShuttle.fastOrderControlsVisible}" first="#{listShuttle.first}" moveControlsVisible="#{listShuttle.moveControlsVisible}" orderControlsVisible="#{listShuttle.orderControlsVisible}" removeAllControlLabel="#{listShuttle.removeAllControlLabel}" removeControlLabel="#{listShuttle.removeControlLabel}" - sourceSelection="#{listShuttle.sourceSelection}" - targetSelection="#{listShuttle.targetSelection}" showButtonLabels="#{listShuttle.showButtonLabels}" + sourceSelection="#{listShuttle.sourceSelection}" targetSelection="#{listShuttle.targetSelection}" + showButtonLabels="#{listShuttle.showButtonLabels}" switchByClick="#{listShuttle.switchByClick}" + targetListWidth="#{listShuttle.targetListWidth}" sourceListWidth="#{listShuttle.sourceListWidth}" + listsHeight="#{listShuttle.listsHeight}" sourceCaptionLabel="#{listShuttle.sourceCaptionLabel}" + targetCaptionLabel="#{listShuttle.targetCaptionLabel}" topControlLabel="#{listShuttle.topControlLabel}" upControlLabel="#{listShuttle.upControlLabel}"> <h:column width="100px"> <f:facet name="header"> Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/ListShuttle/ListShuttleProperty.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/ListShuttle/ListShuttleProperty.xhtml 2007-12-05 02:27:08 UTC (rev 4483) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/ListShuttle/ListShuttleProperty.xhtml 2007-12-05 11:42:31 UTC (rev 4484) @@ -11,9 +11,10 @@ </h:panelGroup> <h:outputText value="Enter quantity of lines" /> - <h:inputText value="#{listShuttle.lenght}"> - <a4j:support event="onchange" action="#{listShuttle.addNewItem}" reRender="listShuttleID"></a4j:support> - </h:inputText> + <h:panelGroup> + <h:inputText value="#{listShuttle.lenght}" /> + <a4j:commandButton action="#{listShuttle.addNewItem}" reRender="listShuttleID" value="ok" /> + </h:panelGroup> <h:outputText value="first" /> <h:inputText value="#{listShuttle.first}"> @@ -35,6 +36,34 @@ <h:outputText value="fastMoveControlsVisible" /> <h:selectBooleanCheckbox value="#{listShuttle.fastMoveControlsVisible}" onchange="submit();" /> + <h:outputText value="switchByClick" /> + <h:selectBooleanCheckbox value="#{listShuttle.switchByClick}" onchange="submit();" /> + + <h:outputText value="sourceCaptionLabel" /> + <h:inputText value="#{listShuttle.sourceCaptionLabel}"> + <a4j:support event="onclick" reRender="listShuttleID"></a4j:support> + </h:inputText> + + <h:outputText value="targetCaptionLabel" /> + <h:inputText value="#{listShuttle.targetCaptionLabel}"> + <a4j:support event="onclick" reRender="listShuttleID"></a4j:support> + </h:inputText> + + <h:outputText value="sourceListWidth" /> + <h:inputText value="#{listShuttle.sourceListWidth}"> + <a4j:support event="onclick" reRender="listShuttleID"></a4j:support> + </h:inputText> + + <h:outputText value="targetListWidth" /> + <h:inputText value="#{listShuttle.targetListWidth}"> + <a4j:support event="onclick" reRender="listShuttleID"></a4j:support> + </h:inputText> + + <h:outputText value="listsHeight" /> + <h:inputText value="#{listShuttle.listsHeight}"> + <a4j:support event="onclick" reRender="listShuttleID"></a4j:support> + </h:inputText> + <h:outputText value="copyControlLabel" /> <h:inputText value="#{listShuttle.copyControlLabel}"> <a4j:support event="onclick" reRender="listShuttleID"></a4j:support> Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/ListShuttle/ListShuttleStraightforward.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/ListShuttle/ListShuttleStraightforward.xhtml 2007-12-05 02:27:08 UTC (rev 4483) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/ListShuttle/ListShuttleStraightforward.xhtml 2007-12-05 11:42:31 UTC (rev 4484) @@ -6,7 +6,7 @@ <h:selectBooleanCheckbox value="#{listShuttle.showSelect}" onclick="submit();" /> </h:column> <h:column> - <h:dataTable id="infoLSlID" value="#{listShuttle.info}" var="info" rendered="#{listShuttle.showSelect}" border="1"> + <h:dataTable id="infoLSID" value="#{listShuttle.info}" var="info" rendered="#{listShuttle.showSelect}" border="1"> <h:column> <h:outputText value="#{info}" /> </h:column> Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/OrderingList/OrderingListProperty.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/OrderingList/OrderingListProperty.xhtml 2007-12-05 02:27:08 UTC (rev 4483) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/OrderingList/OrderingListProperty.xhtml 2007-12-05 11:42:31 UTC (rev 4484) @@ -1,91 +1,91 @@ <f:subview id="orderingListPropertySubviewID" xmlns:a4j="http://richfaces.org/a4j" xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich"> - <rich:simpleTogglePanel id="orderingListPropertyID" switchType="client" opened="true" label="modalPanel property"> - <h:panelGrid columns="2"> - <h:outputText value="Enter quantity of lines" /> - <h:inputText value="#{orderingList.lenght}" onchange="submit();"> - </h:inputText> + <h:panelGrid columns="2"> + <h:outputText value="Enter quantity of lines" /> + <h:panelGroup> + <h:inputText value="#{orderingList.lenght}" /> + <a4j:commandButton action="#{orderingList.addNewItem}" reRender="orderingListID" value="ok" /> + </h:panelGroup> - <h:outputText value="controlsType" /> - <h:selectOneRadio value="#{orderingList.controlsType}"> - <f:selectItem itemLabel="none" itemValue="none" /> - <f:selectItem itemLabel="button" itemValue="button" /> - <a4j:support event="onchange" reRender="orderingListID"></a4j:support> - </h:selectOneRadio> + <h:outputText value="controlsType" /> + <h:selectOneRadio value="#{orderingList.controlsType}"> + <f:selectItem itemLabel="none" itemValue="none" /> + <f:selectItem itemLabel="button" itemValue="button" /> + <a4j:support event="onchange" reRender="orderingListID"></a4j:support> + </h:selectOneRadio> - <h:outputText value="captionLabel" /> - <h:inputText value="#{orderingList.captionLabel}"> - <a4j:support event="onchange" reRender="orderingListID"></a4j:support> - </h:inputText> + <h:outputText value="captionLabel" /> + <h:inputText value="#{orderingList.captionLabel}"> + <a4j:support event="onchange" reRender="orderingListID"></a4j:support> + </h:inputText> - <h:outputText value="headerLabel" /> - <h:inputText value="#{orderingList.headerLabel}"> - <a4j:support event="onchange" reRender="orderingListID"></a4j:support> - </h:inputText> + <h:outputText value="headerLabel" /> + <h:inputText value="#{orderingList.headerLabel}"> + <a4j:support event="onchange" reRender="orderingListID"></a4j:support> + </h:inputText> - <h:outputText value="listHeight:" /> - <h:inputText value="#{orderingList.listHeight}"> - <a4j:support event="onchange" reRender="orderingListID"></a4j:support> - </h:inputText> + <h:outputText value="listHeight:" /> + <h:inputText value="#{orderingList.listHeight}"> + <a4j:support event="onchange" reRender="orderingListID"></a4j:support> + </h:inputText> - <h:outputText value="listWidth" /> - <h:inputText value="#{orderingList.listWidth}"> - <a4j:support event="onchange" reRender="orderingListID"></a4j:support> - </h:inputText> + <h:outputText value="listWidth" /> + <h:inputText value="#{orderingList.listWidth}"> + <a4j:support event="onchange" reRender="orderingListID"></a4j:support> + </h:inputText> - <h:outputText value="controlsVerticalAlign" /> - <h:selectOneRadio value="#{orderingList.controlsVerticalAlign}"> - <f:selectItem itemLabel="top" itemValue="top"/> - <f:selectItem itemLabel="center" itemValue="center"/> - <f:selectItem itemLabel="bottom" itemValue="bottom"/> - <a4j:support event="onchange" reRender="orderingListID"></a4j:support> - </h:selectOneRadio> + <h:outputText value="controlsVerticalAlign" /> + <h:selectOneRadio value="#{orderingList.controlsVerticalAlign}"> + <f:selectItem itemLabel="top" itemValue="top" /> + <f:selectItem itemLabel="center" itemValue="center" /> + <f:selectItem itemLabel="bottom" itemValue="bottom" /> + <a4j:support event="onchange" reRender="orderingListID"></a4j:support> + </h:selectOneRadio> - <h:outputText value="controlsHorizontalAlign" /> - <h:selectOneRadio value="#{orderingList.controlsHorizontalAlign}"> - <f:selectItem itemLabel="left" itemValue="left"/> - <f:selectItem itemLabel="right" itemValue="right"/> - <a4j:support event="onchange" reRender="orderingListID"></a4j:support> - </h:selectOneRadio> + <h:outputText value="controlsHorizontalAlign" /> + <h:selectOneRadio value="#{orderingList.controlsHorizontalAlign}"> + <f:selectItem itemLabel="left" itemValue="left" /> + <f:selectItem itemLabel="right" itemValue="right" /> + <a4j:support event="onchange" reRender="orderingListID"></a4j:support> + </h:selectOneRadio> - <h:outputText value="upControlLabel" /> - <h:inputText value="#{orderingList.upControlLabel}"> - <a4j:support event="onchange" reRender="orderingListID"></a4j:support> - </h:inputText> + <h:outputText value="upControlLabel" /> + <h:inputText value="#{orderingList.upControlLabel}"> + <a4j:support event="onchange" reRender="orderingListID"></a4j:support> + </h:inputText> - <h:outputText value="bottomControlLabel" /> - <h:inputText value="#{orderingList.bottomControlLabel}"> - <a4j:support event="onchange" reRender="orderingListID"></a4j:support> - </h:inputText> + <h:outputText value="bottomControlLabel" /> + <h:inputText value="#{orderingList.bottomControlLabel}"> + <a4j:support event="onchange" reRender="orderingListID"></a4j:support> + </h:inputText> - <h:outputText value="topControlLabel" /> - <h:inputText value="#{orderingList.topControlLabel}"> - <a4j:support event="onchange" reRender="orderingListID"></a4j:support> - </h:inputText> + <h:outputText value="topControlLabel" /> + <h:inputText value="#{orderingList.topControlLabel}"> + <a4j:support event="onchange" reRender="orderingListID"></a4j:support> + </h:inputText> - <h:outputText value="downControlLabel" /> - <h:inputText value="#{orderingList.downControlLabel}"> - <a4j:support event="onchange" reRender="orderingListID"></a4j:support> - </h:inputText> + <h:outputText value="downControlLabel" /> + <h:inputText value="#{orderingList.downControlLabel}"> + <a4j:support event="onchange" reRender="orderingListID"></a4j:support> + </h:inputText> - <h:outputText value="showButtonLabels" /> - <h:selectBooleanCheckbox value="#{orderingList.showButtonLabels}"> - <a4j:support event="onclick" reRender="orderingListID"></a4j:support> - </h:selectBooleanCheckbox> + <h:outputText value="showButtonLabels" /> + <h:selectBooleanCheckbox value="#{orderingList.showButtonLabels}"> + <a4j:support event="onclick" reRender="orderingListID"></a4j:support> + </h:selectBooleanCheckbox> - <h:outputText value="fastOrderControlsVisible" /> - <h:selectBooleanCheckbox value="#{orderingList.fastOrderControlsVisible}"> - <a4j:support event="onclick" reRender="orderingListID"></a4j:support> - </h:selectBooleanCheckbox> + <h:outputText value="fastOrderControlsVisible" /> + <h:selectBooleanCheckbox value="#{orderingList.fastOrderControlsVisible}"> + <a4j:support event="onclick" reRender="orderingListID"></a4j:support> + </h:selectBooleanCheckbox> - <h:outputText value="orderControlsVisible" /> - <h:selectBooleanCheckbox value="#{orderingList.orderControlsVisible}"> - <a4j:support event="onclick" reRender="orderingListID"></a4j:support> - </h:selectBooleanCheckbox> + <h:outputText value="orderControlsVisible" /> + <h:selectBooleanCheckbox value="#{orderingList.orderControlsVisible}"> + <a4j:support event="onclick" reRender="orderingListID"></a4j:support> + </h:selectBooleanCheckbox> - <h:outputText value="rendered" /> - <h:selectBooleanCheckbox value="#{orderingList.rendered}" onclick="submit();"> - </h:selectBooleanCheckbox> - </h:panelGrid> - </rich:simpleTogglePanel> + <h:outputText value="rendered" /> + <h:selectBooleanCheckbox value="#{orderingList.rendered}" onclick="submit();"> + </h:selectBooleanCheckbox> + </h:panelGrid> </f:subview> \ No newline at end of file Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/OrderingList/OrderingListStraightforward.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/OrderingList/OrderingListStraightforward.xhtml 2007-12-05 02:27:08 UTC (rev 4483) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/OrderingList/OrderingListStraightforward.xhtml 2007-12-05 11:42:31 UTC (rev 4484) @@ -1,25 +1,25 @@ <f:subview id="orderingListStraightforwardSubviewID" xmlns:a4j="http://richfaces.org/a4j" xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" xmlns:ui="http://java.sun.com/jsf/facelets"> - <rich:simpleTogglePanel switchType="client" opened="true" label="modalPanel straightforward"> + <h:panelGrid columns="3"> <h:outputText value="Test1" /> - <a4j:commandButton action="#{orderingList.bTest1}" value="run" reRender="orderingListPropertyID,orderingListID"></a4j:commandButton> + <a4j:commandButton action="#{orderingList.bTest1}" value="run" reRender="richGridID"></a4j:commandButton> <h:outputText value="#{msg.t1OrderingList}" /> <h:outputText value="Test2" /> - <a4j:commandButton action="#{orderingList.bTest2}" value="run" reRender="orderingListPropertyID,orderingListID"></a4j:commandButton> + <a4j:commandButton action="#{orderingList.bTest2}" value="run" reRender="richGridID"></a4j:commandButton> <h:outputText value="#{msg.t2OrderingList}" /> <h:outputText value="Test3" /> - <a4j:commandButton action="#{orderingList.bTest3}" value="run" reRender="orderingListPropertyID,orderingListID"></a4j:commandButton> + <a4j:commandButton action="#{orderingList.bTest3}" value="run" reRender="richGridID"></a4j:commandButton> <h:outputText value="#{msg.t3OrderingList}" /> <h:outputText value="Test4" /> - <a4j:commandButton action="#{orderingList.bTest4}" value="run" reRender="orderingListPropertyID,orderingListID"></a4j:commandButton> + <a4j:commandButton action="#{orderingList.bTest4}" value="run" reRender="richGridID"></a4j:commandButton> <h:outputText value="#{msg.t4OrderingList}" /> <h:outputText value="Test5" /> - <a4j:commandButton action="#{orderingList.bTest5}" value="run" reRender="orderingListPropertyID,orderingListID"></a4j:commandButton> + <a4j:commandButton action="#{orderingList.bTest5}" value="run" reRender="richGridID"></a4j:commandButton> <h:outputText value="#{msg.t5OrderingList}" /> <a4j:commandButton value="Show selection (reRender)" reRender="infoPanelID"></a4j:commandButton> @@ -106,5 +106,5 @@ <h:commandButton action="submit();" immediate="true" value="immediate submit();" /> </h:panelGroup> </h:panelGrid> - </rich:simpleTogglePanel> + </f:subview> \ No newline at end of file