Author: dolander
Date: Tue Mar 8 09:01:06 2005
New Revision: 156545
URL: http://svn.apache.org/viewcvs?view=rev&rev=156545
Log:
Start cleaning up TODOs in the code.
Removed the deprecated value attribute on the Error tag
Modified:
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/CheckBox.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/Error.java
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/HtmlBaseTag.java
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Image.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/RadioButtonOption.java
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/coretags/error/nullbinding/index.jsp
Modified:
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/CheckBox.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/CheckBox.java?view=diff&r1=156544&r2=156545
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/CheckBox.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/CheckBox.java
Tue Mar 8 09:01:06 2005
@@ -264,9 +264,8 @@
String hiddenParamName = _state.name + OLDVALUE_SUFFIX;
ServletRequest req = pageContext.getRequest();
- // @todo: should we not support the "on" version of this?
if (val instanceof String) {
- if (val != null && (val.equals("on") || val.equals("true")))
+ if (val != null && Boolean.valueOf(val.toString()).booleanValue())
_state.checked = true;
else
_state.checked = false;
Modified:
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/CheckBoxOption.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/CheckBoxOption.java?view=diff&r1=156544&r2=156545
==============================================================================
---
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
Tue Mar 8 09:01:06 2005
@@ -167,11 +167,6 @@
public void setDefaultValue(boolean defaultValue)
throws JspException
{
- //if (defaultValue == null) {
- // String s = Bundle.getString("Tags_AttrValueRequired", new
Object[]{"defaultValue"});
- // registerTagError(s, null);
- // return;
- //}
_defaultValue = Boolean.valueOf(defaultValue);
}
@@ -252,7 +247,6 @@
// Disabled on the option itself will override the parent setting this.
// We check to see if the option actuall had disabled set on it, if
not then look
// at the parent.
-
if (parent.isMatched(_state.value, _defaultValue))
_state.checked = true;
_state.disabled = isDisabled();
Modified:
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Error.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Error.java?view=diff&r1=156544&r2=156545
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Error.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Error.java
Tue Mar 8 09:01:06 2005
@@ -74,35 +74,17 @@
/**
* Set the key under which the error was stored (often the name of the
form bean property associated with the error).
- * @param value - the key under which the error was stored
- * @jsptagref.attributedescription The key under which the error was
stored (often the name of the form bean property associated with the error)
- * @jsptagref.databindable Read Only
- * @jsptagref.attributesyntaxvalue <i>string_or_expression_value</i>
- * @netui:attribute required="false" rtexprvalue="true"
- * description="The key under which the error was stored (often the name
of the form bean property associated with the error)"
- * @netui.tldx:attribute
- * @deprecated Use [EMAIL PROTECTED] #setKey} instead.
- */
- public void setValue(String value)
- throws JspException
- {
- setKey(value);
- }
-
- /**
- * Set the key under which the error was stored (often the name of the
form bean property associated with the error).
* @param key - the key under which the error was stored
* @jsptagref.attributedescription The key under which the error was
stored (often the name of the form bean property associated with the error)
* @jsptagref.databindable Read Only
* @jsptagref.attributesyntaxvalue <i>string_or_expression_key</i>
- * @netui:attribute required="false" rtexprvalue="true"
+ * @netui:attribute required="true" rtexprvalue="true"
* description="The key under which the error was stored (often the name
of the form bean property associated with the error)"
* @netui.tldx:attribute
*/
public void setKey(String key)
throws JspException
{
- // TODO: make this netui:attribute required="true" when the deprecated
setValue() is removed
_key = setRequiredValueAttribute(key, "key");
}
Modified:
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/HtmlBaseTag.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/HtmlBaseTag.java?view=diff&r1=156544&r2=156545
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/HtmlBaseTag.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/HtmlBaseTag.java
Tue Mar 8 09:01:06 2005
@@ -38,8 +38,6 @@
* [OptionsDataSource] Select
* [GroupDataSource] CheckBoxGroup, RadioButtonGroup
*/
-// @todo: CheckBoxOption, RadioButtonOption don't have a tagId attribute
-
abstract public class HtmlBaseTag extends AbstractClassicTag
implements HtmlConstants, IAttributeConsumer, IHtmlAttrs
{
Modified:
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Image.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Image.java?view=diff&r1=156544&r2=156545
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Image.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Image.java
Tue Mar 8 09:01:06 2005
@@ -323,8 +323,6 @@
// we assume that tagId will over have override id if both
// are defined.
- // @todo: should we move the tagId stuff to the base class?
- //String tagId = getTagId();
if (_state.id != null) {
scriptId = renderNameAndId((HttpServletRequest) req, _state, null);
}
Modified:
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/ImageAnchor.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/ImageAnchor.java?view=diff&r1=156544&r2=156545
==============================================================================
---
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
Tue Mar 8 09:01:06 2005
@@ -113,8 +113,6 @@
extends Anchor
implements IHtmlAccessable
{
- //@todo: verify that tagId is handled correclty
-
private ImageTag.State _imgState = new ImageTag.State();
private String _rolloverImage = null; // The roll-over image of the
ImageAnchor.
Modified:
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/RadioButtonOption.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/RadioButtonOption.java?view=diff&r1=156544&r2=156545
==============================================================================
---
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
Tue Mar 8 09:01:06 2005
@@ -219,7 +219,7 @@
}
}
- // @todo: why is this a Boolean?
+ // set the checked and disabled states
_state.checked = new Boolean(parent.isMatched(_state.value,
null)).booleanValue();
_state.disabled = isDisabled();
if (!_state.disabled)
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/coretags/error/nullbinding/index.jsp
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/coretags/error/nullbinding/index.jsp?view=diff&r1=156544&r2=156545
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/coretags/error/nullbinding/index.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/coretags/error/nullbinding/index.jsp
Tue Mar 8 09:01:06 2005
@@ -17,7 +17,7 @@
</p>
<ul>
<li><netui:error key="val" bundleName="${pageFlow.nullValue}" /> -- error
- bundle</li>
- <li><netui:error value="${pageFlow.nullValue}" /> -- error - value</li>
+ <li><netui:error key="${pageFlow.nullValue}" /> -- error - value</li>
<li><netui:error key="val" locale="${pageFlow.nullValue}" /> -- error -
locale</li>
<li><netui:errors bundle="${pageFlow.nullValue}" /> -- errors - bundle</li>
<li><netui:errors locale="${pageFlow.nullValue}" /> -- errors - locale</li>
