Author: dolander
Date: Mon Aug 2 19:05:33 2004
New Revision: 35610
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/tree/Tree.java
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeItem.java
Log:
Cleanup of the Hidden tag. Remove the duplicate internal tagId which is found
in the state variable
Remove the RootNode property from the TLD. This is basically a duplicate of
dataSource
Fixup a couple of documentation issues in the tree.
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
Mon Aug 2 19:05:33 2004
@@ -72,7 +72,7 @@
private InputHiddenTag.State _state = new InputHiddenTag.State();
private String _value; // The value of the Hidden field.
- private String _tagId;
+ //private String _tagId;
private Object _dataInput;
/**
@@ -116,10 +116,10 @@
* Return the ID of the hidden.
* @return the ID.
*/
- public String getTagId()
- {
- return _tagId;
- }
+ //public String getTagId()
+ //{
+ // return _tagId;
+ //}
/**
* Set the ID of the hidden.
@@ -174,12 +174,12 @@
* @netui:attribute required="false" rtexprvalue="true"
* @netui.tldx:attribute category="general"
*/
- public void setTagId(String tagId)
- throws JspException
- {
- // @todo: this is in the base class, should we remove it?
- _tagId = tagId;
- }
+ //public void setTagId(String tagId)
+ // throws JspException
+ //{
+ // // @todo: this is in the base class, should we remove it?
+ // _tagId = tagId;
+ //}
/**
* Set the data input. This value will override the <code>
@@ -274,8 +274,7 @@
// we assume that tagId will over have override id if both
// are defined.
- if (_tagId != null) {
- _state.id = _tagId;
+ if (_state.id != null) {
idScript = renderTagId(_state, null, true, false);
}
@@ -308,7 +307,7 @@
_state.clear();
_value = null;
- _tagId = null;
+ //_tagId = null;
_dataInput = null;
}
Modified:
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/Tree.java
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/Tree.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/Tree.java
Mon Aug 2 19:05:33 2004
@@ -416,14 +416,6 @@
/**
* Sets the root <code>TreeElement</code> of this tree.
* @param rootNode - the root treeNode
- * @jsptagref.attributedescription
- * Sets the root [EMAIL PROTECTED] TreeElement} of this tree.
- *
- * @jsptagref.databindable false
- *
- * @jsptagref.attributesyntaxvalue <i>string_rootNode</i>
- *
- * @netui:attribute required="false"
*/
public void setRootNode(TreeElement rootNode)
{
Modified:
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeItem.java
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeItem.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeItem.java
Mon Aug 2 19:05:33 2004
@@ -65,7 +65,7 @@
* @see org.apache.beehive.netui.tags.tree.TreeElement
*
* @netui:tag name="treeItem" description="Instantiates a TreeElement object
that will get added to the parent tag (either a Tree or another TreeItem)."
- * @netui.tldx:tag requiredparent="richTree treeItem"
+ * @netui.tldx:tag requiredparent="tree treeItem"
* requiredchild="treeItem treeLabel treeContent treePropertyOverride"
* renderer="workshop.netui.jspdesigner.tldx.TreeItemRenderer"
* whitespace="indent"
