[richfaces-svn-commits] JBoss Rich Faces SVN: r2348 - in trunk/test-applications/jsp/src/main: webapp/PanelMenu and 1 other directory.
richfaces-svn-commits at lists.jboss.org
richfaces-svn-commits at lists.jboss.org
Mon Aug 20 10:59:35 EDT 2007
Author: ayanul
Date: 2007-08-20 10:59:35 -0400 (Mon, 20 Aug 2007)
New Revision: 2348
Modified:
trunk/test-applications/jsp/src/main/java/panelMenu/PanelMenu.java
trunk/test-applications/jsp/src/main/webapp/PanelMenu/PanelMenu.jsp
Log:
http://jira.jboss.com/jira/browse/RF-640
Modified: trunk/test-applications/jsp/src/main/java/panelMenu/PanelMenu.java
===================================================================
--- trunk/test-applications/jsp/src/main/java/panelMenu/PanelMenu.java 2007-08-20 14:59:29 UTC (rev 2347)
+++ trunk/test-applications/jsp/src/main/java/panelMenu/PanelMenu.java 2007-08-20 14:59:35 UTC (rev 2348)
@@ -7,7 +7,6 @@
private Icon icon;
private String width;
private String mode;
- private String mode2;
private String align;
private String rendered;
private String iconItemPosition;
@@ -16,13 +15,13 @@
private String iconGroupTopPosition;
private String tabIndex;
private String expandMode;
+ private String inputText;
private boolean disabled;
private boolean expandSingle;
public PanelMenu() {
width = "500px";
mode = "none";
- mode2 = "none";
align = "";
rendered = "true";
disabled = false;
@@ -96,14 +95,6 @@
this.iconItemTopPosition = iconItemTopPosition;
}
- public String getMode2() {
- return mode2;
- }
-
- public void setMode2(String mode2) {
- this.mode2 = mode2;
- }
-
public String getMode() {
return mode;
}
@@ -127,4 +118,12 @@
public void setExpandMode(String expandMode) {
this.expandMode = expandMode;
}
+
+ public String getInputText() {
+ return inputText;
+ }
+
+ public void setInputText(String inputText) {
+ this.inputText = inputText;
+ }
}
Modified: trunk/test-applications/jsp/src/main/webapp/PanelMenu/PanelMenu.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/PanelMenu/PanelMenu.jsp 2007-08-20 14:59:29 UTC (rev 2347)
+++ trunk/test-applications/jsp/src/main/webapp/PanelMenu/PanelMenu.jsp 2007-08-20 14:59:35 UTC (rev 2348)
@@ -30,57 +30,57 @@
iconGroupPosition="#{panelMenu.iconGroupPosition}" iconGroupTopPosition="#{panelMenu.iconGroupTopPosition}"
iconItemPosition="#{panelMenu.iconItemPosition}" iconItemTopPosition="#{panelMenu.iconItemTopPosition}" styleClass="sPanel">
- <rich:panelMenuItem value="Item 1"></rich:panelMenuItem>
+ <rich:panelMenuItem label="Item 1"></rich:panelMenuItem>
<rich:panelMenuItem disabled="true" iconDisabled="/pics/ajax_stoped.gif">
<h:outputText value="Disabled Item" />
</rich:panelMenuItem>
- <rich:panelMenuItem value="Item Image">
+ <rich:panelMenuItem label="Item Image">
<h:graphicImage value="/pics/item.png"></h:graphicImage>
</rich:panelMenuItem>
<rich:panelMenuItem>
<h:outputText value="Item4" />
</rich:panelMenuItem>
- <rich:panelMenuItem value="CheckBox">
+ <rich:panelMenuItem label="CheckBox">
<h:selectBooleanCheckbox value="false"></h:selectBooleanCheckbox>
</rich:panelMenuItem>
<rich:panelMenuItem>
<h:outputText value="CheckBox 2"></h:outputText>
<h:selectBooleanCheckbox value="false"></h:selectBooleanCheckbox>
</rich:panelMenuItem>
- <rich:panelMenuItem value="Action" onmousedown="alert('OnMouseDown');"></rich:panelMenuItem>
+ <rich:panelMenuItem label="Action" onmousedown="alert('OnMouseDown');"></rich:panelMenuItem>
<rich:panelMenuGroup label="Group 1 (align)" align="#{panelMenu.align}">
- <rich:panelMenuItem value="Item 1" disabled="true"></rich:panelMenuItem>
- <rich:panelMenuItem value="Item 1 (action)" onmousedown="alert('OnMouseDown');"></rich:panelMenuItem>
- <rich:panelMenuItem value="Item 2"></rich:panelMenuItem>
+ <rich:panelMenuItem label="Item 1" disabled="true"></rich:panelMenuItem>
+ <rich:panelMenuItem label="Item 1 (action)" onmousedown="alert('OnMouseDown');"></rich:panelMenuItem>
+ <rich:panelMenuItem label="Item 2"></rich:panelMenuItem>
<rich:panelMenuGroup label="Group 1_1 (align)" align="#{panelMenu.align}">
- <rich:panelMenuItem value="Imem 1_1">
- <h:inputText value="text"></h:inputText>
+ <rich:panelMenuItem label="Imem 1_1">
+ <h:inputText value="#{panelMenu.inputText}"></h:inputText>
</rich:panelMenuItem>
- <rich:panelMenuItem value="Item 1_2"></rich:panelMenuItem>
+ <rich:panelMenuItem label="Item 1_2"></rich:panelMenuItem>
<rich:panelMenuGroup label="Group 1_1_1 (align)" align="#{panelMenu.align}">
- <rich:panelMenuItem value="Item 1 (action)" onmousedown="alert('OnMouseDown');"></rich:panelMenuItem>
- <rich:panelMenuItem value="Item 2"></rich:panelMenuItem>
+ <rich:panelMenuItem label="Item 1 (action)" onmousedown="alert('OnMouseDown');"></rich:panelMenuItem>
+ <rich:panelMenuItem label="Item 2"></rich:panelMenuItem>
</rich:panelMenuGroup>
<rich:panelMenuGroup label="Group 1_1_2">
- <rich:panelMenuItem value="Item 1"></rich:panelMenuItem>
- <rich:panelMenuItem value="Item 2"></rich:panelMenuItem>
- <rich:panelMenuItem value="Item 3"></rich:panelMenuItem>
- <rich:panelMenuItem value="Item 4"></rich:panelMenuItem>
+ <rich:panelMenuItem label="Item 1"></rich:panelMenuItem>
+ <rich:panelMenuItem label="Item 2"></rich:panelMenuItem>
+ <rich:panelMenuItem label="Item 3"></rich:panelMenuItem>
+ <rich:panelMenuItem label="Item 4"></rich:panelMenuItem>
</rich:panelMenuGroup>
</rich:panelMenuGroup>
<rich:panelMenuGroup label="Group 1_2 (disabled, action)" disabled="true" onmousedown="alert('Disabled');">
- <rich:panelMenuItem value="Item 1_2_1"></rich:panelMenuItem>
+ <rich:panelMenuItem label="Item 1_2_1"></rich:panelMenuItem>
</rich:panelMenuGroup>
<rich:panelMenuGroup label="Group 1_3">
- <rich:panelMenuItem value="Item 1_3_1"></rich:panelMenuItem>
- <rich:panelMenuItem value="Item 1_3_1"></rich:panelMenuItem>
+ <rich:panelMenuItem label="Item 1_3_1"></rich:panelMenuItem>
+ <rich:panelMenuItem label="Item 1_3_1"></rich:panelMenuItem>
<rich:panelMenuGroup label="Group disabled" disabled="true">
</rich:panelMenuGroup>
@@ -88,20 +88,20 @@
</rich:panelMenuGroup>
- <rich:panelMenuGroup label="Group 2 (mode 2)" mode="#{panelMenu.mode2}">
- <rich:panelMenuItem value="Item 2_1"></rich:panelMenuItem>
+ <rich:panelMenuGroup label="Group 2">
+ <rich:panelMenuItem label="Item 2_1"></rich:panelMenuItem>
- <rich:panelMenuGroup label="Group 2_2 (mode 2)" mode="#{panelMenu.mode2}">
- <rich:panelMenuItem value="Item 1"></rich:panelMenuItem>
- <rich:panelMenuItem value="Item 2"></rich:panelMenuItem>
+ <rich:panelMenuGroup label="Group 2_2">
+ <rich:panelMenuItem label="Item 1"></rich:panelMenuItem>
+ <rich:panelMenuItem label="Item 2"></rich:panelMenuItem>
</rich:panelMenuGroup>
- <rich:panelMenuItem value="Item 1"></rich:panelMenuItem>
- <rich:panelMenuItem value="Item 2"></rich:panelMenuItem>
+ <rich:panelMenuItem label="Item 1"></rich:panelMenuItem>
+ <rich:panelMenuItem label="Item 2"></rich:panelMenuItem>
</rich:panelMenuGroup>
- <rich:panelMenuGroup label="Group 3 (mode 2)" mode="#{panelMenu.mode2}">
- <rich:panelMenuItem value="Item 3_1">
+ <rich:panelMenuGroup label="Group 3">
+ <rich:panelMenuItem label="Item 3_1">
<f:verbatim>
<br />
text1 <br />
@@ -109,10 +109,10 @@
text3
</f:verbatim>
</rich:panelMenuItem>
- <rich:panelMenuItem value="Item 3_2">
+ <rich:panelMenuItem label="Item 3_2">
<h:graphicImage value="/pics/benq.jpg" width="150px" height="100px"></h:graphicImage>
</rich:panelMenuItem>
- <rich:panelMenuItem value="Item 3_3"></rich:panelMenuItem>
+ <rich:panelMenuItem label="Item 3_3"></rich:panelMenuItem>
</rich:panelMenuGroup>
</rich:panelMenu>
@@ -133,49 +133,49 @@
<rich:panelMenuGroup label="Group 1 (tabIdex, my Image)" tabindex="#{panelMenu.tabIndex}" align="#{panelMenu.align}">
<rich:panelMenuGroup label="Group 1_1 (tabIndex)" tabindex="#{panelMenu.tabIndex}">
<rich:panelMenuGroup label="Group 1_1_1 (tabIndex)" tabindex="#{panelMenu.tabIndex}">
- <rich:panelMenuItem value="Item 1"></rich:panelMenuItem>
- <rich:panelMenuItem value="Item 2"></rich:panelMenuItem>
+ <rich:panelMenuItem label="Item 1"></rich:panelMenuItem>
+ <rich:panelMenuItem label="Item 2"></rich:panelMenuItem>
</rich:panelMenuGroup>
</rich:panelMenuGroup>
<rich:panelMenuGroup label="Group 1_2 (tabIndex)" tabindex="#{panelMenu.tabIndex}">
<rich:panelMenuGroup label="Group 1_2_1 (tabIndex)" tabindex="#{panelMenu.tabIndex}">
- <rich:panelMenuItem value="Item (icon)" icon="#{icon.iconItem}"></rich:panelMenuItem>
- <rich:panelMenuItem value="Item (iconDisabled)" iconDisabled="#{icon.iconHeader}"></rich:panelMenuItem>
- <rich:panelMenuItem value="Item (icon)" disabled="true" icon="#{icon.iconItem}"></rich:panelMenuItem>
- <rich:panelMenuItem value="Item (iconDisabled)" disabled="true" iconDisabled="#{icon.iconItem}"></rich:panelMenuItem>
+ <rich:panelMenuItem label="Item (icon)" icon="#{icon.iconItem}"></rich:panelMenuItem>
+ <rich:panelMenuItem label="Item (iconDisabled)" iconDisabled="#{icon.iconHeader}"></rich:panelMenuItem>
+ <rich:panelMenuItem label="Item (icon)" disabled="true" icon="#{icon.iconItem}"></rich:panelMenuItem>
+ <rich:panelMenuItem label="Item (iconDisabled)" disabled="true" iconDisabled="#{icon.iconItem}"></rich:panelMenuItem>
</rich:panelMenuGroup>
- <rich:panelMenuItem value="Item (icon)" icon="#{icon.iconItem}"></rich:panelMenuItem>
- <rich:panelMenuItem value="Item (icon)" icon="#{icon.iconItem}"></rich:panelMenuItem>
- <rich:panelMenuItem value="Item "></rich:panelMenuItem>
+ <rich:panelMenuItem label="Item (icon)" icon="#{icon.iconItem}"></rich:panelMenuItem>
+ <rich:panelMenuItem label="Item (icon)" icon="#{icon.iconItem}"></rich:panelMenuItem>
+ <rich:panelMenuItem label="Item "></rich:panelMenuItem>
</rich:panelMenuGroup>
<rich:panelMenuGroup label="Group 1_3" align="#{panelMenu.align}" iconCollapsed="#{icon.iconCollapse}" iconExpanded="#{icon.iconExpand}"
iconDisabled="#{icon.disabled}">
- <rich:panelMenuItem value="Item 1"></rich:panelMenuItem>
- <rich:panelMenuItem value="Item 2"></rich:panelMenuItem>
- <rich:panelMenuItem value="Item 3"></rich:panelMenuItem>
+ <rich:panelMenuItem label="Item 1"></rich:panelMenuItem>
+ <rich:panelMenuItem label="Item 2"></rich:panelMenuItem>
+ <rich:panelMenuItem label="Item 3"></rich:panelMenuItem>
</rich:panelMenuGroup>
<!-- triangleUp triangle triangleDown disc chevron chevronUp chevronDown grid -->
- <rich:panelMenuItem value="Item (disc)" icon="disc"></rich:panelMenuItem>
- <rich:panelMenuItem value="Item (grid)" icon="grid"></rich:panelMenuItem>
+ <rich:panelMenuItem label="Item (disc)" icon="disc"></rich:panelMenuItem>
+ <rich:panelMenuItem label="Item (grid)" icon="grid"></rich:panelMenuItem>
<rich:panelMenuGroup label="Group" iconCollapsed="triangleDown" iconExpanded="triangleUp" iconDisabled="triangle">
<rich:panelMenuGroup label="Group" iconCollapsed="chevronDown" iconExpanded="chevronUp" iconDisabled="chevron">
- <rich:panelMenuItem value="Item (disc)" icon="disc"></rich:panelMenuItem>
- <rich:panelMenuItem value="Item (grid)" iconDisabled="grid"></rich:panelMenuItem>
- <rich:panelMenuItem value="Item (grid)" icon="grid"></rich:panelMenuItem>
- <rich:panelMenuItem value="Item (disc)" iconDisabled="disc"></rich:panelMenuItem>
+ <rich:panelMenuItem label="Item (disc)" icon="disc"></rich:panelMenuItem>
+ <rich:panelMenuItem label="Item (grid)" iconDisabled="grid"></rich:panelMenuItem>
+ <rich:panelMenuItem label="Item (grid)" icon="grid"></rich:panelMenuItem>
+ <rich:panelMenuItem label="Item (disc)" iconDisabled="disc"></rich:panelMenuItem>
</rich:panelMenuGroup>
- <rich:panelMenuItem value="Item (icon)" icon="#{icon.iconItem}"></rich:panelMenuItem>
- <rich:panelMenuItem value="Item (icon)" icon="#{icon.iconItem}"></rich:panelMenuItem>
- <rich:panelMenuItem value="Item "></rich:panelMenuItem>
+ <rich:panelMenuItem label="Item (icon)" icon="#{icon.iconItem}"></rich:panelMenuItem>
+ <rich:panelMenuItem label="Item (icon)" icon="#{icon.iconItem}"></rich:panelMenuItem>
+ <rich:panelMenuItem label="Item "></rich:panelMenuItem>
</rich:panelMenuGroup>
<rich:panelMenuGroup label="Group 1_3" iconCollapsed="chevronDown" iconExpanded="chevronUp" iconDisabled="chevron">
- <rich:panelMenuItem value="Item 1"></rich:panelMenuItem>
- <rich:panelMenuItem value="Item 2"></rich:panelMenuItem>
- <rich:panelMenuItem value="Item 3"></rich:panelMenuItem>
+ <rich:panelMenuItem label="Item 1"></rich:panelMenuItem>
+ <rich:panelMenuItem label="Item 2"></rich:panelMenuItem>
+ <rich:panelMenuItem label="Item 3"></rich:panelMenuItem>
</rich:panelMenuGroup>
</rich:panelMenuGroup>
</rich:panelMenu>
@@ -209,14 +209,6 @@
<a4j:support event="onclick" reRender="panelMenuID,Mode2ID"></a4j:support>
</h:selectOneRadio>
- <h:outputText value="Mode 2"></h:outputText>
- <h:selectOneRadio value="#{panelMenu.mode2}" id="Mode2ID" onchange="submit();">
- <f:selectItem itemLabel="none" itemValue="none" />
- <f:selectItem itemLabel="ajax" itemValue="ajax" />
- <f:selectItem itemLabel="server" itemValue="server" />
- <a4j:support event="onclick" reRender="panelMenuID,Mode1ID"></a4j:support>
- </h:selectOneRadio>
-
<h:outputText value="Expand mode"></h:outputText>
<h:selectBooleanCheckbox value="#{panelMenu.expandMode}"></h:selectBooleanCheckbox>
More information about the richfaces-svn-commits
mailing list