Author: ayanul Date: 2007-11-29 03:09:23 -0500 (Thu, 29 Nov 2007) New Revision: 4341 Modified: branches/3.1.x/test-applications/facelets/src/main/java/contextMenu/ContextMenu.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/componentInfo/ComponentInfo.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/ContextMenu/ContextMenu.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/DataTable/DataTable.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/OrderingList/OrderingList.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/OrderingList/OrderingListStraightforward.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-ContextMenu.xml branches/3.1.x/test-applications/facelets/src/main/webapp/pages/RichMenu/RichMenu.xhtml Log: update OrderingList, ContextMenu Modified: branches/3.1.x/test-applications/facelets/src/main/java/contextMenu/ContextMenu.java =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/java/contextMenu/ContextMenu.java 2007-11-29 03:52:22 UTC (rev 4340) +++ branches/3.1.x/test-applications/facelets/src/main/java/contextMenu/ContextMenu.java 2007-11-29 08:09:23 UTC (rev 4341) @@ -1,5 +1,47 @@ package contextMenu; public class ContextMenu { + private boolean disamble; + private String event; + private String mode; + private String param; + + public String getParam() { + return param; + } + public void setParam(String param) { + this.param = param; + } + + public ContextMenu() { + disamble = false; + event = ""; + mode = "client"; + } + + public boolean isDisamble() { + return disamble; + } + + public void setDisamble(boolean disamble) { + this.disamble = disamble; + } + + public String getEvent() { + return event; + } + + public void setEvent(String event) { + this.event = event; + } + + public String getMode() { + return mode; + } + + public void setMode(String mode) { + this.mode = mode; + } + } 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-11-29 03:52:22 UTC (rev 4340) +++ branches/3.1.x/test-applications/facelets/src/main/java/orderingList/OrderingList.java 2007-11-29 08:09:23 UTC (rev 4341) @@ -2,18 +2,19 @@ import java.util.ArrayList; import java.util.Collection; -import java.util.Random; +import java.util.Iterator; -import javax.faces.event.ValueChangeEvent; +import javax.faces.component.html.HtmlDataTable; -import dataScroller.Data; +import util.data.Data; public class OrderingList{ + private ArrayList<String> info; private ArrayList<Data> list; - private Collection<Data> selection; - private String [] status = {"error", "fatal", "info", "passed", "warn"}; private String [] statusIcon = {"/pics/error.gif", "/pics/fatal.gif", "/pics/info.gif", "/pics/passed.gif", "/pics/warn.gif"}; private String captionLabel; + private Collection<Data> selection; + private String select; private String controlsType; private String controlsVerticalAlign; private String controlsHorizontalAlign; @@ -22,19 +23,15 @@ private String upControlLabel; private String topControlLabel; private String downControlLabel; + private String listHeight; + private String listWidth; private int lenght; - private int listHeight; - private int listWidth; private boolean orderControlsVisible; private boolean fastOrderControlsVisible; private boolean rendered; private boolean showButtonLabels; private boolean facet; - public void clSelect(ValueChangeEvent event) { - System.out.println(event.getNewValue()); - } - public boolean isFacet() { return facet; } @@ -49,6 +46,8 @@ public void setSelection(Collection<Data> selection) { System.out.println("Selection.out: " + selection); + info.clear(); + addSelection(); this.selection = selection; } @@ -67,14 +66,15 @@ list.remove(i); else for(int i = list.size() + 1; i <= lenght; i++) - list.add(new Data("Bug " + new Random().nextInt(10 + i), i,status[new Random().nextInt(5)], statusIcon[new Random().nextInt(5)])); + list.add(new Data(i, "Button " + i, "Link " + i, "select" +(i % 5), statusIcon[i % 5])); } public OrderingList() { + info = new ArrayList<String>(); captionLabel = "captionLabel"; lenght = 10; - listHeight = 300; - listWidth = 400; + listHeight = "300"; + listWidth = "400"; controlsType = "button"; controlsHorizontalAlign = "0"; controlsVerticalAlign = "0"; @@ -89,22 +89,22 @@ showButtonLabels = true; list = new ArrayList<Data>(); for(int i = 1; i <= lenght; i++) - list.add(new Data("Bug " + new Random().nextInt(10 + i), i,status[new Random().nextInt(5)], statusIcon[new Random().nextInt(5)])); + list.add(new Data(i, "Button " + i, "Link " + i, "select" +(i % 5), statusIcon[i % 5])); } - public int getListHeight() { + public String getListHeight() { return listHeight; } - public void setListHeight(int listHeight) { + public void setListHeight(String listHeight) { this.listHeight = listHeight; } - public int getListWidth() { + public String getListWidth() { return listWidth; } - public void setListWidth(int listWidth) { + public void setListWidth(String listWidth) { this.listWidth = listWidth; } @@ -220,6 +220,18 @@ this.lenght = lenght; } + public void cbAction() { + info.clear(); + info.add("commandButton submit();"); + addSelection(); + } + + public void clAction() { + info.clear(); + info.add("commandLink immediate submit();"); + addSelection(); + } + public void bTest1(){ setCaptionLabel("Caption Test1"); setControlsHorizontalAlign("0"); @@ -227,8 +239,8 @@ setControlsType("button"); setHeaderLabel("Header Test1"); setLenght(40); - setListHeight(300); - setListWidth(400); + setListHeight("300"); + setListWidth("400"); setFastOrderControlsVisible(true); setOrderControlsVisible(true); setRendered(true); @@ -247,8 +259,8 @@ setControlsType("button"); setHeaderLabel("Header Test2"); setLenght(40); - setListHeight(600); - setListWidth(400); + setListHeight("600"); + setListWidth("400"); setFastOrderControlsVisible(false); setOrderControlsVisible(true); setRendered(true); @@ -267,8 +279,8 @@ setControlsType("button"); setHeaderLabel("Header Test3"); setLenght(40); - setListHeight(500); - setListWidth(500); + setListHeight("500"); + setListWidth("500"); setFastOrderControlsVisible(true); setOrderControlsVisible(false); setRendered(true); @@ -287,8 +299,8 @@ setControlsType("button"); setHeaderLabel("Header Test4"); setLenght(10000); - setListHeight(500); - setListWidth(600); + setListHeight("500"); + setListWidth("600"); setFastOrderControlsVisible(true); setOrderControlsVisible(true); setRendered(true); @@ -307,8 +319,8 @@ setControlsType("none"); setHeaderLabel("Header Test5"); setLenght(100); - setListHeight(400); - setListWidth(500); + setListHeight("400"); + setListWidth("500"); setFastOrderControlsVisible(true); setOrderControlsVisible(true); setRendered(true); @@ -319,4 +331,29 @@ setDownControlLabel("down"); addNewItem(); } + + public String getSelect() { + return select; + } + + public void setSelect(String select) { + this.select = select; + } + + public ArrayList<String> getInfo() { + return info; + } + + public void setInfo(ArrayList<String> info) { + this.info = info; + } + + private void addSelection() { + Iterator<Data> inter = selection.iterator(); + Data data = new Data(); + while (inter.hasNext()) { + data = inter.next(); + info.add(data.getInt0() + "; " + data.getStr0() + "; " + data.getStr1() + "; " + data.getStr2() + "; " + data.getStr3()); + } + } } Modified: branches/3.1.x/test-applications/facelets/src/main/java/util/componentInfo/ComponentInfo.java =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/java/util/componentInfo/ComponentInfo.java 2007-11-29 03:52:22 UTC (rev 4340) +++ branches/3.1.x/test-applications/facelets/src/main/java/util/componentInfo/ComponentInfo.java 2007-11-29 08:09:23 UTC (rev 4341) @@ -6,6 +6,7 @@ public class ComponentInfo { private final String beanName; + private String description; private String attribute; private String property; private boolean print; @@ -20,9 +21,17 @@ public void setComponentInfo(String attribute, String property) { this.attribute = attribute; this.property = property; + this.description = ""; if(print) printInfo(); } + public void setComponentInfo(String attribute, String property, String description) { + this.attribute = attribute; + this.property = property; + this.description = description; + if(print) printInfo(); + } + public static String toString(Object obj) { Class cl = obj.getClass(); String r = cl.getName() + "["; @@ -73,6 +82,14 @@ } private void printInfo() { - System.out.println("beanName: " + beanName + "[attribute:" + attribute + "; property:" + property + "];"); + System.out.println("beanName: " + beanName + "[attribute: " + attribute + "; property: " + property + "; description: " + description + "];"); } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } } 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-11-29 03:52:22 UTC (rev 4340) +++ branches/3.1.x/test-applications/facelets/src/main/java/util/data/Data.java 2007-11-29 08:09:23 UTC (rev 4341) @@ -25,6 +25,10 @@ private boolean bool2; private boolean bool3; + public Data() { + + } + public Data(String str0, String str1, String str2, String str3, int int0, int int1, int int2, int int3, boolean bool0, boolean bool1, boolean bool2, boolean bool3) { @@ -50,6 +54,14 @@ this.str3 = str3; } + public Data(int int0, String str0, String str1, String str2, String str3){ + this.int0 = int0; + this.str0 = str0; + this.str1 = str1; + this.str2 = str2; + this.str3 = str3; + } + public Data(String str0){ this.str0 = str0; } Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/ContextMenu/ContextMenu.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/ContextMenu/ContextMenu.xhtml 2007-11-29 03:52:22 UTC (rev 4340) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/ContextMenu/ContextMenu.xhtml 2007-11-29 08:09:23 UTC (rev 4341) @@ -1,16 +1,65 @@ -<f:subview id="calendarSubviewID" 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"> +<f:subview id="contextMenuSubviewID" 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"> <h:form> <!-- rich:contextMenu id="" attached="" event="" disableDefaultMenu="" rendered="" submitMode=""></rich:contextMenu--> - <rich:panel style="width:200px; hieght:100px;" > - <h:outputText value="text" /> - <rich:contextMenu id="contextMenu" submitMode="client"> - <rich:menuItem value="a"></rich:menuItem> - <rich:menuItem value="b"></rich:menuItem> - <rich:menuItem value="c"></rich:menuItem> - </rich:contextMenu> + <rich:panel style="width: 120px; height: 50px; background-color: #98FB98;"> + <h:outputText value="panel with contextMenu(default)" /> + <rich:contextMenu id="contextMenuDefaultID" submitMode="client"> + <rich:menuItem icon="/pics/header.png" value="abc"> + <f:param name="cmdParam" value="abc" /> + </rich:menuItem> + <rich:menuSeparator /> + <rich:menuItem icon="/pics/info.gif" value="a"> + <f:param name="cmdParam" value="a" /> + </rich:menuItem> + <rich:menuItem icon="/pics/info.gif" value="{cmdParam} b"> + <f:param name="cmdParam" value="b" /> + </rich:menuItem> + <rich:menuItem icon="/pics/info.gif" value="c"> + <f:param name="cmdParam" value="c" /> + </rich:menuItem> + <rich:menuItem icon="/pics/info.gif" value="d" data="cmdParam:aaaa"> + <f:param name="cmdParam" value="d" /> + </rich:menuItem> + </rich:contextMenu> + <a4j:outputPanel ajaxRendered="true"> + #{cmdParam} + </a4j:outputPanel> + <h:commandButton value="aaa" onclick="alert(event.parameters.cmdParam);" /> </rich:panel> + <h:panelGrid id="pgcmTestID" columns="3"> + <rich:panel id="pcmTestID" style="width: 80px; height: 45px; background-color: #F5F5DC;"> + <h:outputText value="rich:panel" /> + </rich:panel> + + <rich:tabPanel id="tpcmTestID" switchType="client"> + <rich:tab id="t1cmTestID" label="tab1"> + <h:outputText value="text1" /> + </rich:tab> + <rich:tab id="t2cmTestID" label="tab2"> + <h:outputText value="text2" /> + </rich:tab> + <rich:tab id="t3cmTestID" label="tab3"> + <h:outputText value="text3" /> + </rich:tab> + </rich:tabPanel> + + <h:graphicImage id="gicmID" value="/pics/asus.jpg" height="125px" width="150px"> + </h:graphicImage> + + <h:inputText id="itcmTestID" value="inputText"> + </h:inputText> + + <f:verbatim> + <div id="divcmTestID" style="width: 80px; height: 45px; background-color: #F5F5DC;"><span> div </span></div> + </f:verbatim> + + <h:panelGrid id="pgTestID" columns="1" border="5" cellpadding="2" cellspacing="2"> + <h:outputText value="panelGrid" /> + <h:outputText value="" /> + </h:panelGrid> + </h:panelGrid> </h:form> </f:subview> \ No newline at end of file Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/DataTable/DataTable.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/DataTable/DataTable.xhtml 2007-11-29 03:52:22 UTC (rev 4340) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/DataTable/DataTable.xhtml 2007-11-29 08:09:23 UTC (rev 4341) @@ -52,6 +52,12 @@ <h:outputText value="#{dataTableID.day}" /> </rich:column> <rich:subTable id="detail" var="detail" value="#{dataTableID.detail}"> + <f:facet name="header"> + <h:outputText value="facet(header)" /> + </f:facet> + <f:facet name="footer"> + <h:outputText value="facet(footer)" /> + </f:facet> <rich:column id="name"> <h:outputText value="#{detail.name}" /> </rich:column> Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/OrderingList/OrderingList.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/OrderingList/OrderingList.xhtml 2007-11-29 03:52:22 UTC (rev 4340) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/OrderingList/OrderingList.xhtml 2007-11-29 08:09:23 UTC (rev 4341) @@ -2,6 +2,7 @@ xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" xmlns:ui="http://java.sun.com/jsf/facelets"> <h:messages showDetail="true" /> + <rich:orderingList id="orderingListID" value="#{orderingList.list}" var="item" listHeight="#{orderingList.listHeight}" listWidth="#{orderingList.listWidth}" controlsType="#{orderingList.controlsType}" bottomControlLabel="#{orderingList.bottomControlLabel}" captionLabel="#{orderingList.captionLabel}" @@ -9,42 +10,68 @@ controlsHorizontalAlign="#{orderingList.controlsHorizontalAlign}" controlsVerticalAlign="#{orderingList.controlsVerticalAlign}" headerLabel="#{orderingList.headerLabel}" downControlLabel="#{orderingList.downControlLabel}" orderControlsVisible="#{orderingList.orderControlsVisible}" fastOrderControlsVisible="#{orderingList.fastOrderControlsVisible}" - rendered="#{orderingList.rendered}" showButtonLabels="#{orderingList.showButtonLabels}" - selection="#{orderingList.selection}"> + rendered="#{orderingList.rendered}" showButtonLabels="#{orderingList.showButtonLabels}" selection="#{orderingList.selection}"> + <f:facet name="header"> + <h:outputText value="header" /> + </f:facet> + <f:facet name="footer"> + <h:outputText value="footer" /> + </f:facet> <h:column width="100px"> <f:facet name="header"> <h:outputText value="Number" /> </f:facet> - <h:outputText value="#{item.data1}" /> + <h:outputText value="#{item.int0}" /> </h:column> - <h:column width="100px"> + <h:column> <f:facet name="header"> - <h:outputText value="Name" /> + <h:outputText value="Input" /> </f:facet> - <h:outputText value="#{item.data0}" /> + <h:inputText value="#{item.str0}" /> </h:column> <h:column width="100px"> <f:facet name="header"> - <h:outputText value="Status" /> + <h:outputText value="Button" /> </f:facet> - <h:selectOneMenu valueChangeListener="#{orderingList.clSelect}"> - <f:selectItem itemLabel="error" itemValue="error" /> - <f:selectItem itemLabel="fatal" itemValue="fatal" /> - <f:selectItem itemLabel="info" itemValue="info" /> - <f:selectItem itemLabel="passed" itemValue="passed" /> - <f:selectItem itemLabel="warn" itemValue="warn" /> + <h:commandButton onclick="submit();" action="#{orderingList.cbAction}" value="#{item.str0} submit();" /> + </h:column> + + <h:column> + <f:facet name="header"> + <h:outputText value="Link" /> + </f:facet> + <a4j:commandLink action="#{orderingList.clAction}" value="#{item.str1} immediate submit()"></a4j:commandLink> + </h:column> + + <h:column> + <f:facet name="header"> + <h:outputText value="select" /> + </f:facet> + <h:selectOneMenu value="#{item.str2}"> + <f:selectItem itemLabel="select0" itemValue="select5" /> + <f:selectItem itemLabel="select1" itemValue="select1" /> + <f:selectItem itemLabel="select2" itemValue="select2" /> + <f:selectItem itemLabel="select3" itemValue="select3" /> + <f:selectItem itemLabel="select4" itemValue="select4" /> <a4j:support event="onclick" action="submit();"></a4j:support> </h:selectOneMenu> </h:column> - <h:column width="30px"> + <h:column> <f:facet name="header"> - <h:outputText value="Icon" /> + <h:outputText value="Text" /> </f:facet> - <h:graphicImage value="#{item.data3}" /> + <h:outputText value="#{item.str3}" /> </h:column> + + <h:column> + <f:facet name="header"> + <h:outputText value="graphicImage" /> + </f:facet> + <h:graphicImage value="#{item.str3}" /> + </h:column> </rich:orderingList> </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-11-29 03:52:22 UTC (rev 4340) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/OrderingList/OrderingListStraightforward.xhtml 2007-11-29 08:09:23 UTC (rev 4341) @@ -4,28 +4,40 @@ <h:panelGrid columns="3"> <h:outputText value="Test1" /> <a4j:commandButton action="#{orderingList.bTest1}" value="run" reRender="orderingListPropertyID,orderingListID"></a4j:commandButton> - <h:outputText value="#{msg.t1OrderingList}"/> + <h:outputText value="#{msg.t1OrderingList}" /> <h:outputText value="Test2" /> <a4j:commandButton action="#{orderingList.bTest2}" value="run" reRender="orderingListPropertyID,orderingListID"></a4j:commandButton> - <h:outputText value="#{msg.t2OrderingList}"/> + <h:outputText value="#{msg.t2OrderingList}" /> <h:outputText value="Test3" /> <a4j:commandButton action="#{orderingList.bTest3}" value="run" reRender="orderingListPropertyID,orderingListID"></a4j:commandButton> - <h:outputText value="#{msg.t3OrderingList}"/> + <h:outputText value="#{msg.t3OrderingList}" /> <h:outputText value="Test4" /> <a4j:commandButton action="#{orderingList.bTest4}" value="run" reRender="orderingListPropertyID,orderingListID"></a4j:commandButton> - <h:outputText value="#{msg.t4OrderingList}"/> + <h:outputText value="#{msg.t4OrderingList}" /> <h:outputText value="Test5" /> <a4j:commandButton action="#{orderingList.bTest5}" value="run" reRender="orderingListPropertyID,orderingListID"></a4j:commandButton> - <h:outputText value="#{msg.t5OrderingList}"/> - - <a4j:commandButton value="reRender" reRender="orderingListID"></a4j:commandButton> - <a4j:commandButton action="submit();" value="a4j submit();"></a4j:commandButton> - <h:commandButton action="submit();" value="submit();" /> - <h:commandButton action="submit();" immediate="true" value="immediate submit();" /> + <h:outputText value="#{msg.t5OrderingList}" /> + + <a4j:commandButton value="Show selection" reRender="infoPanelID"></a4j:commandButton> + <h:column></h:column> + <h:column> + <h:dataTable id="infoPanelID" value="#{orderingList.info}" var="info" rendered="true"> + <h:column> + <h:outputText value="#{info}" /> + </h:column> + </h:dataTable> + </h:column> + + <h:panelGroup> + <a4j:commandButton value="reRender" reRender="orderingListID"></a4j:commandButton> + <a4j:commandButton action="submit();" value="a4j submit();"></a4j:commandButton> + <h:commandButton action="submit();" value="submit();" /> + <h:commandButton action="submit();" immediate="true" value="immediate submit();" /> + </h:panelGroup> </h:panelGrid> </rich:simpleTogglePanel> </f:subview> \ No newline at end of file Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-ContextMenu.xml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-ContextMenu.xml 2007-11-29 03:52:22 UTC (rev 4340) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-ContextMenu.xml 2007-11-29 08:09:23 UTC (rev 4341) @@ -4,7 +4,7 @@ <faces-config> <managed-bean> <managed-bean-name>contextMenu</managed-bean-name> - <managed-bean-class>ContextMenu.ContextMenu</managed-bean-class> + <managed-bean-class>contextMenu.ContextMenu</managed-bean-class> <managed-bean-scope>session</managed-bean-scope> </managed-bean> </faces-config> Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/pages/RichMenu/RichMenu.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/pages/RichMenu/RichMenu.xhtml 2007-11-29 03:52:22 UTC (rev 4340) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/pages/RichMenu/RichMenu.xhtml 2007-11-29 08:09:23 UTC (rev 4341) @@ -1,6 +1,9 @@ <h:form id="forvDivOpthID" xmlns="http://www.w3.org/1999/xhtml" xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" xmlns:a4j="http://richfaces.org/a4j"> - <h:panelGrid columns="3"> + <h:panelGrid columns="4" border="1"> + <h:column> + <a4j:status startText="WORK!" startStyle="color: red;" stopText="a4j:status"></a4j:status> + </h:column> <h:panelGrid columns="1"> <h:panelGroup> <h:outputText value="#{richBean.reComponent ? 'Component hide' : 'Component show'}" />