10:27 a.m.
Author: ayanul
Date: 2007-12-06 11:27:54 -0500 (Thu, 06 Dec 2007)
New Revision: 4563
Modified:
branches/3.1.x/test-applications/facelets/src/main/java/modalPanel/ModalPanel.java
branches/3.1.x/test-applications/facelets/src/main/webapp/ComponentControl/ComponentControl.xhtml
branches/3.1.x/test-applications/facelets/src/main/webapp/ContextMenu/ContextMenu.xhtml
branches/3.1.x/test-applications/facelets/src/main/webapp/ContextMenu/ContextMenuProperty.xhtml
branches/3.1.x/test-applications/facelets/src/main/webapp/DataOrderedList/DataOrderedList.xhtml
branches/3.1.x/test-applications/facelets/src/main/webapp/DataOrderedList/DataOrderedListProperty.xhtml
branches/3.1.x/test-applications/facelets/src/main/webapp/DragAndDrop/DragAndDrop.xhtml
branches/3.1.x/test-applications/facelets/src/main/webapp/ModalPanel/ModalPanel.xhtml
branches/3.1.x/test-applications/facelets/src/main/webapp/ModalPanel/ModalPanelProperty.xhtml
Log:
Modified:
branches/3.1.x/test-applications/facelets/src/main/java/modalPanel/ModalPanel.java
===================================================================
---
branches/3.1.x/test-applications/facelets/src/main/java/modalPanel/ModalPanel.java 2007-12-06
15:09:45 UTC (rev 4562)
+++
branches/3.1.x/test-applications/facelets/src/main/java/modalPanel/ModalPanel.java 2007-12-06
16:27:54 UTC (rev 4563)
@@ -3,43 +3,54 @@
public class ModalPanel {
private boolean autosized;
- private boolean immediate;
private boolean keepVisualState;
private String left;
private String top;
private boolean rendered;
- private boolean required;
- private String requiredMessage;
private int shadowDepth;
private int shadowOpacity;
private boolean showWhenRendered;
private String zindex;
-
private int minHeight;
private int minWidth;
private int height;
private int width;
-
private boolean moveable;
private boolean resizeable;
+ private String inputTextTest;
+ private String selectOneListboxTest;
+
+ public String getInputTextTest() {
+ return inputTextTest;
+ }
+
+ public void setInputTextTest(String inputTextTest) {
+ this.inputTextTest = inputTextTest;
+ }
+
+ public String getSelectOneListboxTest() {
+ return selectOneListboxTest;
+ }
+
+ public void setSelectOneListboxTest(String selectOneListboxTest) {
+ this.selectOneListboxTest = selectOneListboxTest;
+ }
+
public ModalPanel() {
-
+ this.inputTextTest = "text";
+ this.selectOneListboxTest = "1";
this.minHeight = 100;
this.minWidth = 100;
this.height = 300;
this.width = 300;
-
this.moveable=true;
this.resizeable=true;
this.autosized = false;
- this.immediate = false;
this.keepVisualState = false;
this.left = "100";
this.top = "100";
this.rendered = true;
- this.required = true;
- this.requiredMessage = "requiredMessage";
this.shadowDepth = 3;
this.shadowOpacity = 3;
this.zindex = "3";
@@ -85,7 +96,12 @@
public void setResizeable(boolean resizeable) {
this.resizeable = resizeable;
}
+
+ public void setAutosized(boolean autosized) {
+ this.autosized = autosized;
+ }
+
public int getWidth() {
return width;
}
@@ -143,18 +159,6 @@
return autosized;
}
- public void setAutosized(boolean autosized) {
- this.autosized = autosized;
- }
-
- public boolean isImmediate() {
- return immediate;
- }
-
- public void setImmediate(boolean immediate) {
- this.immediate = immediate;
- }
-
public boolean isKeepVisualState() {
return keepVisualState;
}
@@ -187,22 +191,6 @@
this.rendered = rendered;
}
- public boolean isRequired() {
- return required;
- }
-
- public void setRequired(boolean required) {
- this.required = required;
- }
-
- public String getRequiredMessage() {
- return requiredMessage;
- }
-
- public void setRequiredMessage(String requiredMessage) {
- this.requiredMessage = requiredMessage;
- }
-
public int getShadowDepth() {
return shadowDepth;
}
Modified:
branches/3.1.x/test-applications/facelets/src/main/webapp/ComponentControl/ComponentControl.xhtml
===================================================================
---
branches/3.1.x/test-applications/facelets/src/main/webapp/ComponentControl/ComponentControl.xhtml 2007-12-06
15:09:45 UTC (rev 4562)
+++
branches/3.1.x/test-applications/facelets/src/main/webapp/ComponentControl/ComponentControl.xhtml 2007-12-06
16:27:54 UTC (rev 4563)
@@ -2,24 +2,24 @@
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:modalPanel id="ccModalPanelID"
onshow="alert(event.parameters.show)"
onhide="alert(event.parameters.hide)">
- <h:outputLink id="hideButton1ID" onclick="return false;"
value="Close">
+ <h:outputLink id="hideButton1ID" onclick="return false;"
value="#">
<f:verbatim>Close 1</f:verbatim>
</h:outputLink>
<f:verbatim>
<br />
</f:verbatim>
- <h:outputLink id="hideButton2ID" onclick="return false;"
value="Close">
+ <h:outputLink id="hideButton2ID" onclick="return false;"
value="#">
<f:verbatim>Close 2</f:verbatim>
</h:outputLink>
</rich:modalPanel>
-
- <h:commandButton id="showButtonID" onclick="return false;"
value="show ModalPanel">
- <rich:componentControl for="ccModalPanelID" event="onclick"
operation="show" params="show:'componentControl work(show)'"
/>
+
+ <h:commandButton id="showButtonID" value="show ModalPanel" >
+ <rich:componentControl for="ccModalPanelID" event="onclick"
disableDefault="true" operation="show"
params="show:'componentControl work(show)'" />
</h:commandButton>
<rich:componentControl attachTo="hideButton1ID, hideButton2ID"
event="onclick" for="ccModalPanelID" operation="hide"
params="hide:'componentControl work(hide)'" />
-
+
<ui:remove>
<f:verbatim>
<br />
@@ -41,7 +41,7 @@
<a href="#" id="testPMID" onclick="return
false;">Click text</a>
</ui:remove>
-
+
<f:verbatim>
<br />
<br />
@@ -49,8 +49,8 @@
<rich:calendar popup="#{componentControl.calendarPopup}"
id="ccCalendarID" />
<h:panelGrid columns="2">
- <h:outputText value="popup calendar" />
- <h:selectBooleanCheckbox id="calendarSelectID"
value="#{componentControl.calendarPopup}" onchange="submit();" />
+ <h:outputText value="popup calendar" />
+ <h:selectBooleanCheckbox id="calendarSelectID"
value="#{componentControl.calendarPopup}" onchange="submit();" />
</h:panelGrid>
<f:verbatim>
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-12-06
15:09:45 UTC (rev 4562)
+++
branches/3.1.x/test-applications/facelets/src/main/webapp/ContextMenu/ContextMenu.xhtml 2007-12-06
16:27:54 UTC (rev 4563)
@@ -36,17 +36,17 @@
</rich:menuGroup>
</rich:contextMenu>
</rich:panel>
-
+
<rich:panel style="width: 130px; height: 50px; background-color:
#98FB98;">
<h:outputText value="panel with contextMenu(Test)" />
<rich:contextMenu id="contextMenuID"
attached="#{contextMenu.attached}"
submitMode="#{contextMenu.submitMode}"
event="#{contextMenu.event}"
disableDefaultMenu="#{contextMenu.disableDefaultMenu}"
rendered="#{contextMenu.rendered}"
hideDelay="#{contextMenu.hideDelay}"
showDelay="#{contextMenu.showDelay}"
popupWidth="#{contextMenu.popupWidth}">
- <rich:menuItem icon="/pics/header.png" value="abc"
reRender="cmInfoID">
+ <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="action"
action="alert('action work')" reRender="cmInfoID">
+ <rich:menuItem icon="/pics/info.gif" value="action"
reRender="cmInfoID">
<f:param name="cmdParam" value="action" />
</rich:menuItem>
<rich:menuItem icon="/pics/info.gif" value="actionListener"
actionListener="#{contextMenu.actionListener}"
reRender="cmInfoID">
@@ -97,7 +97,10 @@
<h:outputText value="Select items: " />
<h:outputText value="#{contextMenu.info}" style="color: red"
/>
</h:panelGrid>
-
+ <a4j:commandButton value="abc" reRender="cmInfoID">
+
+ </a4j:commandButton>
+
<h:panelGrid id="pgcmTestID" columns="3">
<h:selectOneMenu value="#{contextMenu.selectOneMenu}">
<f:selectItem itemLabel="select1" itemValue="select1" />
@@ -236,7 +239,9 @@
</rich:menuItem>
</rich:contextMenu>
</rich:tabPanel>
-
+ <a4j:commandButton value="abc" reRender="cmInfoID">
+ </a4j:commandButton>
+
<h:graphicImage id="gicmID" value="/pics/asus.jpg"
height="125px" width="150px">
<rich:contextMenu attached="#{contextMenu.attached}"
submitMode="#{contextMenu.submitMode}" event="#{contextMenu.event}"
disableDefaultMenu="#{contextMenu.disableDefaultMenu}"
rendered="#{contextMenu.rendered}"
hideDelay="#{contextMenu.hideDelay}"
@@ -319,9 +324,9 @@
</rich:contextMenu>
</h:inputText>
-
- <div id="divcmTestID" style="width: 80px; height: 45px;
background-color: #008080;"> <rich:contextMenu
- attached="#{contextMenu.attached}"
submitMode="#{contextMenu.submitMode}" event="#{contextMenu.event}"
+ <h:panelGroup>
+ <div id="divcmTestID" style="width: 80px; height: 45px;
background-color: #008080;">
+ <rich:contextMenu attached="#{contextMenu.attached}"
submitMode="#{contextMenu.submitMode}" event="#{contextMenu.event}"
disableDefaultMenu="#{contextMenu.disableDefaultMenu}"
rendered="#{contextMenu.rendered}"
hideDelay="#{contextMenu.hideDelay}"
showDelay="#{contextMenu.showDelay}"
popupWidth="#{contextMenu.popupWidth}">
<rich:menuItem icon="/pics/header.png" value="div"
reRender="cmInfoID">
@@ -358,9 +363,10 @@
<f:selectItem itemLabel="item2" itemValue="item2" />
</h:selectOneMenu>
</rich:menuItem>
- </rich:contextMenu></div>
+ </rich:contextMenu>
+ </div>
+</h:panelGroup>
-
<h:panelGrid id="pgTestID" columns="1" border="5"
cellpadding="2" cellspacing="2">
<h:outputText value="panelGrid" />
<h:outputText value="" />
Modified:
branches/3.1.x/test-applications/facelets/src/main/webapp/ContextMenu/ContextMenuProperty.xhtml
===================================================================
---
branches/3.1.x/test-applications/facelets/src/main/webapp/ContextMenu/ContextMenuProperty.xhtml 2007-12-06
15:09:45 UTC (rev 4562)
+++
branches/3.1.x/test-applications/facelets/src/main/webapp/ContextMenu/ContextMenuProperty.xhtml 2007-12-06
16:27:54 UTC (rev 4563)
@@ -31,10 +31,11 @@
</h:inputText>
<h:outputText value="submitMode:" />
- <h:selectOneRadio value="#{contextMenu.submitMode}"
onchange="submit();">
+ <h:selectOneRadio value="#{contextMenu.submitMode}">
<f:selectItem itemLabel="none" itemValue="none" />
<f:selectItem itemLabel="server" itemValue="server" />
<f:selectItem itemLabel="ajax" itemValue="ajax" />
+ <a4j:support event="onchange"
action="submit();"></a4j:support>
</h:selectOneRadio>
<h:outputText value="attached" />
Modified:
branches/3.1.x/test-applications/facelets/src/main/webapp/DataOrderedList/DataOrderedList.xhtml
===================================================================
---
branches/3.1.x/test-applications/facelets/src/main/webapp/DataOrderedList/DataOrderedList.xhtml 2007-12-06
15:09:45 UTC (rev 4562)
+++
branches/3.1.x/test-applications/facelets/src/main/webapp/DataOrderedList/DataOrderedList.xhtml 2007-12-06
16:27:54 UTC (rev 4563)
@@ -1,7 +1,7 @@
<f:subview id="dataOrderedListSubviewID"
xmlns:f="http://java.sun.com/jsf/core"
xmlns:a4j="http://richfaces.org/a4j"
xmlns:h="http://java.sun.com/jsf/html"
xmlns:rich="http://richfaces.org/rich"
xmlns:ui="http://java.sun.com/jsf/facelets">
<rich:dataOrderedList id="doListID"
value="#{dataOrderedList.arr}" var="arr"
first="#{dataOrderedList.first}"
- rendered="#{dataOrderedList.rendered}"
title="#{dataOrderedList.title}" type="#{dataOrderedList.type}"
dir="#{dataOrderedList.dir}"
+ rendered="#{dataOrderedList.rendered}"
title="#{dataOrderedList.title}" type="disc"
dir="#{dataOrderedList.dir}"
rows="#{dataOrderedList.rows}">
<f:facet name="header">
<h:outputText value="Africa(header):" />
Modified:
branches/3.1.x/test-applications/facelets/src/main/webapp/DataOrderedList/DataOrderedListProperty.xhtml
===================================================================
---
branches/3.1.x/test-applications/facelets/src/main/webapp/DataOrderedList/DataOrderedListProperty.xhtml 2007-12-06
15:09:45 UTC (rev 4562)
+++
branches/3.1.x/test-applications/facelets/src/main/webapp/DataOrderedList/DataOrderedListProperty.xhtml 2007-12-06
16:27:54 UTC (rev 4563)
@@ -34,7 +34,7 @@
<f:selectItem itemValue="a" itemLabel="a"/>
<f:selectItem itemValue="I" itemLabel="I"/>
<f:selectItem itemValue="i" itemLabel="i"/>
- <f:selectItem itemValue="disk" itemLabel="disk"/>
+ <f:selectItem itemValue="disc" itemLabel="disc"/>
<f:selectItem itemValue="circle" itemLabel="circle"/>
<f:selectItem itemValue="square" itemLabel="square"/>
<a4j:support event="onchange"
reRender="doListID"></a4j:support>
Modified:
branches/3.1.x/test-applications/facelets/src/main/webapp/DragAndDrop/DragAndDrop.xhtml
===================================================================
---
branches/3.1.x/test-applications/facelets/src/main/webapp/DragAndDrop/DragAndDrop.xhtml 2007-12-06
15:09:45 UTC (rev 4562)
+++
branches/3.1.x/test-applications/facelets/src/main/webapp/DragAndDrop/DragAndDrop.xhtml 2007-12-06
16:27:54 UTC (rev 4563)
@@ -186,7 +186,7 @@
<f:verbatim>dragSupport</f:verbatim>
</h:panelGrid>
- <a4j:status id="adf" startText="...request..."
stopText="stop" />
+
<a4j:outputPanel ajaxRendered="true">
<h:messages />
Modified:
branches/3.1.x/test-applications/facelets/src/main/webapp/ModalPanel/ModalPanel.xhtml
===================================================================
---
branches/3.1.x/test-applications/facelets/src/main/webapp/ModalPanel/ModalPanel.xhtml 2007-12-06
15:09:45 UTC (rev 4562)
+++
branches/3.1.x/test-applications/facelets/src/main/webapp/ModalPanel/ModalPanel.xhtml 2007-12-06
16:27:54 UTC (rev 4563)
@@ -1,13 +1,13 @@
<f:subview id="modalPanelSubviewID"
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:messages />
- <rich:modalPanel id="modalPanelID"
minHeight="#{modalPanel.minHeight}" minWidth="#{modalPanel.minWidth}"
height="#{modalPanel.height}"
- width="#{modalPanel.width}" moveable="#{modalPanel.moveable}"
resizeable="#{modalPanel.resizeable}"
- immediate="#{modalPanel.immediate}"
keepVisualState="#{modalPanel.keepVisualState}"
rendered="#{modalPanel.rendered}"
- zindex="#{modalPanel.zindex}" autosized="#{modalPanel.autosized}"
left="#{modalPanel.left}" top="#{modalPanel.top}"
- required="#{modalPanel.required}"
requiredMessage="#{modalPanel.requiredMessage}"
shadowDepth="#{modalPanel.shadowDepth}"
- shadowOpacity="#{modalPanel.shadowOpacity}"
showWhenRendered="#{modalPanel.showWhenRendered}"
- onhide="print('onhideInputID', 'onhide work!')"
onshow="print('onshowInputID', 'onshow work!')">
+ <rich:modalPanel id="modalPanelID"
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}" left="#{modalPanel.left}"
+ top="#{modalPanel.top}" shadowDepth="#{modalPanel.shadowDepth}"
shadowOpacity="#{modalPanel.shadowOpacity}"
+ showWhenRendered="#{modalPanel.showWhenRendered}"
onhide="print('onhideInputID', 'onhide work!')"
+ onshow="print('onshowInputID', 'onshow work!')">
<f:facet name="header">
<h:outputText value="Heder goes here..." />
</f:facet>
@@ -15,11 +15,17 @@
<h:graphicImage value="/pics/error.gif"
onclick="Richfaces.hideModalPanel('modalPanelID');return false;" />
</f:facet>
<h:outputText value="This is Modal Panel example"
styleClass="text1" />
+ <h:inputText value="#{modalPanel.inputTextTest}" />
+ <h:selectOneListbox value="#{modalPanel.selectOneListboxTest}">
+ <f:selectItem itemLabel="1" itemValue="1" />
+ <f:selectItem itemLabel="2" itemValue="2" />
+ <f:selectItem itemLabel="3" itemValue="3" />
+ </h:selectOneListbox>
<f:verbatim>
<br />
<br />
</f:verbatim>
- <h:outputLink onclick="Richfaces.hideModalPanel('MPid');return
false;" value="Close">
+ <h:outputLink onclick="Richfaces.hideModalPanel('modalPanelID');return
false;" value="Close">
<f:verbatim>Close</f:verbatim>
</h:outputLink>
</rich:modalPanel>
Modified:
branches/3.1.x/test-applications/facelets/src/main/webapp/ModalPanel/ModalPanelProperty.xhtml
===================================================================
---
branches/3.1.x/test-applications/facelets/src/main/webapp/ModalPanel/ModalPanelProperty.xhtml 2007-12-06
15:09:45 UTC (rev 4562)
+++
branches/3.1.x/test-applications/facelets/src/main/webapp/ModalPanel/ModalPanelProperty.xhtml 2007-12-06
16:27:54 UTC (rev 4563)
@@ -38,7 +38,7 @@
<h:outputText value="showWhenRendered" />
<h:selectBooleanCheckbox value="#{modalPanel.showWhenRendered}" >
- <a4j:support event="onchange"
reRender="modalPanelID""></a4j:support>
+ <a4j:support event="onchange"
reRender="modalPanelID"></a4j:support>
</h:selectBooleanCheckbox>
<h:outputText value="zindex" />
@@ -48,11 +48,6 @@
<a4j:support event="onchange"
reRender="modalPanelID"></a4j:support>
</h:selectOneRadio>
- <h:outputText value="autosized" />
- <h:selectBooleanCheckbox value="#{modalPanel.autosized}" >
- <a4j:support event="onchange"
reRender="modalPanelID"></a4j:support>
- </h:selectBooleanCheckbox>
-
<h:outputText value="Width:" />
<h:inputText value="#{modalPanel.width}">
<a4j:support event="onchange"
reRender="modalPanelID"></a4j:support>
@@ -72,10 +67,15 @@
<h:inputText value="#{modalPanel.minHeight}">
<a4j:support event="onchange"
reRender="modalPanelID"></a4j:support>
</h:inputText>
+
+ <h:outputText value="autosized" />
+ <h:selectBooleanCheckbox value="#{modalPanel.autosized}" >
+
+ </h:selectBooleanCheckbox>
<h:outputText value="Resizeable:" />
- <h:selectBooleanCheckbox value="#{modalPanel.resizeable}">
- <a4j:support event="onclick"
reRender="modalPanelID"></a4j:support>
+ <h:selectBooleanCheckbox value="#{modalPanel.resizeable}"
onchange="submit();">
+
</h:selectBooleanCheckbox>
<h:outputText value="Moveable:" />