Author: dolander
Date: Wed Aug 4 11:57:56 2004
New Revision: 35693
Added:
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Label.java
- copied, changed from rev 35679,
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/FormLabel.java
Removed:
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/FormLabel.java
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/xhtml/formLabelResults.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/xhtml/formLabelTest.jsp
incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/XhtmlFormLabel.xml
Log:
Rename the FormLabel tag to Label. This completes the transistion aligning the
<netui:label> and the HTML <label>
Copied:
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Label.java
(from rev 35679,
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/FormLabel.java)
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/FormLabel.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Label.java
Wed Aug 4 11:57:56 2004
@@ -29,15 +29,15 @@
import javax.servlet.jsp.JspException;
/**
- * @netui:tag name="formLabel" description="a <label> element which may point
to a form control."
+ * @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 FormLabel extends LabelBase
+public class Label extends LabelBase
implements Formattable
{
- private static final Logger logger = Logger.getInstance(FormLabel.class);
+ private static final Logger logger = Logger.getInstance(Label.class);
private LabelTag.State _state = new LabelTag.State();
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/xhtml/formLabelResults.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/xhtml/formLabelResults.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/xhtml/formLabelResults.jsp
Wed Aug 4 11:57:56 2004
@@ -5,7 +5,7 @@
<netui-data:declarePageInput name="formData"
type="xhtml.Controller.FormLabelTests"/>
<netui:html documentType="xhtml1-transitional">
<head>
- <title>FormLabel Post Results</title>
+ <title>Label Post Results</title>
<style type="text/css">
.normal {color: #000099;font-family:Verdana;
font-size:8pt;margin:0,0,0,0;}
p {color: #000099;font-family:Verdana; font-size:8pt;margin:0,0,0,0;}
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/xhtml/formLabelTest.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/xhtml/formLabelTest.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/xhtml/formLabelTest.jsp
Wed Aug 4 11:57:56 2004
@@ -26,19 +26,19 @@
<netui:form action="postFormLabelResults">
<table>
<tr valign="top">
- <td><netui:formLabel value="Value Three:"
for="labelOne" styleClass="normal" /></td>
+ <td><netui:label value="Value Three:" for="labelOne"
styleClass="normal" /></td>
<td>
<netui:textBox dataSource="actionForm.valueOne"
tagId="labelOne"/>
</td>
</tr>
<tr valign="top">
- <td><netui:formLabel value="Value Two:" for="labelTwo"
styleClass="normal" /></td>
+ <td><netui:label value="Value Two:" for="labelTwo"
styleClass="normal" /></td>
<td>
<netui:textBox dataSource="actionForm.valueTwo"
tagId="labelTwo"/>
</td>
</tr>
<tr valign="top">
- <td><netui:formLabel value="Value Three:"
for="labelThree" styleClass="normal" /></td>
+ <td><netui:label value="Value Three:" for="labelThree"
styleClass="normal" /></td>
<td>
<netui:textBox dataSource="actionForm.valueThree"
tagId="labelThree"/>
</td>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/XhtmlFormLabel.xml
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/XhtmlFormLabel.xml
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/XhtmlFormLabel.xml
Wed Aug 4 11:57:56 2004
@@ -2,7 +2,7 @@
<ses:recorderSession
xmlns:ses="http://beehive.apache.org/netui/tools/testrecorder/2004/session";>
<ses:sessionName>XhtmlFormLabel</ses:sessionName>
<ses:tester>Daryl</ses:tester>
- <ses:startDate>24 Jul 2004, 05:48:34.777 PM MDT</ses:startDate>
+ <ses:startDate>04 Aug 2004, 12:09:31.367 PM MDT</ses:startDate>
<ses:description>Daryl</ses:description>
<ses:tests>
<ses:test>
@@ -47,7 +47,7 @@
</ses:header>
<ses:header>
<ses:name>testrecorder.playback.testid</ses:name>
- <ses:value>4b58bc9d:fdf37c62e7:-7970</ses:value>
+ <ses:value>4c6bf002:fe2af42bb4:-7956</ses:value>
</ses:header>
<ses:header>
<ses:name>user-agent</ses:name>
@@ -155,7 +155,7 @@
</html></ses:responseBody>
</ses:response>
<ses:testResults>
- <ses:testStatus>fail</ses:testStatus>
+ <ses:testStatus>pass</ses:testStatus>
</ses:testResults>
</ses:test>
<ses:test>
@@ -184,7 +184,7 @@
<ses:cookies>
<ses:cookie>
<ses:name>JSESSIONID</ses:name>
- <ses:value>EE0E4EFAD3FF82E7063F3249050B7334</ses:value>
+ <ses:value>8D39D81D42F98F8CD92151BAE64636D6</ses:value>
</ses:cookie>
</ses:cookies>
<ses:headers>
@@ -218,7 +218,7 @@
</ses:header>
<ses:header>
<ses:name>cookie</ses:name>
- <ses:value>$Version=0;
JSESSIONID=EE0E4EFAD3FF82E7063F3249050B7334; $Path=/coreWeb</ses:value>
+ <ses:value>$Version=0;
JSESSIONID=8D39D81D42F98F8CD92151BAE64636D6; $Path=/coreWeb</ses:value>
</ses:header>
<ses:header>
<ses:name>cookie2</ses:name>
@@ -234,7 +234,7 @@
</ses:header>
<ses:header>
<ses:name>testrecorder.playback.testid</ses:name>
- <ses:value>4b58bc9d:fdf37c62e7:-7970</ses:value>
+ <ses:value>4c6bf002:fe2af42bb4:-7956</ses:value>
</ses:header>
<ses:header>
<ses:name>user-agent</ses:name>
@@ -249,7 +249,7 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
<html lang="en" xml:lang="en" xmlns="http://www.w3.org/1999/xhtml";>
<head>
- <title>FormLabel Post Results</title>
+ <title>Label Post Results</title>
<style type="text/css">
.normal {color: #000099;font-family:Verdana;
font-size:8pt;margin:0,0,0,0;}
p {color: #000099;font-family:Verdana; font-size:8pt;margin:0,0,0,0;}
@@ -288,11 +288,11 @@
</html>]]></ses:responseBody>
</ses:response>
<ses:testResults>
- <ses:testStatus>pass</ses:testStatus>
+ <ses:testStatus>fail</ses:testStatus>
</ses:testResults>
</ses:test>
</ses:tests>
- <ses:endDate>24 Jul 2004, 05:48:39.343 PM MDT</ses:endDate>
+ <ses:endDate>04 Aug 2004, 12:09:32.989 PM MDT</ses:endDate>
<ses:sessionStatus>fail</ses:sessionStatus>
<ses:testCount>2</ses:testCount>
<ses:passedCount>1</ses:passedCount>
