Author: ayanul Date: 2008-03-13 05:48:11 -0400 (Thu, 13 Mar 2008) New Revision: 6773 Modified: trunk/test-applications/jsp/src/main/java/fileUpload/FileUpload.java trunk/test-applications/jsp/src/main/java/modalPanel/ModalPanel.java trunk/test-applications/jsp/src/main/java/skinning/Skinning.java trunk/test-applications/jsp/src/main/java/util/style/Style.java trunk/test-applications/jsp/src/main/webapp/FileUpload/FileUpload.jsp trunk/test-applications/jsp/src/main/webapp/ModalPanel/ModalPanel.jsp trunk/test-applications/jsp/src/main/webapp/ModalPanel/ModalPanelProperty.jsp trunk/test-applications/jsp/src/main/webapp/PickList/PickList.jsp Log: update Modified: trunk/test-applications/jsp/src/main/java/fileUpload/FileUpload.java =================================================================== --- trunk/test-applications/jsp/src/main/java/fileUpload/FileUpload.java 2008-03-12 21:41:13 UTC (rev 6772) +++ trunk/test-applications/jsp/src/main/java/fileUpload/FileUpload.java 2008-03-13 09:48:11 UTC (rev 6773) @@ -4,8 +4,8 @@ import java.io.File; import java.io.IOException; import java.util.ArrayList; +import java.util.List; - import org.richfaces.event.UploadEvent; import org.richfaces.model.UploadItem; @@ -18,10 +18,10 @@ private String requiredMessage; private String listHeight; private String listWidth; - private ArrayList data; + private List data; private Integer maxFilesQuantity; - - public FileUpload() { + + public FileUpload() { data = new ArrayList(); disabled = false; autoclear = false; @@ -38,10 +38,12 @@ UploadItem upload = event.getUploadItem(); if (upload.isFile()) { File file = upload.getFile(); + System.out.println("FileUpload.fileUploadListener()"); } else { ByteArrayOutputStream b = new ByteArrayOutputStream(); b.write(upload.getData()); } + System.out.println("FileUpload.fileUploadListener()"); } public boolean isDisabled() { @@ -116,11 +118,13 @@ this.acceptedTypes = acceptedTypes; } - public ArrayList getData() { + public List getData() { + for(int i = 0; i < data.size(); i++) + System.out.println(data.get(i)); return data; } - public void setData(ArrayList data) { + public void setData(List data) { this.data = data; } } Modified: trunk/test-applications/jsp/src/main/java/modalPanel/ModalPanel.java =================================================================== --- trunk/test-applications/jsp/src/main/java/modalPanel/ModalPanel.java 2008-03-12 21:41:13 UTC (rev 6772) +++ trunk/test-applications/jsp/src/main/java/modalPanel/ModalPanel.java 2008-03-13 09:48:11 UTC (rev 6773) @@ -1,7 +1,6 @@ package modalPanel; public class ModalPanel { - private String id; private boolean autosized; private boolean keepVisualState; private String left; @@ -19,8 +18,17 @@ private boolean resizeable; private String inputTextTest; private String selectOneListboxTest; + private String visualOptions; + public String getVisualOptions() { + return visualOptions; + } + + public void setVisualOptions(String visualOptions) { + this.visualOptions = visualOptions; + } + public String getInputTextTest() { return inputTextTest; } @@ -38,6 +46,7 @@ } public ModalPanel() { + this.visualOptions = ""; this.inputTextTest = "text"; this.selectOneListboxTest = "1"; this.minHeight = 100; @@ -48,8 +57,8 @@ this.resizeable=true; this.autosized = false; this.keepVisualState = false; - this.left = "100"; - this.top = "100"; + this.left = "auto"; + this.top = "auto"; this.rendered = true; this.shadowDepth = "3"; this.shadowOpacity = "3"; @@ -222,12 +231,4 @@ public void setZindex(int zindex) { this.zindex = zindex; } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } } Modified: trunk/test-applications/jsp/src/main/java/skinning/Skinning.java =================================================================== --- trunk/test-applications/jsp/src/main/java/skinning/Skinning.java 2008-03-12 21:41:13 UTC (rev 6772) +++ trunk/test-applications/jsp/src/main/java/skinning/Skinning.java 2008-03-13 09:48:11 UTC (rev 6773) @@ -41,6 +41,7 @@ selectOneRadio = "rich-select"; skinning = "disable"; skinningClass = "disable"; + selectSkinning = "none"; } public String getCommandButton() { @@ -196,9 +197,9 @@ } public void setSelectSkinning(String selectSkinning) { - if (selectSkinning.equals("skinning")) { + if (selectSkinning.equals("SKINNING")) { setSkinning("enable"); - } else if (selectSkinning.equals("skinningClass")) { + } else if (selectSkinning.equals("SKINNING_CLASSES")) { setSkinning("disable"); setSkinningClass("enable"); } else { Modified: trunk/test-applications/jsp/src/main/java/util/style/Style.java =================================================================== --- trunk/test-applications/jsp/src/main/java/util/style/Style.java 2008-03-12 21:41:13 UTC (rev 6772) +++ trunk/test-applications/jsp/src/main/java/util/style/Style.java 2008-03-13 09:48:11 UTC (rev 6773) @@ -4,6 +4,7 @@ public class Style { private RichBean curentComponent; + private String controlsClass; private String style; private String styleClass; private String rangeStyleClass; @@ -78,6 +79,7 @@ private String headerClassA; public Style() { + controlsClass = "controlsClass"; style = "style"; styleClass = "styleClass"; rangeStyleClass = "rangeStyleClass"; @@ -727,4 +729,12 @@ public void setHandleStyle(String handleStyle) { this.handleStyle = handleStyle; } + + public String getControlsClass() { + return controlsClass; + } + + public void setControlsClass(String controlsClass) { + this.controlsClass = controlsClass; + } } Modified: trunk/test-applications/jsp/src/main/webapp/FileUpload/FileUpload.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/FileUpload/FileUpload.jsp 2008-03-12 21:41:13 UTC (rev 6772) +++ trunk/test-applications/jsp/src/main/webapp/FileUpload/FileUpload.jsp 2008-03-13 09:48:11 UTC (rev 6773) @@ -4,14 +4,14 @@ <%@ taglib uri="http://richfaces.org/rich" prefix="rich"%> <f:subview id="FileUploadSubviewID"> - <rich:fileUpload id="fileUploadID" uploadData="#{fileUpload.data}" + <rich:fileUpload id="fileUploadID" uploadData="#{fileUpload.data}" acceptedTypes="#{fileUpload.acceptedTypes}" disabled="#{fileUpload.disabled}" autoclear="#{fileUpload.autoclear}" required="#{fileUpload.required}" requiredMessage="#{fileUpload.requiredMessage}" rendered="#{fileUpload.rendered}" listHeight="#{fileUpload.listHeight}" - listWidth="#{fileUpload.listHeight}" + listWidth="#{fileUpload.listWidth}" maxFilesQuantity="#{fileUpload.maxFilesQuantity}" fileUploadListener="#{fileUpload.fileUploadListener}"> <f:facet name="label"> @@ -19,6 +19,12 @@ </f:facet> </rich:fileUpload> + <h:panelGrid columns="2"> + <a4j:commandButton value="show file" reRender="fileUploadDataID"></a4j:commandButton> + <h:dataTable id="fileUploadDataID" value="#{fileUpload.data}" var="item"> + <h:outputText value="#{item.fileName}"></h:outputText> + </h:dataTable> + </h:panelGrid> <h:panelGrid columns="2"> <h:outputText value="acceptedTypes"></h:outputText> Modified: trunk/test-applications/jsp/src/main/webapp/ModalPanel/ModalPanel.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/ModalPanel/ModalPanel.jsp 2008-03-12 21:41:13 UTC (rev 6772) +++ trunk/test-applications/jsp/src/main/webapp/ModalPanel/ModalPanel.jsp 2008-03-13 09:48:11 UTC (rev 6773) @@ -10,11 +10,12 @@ <f:selectItems value="#{richBean.listContainer}" /> </h:selectOneMenu> - <rich:modalPanel id="modalPanelID" minHeight="#{modalPanel.minHeight}" minWidth="#{modalPanel.minWidth}" + <rich:modalPanel id="modalPanelID" visualOptions="#{modalPanel.visualOptions}" left="#{modalPanel.left}" top="#{modalPanel.top}" minHeight="#{modalPanel.minHeight}" minWidth="#{modalPanel.minWidth}" height="#{modalPanel.height}" width="#{modalPanel.width}" moveable="#{modalPanel.moveable}" resizeable="#{modalPanel.resizeable}" keepVisualState="#{modalPanel.keepVisualState}" rendered="#{modalPanel.rendered}" zindex="#{modalPanel.zindex}" autosized="#{modalPanel.autosized}" shadowDepth="#{modalPanel.shadowDepth}" shadowOpacity="#{modalPanel.shadowOpacity}" showWhenRendered="#{modalPanel.showWhenRendered}" + controlsClass="#{style.controlsClass}" headerClass="#{style.headerClass}" styleClass="#{style.styleClass}" onhide="#{event.onhide}" onmaskclick="#{event.onmaskclick}" onmaskcontextmenu="#{event.onmaskcontextmenu}" onmaskdblclick="#{event.onmaskdblclick}" onmaskmousedown="#{event.onmaskmousedown}" onmaskmousemove="#{event.onmaskmousemove}" onmaskmouseout="#{event.onmaskmouseout}" onmaskmouseover="#{event.onmaskmouseover}" onmaskmouseup="#{event.onmaskmouseup}" onmove="#{event.onmove}" onresize="#{event.onresize}" onshow="#{event.onshow}"> <f:facet name="header"> <h:outputText value="Heder goes here..." /> Modified: trunk/test-applications/jsp/src/main/webapp/ModalPanel/ModalPanelProperty.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/ModalPanel/ModalPanelProperty.jsp 2008-03-12 21:41:13 UTC (rev 6772) +++ trunk/test-applications/jsp/src/main/webapp/ModalPanel/ModalPanelProperty.jsp 2008-03-13 09:48:11 UTC (rev 6773) @@ -5,6 +5,9 @@ <f:subview id="ModalPanelPropertySubviewID"> <h:panelGrid columns="2"> + <h:outputText value="visualOptions"></h:outputText> + <h:inputText value="#{modalPanel.visualOptions}" onchange="submit();"></h:inputText> + <h:outputText value="shadowDepth" /> <h:inputText value="#{modalPanel.shadowDepth}" > <a4j:support event="onchange" reRender="modalPanelID"></a4j:support> Modified: trunk/test-applications/jsp/src/main/webapp/PickList/PickList.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/PickList/PickList.jsp 2008-03-12 21:41:13 UTC (rev 6772) +++ trunk/test-applications/jsp/src/main/webapp/PickList/PickList.jsp 2008-03-13 09:48:11 UTC (rev 6773) @@ -3,7 +3,6 @@ <%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%> <%@ taglib uri="http://richfaces.org/rich" prefix="rich"%> <f:subview id="pickListSubviewID"> - <rich:pickList id="pickListID" value="#{pickList.value}" showButtonsLabel="#{pickList.showButtonLabels}" valueChangeListener="#{pickList.valueChangeListener}" controlClass="#{style.controlClass}" listClass="#{style.listClass}" style="#{style.style}" styleClass="#{style.styleClass}" copyAllControlLabel="#{pickList.copyAllControlLabel}" copyControlLabel="#{pickList.copyControlLabel}" @@ -17,14 +16,10 @@ onfocus="#{event.onfocus}" onkeydown="#{event.onkeydown}" onkeypress="#{event.onkeypress}" onkeyup="#{event.onkeyup}" onmousedown="#{event.onmousedown}" onmousemove="#{event.onmousemove}" onmouseout="#{event.onmouseout}" onmouseover="#{event.onmouseover}" onmouseup="#{event.onmouseup}"> - <f:selectItem itemValue="selectItem" itemLabel="selectItem" /> - <f:selectItem itemValue="selectItem 1" itemLabel="selectItem 1" /> - <f:selectItem itemValue="selectItem 2" itemLabel="selectItem 2" /> <f:selectItems value="#{pickList.data}" /> </rich:pickList> <h:panelGrid columns="2"> <a4j:commandButton value="refresh" reRender="pickListvalueCLID"></a4j:commandButton> <h:outputText id="pickListvalueCLID" value="#{pickList.valueCL}"></h:outputText> </h:panelGrid> - </f:subview> \ No newline at end of file