You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beehive.apache.org by ri...@apache.org on 2005/05/17 01:18:44 UTC
svn commit: r170487 - in /incubator/beehive/trunk/netui:
src/compiler-core/org/apache/beehive/netui/compiler/
src/pageflow/org/apache/beehive/netui/pageflow/annotations/
src/tags-html/org/apache/beehive/netui/tags/html/
test/webapps/drt/coreWeb/tags/formatTags/
test/webapps/drt/testRecorder/tests/ test/webapps/jsf/jsfWeb/WEB-INF/
Author: rich
Date: Mon May 16 16:18:42 2005
New Revision: 170487
URL: http://svn.apache.org/viewcvs?rev=170487&view=rev
Log:
This is a contribution from Carlin Rogers to address Fix for http://issues.apache.org/jira/browse/BEEHIVE-710 : netui tag libraries documentation: imageAnchor through textBox tags
Also includes a formatting change to the MyFaces DRT web.xml, and a fix for a JavaDoc error from my last checkin.
tests: drt in trunk, bvt in netui (WinXP)
BB: self (linux)
Modified:
incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/CompilerUtils.java
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/annotations/Jpf.java
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Attribute.java
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Content.java
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/FormatDate.java
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/FormatNumber.java
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/FormatString.java
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/formatTags/Begin.jsp
incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/FormatTags.xml
incubator/beehive/trunk/netui/test/webapps/jsf/jsfWeb/WEB-INF/web.xml.myfaces
Modified: incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/CompilerUtils.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/CompilerUtils.java?rev=170487&r1=170486&r2=170487&view=diff
==============================================================================
--- incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/CompilerUtils.java (original)
+++ incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/CompilerUtils.java Mon May 16 16:18:42 2005
@@ -185,18 +185,16 @@
public static DeclaredType getDeclaredType( AnnotationInstance annotation, String memberName, boolean defaultIsNull )
{
- AnnotationValue value = getAnnotationValue( annotation, memberName, defaultIsNull );
-
- // If the type is the string "", it means that there is already an error related to the type itself.
- if ( value != null && isErrorString( value.getValue() ) ) return null;
-
- assert value == null || value.getValue() instanceof DeclaredType : value.getValue().getClass().getName();
- return value != null ? ( DeclaredType ) value.getValue() : null;
+ return ( DeclaredType ) getReferenceType( annotation, memberName, defaultIsNull );
}
public static ReferenceType getReferenceType( AnnotationInstance annotation, String memberName, boolean defaultIsNull )
{
AnnotationValue value = getAnnotationValue( annotation, memberName, defaultIsNull );
+
+ // If the type is the string "<error>", it means that there is already an error related to the type itself.
+ if ( value != null && isErrorString( value.getValue() ) ) return null;
+
return value != null ? ( ReferenceType ) value.getValue() : null;
}
Modified: incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/annotations/Jpf.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/annotations/Jpf.java?rev=170487&r1=170486&r2=170487&view=diff
==============================================================================
--- incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/annotations/Jpf.java (original)
+++ incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/annotations/Jpf.java Mon May 16 16:18:42 2005
@@ -126,7 +126,7 @@
* If set to <code>true</code>, then this page flow does not get discarded when another page flow is hit
* (only valid for {@link org.apache.beehive.netui.pageflow.PageFlowController}s). It ramains stored in the
* background, and is reinstated when it is requested again. Long-lived page flows may be deleted using
- * {@link org.apache.beehive.netui.pageflow.PageFlowUtils#removedLongLivedPageFlow}.
+ * {@link org.apache.beehive.netui.pageflow.PageFlowUtils#removeLongLivedPageFlow}.
*/
boolean longLived() default false;
Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Attribute.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Attribute.java?rev=170487&r1=170486&r2=170487&view=diff
==============================================================================
--- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Attribute.java (original)
+++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Attribute.java Mon May 16 16:18:42 2005
@@ -28,14 +28,13 @@
/**
* @jsptagref.tagdescription <p>Adds an attribute to the parent tag rendered in the browser.</p>
*
- * <p>The following <netui:attribute> tags are rendered within the <span> tag (since
- * the <netui:label> tag is rendered as a <span> tag in the browser.
+ * <p>The following <netui:attribute> tags are rendered within the <span> tag in the browser.
*
- * <pre> <netui:span value="Some Text">
- * <netui:attribute name="a" value="aVal" />
- * <netui:attribute name="b" value="bVal" />
- * <netui:attribute name="c" value="cVal" />
- * </netui:span></pre>
+ * <pre> <netui:span value="Some Text">
+ * <netui:attribute name="a" value="aVal" />
+ * <netui:attribute name="b" value="bVal" />
+ * <netui:attribute name="c" value="cVal" />
+ * </netui:span></pre>
*
* <p>The HTML rendered in the browser appears as follows.
*
Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Content.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Content.java?rev=170487&r1=170486&r2=170487&view=diff
==============================================================================
--- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Content.java (original)
+++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Content.java Mon May 16 16:18:42 2005
@@ -26,17 +26,17 @@
/**
* The Content tag is used to display text, or the result of an expression, to the page.
* @jsptagref.tagdescription Displays text or the result of an expression.
- * Note that <netui:content> is similar to {@link Label}, except for the way
+ * Note that <netui:content> is similar to {@link Span}, except for the way
* it processes HTML-sensitive text. The <netui:content> tag does not escape
- * HTML-sensitive characters, but the <netui:label> tag filters the input
+ * HTML-sensitive characters, but the <netui:span> tag filters the input
* string for characters that are senstive to
* HTML interpreters 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>
@@ -50,7 +50,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>
Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/FormatDate.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/FormatDate.java?rev=170487&r1=170486&r2=170487&view=diff
==============================================================================
--- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/FormatDate.java (original)
+++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/FormatDate.java Mon May 16 16:18:42 2005
@@ -178,10 +178,10 @@
* <li>the local default</li>
* </ul>
* </blockquote>
- * @example In this sample, the <netui:label> tag's output will be formatted to something like 08/29/1957.
- * <pre> <netui:label value="${pageScope.today}">
+ * @example In this sample, the <netui:span> tag's output will be formatted to something like 08/29/1957.
+ * <pre> <netui:span value="${pageScope.today}">
* <netui:formatDate pattern="MM/dd/yyyy" />
- * </netui:label></pre>
+ * </netui:span></pre>
* @netui:tag name="formatDate" body-content="empty" description="A formatter used to format dates."
*/
public class FormatDate extends FormatTag
Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/FormatNumber.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/FormatNumber.java?rev=170487&r1=170486&r2=170487&view=diff
==============================================================================
--- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/FormatNumber.java (original)
+++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/FormatNumber.java Mon May 16 16:18:42 2005
@@ -80,20 +80,20 @@
* two-letter code as defined by ISO-639.
* @example In this first example, the value "12345678" is formatted
* to 12,345,678.00.
- * <pre> <netui:label value="12345678">
+ * <pre> <netui:span value="12345678">
* <netui:formatNumber pattern="#,###.00" />
- * </netui:label></pre>
+ * </netui:span></pre>
*
* <p>In the next sample, the value ".33" is formatted to 33%.</p>
- * <pre> <netui:label value=".33">
+ * <pre> <netui:span value=".33">
* <netui:formatNumber type="percent" />
- * </netui:label></pre>
+ * </netui:span></pre>
*
* <p>In the next sample, the value "14.317" is formatted
* to $14.32.</p>
- * <pre> <netui:label value="14.317">
+ * <pre> <netui:span value="14.317">
* <netui:formatNumber country="US" language="en" type="currency" />
- * </netui:label></pre>
+ * </netui:span></pre>
* @netui:tag name="formatNumber" body-content="empty" description="A formatter used to format numbers."
*/
public class FormatNumber extends FormatTag
Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/FormatString.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/FormatString.java?rev=170487&r1=170486&r2=170487&view=diff
==============================================================================
--- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/FormatString.java (original)
+++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/FormatString.java Mon May 16 16:18:42 2005
@@ -58,9 +58,9 @@
*
* <p>The <netui:formatString> tag formats the output of its parent tag. For example:
*
- * <pre> <netui:label value="${pageFlow.phone}">
- * <netui:formatString pattern="phone number: (###) ###-####"/>
- * </netui:label> </pre>
+ * <pre> <netui:span value="${pageFlow.phone}">
+ * <netui:formatString pattern="phone number: (###) ###-####"/>
+ * </netui:span> </pre>
*
* <p>
* <netui:formatString> uses the following pattern syntax:
@@ -87,9 +87,9 @@
* will be dropped. Otherwise, they will be appended to the end of the formatted String.
* @example In this sample, the String "2125555555" will be formatted to this form: (212)555-5555.
*
- * <pre> <netui:label value="2125555555">
+ * <pre> <netui:span value="2125555555">
* <netui:formatString pattern="phone (###) ###-####"/>
- * </netui:label> </pre>
+ * </netui:span> </pre>
* @netui:tag name="formatString" body-content="empty" description="A formatter used to format strings."
* @netui:attribute name="pattern" required="true" rtexprvalue="true"
*/
Modified: incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/formatTags/Begin.jsp
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/formatTags/Begin.jsp?rev=170487&r1=170486&r2=170487&view=diff
==============================================================================
--- incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/formatTags/Begin.jsp (original)
+++ incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/formatTags/Begin.jsp Mon May 16 16:18:42 2005
@@ -51,10 +51,9 @@
<netui:span value="12345.67">
<netui:formatNumber language="EN" country = "US" type="currency"/>
</netui:span>
-<!-- removing the GB for the moment because this causes the test recorder problems -->
<th>GB Currency</th><td>
<netui:span value="12345.67">
- <netui:formatNumber language="EN" country = "US" type="currency"/>
+ <netui:formatNumber language="EN" country = "GB" type="currency"/>
</netui:span>
</td></tr>
<tr><th>EN Number</ty><td>
Modified: incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/FormatTags.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/FormatTags.xml?rev=170487&r1=170486&r2=170487&view=diff
==============================================================================
--- incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/FormatTags.xml (original)
+++ incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/FormatTags.xml Mon May 16 16:18:42 2005
@@ -104,9 +104,8 @@
<table border="1" cellspacing="0">
<tr><th>EN Currency</ty><td>
<span>$12,345.67</span>
-<!-- removing the GB for the moment because this causes the test recorder problems -->
<th>GB Currency</th><td>
-<span>$12,345.67</span>
+<span>£12,345.67</span>
</td></tr>
<tr><th>EN Number</ty><td>
<span>12,345.67</span>
@@ -155,4 +154,4 @@
<endDate>05 Mar 2004, 01:25:39.748 PM MST</endDate>
<testCount>1</testCount>
-</recorderSession>
\ No newline at end of file
+</recorderSession>
Modified: incubator/beehive/trunk/netui/test/webapps/jsf/jsfWeb/WEB-INF/web.xml.myfaces
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/jsf/jsfWeb/WEB-INF/web.xml.myfaces?rev=170487&r1=170486&r2=170487&view=diff
==============================================================================
--- incubator/beehive/trunk/netui/test/webapps/jsf/jsfWeb/WEB-INF/web.xml.myfaces (original)
+++ incubator/beehive/trunk/netui/test/webapps/jsf/jsfWeb/WEB-INF/web.xml.myfaces Mon May 16 16:18:42 2005
@@ -37,8 +37,9 @@
influence the HTML code.
Default: "true"
</description>
- </context-param><!-- Test Recorder Filter -->
-
+ </context-param>
+
+ <!-- Test Recorder Filter -->
<filter>
<filter-name>TestRecorderFilter</filter-name>
<filter-class>org.apache.beehive.netui.tools.testrecorder.server.TestRecorderFilter</filter-class>