You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beehive.apache.org by do...@apache.org on 2004/07/17 21:32:39 UTC
svn commit: rev 23009 - in incubator/beehive/trunk/netui: src/tags-html/org/apache/beehive/netui/tags/html src/util/org/apache/beehive/netui/util/tags test/webapps/drt/coreWeb/tags/accesskeyGroup
Author: dolander
Date: Sat Jul 17 12:32:39 2004
New Revision: 23009
Modified:
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Attribute.java
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/CheckBoxGroup.java
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/CheckBoxOption.java
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/FormLabel.java
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/FormatDate.java
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Hidden.java
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/HtmlFocusBaseTag.java
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/HtmlGroupBaseTag.java
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/HtmlOptionsDataSourceTag.java
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/ImageAnchor.java
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/ImageButton.java
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/ParameterMap.java
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/RadioButtonGroup.java
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/RadioButtonOption.java
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Select.java
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/SelectOption.java
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/TextArea.java
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/TextBox.java
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/tags/GroupOption.java
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/accesskeyGroup/Controller.jpf
Log:
Additional cleanup based to support the transition to JSP 2.0 EL.
Removed the language='netuiexpression' from all attributes that no longer support NetUI EL
Verify all attributes other than dataSource allow runtime expressions and that dataSource does not
Cleaned up the attribute types of tabindex and accessKey so they are consistent accross tags
Review: Eddie
Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Attribute.java
==============================================================================
--- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Attribute.java (original)
+++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Attribute.java Sat Jul 17 12:32:39 2004
@@ -48,7 +48,7 @@
* Sets the <code>name</code> attribute.
* @param name - the value of the <code>name</code> attribute.
* @netui:attribute required="true" rtexprvalue="true"
- * @netui.tldx:attribute language="netuiexpression"
+ * @netui.tldx:attribute
*/
public void setName(String name)
{
@@ -59,7 +59,7 @@
* Sets the <code>value</code> attribute.
* @param value - the value of the <code>name</code> attribute.
* @netui:attribute required="true" rtexprvalue="true"
- * @netui.tldx:attribute language="netuiexpression"
+ * @netui.tldx:attribute
*/
public void setValue(String value)
{
@@ -70,7 +70,7 @@
* Sets the <code>facet</code> attribute.
* @param facet - the value of the <code>facet</code> attribute.
* @netui:attribute rtexprvalue="true"
- * @netui.tldx:attribute language="netuiexpression"
+ * @netui.tldx:attribute
*/
public void setFacet(String facet)
{
Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/CheckBoxGroup.java
==============================================================================
--- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/CheckBoxGroup.java (original)
+++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/CheckBoxGroup.java Sat Jul 17 12:32:39 2004
@@ -413,7 +413,7 @@
String idScript = null;
String altText = null;
- String accessKey = null;
+ char accessKey = 0x00;
// Render a tag representing the end of our current form
Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/CheckBoxOption.java
==============================================================================
--- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/CheckBoxOption.java (original)
+++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/CheckBoxOption.java Sat Jul 17 12:32:39 2004
@@ -141,7 +141,7 @@
* Set the value of this CheckBoxOption.
* @param value - the CheckBoxOption value
* @netui:attribute required="false" rtexprvalue="true"
- * @netui.tldx:attribute language="netuiexpression"
+ * @netui.tldx:attribute
*/
public void setValue(Object value)
throws JspException
Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/FormLabel.java
==============================================================================
--- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/FormLabel.java (original)
+++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/FormLabel.java Sat Jul 17 12:32:39 2004
@@ -62,21 +62,13 @@
/**
* Set the <code>for</code> attribute.
* @param forAttr - the for attribute.
- * @netui:attribute required="false"
+ * @netui:attribute required="false" rtexprvalue="true"
* @netui.tldx:attribute category="general"
*/
public void setFor(String forAttr)
{
// @todo: this needs to be have the name qualitification done.
_state.forAttr = forAttr;
- }
-
- /**
- * @return the value of the for attribute.
- */
- public String getFor()
- {
- return _state.forAttr;
}
/**
Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/FormatDate.java
==============================================================================
--- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/FormatDate.java (original)
+++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/FormatDate.java Sat Jul 17 12:32:39 2004
@@ -103,7 +103,7 @@
* will be used before the common formats.
* @param pattern the pattern representing the string input
* @netui:attribute required="false" rtexprvalue="true"
- * @netui.tldx:attribute language="netuiexpression"
+ * @netui.tldx:attribute
*/
public void setStringInputPattern(String pattern)
{
Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Hidden.java
==============================================================================
--- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Hidden.java (original)
+++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Hidden.java Sat Jul 17 12:32:39 2004
@@ -128,7 +128,7 @@
* @param dataInput the value of the input to the page. This value
* may contain an expression.
* @netui:attribute required="false" rtexprvalue="true" type="java.lang.Object"
- * @netui.tldx:attribute language="netuiexpression"
+ * @netui.tldx:attribute
*/
public void setDataInput(Object dataInput)
{
@@ -251,21 +251,11 @@
/**
* Sets the tabIndex of the rendered html tag.
* @param tabindex - the tab index.
- * @netui:attribute required="false"
+ * @netui:attribute required="false" rtexprvalue="true" type="int"
* @netui.tldx:attribute category="misc"
*/
- public void setTabindex(String tabindex)
+ public void setTabindex(int tabindex)
{
- _state.registerAttribute(AbstractHtmlState.ATTR_GENERAL, HtmlConstants.TABINDEX, tabindex);
+ _state.registerAttribute(AbstractHtmlState.ATTR_GENERAL, HtmlConstants.TABINDEX, Integer.toString(tabindex));
}
-
- /**
- * Gets the tabIndex of the rendered html tag.
- * @return the tabindex.
- */
- //public String getTabindex()
- //{
- // return _state.getAttribute(AbstractHtmlState.ATTR_GENERAL, HtmlConstants.TABINDEX);
- //}
-
}
Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/HtmlFocusBaseTag.java
==============================================================================
--- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/HtmlFocusBaseTag.java (original)
+++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/HtmlFocusBaseTag.java Sat Jul 17 12:32:39 2004
@@ -35,7 +35,7 @@
* or with an expression.
* @param disabled - true or false or an expression
* @netui:attribute required="false" rtexprvalue="true" type="boolean"
- * @netui.tldx:attribute language="netuiexpression"
+ * @netui.tldx:attribute
*/
public void setDisabled(boolean disabled)
{
Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/HtmlGroupBaseTag.java
==============================================================================
--- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/HtmlGroupBaseTag.java (original)
+++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/HtmlGroupBaseTag.java Sat Jul 17 12:32:39 2004
@@ -179,7 +179,7 @@
* or with an expression.
* @param disabled - true or false or an expression
* @netui:attribute required="false" rtexprvalue="true" type="boolean"
- * @netui.tldx:attribute language="netuiexpression"
+ * @netui.tldx:attribute
*/
public void setDisabled(boolean disabled)
{
@@ -296,7 +296,7 @@
/**
* Sets the tag's data source (can be an expression).
* @param dataSource the data source
- * @netui:attribute required="true" rtexprvalue="true"
+ * @netui:attribute required="true"
* @netui.tldx:attribute language="netuiexpression"
*/
public void setDataSource(String dataSource)
@@ -416,7 +416,7 @@
* Sets the default value (can be an expression).
* @param defaultValue - the default value
* @netui:attribute required="false" rtexprvalue="true"
- * @netui.tldx:attribute language="netuiexpression"
+ * @netui.tldx:attribute
*/
public void setDefaultValue(Object defaultValue)
throws JspException
@@ -487,7 +487,7 @@
* This will create a new option in the HTML.
*/
protected void addOption(StringBuilder buffer, String type, String optionValue,
- String optionDisplay, int idx, String altText, String accessKey, boolean disabled)
+ String optionDisplay, int idx, String altText, char accessKey, boolean disabled)
throws JspException
{
ServletRequest req = pageContext.getRequest();
@@ -514,7 +514,8 @@
}
_inputState.disabled = isDisabled();
_inputState.registerAttribute(AbstractHtmlState.ATTR_GENERAL, ALT, altText);
- _inputState.registerAttribute(AbstractHtmlState.ATTR_GENERAL, ACCESSKEY, accessKey);
+ if (accessKey != 0x00)
+ _inputState.registerAttribute(AbstractHtmlState.ATTR_GENERAL, ACCESSKEY, Character.toString(accessKey));
// if there are attributes defined push them to the options.
if (_attrs != null && _attrs.size() > 0) {
Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/HtmlOptionsDataSourceTag.java
==============================================================================
--- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/HtmlOptionsDataSourceTag.java (original)
+++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/HtmlOptionsDataSourceTag.java Sat Jul 17 12:32:39 2004
@@ -35,7 +35,7 @@
* Sets the options datasource value (an expression).
* @param optionsDataSource - the options datasource
* @netui:attribute required="false" rtexprvalue="true" type="java.lang.Object"
- * @netui.tldx:attribute language="netuiexpression"
+ * @netui.tldx:attribute
*/
public void setOptionsDataSource(Object optionsDataSource)
throws JspException
Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/ImageAnchor.java
==============================================================================
--- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/ImageAnchor.java (original)
+++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/ImageAnchor.java Sat Jul 17 12:32:39 2004
@@ -218,7 +218,7 @@
* Sets the property to specify the longdesc.
* @param longdesc - the longdesc.
* @netui:attribute required="false" rtexprvalue="true"
- * @netui.tldx:attribute language="netuiexpression" category="misc"
+ * @netui.tldx:attribute category="misc"
*/
public void setLongdesc(String longdesc)
{
@@ -253,7 +253,7 @@
* Sets the image height.
* @param height - the height.
* @netui:attribute required="false" rtexprvalue="true"
- * @netui.tldx:attribute language="netuiexpression"
+ * @netui.tldx:attribute
*/
public void setHeight(String height)
{
@@ -264,7 +264,7 @@
* Sets the the horizontal spacing around the image.
* @param hspace - the horizontal spacing.
* @netui:attribute required="false" rtexprvalue="true"
- * @netui.tldx:attribute language="netuiexpression" category="misc"
+ * @netui.tldx:attribute category="misc"
*/
public void setHspace(String hspace)
{
@@ -298,7 +298,6 @@
* @param src - the image source URI.
* @netui:attribute required="false" rtexprvalue="true"
* @netui.tldx:attribute propertyclass="workshop.jspdesigner.properties.URIPropertyClass"
- * language="netuiexpression"
* reftype="img-url"
*/
public void setSrc(String src)
@@ -322,7 +321,7 @@
* Sets the vertical spacing around the image.
* @param vspace - the vertical spacing.
* @netui:attribute required="false" rtexprvalue="true"
- * @netui.tldx:attribute language="netuiexpression"
+ * @netui.tldx:attribute
*/
public void setVspace(String vspace)
{
@@ -361,7 +360,7 @@
* Sets the image width.
* @param width - the image width.
* @netui:attribute required="false" rtexprvalue="true"
- * @netui.tldx:attribute language="netuiexpression"
+ * @netui.tldx:attribute
*/
public void setWidth(String width)
{
Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/ImageButton.java
==============================================================================
--- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/ImageButton.java (original)
+++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/ImageButton.java Sat Jul 17 12:32:39 2004
@@ -167,12 +167,12 @@
/**
* Sets the tabIndex of the rendered html tag.
* @param tabindex - the tab index.
- * @netui:attribute required="false" rtexprvalue="true"
+ * @netui:attribute required="false" rtexprvalue="true" type="int"
* @netui.tldx:attribute category="misc"
*/
- public void setTabindex(String tabindex)
+ public void setTabindex(int tabindex)
{
- _state.registerAttribute(AbstractHtmlState.ATTR_GENERAL, TABINDEX, tabindex);
+ _state.registerAttribute(AbstractHtmlState.ATTR_GENERAL, TABINDEX, Integer.toString(tabindex));
}
/**
@@ -201,7 +201,7 @@
* Sets the property to specify the alt text of the image.
* @param alt - the image alt text.
* @netui:attribute required="false" rtexprvalue="true"
- * @netui.tldx:attribute language="netuiexpression"
+ * @netui.tldx:attribute
*/
public void setAlt(String alt)
{
@@ -223,7 +223,7 @@
* @param src - the source URI.
* @netui:attribute required="false" rtexprvalue="true"
* @netui.tldx:attribute propertyclass="workshop.jspdesigner.properties.URIPropertyClass"
- * language="netuiexpression" reftype="img-url"
+ * reftype="img-url"
*/
public void setSrc(String src)
throws JspException
@@ -235,7 +235,7 @@
* Set the value of the ImageButton.
* @param value - the value of the ImageButton.
* @netui:attribute required="false" rtexprvalue="true"
- * @netui.tldx:attribute language="netuiexpression"
+ * @netui.tldx:attribute
*/
public void setValue(String value)
{
Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/ParameterMap.java
==============================================================================
--- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/ParameterMap.java (original)
+++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/ParameterMap.java Sat Jul 17 12:32:39 2004
@@ -75,7 +75,7 @@
* Sets the map expression.
* @param map - the map expression.
* @netui:attribute required="true" rtexprvalue="true" type="java.util.Map"
- * @netui.tldx:attribute language="netuiexpression"
+ * @netui.tldx:attribute
*/
public void setMap(Map map) throws JspException
{
Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/RadioButtonGroup.java
==============================================================================
--- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/RadioButtonGroup.java (original)
+++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/RadioButtonGroup.java Sat Jul 17 12:32:39 2004
@@ -288,7 +288,7 @@
String idScript = null;
String altText = null;
- String accessKey = null;
+ char accessKey = 0x00;
// Remove the page scope attributes we created
pageContext.removeAttribute(RADIOBUTTONGROUP_KEY);
Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/RadioButtonOption.java
==============================================================================
--- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/RadioButtonOption.java (original)
+++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/RadioButtonOption.java Sat Jul 17 12:32:39 2004
@@ -136,7 +136,7 @@
* Set the value of this RadioButtonOption.
* @param value - the RadioButtonOption value
* @netui:attribute required="true" rtexprvalue="true" type="java.lang.Object"
- * @netui.tldx:attribute language="netuiexpression"
+ * @netui.tldx:attribute
*/
public void setValue(Object value)
throws JspException
Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Select.java
==============================================================================
--- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Select.java (original)
+++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Select.java Sat Jul 17 12:32:39 2004
@@ -1040,12 +1040,12 @@
* values because there are often used by browsers <code>A, C, E, F, G,
* H, V, left arrow, and right arrow</code>.
* @param accessKey - the accessKey value.
- * @netui:attribute required="false" rtexprvalue="true"
+ * @netui:attribute required="false" rtexprvalue="true" type="char"
* @netui.tldx:attribute category="misc"
*/
- public void setAccessKey(String accessKey)
+ public void setAccessKey(char accessKey)
{
- _state.registerAttribute(AbstractHtmlState.ATTR_GENERAL, ACCESSKEY, accessKey);
+ _state.registerAttribute(AbstractHtmlState.ATTR_GENERAL, ACCESSKEY, Character.toString(accessKey));
}
/**
Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/SelectOption.java
==============================================================================
--- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/SelectOption.java (original)
+++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/SelectOption.java Sat Jul 17 12:32:39 2004
@@ -171,7 +171,7 @@
* Set the value of this SelectOption.
* @param value - the SelectOption value
* @netui:attribute required="true" rtexprvalue="true"
- * @netui.tldx:attribute language="netuiexpression"
+ * @netui.tldx:attribute
*/
public void setValue(String value)
throws JspException
Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/TextArea.java
==============================================================================
--- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/TextArea.java (original)
+++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/TextArea.java Sat Jul 17 12:32:39 2004
@@ -130,7 +130,7 @@
* Sets the number of columns in the TextArea.
* @param cols - the number of columns
* @netui:attribute required="false" rtexprvalue="true" type="int"
- * @netui.tldx:attribute language="netuiexpression"
+ * @netui.tldx:attribute
*/
public void setCols(int cols)
{
@@ -151,7 +151,7 @@
* Sets the number of rows in the TextArea.
* @param rows - the number of rows
* @netui:attribute required="false" rtexprvalue="true" type="int"
- * @netui.tldx:attribute language="netuiexpression"
+ * @netui.tldx:attribute
*/
public void setRows(int rows)
{
@@ -301,11 +301,11 @@
/**
* Sets the tabIndex of the rendered html tag.
* @param tabindex - the tab index.
- * @netui:attribute required="false" rtexprvalue="true"
+ * @netui:attribute required="false" rtexprvalue="true" type="int"
* @netui.tldx:attribute category="misc"
*/
- public void setTabindex(String tabindex)
+ public void setTabindex(int tabindex)
{
- _state.registerAttribute(AbstractHtmlState.ATTR_GENERAL, TABINDEX, tabindex);
+ _state.registerAttribute(AbstractHtmlState.ATTR_GENERAL, TABINDEX, Integer.toString(tabindex));
}
}
Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/TextBox.java
==============================================================================
--- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/TextBox.java (original)
+++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/TextBox.java Sat Jul 17 12:32:39 2004
@@ -326,11 +326,11 @@
/**
* Sets the tabIndex of the rendered html tag.
* @param tabindex - the tab index.
- * @netui:attribute required="false" rtexprvalue="true"
+ * @netui:attribute required="false" rtexprvalue="true" type="int"
* @netui.tldx:attribute category="misc"
*/
- public void setTabindex(String tabindex)
+ public void setTabindex(int tabindex)
{
- _state.registerAttribute(AbstractHtmlState.ATTR_GENERAL, TABINDEX, tabindex);
+ _state.registerAttribute(AbstractHtmlState.ATTR_GENERAL, TABINDEX, Integer.toString(tabindex));
}
}
Modified: incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/tags/GroupOption.java
==============================================================================
--- incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/tags/GroupOption.java (original)
+++ incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/tags/GroupOption.java Sat Jul 17 12:32:39 2004
@@ -33,7 +33,7 @@
private String _name;
private String _value;
private String _alt;
- private String _accessKey;
+ private char _accessKey;
/**
@@ -61,7 +61,7 @@
/**
* Construct a GroupOption setting all the values.
*/
- public GroupOption(String name,String value,String alt, String accessKey)
+ public GroupOption(String name,String value,String alt, char accessKey)
{
_name = name;
_value = value;
@@ -126,7 +126,7 @@
* @param accessKey The value that will be set for the
* <code>accesskey</code> attribute.
*/
- public void setAccessKey(String accessKey) {
+ public void setAccessKey(char accessKey) {
_accessKey = accessKey;
}
@@ -134,7 +134,7 @@
* Get the accesskey of the option.
* @return The accessKey of the option.
*/
- public String getAccessKey() {
+ public char getAccessKey() {
return _accessKey;
}
}
Modified: incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/accesskeyGroup/Controller.jpf
==============================================================================
--- incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/accesskeyGroup/Controller.jpf (original)
+++ incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/accesskeyGroup/Controller.jpf Sat Jul 17 12:32:39 2004
@@ -63,17 +63,17 @@
public class Controller extends PageFlowController
{
private GroupOption[] attributes = {
- new GroupOption("fenders (1)","fenders","finders","1"),
- new GroupOption("wheels (2)","wheels","wheels","2"),
+ new GroupOption("fenders (1)","fenders","finders",'1'),
+ new GroupOption("wheels (2)","wheels","wheels",'2'),
null,
- new GroupOption("windows (3)","windows","windows","3"),
+ new GroupOption("windows (3)","windows","windows",'3'),
};
private GroupOption[] colors = {
- new GroupOption("red (a)","red","red","A"),
- new GroupOption("blue (b)","blue","blue","B"),
+ new GroupOption("red (a)","red","red",'A'),
+ new GroupOption("blue (b)","blue","blue",'B'),
null,
- new GroupOption("yellow (c)","yellow","yellow","C"),
+ new GroupOption("yellow (c)","yellow","yellow",'C'),
};
public GroupOption[] getAttributes() {