You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beehive.apache.org by ek...@apache.org on 2005/05/02 19:24:33 UTC
svn commit: r165649 [4/5] - in /incubator/beehive/trunk/netui: ant/
src/bootstrap/org/apache/beehive/netui/tools/tldx/ src/tags-databinding/
src/tags-databinding/org/apache/beehive/netui/tags/databinding/bundle/
src/tags-databinding/org/apache/beehive/netui/tags/databinding/cellrepeater/
src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/
src/tags-databinding/org/apache/beehive/netui/tags/databinding/invoke/
src/tags-databinding/org/apache/beehive/netui/tags/databinding/message/
src/tags-databinding/org/apache/beehive/netui/tags/databinding/pageinput/
src/tags-databinding/org/apache/beehive/netui/tags/databinding/repeater/
src/tags-databinding/org/apache/beehive/netui/tags/databinding/repeater/pad/
src/tags-databinding/org/apache/beehive/netui/tags/databinding/script/
src/tags-databinding/org/apache/beehive/netui/tags/databinding/xml/
src/tags-html/ src/tags-html/org/apache/beehive/netui/tags/divpanel/
src/tags-html/org/apache/beehive/netui/tags/html/
src/tags-html/org/apache/beehive/netui/tags/javascript/
src/tags-html/org/apache/beehive/netui/tags/tree/ src/tags-template/
src/tags-template/org/apache/beehive/netui/tags/template/ test/dist-test/
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?rev=165649&r1=165648&r2=165649&view=diff
==============================================================================
--- 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 Mon May 2 10:24:30 2005
@@ -59,7 +59,6 @@
* @jsptagref.attributesyntaxvalue <i>string_style</i>
* @netui:attribute required="false" rtexprvalue="true"
* description="The style."
- * @netui.tldx:attribute propertyclass="workshop.jspdesigner.properties.JspStyleProperty" category="format"
*/
public void setStyle(String style)
{
@@ -77,7 +76,6 @@
* @jsptagref.attributesyntaxvalue <i>string_style_class</i>
* @netui:attribute required="false" rtexprvalue="true"
* description="The style class."
- * @netui.tldx:attribute category="Format"
*/
public void setStyleClass(String styleClass)
{
@@ -135,7 +133,6 @@
* @jsptagref.attributesyntaxvalue <i>string_tagId</i>
* @netui:attribute required="false" rtexprvalue="true"
* description="String value. Sets the id (or name) attribute of the rendered HTML tag. "
- * @netui.tldx:attribute category="general"
*/
public void setTagId(String tagId)
throws JspException
@@ -167,7 +164,6 @@
* @jsptagref.attributesyntaxvalue <i>string_title</i>
* @netui:attribute required="false" rtexprvalue="true"
* description="The title. "
- * @netui.tldx:attribute category="misc"
*/
public void setTitle(String title)
{
@@ -184,7 +180,6 @@
* @jsptagref.attributesyntaxvalue <i>string_lang</i>
* @netui:attribute required="false" rtexprvalue="true"
* description="The lang."
- * @netui.tldx:attribute category="internationalization"
*/
public void setLang(String lang)
{
@@ -200,7 +195,6 @@
* @jsptagref.attributesyntaxvalue <i>string_dir</i>
* @netui:attribute required="false" rtexprvalue="true"
* description="The dir."
- * @netui.tldx:attribute category="internationalization"
*/
public void setDir(String dir)
{
@@ -227,7 +221,6 @@
* @jsptagref.attributesyntaxvalue <i>string_onClick</i>
* @netui:attribute required="false" rtexprvalue="true"
* description="The onClick JavaScript event."
- * @netui.tldx:attribute propertyclass="workshop.jspdesigner.properties.EventPropertyClass" category="event"
*/
public void setOnClick(String onclick)
{
@@ -243,7 +236,6 @@
* @jsptagref.attributesyntaxvalue <i>string_onDblClick</i>
* @netui:attribute required="false" rtexprvalue="true"
* description="The onDblClick JavaScript event."
- * @netui.tldx:attribute propertyclass="workshop.jspdesigner.properties.EventPropertyClass" category="event"
*/
public void setOnDblClick(String ondblclick)
{
@@ -259,7 +251,6 @@
* @jsptagref.attributesyntaxvalue <i>string_onKeyDown</i>
* @netui:attribute required="false" rtexprvalue="true"
* description="The onKeyDown JavaScript event."
- * @netui.tldx:attribute propertyclass="workshop.jspdesigner.properties.EventPropertyClass" category="event"
*/
public void setOnKeyDown(String onkeydown)
{
@@ -275,7 +266,6 @@
* @jsptagref.attributesyntaxvalue <i>string_onKeyPress</i>
* @netui:attribute required="false" rtexprvalue="true"
* description="The onKeyPress JavaScript event."
- * @netui.tldx:attribute propertyclass="workshop.jspdesigner.properties.EventPropertyClass" category="event"
*/
public void setOnKeyPress(String onkeypress)
{
@@ -291,7 +281,6 @@
* @jsptagref.attributesyntaxvalue <i>string_onKeyUp</i>
* @netui:attribute required="false" rtexprvalue="true"
* description="The onKeyUp JavaScript event."
- * @netui.tldx:attribute propertyclass="workshop.jspdesigner.properties.EventPropertyClass" category="event"
*/
public void setOnKeyUp(String onkeyup)
{
@@ -307,7 +296,6 @@
* @jsptagref.attributesyntaxvalue <i>string_onMouseDown</i>
* @netui:attribute required="false" rtexprvalue="true"
* description="The onMouseDown JavaScript event."
- * @netui.tldx:attribute propertyclass="workshop.jspdesigner.properties.EventPropertyClass" category="event"
*/
public void setOnMouseDown(String onmousedown)
{
@@ -323,7 +311,6 @@
* @jsptagref.attributesyntaxvalue <i>string_onMouseMove</i>
* @netui:attribute required="false" rtexprvalue="true"
* description="The onMouseMove JavaScript event."
- * @netui.tldx:attribute propertyclass="workshop.jspdesigner.properties.EventPropertyClass" category="event"
*/
public void setOnMouseMove(String onmousemove)
{
@@ -339,7 +326,6 @@
* @jsptagref.attributesyntaxvalue <i>string_onMouseOut</i>
* @netui:attribute required="false" rtexprvalue="true"
* description="The onMouseOut JavaScript event."
- * @netui.tldx:attribute propertyclass="workshop.jspdesigner.properties.EventPropertyClass" category="event"
*/
public void setOnMouseOut(String onmouseout)
{
@@ -355,7 +341,6 @@
* @jsptagref.attributesyntaxvalue <i>string_onMouseOver</i>
* @netui:attribute required="false" rtexprvalue="true"
* description="The onMouseOver JavaScript event."
- * @netui.tldx:attribute propertyclass="workshop.jspdesigner.properties.EventPropertyClass" category="event"
*/
public void setOnMouseOver(String onmouseover)
{
@@ -371,7 +356,6 @@
* @jsptagref.attributesyntaxvalue <i>string_onMouseUp</i>
* @netui:attribute required="false" rtexprvalue="true"
* description="The onMouseUp JavaScript event."
- * @netui.tldx:attribute propertyclass="workshop.jspdesigner.properties.EventPropertyClass" category="event"
*/
public void setOnMouseUp(String onmouseup)
{
Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/HtmlDataSourceTag.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/HtmlDataSourceTag.java?rev=165649&r1=165648&r2=165649&view=diff
==============================================================================
--- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/HtmlDataSourceTag.java (original)
+++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/HtmlDataSourceTag.java Mon May 2 10:24:30 2005
@@ -74,7 +74,6 @@
* description="The <code>dataSource</code> attribute determines both
* the source of populating data for the tag and
* the object to which the tag submits data."
- * @netui.tldx:attribute language="netuiel"
*/
public void setDataSource(String dataSource)
{
Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/HtmlDefaultableDataSourceTag.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/HtmlDefaultableDataSourceTag.java?rev=165649&r1=165648&r2=165649&view=diff
==============================================================================
--- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/HtmlDefaultableDataSourceTag.java (original)
+++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/HtmlDefaultableDataSourceTag.java Mon May 2 10:24:30 2005
@@ -52,7 +52,6 @@
* @jsptagref.attributesyntaxvalue <i>string_or_expression_default</i>
* @netui:attribute required="false" rtexprvalue="true" type="java.lang.Object"
* description="Sets the default value of the control which is used if the object bound to is null."
- * @netui.tldx:attribute
*/
public void setDefaultValue(Object defaultValue)
throws JspException
Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/HtmlFocusBaseTag.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/HtmlFocusBaseTag.java?rev=165649&r1=165648&r2=165649&view=diff
==============================================================================
--- 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 Mon May 2 10:24:30 2005
@@ -36,7 +36,6 @@
* @netui:attribute required="false" rtexprvalue="true" type="boolean"
* description="Set the disable state either with the literal "true" or "false"
* or with an expression."
- * @netui.tldx:attribute
*/
public void setDisabled(boolean disabled)
{
@@ -58,7 +57,6 @@
* @param onblur - the onBlur event.
* @netui:attribute required="false" rtexprvalue="true"
* description="Sets the onBlur javascript event."
- * @netui.tldx:attribute propertyclass="workshop.jspdesigner.properties.EventPropertyClass" category="event"
*/
public void setOnBlur(String onblur)
{
@@ -71,7 +69,6 @@
* @param onfocus - the onFocus event.
* @netui:attribute required="false" rtexprvalue="true"
* description="Sets the onFocus javascript event."
- * @netui.tldx:attribute propertyclass="workshop.jspdesigner.properties.EventPropertyClass" category="event"
*/
public void setOnFocus(String onfocus)
{
@@ -84,7 +81,6 @@
* @param onchange - the onChange event.
* @netui:attribute required="false" rtexprvalue="true"
* description="Sets the onChange javascript event."
- * @netui.tldx:attribute propertyclass="workshop.jspdesigner.properties.EventPropertyClass" category="event"
*/
public void setOnChange(String onchange)
{
@@ -97,7 +93,6 @@
* @param onselect - the onSelect event.
* @netui:attribute required="false" rtexprvalue="true"
* description="Sets the onSelect javascript event."
- * @netui.tldx:attribute propertyclass="workshop.jspdesigner.properties.EventPropertyClass" category="event"
*/
public void setOnSelect(String onselect)
{
Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/HtmlGroupBaseTag.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/HtmlGroupBaseTag.java?rev=165649&r1=165648&r2=165649&view=diff
==============================================================================
--- 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 Mon May 2 10:24:30 2005
@@ -181,7 +181,6 @@
* @netui:attribute required="false" rtexprvalue="true" type="boolean"
* description="Set the disable state either with the literal "true" or "false"
* or with an expression."
- * @netui.tldx:attribute
*/
public void setDisabled(boolean disabled)
{
@@ -194,7 +193,6 @@
* @param orientation - true or false or an expression
* @netui:attribute required="false" rtexprvalue="true"
* description="Set the orientation of the resulting options group."
- * @netui.tldx:attribute
*/
public void setOrientation(String orientation)
{
@@ -239,7 +237,6 @@
* @param style - the html style.
* @netui:attribute required="false" rtexprvalue="true"
* description="Sets the style of the rendered html tag."
- * @netui.tldx:attribute propertyclass="workshop.jspdesigner.properties.JspStyleProperty" category="format"
*/
public void setStyle(String style)
{
@@ -251,7 +248,6 @@
* @param styleClass - the html style class.
* @netui:attribute required="false" rtexprvalue="true"
* description="Sets the style class of the rendered html tag."
- * @netui.tldx:attribute category="Format"
*/
public void setStyleClass(String styleClass)
{
@@ -272,7 +268,6 @@
* @param labelStyle - the label style
* @netui:attribute required="false" rtexprvalue="true"
* description="Set the label style for each contained CheckBoxOption."
- * @netui.tldx:attribute category="format" propertyclass="workshop.jspdesigner.properties.JspStyleProperty"
*/
public void setLabelStyle(String labelStyle)
{
@@ -293,7 +288,6 @@
* @param labelStyleClass - the label style
* @netui:attribute required="false" rtexprvalue="true"
* description="Set the label style class for each contained CheckBoxOption."
- * @netui.tldx:attribute category="format"
*/
public void setLabelStyleClass(String labelStyleClass)
{
@@ -306,7 +300,6 @@
* @param dataSource the data source
* @netui:attribute required="true"
* description="Sets the tag's data source."
- * @netui.tldx:attribute language="netuiel"
*/
public void setDataSource(String dataSource)
throws JspException
@@ -416,7 +409,6 @@
* @param defaultValue - the default value
* @netui:attribute required="false" rtexprvalue="true"
* description="Sets the default value."
- * @netui.tldx:attribute
*/
public void setDefaultValue(Object defaultValue)
throws JspException
@@ -443,7 +435,6 @@
* @param optionsDataSource - the options datasource
* @netui:attribute required="false" rtexprvalue="true" type="java.lang.Object"
* description="Sets the options datasource value."
- * @netui.tldx:attribute
*/
public void setOptionsDataSource(Object optionsDataSource)
throws JspException
Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/HtmlOptionsDataSourceTag.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/HtmlOptionsDataSourceTag.java?rev=165649&r1=165648&r2=165649&view=diff
==============================================================================
--- 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 Mon May 2 10:24:30 2005
@@ -35,7 +35,6 @@
* @param optionsDataSource - the options datasource
* @netui:attribute required="false" rtexprvalue="true" type="java.lang.Object"
* description="Sets the options datasource value."
- * @netui.tldx:attribute
*/
public void setOptionsDataSource(Object optionsDataSource)
throws JspException
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?rev=165649&r1=165648&r2=165649&view=diff
==============================================================================
--- 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 Mon May 2 10:24:30 2005
@@ -40,10 +40,6 @@
* @example In this sample, an Image shows "friends.jpg" at 150 x 175 pixels, with the id "Friends".
* <pre><netui:image src="friends.jpg" id="Friends" height="150" width="175" /></pre>
* @netui:tag name="image" description="Places an image file type on your page."
- * @netui.tldx:tag requiredchild="parameter parameterMap attribute"
- * renderer="workshop.netui.jspdesigner.tldx.ImageRenderer"
- * bodycontentpref="empty"
- * whitespace="indent"
*/
public class Image extends HtmlBaseTag
implements IUrlParams
@@ -97,7 +93,6 @@
* @jsptagref.attributesyntaxvalue <i>string_align</i>
* @netui:attribute required="false" rtexprvalue="true"
* description="The alignment of the image."
- * @netui.tldx:attribute
*/
public void setAlign(String align)
{
@@ -112,7 +107,6 @@
* @jsptagref.attributesyntaxvalue <i>string_alt</i>
* @netui:attribute required="false" rtexprvalue="true"
* description="The alternative text of the image."
- * @netui.tldx:attribute
*/
public void setAlt(String alt)
{
@@ -124,7 +118,6 @@
* @param longdesc - the longdesc.
* @netui:attribute required="false" rtexprvalue="true"
* description="Sets the property to specify the longdesc."
- * @netui.tldx:attribute category="misc"
*/
public void setLongdesc(String longdesc)
{
@@ -139,7 +132,6 @@
* @jsptagref.attributesyntaxvalue <i>integer_pixelBorder</i>
* @netui:attribute required="false" rtexprvalue="true"
* description="The border size around the image."
- * @netui.tldx:attribute
*/
public void setBorder(String border)
{
@@ -154,7 +146,6 @@
* @jsptagref.attributesyntaxvalue <i>integer_height</i>
* @netui:attribute required="false" rtexprvalue="true"
* description="The image height."
- * @netui.tldx:attribute
*/
public void setHeight(String height)
{
@@ -169,7 +160,6 @@
* @jsptagref.attributesyntaxvalue <i>integer_hspace</i>
* @netui:attribute required="false" rtexprvalue="true"
* description="The horizontal spacing around the image."
- * @netui.tldx:attribute
*/
public void setHspace(String hspace)
{
@@ -184,7 +174,6 @@
* @jsptagref.attributesyntaxvalue <i>string_isMap</i>
* @netui:attribute required="false" rtexprvalue="true"
* description="The server-side map declaration."
- * @netui.tldx:attribute category="misc"
*/
public void setIsmap(String ismap)
{
@@ -199,7 +188,6 @@
* @jsptagref.attributesyntaxvalue <i>string_location</i>
* @netui:attribute required="false" rtexprvalue="true"
* description="The location hash to append to the URL."
- * @netui.tldx:attribute category="misc"
*/
public void setLocation(String location)
{
@@ -214,7 +202,6 @@
* @jsptagref.attributesyntaxvalue <i>string_src</i>
* @netui:attribute required="false" rtexprvalue="true"
* description="The image source URI"
- * @netui.tldx:attribute propertyclass="workshop.jspdesigner.properties.URIPropertyClass" reftype="img-url"
*/
public void setSrc(String src)
throws JspException
@@ -230,7 +217,6 @@
* @jsptagref.attributesyntaxvalue <i>string_useMap</i>
* @netui:attribute required="false" rtexprvalue="true"
* description="The client-side image map declaration"
- * @netui.tldx:attribute category="misc"
*/
public void setUsemap(String usemap)
{
@@ -245,7 +231,6 @@
* @jsptagref.attributesyntaxvalue <i>string_vspace</i>
* @netui:attribute required="false" rtexprvalue="true"
* description="The vertical spacing around the image."
- * @netui.tldx:attribute
*/
public void setVspace(String vspace)
{
@@ -260,7 +245,6 @@
* @jsptagref.attributesyntaxvalue <i>integer_pixelWidth</i>
* @netui:attribute required="false" rtexprvalue="true"
* description="The image width."
- * @netui.tldx:attribute
*/
public void setWidth(String width)
{
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?rev=165649&r1=165648&r2=165649&view=diff
==============================================================================
--- 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 Mon May 2 10:24:30 2005
@@ -105,9 +105,6 @@
* <pre> <netui:imageAnchor href="index.jsp" src="top.jpg" height="25" width="25" /></pre>
* </p>
* @netui:tag name="imageAnchor" description="Combines the functionality of the netui:image and netui:anchor tags."
- * @netui.tldx:tag requiredchild="parameter parameterMap attribute"
- * renderer="workshop.netui.jspdesigner.tldx.ImageAnchorRenderer"
- * whitespace="indent"
*/
public class ImageAnchor
extends Anchor
@@ -159,7 +156,6 @@
* @jsptagref.attributesyntaxvalue <i>string_align</i>
* @netui:attribute required="false" rtexprvalue="true"
* description="The alignment of the image."
- * @netui.tldx:attribute
*/
public void setAlign(String align)
{
@@ -174,7 +170,6 @@
* @jsptagref.attributesyntaxvalue <i>string_alt</i>
* @netui:attribute required="false" rtexprvalue="true"
* description="The alternative text of the image."
- * @netui.tldx:attribute
*/
public void setAlt(String alt)
{
@@ -186,7 +181,6 @@
* @param longdesc - the longdesc.
* @netui:attribute required="false" rtexprvalue="true"
* description="Sets the property to specify the longdesc."
- * @netui.tldx:attribute category="misc"
*/
public void setLongdesc(String longdesc)
{
@@ -201,7 +195,6 @@
* @jsptagref.attributesyntaxvalue <i>integer_pixelBorder</i>
* @netui:attribute required="false" rtexprvalue="true"
* description="The border size around the image."
- * @netui.tldx:attribute
*/
public void setBorder(String border)
{
@@ -216,7 +209,6 @@
* @jsptagref.attributesyntaxvalue <i>integer_height</i>
* @netui:attribute required="false" rtexprvalue="true"
* description="The image height."
- * @netui.tldx:attribute
*/
public void setHeight(String height)
{
@@ -231,7 +223,6 @@
* @jsptagref.attributesyntaxvalue <i>integer_hspace</i>
* @netui:attribute required="false" rtexprvalue="true"
* description="The horizontal spacing around the image."
- * @netui.tldx:attribute category="misc"
*/
public void setHspace(String hspace)
{
@@ -246,7 +237,6 @@
* @jsptagref.attributesyntaxvalue <i>string_isMap</i>
* @netui:attribute required="false" rtexprvalue="true"
* description="The server-side map declaration."
- * @netui.tldx:attribute category="misc"
*/
public void setIsmap(String ismap)
{
@@ -261,7 +251,6 @@
* @jsptagref.attributesyntaxvalue <i>string_rolloverImage</i>
* @netui:attribute required="false" rtexprvalue="true"
* description="The URI of the rollover image."
- * @netui.tldx:attribute propertyclass="workshop.jspdesigner.properties.URIPropertyClass"
*/
public void setRolloverImage(String rolloverImage)
{
@@ -276,7 +265,6 @@
* @jsptagref.attributesyntaxvalue <i>string_src</i>
* @netui:attribute required="false" rtexprvalue="true"
* description="The image source URI"
- * @netui.tldx:attribute propertyclass="workshop.jspdesigner.properties.URIPropertyClass"
* reftype="img-url"
*/
public void setSrc(String src)
@@ -293,7 +281,6 @@
* @jsptagref.attributesyntaxvalue <i>string_useMap</i>
* @netui:attribute required="false" rtexprvalue="true"
* description="The client-side image map declaration"
- * @netui.tldx:attribute category="misc"
*/
public void setUsemap(String usemap)
{
@@ -308,7 +295,6 @@
* @jsptagref.attributesyntaxvalue <i>string_vspace</i>
* @netui:attribute required="false" rtexprvalue="true"
* description="The vertical spacing around the image."
- * @netui.tldx:attribute
*/
public void setVspace(String vspace)
{
@@ -323,7 +309,6 @@
* @param imageStyle - the label style
* @netui:attribute required="false" rtexprvalue="true"
* description="Set the style for the contained image. "
- * @netui.tldx:attribute category="format" propertyclass="workshop.jspdesigner.properties.JspStyleProperty"
*/
public void setImageStyle(String imageStyle)
{
@@ -338,7 +323,6 @@
* @param imageClass - the image class
* @netui:attribute required="false" rtexprvalue="true"
* description="Set the label style class for each contained image."
- * @netui.tldx:attribute category="format"
*/
public void setImageStyleClass(String imageClass)
{
@@ -353,7 +337,6 @@
* @jsptagref.attributesyntaxvalue <i>integer_pixelWidth</i>
* @netui:attribute required="false" rtexprvalue="true"
* description="The image width."
- * @netui.tldx:attribute
*/
public void setWidth(String width)
{
Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/ImageButton.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/ImageButton.java?rev=165649&r1=165648&r2=165649&view=diff
==============================================================================
--- 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 Mon May 2 10:24:30 2005
@@ -55,9 +55,6 @@
* <netui:imageButton rolloverImage="house_highlight.jpg" src="house.jpg" />
* </netui:form></pre>
* @netui:tag name="imageButton" description="Combines the functionality of the netui:image and netui:button tags."
- * @netui.tldx:tag requiredchild="attribute"
- * renderer="workshop.netui.jspdesigner.tldx.ImageButtonRenderer"
- * whitespace="indent"
*/
public class ImageButton
extends HtmlFocusBaseTag
@@ -120,7 +117,6 @@
* @jsptagref.attributesyntaxvalue <i>string_align</i>
* @netui:attribute required="false" rtexprvalue="true"
* description="Sets the property to specify where to align the image."
- * @netui.tldx:attribute
*/
public void setAlign(String align)
{
@@ -144,7 +140,6 @@
* The following values are not recommended because they
* are often used by browsers: A, C, E, F, G,
* H, V, left arrow, and right arrow"
- * @netui.tldx:attribute
*/
public void setAccessKey(char accessKey)
{
@@ -161,7 +156,6 @@
* @netui:attribute required="false" rtexprvalue="true" type="int"
* description="The tabIndex of the rendered HTML tag. This attribute determines the position of the
* rendered HTML tag in the sequence of tags that the user may advance through by pressing the TAB key."
- * @netui.tldx:attribute category="misc"
*/
public void setTabindex(int tabindex)
{
@@ -173,7 +167,6 @@
* @param usemap - the tab index.
* @netui:attribute required="false" rtexprvalue="true"
* description="Sets the usemap of for the map."
- * @netui.tldx:attribute category="misc"
*/
public void setUsemap(String usemap)
{
@@ -185,7 +178,6 @@
* @param ismap - the tab index.
* @netui:attribute required="false" rtexprvalue="true"
* description="Sets the ismap of for the map."
- * @netui.tldx:attribute category="misc"
*/
public void setIsmap(String ismap)
{
@@ -200,7 +192,6 @@
* @jsptagref.attributesyntaxvalue <i>string_alt</i>
* @netui:attribute required="false" rtexprvalue="true"
* description="The alternative text of the image"
- * @netui.tldx:attribute
*/
public void setAlt(String alt)
{
@@ -215,7 +206,6 @@
* @jsptagref.attributesyntaxvalue <i>string_rolloverImage</i>
* @netui:attribute required="false" rtexprvalue="true"
* description="The URI of the rollover image."
- * @netui.tldx:attribute propertyclass="workshop.jspdesigner.properties.URIPropertyClass"
*/
public void setRolloverImage(String rolloverImage)
{
@@ -230,7 +220,6 @@
* @jsptagref.attributesyntaxvalue <i>string_src</i>
* @netui:attribute required="false" rtexprvalue="true"
* description="The image source URI"
- * @netui.tldx:attribute propertyclass="workshop.jspdesigner.properties.URIPropertyClass"
* reftype="img-url"
*/
public void setSrc(String src)
@@ -247,7 +236,6 @@
* @jsptagref.attributesyntaxvalue <i>string_value</i>
* @netui:attribute required="false" rtexprvalue="true"
* description="The value of the image button."
- * @netui.tldx:attribute
*/
public void setValue(String value)
{
Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Label.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Label.java?rev=165649&r1=165648&r2=165649&view=diff
==============================================================================
--- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Label.java (original)
+++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Label.java Mon May 2 10:24:30 2005
@@ -32,9 +32,6 @@
/**
* @jsptagref.tagdescription Associates text with an input element in a {@link Form}.
* @netui:tag name="label" description="a <label> element which may point to a form control."
- * @netui.tldx:tag requiredchild="formatDate formatNumber formatString"
- * renderer="workshop.netui.jspdesigner.tldx.FormLabelRenderer"
- * bodycontentpref="empty"
*/
public class Label extends LabelBase
implements IFormattable
@@ -66,7 +63,6 @@
* @param forAttr - the for attribute.
* @netui:attribute required="false" rtexprvalue="true"
* description="The value of this attribute matches a tagId on an form input and links the value to that control."
- * @netui.tldx:attribute category="general"
*/
public void setFor(String forAttr)
{
Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/LabelBase.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/LabelBase.java?rev=165649&r1=165648&r2=165649&view=diff
==============================================================================
--- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/LabelBase.java (original)
+++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/LabelBase.java Mon May 2 10:24:30 2005
@@ -48,7 +48,6 @@
* @param defaultValue - the default value
* @netui:attribute required="false" rtexprvalue="true" type="java.lang.Object"
* description="Set the default value of this Label or Span."
- * @netui.tldx:attribute
*/
public void setDefaultValue(Object defaultValue)
{
@@ -62,7 +61,6 @@
* @param formatDisplay Apply formatting to the default value.
* @netui:attribute required="false" rtexprvalue="true"
* description="Apply formatting to the default value of this Label or Span."
- * @netui.tldx:attribute
*/
public void setFormatDefaultValue(boolean formatDisplay)
{
@@ -74,7 +72,6 @@
* @param value - the Label value or expression.
* @netui:attribute required="true" rtexprvalue="true" type="java.lang.Object"
* description="Sets the text of the Label or Span."
- * @netui.tldx:attribute
*/
public void setValue(Object value)
{
Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Parameter.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Parameter.java?rev=165649&r1=165648&r2=165649&view=diff
==============================================================================
--- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Parameter.java (original)
+++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Parameter.java Mon May 2 10:24:30 2005
@@ -45,11 +45,6 @@
*
* <pre> http://www.google.com/search?q=Socrates</pre>
* @netui:tag name="parameter" description="Writes a URL parameter to a URL on its parent tag."
- * @netui.tldx:tag requiredparent="anchor button form image imageAnchor data:anchorColumn"
- * requiredchild="#nothing"
- * renderer="workshop.netui.jspdesigner.tldx.ParameterRenderer"
- * bodycontentpref="empty"
- * whitespace="indent"
*/
public class Parameter
extends AbstractClassicTag
@@ -87,7 +82,6 @@
* @jsptagref.attributesyntaxvalue <i>string_or_expression_value</i>
* @netui:attribute required="true" rtexprvalue="true" type="java.lang.Object"
* description="The value of the parameter."
- * @netui.tldx:attribute
*/
public void setValue(Object value)
throws JspException
Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/ParameterMap.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/ParameterMap.java?rev=165649&r1=165648&r2=165649&view=diff
==============================================================================
--- 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 Mon May 2 10:24:30 2005
@@ -60,11 +60,6 @@
*
* <pre> http://www.google.com/search?lr=lang_el&q=Socrates&as_qdr=m3</pre>
* @netui:tag name="parameterMap" description="Uses a JSP 2.0 expression that points to a map of parameters. Each entry in the map provides a URL parameter that will be added to the parent tag's URL."
- * @netui.tldx:tag requiredparent="anchor button form image imageAnchor data:anchorColumn"
- * requiredchild="#nothing"
- * renderer="workshop.netui.jspdesigner.tldx.ParameterMapRenderer"
- * bodycontentpref="empty"
- * whitespace="indent"
*/
public class ParameterMap
extends AbstractClassicTag
@@ -91,7 +86,6 @@
* @jsptagref.attributesyntaxvalue <i>string_mapObject</i>
* @netui:attribute required="true" rtexprvalue="true" type="java.util.Map"
* description="A JSP 2.0 EL expression pointing to a java.util.Map of parameters."
- * @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
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/RadioButtonGroup.java?rev=165649&r1=165648&r2=165649&view=diff
==============================================================================
--- 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 Mon May 2 10:24:30 2005
@@ -145,7 +145,6 @@
* <netui:radioButtonOption value="value3">Display Text 3</netui:radioButtonOption><br>
* </netui:radioButtonGroup></pre>
* @netui:tag name="radioButtonGroup" description="Defines a group of netui:radioButtonOption elements."
- * @netui.tldx:tag renderer="workshop.netui.jspdesigner.tldx.RadioButtonGroupRenderer" whitespace="indent"
*/
public class RadioButtonGroup
extends HtmlGroupBaseTag
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?rev=165649&r1=165648&r2=165649&view=diff
==============================================================================
--- 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 Mon May 2 10:24:30 2005
@@ -42,9 +42,6 @@
* <netui:button value="Submit" />
* </netui:form></pre>
* @netui:tag name="radioButtonOption" description="A radio button whose state is determined by its enclosing netui:RadioButtonGroup."
- * @netui.tldx:tag requiredparent="radioButtonGroup td"
- * renderer="workshop.netui.jspdesigner.tldx.RadioButtonOptionRenderer"
- * whitespace="indent"
*/
public class RadioButtonOption
extends HtmlFocusBaseTag
@@ -103,7 +100,6 @@
* @jsptagref.attributesyntaxvalue <i>string_labelStyle</i>
* @netui:attribute required="false" rtexprvalue="true"
* description="The style of the label for each contained <netui:radioButtonOption> tag."
- * @netui.tldx:attribute category="format" propertyclass="workshop.jspdesigner.properties.JspStyleProperty"
*/
public void setLabelStyle(String labelStyle)
{
@@ -119,7 +115,6 @@
* @jsptagref.attributesyntaxvalue <i>string_class</i>
* @netui:attribute required="false" rtexprvalue="true"
* description="The class of the labels for each contained <netui:radioButtonOption> tag."
- * @netui.tldx:attribute category="format"
*/
public void setLabelStyleClass(String labelStyleClass)
{
@@ -134,7 +129,6 @@
* @jsptagref.attributesyntaxvalue <i>string_or_expression_value</i>
* @netui:attribute required="true" rtexprvalue="true" type="java.lang.Object"
* description="The value of the option."
- * @netui.tldx:attribute
*/
public void setValue(Object value)
throws JspException
@@ -295,7 +289,6 @@
* The following values are not recommended because they
* are often used by browsers: A, C, E, F, G,
* H, V, left arrow, and right arrow"
- * @netui.tldx:attribute category="misc"
*/
public void setAccessKey(char accessKey)
{
@@ -310,7 +303,6 @@
* @jsptagref.attributesyntaxvalue <i>string_alt</i>
* @netui:attribute required="false" rtexprvalue="true"
* description="The alt attribute of the element."
- * @netui.tldx:attribute category="misc"
*/
public void setAlt(String alt)
{
@@ -327,7 +319,6 @@
* @netui:attribute required="false" rtexprvalue="true" type="char"
* description="The tabIndex of the rendered HTML tag. This attribute determines the position of the
* tag in the sequence of page elements that the user may advance through by pressing the TAB key."
- * @netui.tldx:attribute category="misc"
*/
public void setTabindex(int tabindex)
{
Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/RetrievePopupOutput.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/RetrievePopupOutput.java?rev=165649&r1=165648&r2=165649&view=diff
==============================================================================
--- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/RetrievePopupOutput.java (original)
+++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/RetrievePopupOutput.java Mon May 2 10:24:30 2005
@@ -38,10 +38,6 @@
* </netui:configurePopup>
* </netui:anchor></pre>
* @netui:tag name="retrievePopupOutput" description="Causes a value to be retrieved when a popup window closes."
- * @netui.tldx:tag requiredparent="configurePopup"
- * requiredchild="#nothing"
- * bodycontentpref="empty"
- * whitespace="indent"
*/
public class RetrievePopupOutput
extends AbstractClassicTag
@@ -79,7 +75,6 @@
* @jsptagref.attributesyntaxvalue <i>string_dataSource</i>
* @netui:attribute required="true" rtexprvalue="true"
* description="An expression to be evaluated and retrieved from the popup window."
- * @netui.tldx:attribute
*/
public void setDataSource(String dataSource)
{
Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/RewriteName.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/RewriteName.java?rev=165649&r1=165648&r2=165649&view=diff
==============================================================================
--- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/RewriteName.java (original)
+++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/RewriteName.java Mon May 2 10:24:30 2005
@@ -45,10 +45,6 @@
*
* <pre> <span id="<netui:rewriteName name="foo"/>"></pre>
* @netui:tag name="rewriteName" description="Allows the URL Rewriter to rewrite the name attribute before it is output into the HTML stream."
- * @netui.tldx:tag requiredchild="#nothing"
- * renderer="workshop.netui.jspdesigner.tldx.RewriteNameRenderer"
- * bodycontentpref="empty"
- * whitespace="indent"
*/
public class RewriteName
extends AbstractClassicTag
Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/RewriteURL.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/RewriteURL.java?rev=165649&r1=165648&r2=165649&view=diff
==============================================================================
--- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/RewriteURL.java (original)
+++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/RewriteURL.java Mon May 2 10:24:30 2005
@@ -55,10 +55,6 @@
* value of the id attribute actually rendered in the browser.
* <pre> <span id="<netui:rewriteURL URL="foo"/>"></pre>
* @netui:tag name="rewriteURL" description="Allows the URL Rewriter to rewrite the url attribute before it is output into the HTML stream."
- * @netui.tldx:tag requiredchild="#nothing"
- * renderer="workshop.netui.jspdesigner.tldx.RewriteURLRenderer"
- * bodycontentpref="empty"
- * whitespace="indent"
*/
public class RewriteURL extends AbstractClassicTag implements IUrlParams
{
Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Select.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Select.java?rev=165649&r1=165648&r2=165649&view=diff
==============================================================================
--- 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 Mon May 2 10:24:30 2005
@@ -154,13 +154,7 @@
* ...
* </select></pre>
* @netui:tag name="select" description="Defines a multiple-choice menu or drop-down list within a netui:form element."
- * @netui:attribute name="onSelect" hide="true"
- * description=""
- * @netui.tldx:tag requiredchild="formatDate formatNumber formatString selectOption attribute"
- * renderer="workshop.netui.jspdesigner.tldx.SelectRenderer"
- * whitespace="indent"
- * @netui.tldx:attribute name="dataSource"
- * @netui.tldx:attribute name="defaultValue"
+ * @netui:attribute name="onSelect" hide="true" description=""
*/
public class Select extends HtmlOptionsDataSourceTag
implements IDataAccessProvider, IFormattable
@@ -512,7 +506,6 @@
* @netui:attribute required="false" rtexprvalue="true" type="boolean"
* description="Whether a option with the value null should be added to the bottom of the list.
* If <select> has the multiple attribute set to true, the null option won't be shown."
- * @netui.tldx:attribute category="misc"
*/
public void setNullable(boolean nullable)
{
@@ -541,7 +534,6 @@
* @netui:attribute required="false" rtexprvalue="true" type="boolean"
* description="If the nullable attribute is set to true, then the nullableOptionText
* attribute determines the display text of the null option.
- * @netui.tldx:attribute category="misc"
*/
public void setNullableOptionText(String nullableOptionText)
{
@@ -587,7 +579,6 @@
* @jsptagref.attributesyntaxvalue <i>integer_size</i>
* @netui:attribute required="false" rtexprvalue="true" type="int"
* description="The number of visible options"
- * @netui.tldx:attribute
*/
public void setSize(int size)
{
@@ -1273,7 +1264,6 @@
* The following values are not recommended because they
* are often used by browsers: A, C, E, F, G,
* H, V, left arrow, and right arrow"
- * @netui.tldx:attribute category="misc"
*/
public void setAccessKey(char accessKey)
{
@@ -1290,7 +1280,6 @@
* @netui:attribute required="false" rtexprvalue="true" type="int"
* description="The tabIndex of the rendered HTML tag. This attribute determines the position of the
* tag in the sequence of page elements that the user may advance through by pressing the TAB key."
- * @netui.tldx:attribute category="misc"
*/
public void setTabindex(int tabindex)
{
Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/SelectOption.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/SelectOption.java?rev=165649&r1=165648&r2=165649&view=diff
==============================================================================
--- 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 Mon May 2 10:24:30 2005
@@ -51,11 +51,6 @@
* <netui:button type="submit" value="Submit"/>
* </netui:form></pre>
* @netui:tag name="selectOption" description="An option whose state is determined by its enclosing netui:selectOption."
- * @netui.tldx:tag requiredparent="select"
- * requiredchild="label attribute"
- * renderer="workshop.netui.jspdesigner.tldx.SelectOptionRenderer"
- * bodycontentpref="empty"
- * whitespace="indent"
*/
public class SelectOption extends HtmlBaseTag
{
@@ -122,7 +117,6 @@
* @jsptagref.attributesyntaxvalue <i>boolean_disabled</i>
* @netui:attribute required="false" rtexprvalue="true" type="boolean"
* description="Determines whether the <option> is disabled."
- * @netui.tldx:attribute category="misc"
*/
public void setDisabled(boolean disabled)
{
@@ -146,7 +140,6 @@
* @param repeatingType - "Options", "Default", "DataSource", "Null", "Data"
* @netui:attribute required="false" rtexprvalue="true"
* description="If the options is being used inside a repeating Select, this is the type of the option."
- * @netui.tldx:attribute
*/
public void setRepeatingType(String repeatingType)
{
@@ -163,7 +156,6 @@
* @netui:attribute required="true" rtexprvalue="true"
* description="A literal or a data binding expression that determines the value submitted by the
* <option> tag."
- * @netui.tldx:attribute
*/
public void setValue(String value)
throws JspException
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?rev=165649&r1=165648&r2=165649&view=diff
==============================================================================
--- 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 Mon May 2 10:24:30 2005
@@ -82,9 +82,6 @@
* see '&nbsp;'</p>
* <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"
- * bodycontentpref="empty"
*/
public class Span extends LabelBase
implements IFormattable
Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/TextArea.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/TextArea.java?rev=165649&r1=165648&r2=165649&view=diff
==============================================================================
--- 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 Mon May 2 10:24:30 2005
@@ -41,7 +41,6 @@
* defaultValue="{pageFlow.defaultDescription}"
* cols="25" rows="3" /></pre>
* @netui:tag name="textArea" description="Renders a databound TextArea with the given attributes."
- * @netui.tldx:tag renderer="workshop.netui.jspdesigner.tldx.TextAreaRenderer" bodycontentpref="empty" whitespace="indent"
*/
public class TextArea extends HtmlDefaultableDataSourceTag
implements IFormattable
@@ -109,7 +108,6 @@
* @jsptagref.attributesyntaxvalue <i>integer_columns</i>
* @netui:attribute required="false" rtexprvalue="true" type="int"
* description="The number of columns in the <netui:textArea>."
- * @netui.tldx:attribute
*/
public void setCols(int cols)
{
@@ -138,7 +136,6 @@
* @jsptagref.attributesyntaxvalue <i>integer_rows</i>
* @netui:attribute required="false" rtexprvalue="true" type="int"
* description="The number of rows in the <netui:textArea>"
- * @netui.tldx:attribute
*/
public void setRows(int rows)
{
@@ -311,7 +308,6 @@
* @netui:attribute required="false" rtexprvalue="true" type="int"
* description="The tabIndex of the rendered HTML tag. This attribute determines the position of the
* tag in the sequence of page elements that the user may advance through by pressing the TAB key."
- * @netui.tldx:attribute category="misc"
*/
public void setTabindex(int tabindex)
{
Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/TextBox.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/TextBox.java?rev=165649&r1=165648&r2=165649&view=diff
==============================================================================
--- 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 Mon May 2 10:24:30 2005
@@ -38,7 +38,6 @@
* defaultValue="{pageFlow.defaultFirstName}"
* size="20" /></pre>
* @netui:tag name="textBox" description="Renders a databound TextBox with the given attributes."
- * @netui.tldx:tag renderer="workshop.netui.jspdesigner.tldx.TextboxRenderer" bodycontentpref="empty" whitespace="indent"
*/
public class TextBox extends HtmlDefaultableDataSourceTag
implements IFormattable, IHtmlAccessable
@@ -116,7 +115,6 @@
* @jsptagref.attributesyntaxvalue <i>integer_maxLength</i>
* @netui:attribute required="false" rtexprvalue="true" type="int"
* description="The maximum number of character that can be entered in the rendered <input> element."
- * @netui.tldx:attribute
*/
public void setMaxlength(int maxlength)
{
@@ -168,7 +166,6 @@
* @jsptagref.attributesyntaxvalue <i>integer_size</i>
* @netui:attribute required="false" rtexprvalue="true" type="int"
* description="The number of characters visible in the <input> element."
- * @netui.tldx:attribute
*/
public void setSize(int size)
{
@@ -222,7 +219,6 @@
* @netui:attribute required="false" rtexprvalue="true" type="int"
* description="The tabIndex of the rendered HTML tag. This attribute determines the position of the
* tag in the sequence of page elements that the user may advance through by pressing the TAB key."
- * @netui.tldx:attribute category="misc"
*/
public void setTabindex(int tabindex)
{
Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/javascript/CoreScriptFeature.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/javascript/CoreScriptFeature.java?rev=165649&r1=165648&r2=165649&view=diff
==============================================================================
--- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/javascript/CoreScriptFeature.java (original)
+++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/javascript/CoreScriptFeature.java Mon May 2 10:24:30 2005
@@ -1,114 +1,114 @@
-/*
- * Copyright 2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * $Header:$
- */
-package org.apache.beehive.netui.tags.javascript;
-
-/**
- *
- */
-public class CoreScriptFeature
-{
- public static final int INT_LEGACY_LOOKUP = 0x0001;
- public static final int INT_ID_LOOKUP = 0x0002;
- public static final int INT_NAME_LOOKUP = 0x0004;
- public static final int INT_SCOPE_LOOKUP = 0x0008;
- public static final int INT_ROLLOVER = 0x0010;
- public static final int INT_ANCHOR_SUBMIT = 0x0020;
- public static final int INT_POPUP_DONE = 0x0040;
- public static final int INT_ALLOCATE_LEGACY = 0x0080;
- public static final int INT_ALLOCATE_ID = 0x0100;
- public static final int INT_ALLOCATE_NAME = 0x0200;
- public static final int INT_LEGACY_SCOPE_LOOKUP = 0x0400;
- public static final int INT_TREE_INIT = 0x0800;
- public static final int INT_DIVPANEL_INIT = 0x1000;
- public static final int INT_DYNAMIC_INIT = 0x2000;
- public static final int INT_BUTTON_DISABLE_AND_SUBMIT = 0x4000;
- public static final int INT_BUTTON_DISABLE = 0x8000;
-
- // These features are not written out once. They are identified by setting the top bit
- protected static final int INT_SET_FOCUS = 0x10000001;
-
- public int value;
-
- CoreScriptFeature(int val)
- {
- value = val;
- }
-
- public static final CoreScriptFeature LEGACY_LOOKUP = new CoreScriptFeature(INT_LEGACY_LOOKUP);
- public static final CoreScriptFeature ID_LOOKUP = new CoreScriptFeature(INT_ID_LOOKUP);
- public static final CoreScriptFeature NAME_LOOKUP = new CoreScriptFeature(INT_NAME_LOOKUP);
- public static final CoreScriptFeature SCOPE_LOOKUP = new CoreScriptFeature(INT_SCOPE_LOOKUP);
- public static final CoreScriptFeature ROLLOVER = new CoreScriptFeature(INT_ROLLOVER);
- public static final CoreScriptFeature ANCHOR_SUBMIT = new CoreScriptFeature(INT_ANCHOR_SUBMIT);
- public static final CoreScriptFeature POPUP_DONE = new CoreScriptFeature(INT_POPUP_DONE);
- public static final CoreScriptFeature ALLOCATE_LEGACY = new CoreScriptFeature(INT_ALLOCATE_LEGACY);
- public static final CoreScriptFeature ALLOCATE_ID = new CoreScriptFeature(INT_ALLOCATE_ID);
- public static final CoreScriptFeature ALLOCATE_NAME = new CoreScriptFeature(INT_ALLOCATE_NAME);
- public static final CoreScriptFeature LEGACY_SCOPE_LOOKUP = new CoreScriptFeature(INT_LEGACY_SCOPE_LOOKUP);
- public static final CoreScriptFeature TREE_INIT = new CoreScriptFeature(INT_TREE_INIT);
- public static final CoreScriptFeature DIVPANEL_INIT = new CoreScriptFeature(INT_DIVPANEL_INIT);
- public static final CoreScriptFeature DYNAMIC_INIT = new CoreScriptFeature(INT_DYNAMIC_INIT);
- public static final CoreScriptFeature BUTTON_DISABLE_AND_SUBMIT = new CoreScriptFeature(INT_BUTTON_DISABLE_AND_SUBMIT);
- public static final CoreScriptFeature BUTTON_DISABLE = new CoreScriptFeature(INT_BUTTON_DISABLE);
- public static final CoreScriptFeature SET_FOCUS = new CoreScriptFeature(INT_SET_FOCUS);
-
- public String toString()
- {
- switch ( value )
- {
- case INT_LEGACY_LOOKUP: return "LEGACY_LOOKUP";
- case INT_ID_LOOKUP: return "ID_LOOKUP";
- case INT_NAME_LOOKUP: return "NAME_LOOKUP";
- case INT_SCOPE_LOOKUP: return "SCOPE_LOOKUP";
- case INT_ROLLOVER: return "ROLLOVER";
- case INT_ANCHOR_SUBMIT: return "ANCHOR_SUBMIT";
- case INT_POPUP_DONE: return "POPUP_DONE";
- case INT_ALLOCATE_LEGACY: return "ALLOCATE_LEGACY";
- case INT_ALLOCATE_ID: return "ALLOCATE_ID";
- case INT_ALLOCATE_NAME: return "ALLOCATE_NAME";
- case INT_LEGACY_SCOPE_LOOKUP: return "LEGACY_SCOPE_LOOKUP";
- case INT_TREE_INIT: return "TREE_INIT";
- case INT_DIVPANEL_INIT: return "DIVPANEL_INIT";
- case INT_DYNAMIC_INIT: return "DYNAMIC_INIT";
- case INT_BUTTON_DISABLE_AND_SUBMIT: return "BUTTON_DISABLE_AND_SUBMIT";
- case INT_BUTTON_DISABLE: return "BUTTON_DISABLE";
- case INT_SET_FOCUS: return "SET_FOCUS";
- }
-
- assert false : value;
- return "<unknown CoreScriptFeature>";
- }
-
- public boolean equals( Object o )
- {
- if (o == null) return false;
- if (o == this ) return true;
- if (!(o instanceof CoreScriptFeature)) return false;
- return ((CoreScriptFeature)o).value == value;
- }
-
- public int hashCode()
- {
- return value;
- }
-
- public int getIntValue()
- {
- return value;
- }
-}
+/*
+ * Copyright 2004 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * $Header:$
+ */
+package org.apache.beehive.netui.tags.javascript;
+
+/**
+ *
+ */
+public class CoreScriptFeature
+{
+ public static final int INT_LEGACY_LOOKUP = 0x0001;
+ public static final int INT_ID_LOOKUP = 0x0002;
+ public static final int INT_NAME_LOOKUP = 0x0004;
+ public static final int INT_SCOPE_LOOKUP = 0x0008;
+ public static final int INT_ROLLOVER = 0x0010;
+ public static final int INT_ANCHOR_SUBMIT = 0x0020;
+ public static final int INT_POPUP_DONE = 0x0040;
+ public static final int INT_ALLOCATE_LEGACY = 0x0080;
+ public static final int INT_ALLOCATE_ID = 0x0100;
+ public static final int INT_ALLOCATE_NAME = 0x0200;
+ public static final int INT_LEGACY_SCOPE_LOOKUP = 0x0400;
+ public static final int INT_TREE_INIT = 0x0800;
+ public static final int INT_DIVPANEL_INIT = 0x1000;
+ public static final int INT_DYNAMIC_INIT = 0x2000;
+ public static final int INT_BUTTON_DISABLE_AND_SUBMIT = 0x4000;
+ public static final int INT_BUTTON_DISABLE = 0x8000;
+
+ // These features are not written out once. They are identified by setting the top bit
+ protected static final int INT_SET_FOCUS = 0x10000001;
+
+ public int value;
+
+ CoreScriptFeature(int val)
+ {
+ value = val;
+ }
+
+ public static final CoreScriptFeature LEGACY_LOOKUP = new CoreScriptFeature(INT_LEGACY_LOOKUP);
+ public static final CoreScriptFeature ID_LOOKUP = new CoreScriptFeature(INT_ID_LOOKUP);
+ public static final CoreScriptFeature NAME_LOOKUP = new CoreScriptFeature(INT_NAME_LOOKUP);
+ public static final CoreScriptFeature SCOPE_LOOKUP = new CoreScriptFeature(INT_SCOPE_LOOKUP);
+ public static final CoreScriptFeature ROLLOVER = new CoreScriptFeature(INT_ROLLOVER);
+ public static final CoreScriptFeature ANCHOR_SUBMIT = new CoreScriptFeature(INT_ANCHOR_SUBMIT);
+ public static final CoreScriptFeature POPUP_DONE = new CoreScriptFeature(INT_POPUP_DONE);
+ public static final CoreScriptFeature ALLOCATE_LEGACY = new CoreScriptFeature(INT_ALLOCATE_LEGACY);
+ public static final CoreScriptFeature ALLOCATE_ID = new CoreScriptFeature(INT_ALLOCATE_ID);
+ public static final CoreScriptFeature ALLOCATE_NAME = new CoreScriptFeature(INT_ALLOCATE_NAME);
+ public static final CoreScriptFeature LEGACY_SCOPE_LOOKUP = new CoreScriptFeature(INT_LEGACY_SCOPE_LOOKUP);
+ public static final CoreScriptFeature TREE_INIT = new CoreScriptFeature(INT_TREE_INIT);
+ public static final CoreScriptFeature DIVPANEL_INIT = new CoreScriptFeature(INT_DIVPANEL_INIT);
+ public static final CoreScriptFeature DYNAMIC_INIT = new CoreScriptFeature(INT_DYNAMIC_INIT);
+ public static final CoreScriptFeature BUTTON_DISABLE_AND_SUBMIT = new CoreScriptFeature(INT_BUTTON_DISABLE_AND_SUBMIT);
+ public static final CoreScriptFeature BUTTON_DISABLE = new CoreScriptFeature(INT_BUTTON_DISABLE);
+ public static final CoreScriptFeature SET_FOCUS = new CoreScriptFeature(INT_SET_FOCUS);
+
+ public String toString()
+ {
+ switch ( value )
+ {
+ case INT_LEGACY_LOOKUP: return "LEGACY_LOOKUP";
+ case INT_ID_LOOKUP: return "ID_LOOKUP";
+ case INT_NAME_LOOKUP: return "NAME_LOOKUP";
+ case INT_SCOPE_LOOKUP: return "SCOPE_LOOKUP";
+ case INT_ROLLOVER: return "ROLLOVER";
+ case INT_ANCHOR_SUBMIT: return "ANCHOR_SUBMIT";
+ case INT_POPUP_DONE: return "POPUP_DONE";
+ case INT_ALLOCATE_LEGACY: return "ALLOCATE_LEGACY";
+ case INT_ALLOCATE_ID: return "ALLOCATE_ID";
+ case INT_ALLOCATE_NAME: return "ALLOCATE_NAME";
+ case INT_LEGACY_SCOPE_LOOKUP: return "LEGACY_SCOPE_LOOKUP";
+ case INT_TREE_INIT: return "TREE_INIT";
+ case INT_DIVPANEL_INIT: return "DIVPANEL_INIT";
+ case INT_DYNAMIC_INIT: return "DYNAMIC_INIT";
+ case INT_BUTTON_DISABLE_AND_SUBMIT: return "BUTTON_DISABLE_AND_SUBMIT";
+ case INT_BUTTON_DISABLE: return "BUTTON_DISABLE";
+ case INT_SET_FOCUS: return "SET_FOCUS";
+ }
+
+ assert false : value;
+ return "<unknown CoreScriptFeature>";
+ }
+
+ public boolean equals( Object o )
+ {
+ if (o == null) return false;
+ if (o == this ) return true;
+ if (!(o instanceof CoreScriptFeature)) return false;
+ return ((CoreScriptFeature)o).value == value;
+ }
+
+ public int hashCode()
+ {
+ return value;
+ }
+
+ public int getIntValue()
+ {
+ return value;
+ }
+}
Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/javascript/ScriptBlock.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/javascript/ScriptBlock.java?rev=165649&r1=165648&r2=165649&view=diff
==============================================================================
--- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/javascript/ScriptBlock.java (original)
+++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/javascript/ScriptBlock.java Mon May 2 10:24:30 2005
@@ -1,105 +1,102 @@
-/*
- * Copyright 2005 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * $Header:$
- */
-package org.apache.beehive.netui.tags.javascript;
-
-import org.apache.beehive.netui.tags.AbstractSimpleTag;
-import org.apache.beehive.netui.tags.rendering.WriteRenderAppender;
-
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.PageContext;
-import java.io.IOException;
-
-/**
- * This class will output a script block into the generated HTML. The primary reason
- * for this class is to add the ability to add JavaScript either before or after the
- * framework provided JavaScript.
- * @jsptagref.tagdescription <p>Outputs a script block into the generated HTML. The primary reason
- * for this tag is to add JavaScript either before or after the
- * framework provided JavaScript.</p>
- * @netui:tag name="scriptBlock" body-content="scriptless" description="Used to place JavaScript in relationship to the framework genrated JavaScript"
- * @netui.tldx:tag whitespace="indent"
- * renderer=""
- */
-public class ScriptBlock extends AbstractSimpleTag
-{
- private ScriptPlacement _placement = ScriptPlacement.PLACE_INLINE;
-
- /**
- * Return the name of the Tag.
- */
- public String getTagName()
- {
- return "Content";
- }
-
- /**
- * Place the JavaScript inside in relationship to the frameword generated JavaScript.
- * @param placement - The placement of the JavaScript
- * @jsptagref.attributedescription String value 'after' or 'before'. Places the JavaScript
- * before or after the JavaScript provided by the framework.
- * @jsptagref.databindable false
- * @jsptagref.attributesyntaxvalue <i>string_or_expression_output</i>
- * @netui:attribute rtexprvalue="true"
- * description="The String literal or expression used to output the content."
- * @netui.tldx:attribute
- */
- public void setPlacement(String placement)
- {
- if (placement.equals("after"))
- _placement = ScriptPlacement.PLACE_AFTER;
- else if (placement.equals("before"))
- _placement = ScriptPlacement.PLACE_BEFORE;
- else
- _placement = ScriptPlacement.PLACE_INLINE;
- }
-
- /**
- * Render the content.
- * @throws javax.servlet.jsp.JspException if a JSP exception has occurred
- */
- public void doTag()
- throws JspException, IOException
- {
- // report any errors...
- if (hasErrors()) {
- reportErrors();
- return;
- }
-
- PageContext pageContext = getPageContext();
- WriteRenderAppender writer = new WriteRenderAppender(pageContext);
- String script = getBufferBody(false);
- if (script == null)
- return;
-
- // make sure that the last character is a new line
- if (script.length() > 0 && script.charAt(script.length() -1) != '\n') {
- script = script + "\n";
- }
-
- IScriptReporter sr = getScriptReporter();
-
- // if we are writting the javaScript inline then do it....
- if (_placement == ScriptPlacement.PLACE_INLINE || sr == null) {
- ScriptRequestState.writeScriptBlock(pageContext.getRequest(), writer, script);
- return;
- }
-
- sr.addScriptFunction(_placement, script);
- }
-}
+/*
+ * Copyright 2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * $Header:$
+ */
+package org.apache.beehive.netui.tags.javascript;
+
+import org.apache.beehive.netui.tags.AbstractSimpleTag;
+import org.apache.beehive.netui.tags.rendering.WriteRenderAppender;
+
+import javax.servlet.jsp.JspException;
+import javax.servlet.jsp.PageContext;
+import java.io.IOException;
+
+/**
+ * This class will output a script block into the generated HTML. The primary reason
+ * for this class is to add the ability to add JavaScript either before or after the
+ * framework provided JavaScript.
+ * @jsptagref.tagdescription <p>Outputs a script block into the generated HTML. The primary reason
+ * for this tag is to add JavaScript either before or after the
+ * framework provided JavaScript.</p>
+ * @netui:tag name="scriptBlock" body-content="scriptless" description="Used to place JavaScript in relationship to the framework genrated JavaScript"
+ */
+public class ScriptBlock extends AbstractSimpleTag
+{
+ private ScriptPlacement _placement = ScriptPlacement.PLACE_INLINE;
+
+ /**
+ * Return the name of the Tag.
+ */
+ public String getTagName()
+ {
+ return "Content";
+ }
+
+ /**
+ * Place the JavaScript inside in relationship to the frameword generated JavaScript.
+ * @param placement - The placement of the JavaScript
+ * @jsptagref.attributedescription String value 'after' or 'before'. Places the JavaScript
+ * before or after the JavaScript provided by the framework.
+ * @jsptagref.databindable false
+ * @jsptagref.attributesyntaxvalue <i>string_or_expression_output</i>
+ * @netui:attribute rtexprvalue="true"
+ * description="The String literal or expression used to output the content."
+ */
+ public void setPlacement(String placement)
+ {
+ if (placement.equals("after"))
+ _placement = ScriptPlacement.PLACE_AFTER;
+ else if (placement.equals("before"))
+ _placement = ScriptPlacement.PLACE_BEFORE;
+ else
+ _placement = ScriptPlacement.PLACE_INLINE;
+ }
+
+ /**
+ * Render the content.
+ * @throws javax.servlet.jsp.JspException if a JSP exception has occurred
+ */
+ public void doTag()
+ throws JspException, IOException
+ {
+ // report any errors...
+ if (hasErrors()) {
+ reportErrors();
+ return;
+ }
+
+ PageContext pageContext = getPageContext();
+ WriteRenderAppender writer = new WriteRenderAppender(pageContext);
+ String script = getBufferBody(false);
+ if (script == null)
+ return;
+
+ // make sure that the last character is a new line
+ if (script.length() > 0 && script.charAt(script.length() -1) != '\n') {
+ script = script + "\n";
+ }
+
+ IScriptReporter sr = getScriptReporter();
+
+ // if we are writting the javaScript inline then do it....
+ if (_placement == ScriptPlacement.PLACE_INLINE || sr == null) {
+ ScriptRequestState.writeScriptBlock(pageContext.getRequest(), writer, script);
+ return;
+ }
+
+ sr.addScriptFunction(_placement, script);
+ }
+}
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?rev=165649&r1=165648&r2=165649&view=diff
==============================================================================
--- 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 Mon May 2 10:24:30 2005
@@ -70,7 +70,6 @@
* The first <netui:scriptContainer> tag should appear after the JSP's <body> tag.
* The closing </netui:scriptContainer> tag should appear before the JSP's </body> tag.
* @netui:tag name="scriptContainer" description="ScriptContainers defines a container that will gather all of the JavaScript of their children and output it in a single <script> tag. In addition, they providing scoping of tagIds."
- * @netui.tldx:tag renderer="workshop.netui.jspdesigner.tldx.ScriptContainerRenderer" whitespace="indent"
*/
public class ScriptContainer extends AbstractClassicTag
implements IScriptReporter
Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/javascript/ScriptHeader.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/javascript/ScriptHeader.java?rev=165649&r1=165648&r2=165649&view=diff
==============================================================================
--- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/javascript/ScriptHeader.java (original)
+++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/javascript/ScriptHeader.java Mon May 2 10:24:30 2005
@@ -29,7 +29,6 @@
* ScriptHeader will write the <script> and JavaScript includes into the HTML <head> tag.
* @jsptagref.tagdescription ScriptHeader will write the <script> and JavaScript includes into the HTML <head> tag.
* @netui:tag name="scriptHeader" body-content="empty" description="ScriptHeader will write the <script> and JavaScript includes into the HTML <head> tag."
- * @netui.tldx:tag renderer="workshop.netui.jspdesigner.tldx.ScriptHeaderRenderer" whitespace="indent"
*/
public class ScriptHeader extends AbstractClassicTag
{
Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/javascript/ScriptPlacement.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/javascript/ScriptPlacement.java?rev=165649&r1=165648&r2=165649&view=diff
==============================================================================
--- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/javascript/ScriptPlacement.java (original)
+++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/javascript/ScriptPlacement.java Mon May 2 10:24:30 2005
@@ -1,68 +1,68 @@
-/*
- * Copyright 2005 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * $Header:$
- */
-package org.apache.beehive.netui.tags.javascript;
-
-/**
- *
- */
-public class ScriptPlacement
-{
- protected static final int INT_PLACE_BEFORE = 0;
- protected static final int INT_PLACE_AFTER = 1;
- protected static final int INT_PLACE_INLINE = 2;
- protected static final int INT_PLACE_INFRAMEWORK = 3;
-
- public static final ScriptPlacement PLACE_BEFORE = new ScriptPlacement(INT_PLACE_BEFORE);
- public static final ScriptPlacement PLACE_AFTER = new ScriptPlacement(INT_PLACE_AFTER);
- public static final ScriptPlacement PLACE_INLINE = new ScriptPlacement(INT_PLACE_INLINE);
- public static final ScriptPlacement PLACE_INFRAMEWORK = new ScriptPlacement(INT_PLACE_INFRAMEWORK);
-
- private int _val;
-
- private ScriptPlacement(int val)
- {
- _val = val;
- }
-
- public String toString()
- {
- switch (_val)
- {
- case INT_PLACE_BEFORE : return "PLACE_BEFORE";
- case INT_PLACE_AFTER: return "PLACE_AFTER";
- case INT_PLACE_INLINE: return "PLACE_INLINE";
- case INT_PLACE_INFRAMEWORK: return "PLACE_INFRAMEWORK";
- }
-
- assert false : _val;
- return "<unknown ScriptPlacement>";
- }
-
- public boolean equals( Object o )
- {
- if (o == null) return false;
- if (o == this) return true;
- if (!(o instanceof ScriptPlacement)) return false;
- return ((ScriptPlacement )o)._val == _val;
- }
-
- public int hashCode()
- {
- return _val;
- }
-}
+/*
+ * Copyright 2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * $Header:$
+ */
+package org.apache.beehive.netui.tags.javascript;
+
+/**
+ *
+ */
+public class ScriptPlacement
+{
+ protected static final int INT_PLACE_BEFORE = 0;
+ protected static final int INT_PLACE_AFTER = 1;
+ protected static final int INT_PLACE_INLINE = 2;
+ protected static final int INT_PLACE_INFRAMEWORK = 3;
+
+ public static final ScriptPlacement PLACE_BEFORE = new ScriptPlacement(INT_PLACE_BEFORE);
+ public static final ScriptPlacement PLACE_AFTER = new ScriptPlacement(INT_PLACE_AFTER);
+ public static final ScriptPlacement PLACE_INLINE = new ScriptPlacement(INT_PLACE_INLINE);
+ public static final ScriptPlacement PLACE_INFRAMEWORK = new ScriptPlacement(INT_PLACE_INFRAMEWORK);
+
+ private int _val;
+
+ private ScriptPlacement(int val)
+ {
+ _val = val;
+ }
+
+ public String toString()
+ {
+ switch (_val)
+ {
+ case INT_PLACE_BEFORE : return "PLACE_BEFORE";
+ case INT_PLACE_AFTER: return "PLACE_AFTER";
+ case INT_PLACE_INLINE: return "PLACE_INLINE";
+ case INT_PLACE_INFRAMEWORK: return "PLACE_INFRAMEWORK";
+ }
+
+ assert false : _val;
+ return "<unknown ScriptPlacement>";
+ }
+
+ public boolean equals( Object o )
+ {
+ if (o == null) return false;
+ if (o == this) return true;
+ if (!(o instanceof ScriptPlacement)) return false;
+ return ((ScriptPlacement )o)._val == _val;
+ }
+
+ public int hashCode()
+ {
+ return _val;
+ }
+}