Author: steveh
Date: Wed Feb 2 15:18:43 2005
New Revision: 151080
URL: http://svn.apache.org/viewcvs?view=rev&rev=151080
Log:
Fixes for:
BEEHIVE-130: Inconsistancy in <netui:span> javadoc
BEEHIVE-131: A minior error in <netui:scriptContainer> javadoc description
BEEHIVE-132: <netui:node> still mentioned in <netui:treeItem> and <net:tree>
javadoc examples
Modified:
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Span.java
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/javascript/ScriptContainer.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
Modified:
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Span.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Span.java?view=diff&r1=151079&r2=151080
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Span.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Span.java
Wed Feb 2 15:18:43 2005
@@ -36,17 +36,17 @@
* the value <nobr><code>"&nbsp;"</code></nobr>.</p>
* @jsptagref.tagdescription <p>Generates styled text based on a String
literal or data binding expression.
*
- * <p>The <netui:label> tag is similar to the [EMAIL PROTECTED] Content}
tag,
+ * <p>The <netui:span> tag is similar to the [EMAIL PROTECTED] Content} tag,
* except with respect to the way that it treats
* characters sensitive to HTML browsers.
- * The <netui:label> tag filters the input string for browser-sensitive
characters
+ * The <netui:span> tag filters the input string for browser-sensitive
characters
* and replaces these characters
* with the corresponding entity strings. For example, if you pass the
- * string '&amp;' to a <netui:label> tag, the string '&amp;amp;'
will be written to
+ * string '&amp;' to a <netui:span> tag, the string '&amp;amp;'
will be written to
* the HTML source file, and the following will be displayed
* in the browser: '&amp;'.
*
- * <p>The following table shows how the <netui:label> and
<netui:content> tags treat HTML-sensitive characters.
+ * <p>The following table shows how the <netui:span> and <netui:content>
tags treat HTML-sensitive characters.
* <blockquote>
* <table border="1">
* <tr>
@@ -60,7 +60,7 @@
* <td>&</td>
* </tr>
* <tr>
- * <td><netui:label value="&amp;"/></td>
+ * <td><netui:span value="&amp;"/></td>
* <td>&amp;amp;</td>
* <td>&amp;</td>
* </tr>
@@ -69,18 +69,18 @@
*
* <p><b>Note:</b> escaping is <i>not</i> applied to browser-sensitive
characters in
* the <code>defaultValue</code> attribute.
- * @example In this first sample, a <netui:label> tag displays the Form
Bean's firstName property.
- * The <netui:label> tag will resolve this data binding expression, and
display its value.
+ * @example In this first sample, a <netui:span> tag displays the Form
Bean's firstName property.
+ * The <netui:span> tag will resolve this data binding expression, and
display its value.
*
- * <pre> <netui:label value="{actionForm.firstName}" /></pre>
+ * <pre> <netui:span value="${actionForm.firstName}" /></pre>
*
* <p>In this next sample, the <code>value</code> attribute will resolve to
null.
* This causes the <code>defaultValue</code> to be displayed. The user will
see ' '.</p>
- * <pre> <netui:label value="{pageFlow.somethingNull}"
defaultValue="&nbsp;"/></pre>
+ * <pre> <netui:span value="${pageFlow.somethingNull}"
defaultValue="&nbsp;"/></pre>
*
* <p>In this next sample, the HTML will contain the text "&amp;nbsp;" and
the user will
* see '&nbsp;'</p>
- * <pre> <netui:label value="{pageFlow.somethingNull}"
defaultValue="&amp;nbsp;"/></pre>
+ * <pre> <netui:span value="${pageFlow.somethingNull}"
defaultValue="&amp;nbsp;"/></pre>
* @netui:tag name="span" description="Places formatted or dynamically
generated text on the page inside an HTML span."
* @netui.tldx:tag requiredchild="formatDate formatNumber formatString
attribute"
* renderer="workshop.netui.jspdesigner.tldx.LabelRenderer"
Modified:
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/javascript/ScriptContainer.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/javascript/ScriptContainer.java?view=diff&r1=151079&r2=151080
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/javascript/ScriptContainer.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/javascript/ScriptContainer.java
Wed Feb 2 15:18:43 2005
@@ -41,7 +41,7 @@
* <html> ... </html> tags in the rendered portlet JSP can result in
display
* problems for some browsers. However, omitting the <html> tag (and the
* container it provides) can result in cluttered code, especially where
Javascript
- * appears in the file. To solve this issue, WebLogic Workshop provides the
+ * appears in the file. To solve this issue, Beehive provides the
* <netui:scriptContainer> tag.
* @jsptagref.tagdescription Acts as a container that will bundle up
JavaScript created by other <netui...> tags,
* and outputs it within a single <script> tag. This is especially useful
for
@@ -51,7 +51,7 @@
* <html> ... </html> tags in the rendered Portlet JSP can result in
display
* problems for some browsers. On the other hand, omitting the <html> tag
(and the
* container it provides) can result in cluttered code, especially where
JavaScript
- * appears in the file. To solve this issue, WebLogic Workshop provides the
+ * appears in the file. To solve this issue, Beehive provides the
* <netui:scriptContainer> tag.
*
* <p>The <netui:scriptContainer> ... </netui:scriptContainer> tag set
should
Modified:
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/Tree.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/Tree.java?view=diff&r1=151079&r2=151080
==============================================================================
---
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
Wed Feb 2 15:18:43 2005
@@ -45,7 +45,7 @@
/**
* Netui tag that renders a tree control represented by a set of
* <code>TreeElement</code> objects.
- * @jsptagref.tagdescription Renders a navigable tree of [EMAIL PROTECTED]
TreeItem}/[EMAIL PROTECTED] TreeLabel}
+ * @jsptagref.tagdescription Renders a navigable tree of [EMAIL PROTECTED]
TreeElement}
* tags.
*
* <p>This tag can automatically handle display icons for the tree nodes
Modified:
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeItem.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeItem.java?view=diff&r1=151079&r2=151080
==============================================================================
---
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
Wed Feb 2 15:18:43 2005
@@ -33,13 +33,13 @@
/**
* Instantiates a TreeElement object that will get added to the parent tag
(either a Tree or
* another TreeItem).
- * @example In this first sample, a Node contained by a parent Node or Tree
will display with
- * the label of "Login" and when clicked, will navigate to the Login pageflow.
- * <pre><netui:node label="Login" action="/netui/login/Login.jpf" /></pre>
- * <p>In this next sample, a Node contained by a parent Node or Tree will
display with
+ * @example In this first sample, a TreeItem contained by a parent TreeItem or
Tree will display with
+ * the label of "Login" and, when clicked, will navigate to the Login pageflow.
+ * <pre><netui:treeItem label="Login" action="/netui/login/Login.jpf"
/></pre>
+ * <p>In this next sample, a TreeItem contained by a parent TreeItem or Tree
will display with
* the label of "Human Resources" and icon "folder16.gif" and most likely will
have
- * child Node tags because it does not have an action and starts expanded.</p>
- * <pre><netui:node label="Human Resources" icon="folder16.gif"
expanded="true"></pre>
+ * child TreeItem tags because it does not have an action and starts
expanded.</p>
+ * <pre><netui:treeItem label="Human Resources" icon="folder16.gif"
expanded="true"></pre>
* @netui:tag name="treeItem" body-content="scriptless"
description="Instantiates a TreeElement object that will get added to the
parent tag (either a Tree or another TreeItem)."
* @netui.tldx:tag requiredparent="tree treeItem"
* requiredchild="treeItem treeLabel treeContent treePropertyOverride"
