Return-Path: 
 <beehive-commits-return-1983-apmail-incubator-beehive-commits-archive=incubator.apache.org@incubator.apache.org>
Delivered-To: apmail-incubator-beehive-commits-archive@www.apache.org
Received: (qmail 69029 invoked from network); 1 Apr 2005 22:19:38 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 1 Apr 2005 22:19:38 -0000
Received: (qmail 53637 invoked by uid 500); 1 Apr 2005 22:19:38 -0000
Delivered-To: apmail-incubator-beehive-commits-archive@incubator.apache.org
Received: (qmail 53613 invoked by uid 500); 1 Apr 2005 22:19:38 -0000
Mailing-List: contact beehive-commits-help@incubator.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:beehive-commits-help@incubator.apache.org>
List-Unsubscribe: <mailto:beehive-commits-unsubscribe@incubator.apache.org>
List-Post: <mailto:beehive-commits@incubator.apache.org>
List-Id: <beehive-commits.incubator.apache.org>
Reply-To: "Beehive Dev" <beehive-dev@incubator.apache.org>
Delivered-To: mailing list beehive-commits@incubator.apache.org
Received: (qmail 53600 invoked by uid 500); 1 Apr 2005 22:19:38 -0000
Delivered-To: apmail-incubator-beehive-cvs@incubator.apache.org
Received: (qmail 53597 invoked by uid 99); 1 Apr 2005 22:19:38 -0000
X-ASF-Spam-Status: No, hits=-9.8 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from minotaur.apache.org (HELO minotaur.apache.org)
 (209.237.227.194)
  by apache.org (qpsmtpd/0.28) with SMTP; Fri, 01 Apr 2005 14:19:37 -0800
Received: (qmail 69024 invoked by uid 65534); 1 Apr 2005 22:19:36 -0000
Message-ID: <20050401221936.69023.qmail@minotaur.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Mailer: svnmailer-1.0.0-dev
Date: Fri, 01 Apr 2005 22:19:36 -0000
Subject: svn commit: r159741 - in incubator/beehive/trunk/netui:
 src/tags-html/org/apache/beehive/netui/tags/html/AnchorBase.java
 test/webapps/drt/testRecorder/tests/J162.xml
To: beehive-cvs@incubator.apache.org
From: dolander@apache.org
X-Virus-Checked: Checked
X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N

Author: dolander
Date: Fri Apr  1 14:19:35 2005
New Revision: 159741

URL: http://svn.apache.org/viewcvs?view=3Drev&rev=3D159741
Log:
Jira 162 -- The legacy TagId were not being generated for linkName enabled
anchors.


Modified:
    incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/ta=
gs/html/AnchorBase.java
    incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/J162.=
xml

Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/ne=
tui/tags/html/AnchorBase.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-h=
tml/org/apache/beehive/netui/tags/html/AnchorBase.java?view=3Ddiff&r1=3D159=
740&r2=3D159741
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/ta=
gs/html/AnchorBase.java (original)
+++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/ta=
gs/html/AnchorBase.java Fri Apr  1 14:19:35 2005
@@ -559,7 +559,7 @@
         // if the tagId was set then rewrite it and output it.
         if (_state.id !=3D null) {
             _state.id =3D getIdForTagId(_state.id);
-            renderDefaultNameAndId((HttpServletRequest) req, _state, _stat=
e=2Eid, null);
+            renderDefaultNameAndId((HttpServletRequest) req, _state, _stat=
e=2Eid, _state.id);
         }
=20
         // write out the tag.

Modified: incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests=
/J162.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webap=
ps/drt/testRecorder/tests/J162.xml?view=3Ddiff&r1=3D159740&r2=3D159741
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/J162.=
xml (original)
+++ incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/J162.=
xml Fri Apr  1 14:19:35 2005
@@ -2,7 +2,7 @@
 <ses:recorderSession xmlns:ses=3D"http://beehive.apache.org/netui/tools/te=
strecorder/2004/session">
    <ses:sessionName>J162</ses:sessionName>
    <ses:tester>Daryl</ses:tester>
-   <ses:startDate>29 Mar 2005, 09:42:18.173 AM MST</ses:startDate>
+   <ses:startDate>01 Apr 2005, 02:53:08.262 PM MST</ses:startDate>
    <ses:description>Daryl</ses:description>
    <ses:tests>
       <ses:test>
@@ -18,7 +18,7 @@
             <ses:cookies>
                <ses:cookie>
                   <ses:name>JSESSIONID</ses:name>
-                  <ses:value>BA2FBB0E95DC2FF882CECA0FB3BF9B48</ses:value>
+                  <ses:value>03EE55AB827FC69162943322438E4AAA</ses:value>
                </ses:cookie>
             </ses:cookies>
             <ses:headers>
@@ -44,7 +44,7 @@
                </ses:header>
                <ses:header>
                   <ses:name>cookie</ses:name>
-                  <ses:value>$Version=3D0; JSESSIONID=3DBA2FBB0E95DC2FF882=
CECA0FB3BF9B48; $Path=3D/coreWeb</ses:value>
+                  <ses:value>$Version=3D0; JSESSIONID=3D03EE55AB827FC69162=
943322438E4AAA; $Path=3D/coreWeb</ses:value>
                </ses:header>
                <ses:header>
                   <ses:name>host</ses:name>
@@ -56,7 +56,7 @@
                </ses:header>
                <ses:header>
                   <ses:name>testrecorder.playback.testid</ses:name>
-                  <ses:value>1b325bd5:102ef2c7065:-7ba6</ses:value>
+                  <ses:value>-15ffc26:102ffbc4ce1:-7bab</ses:value>
                </ses:header>
                <ses:header>
                   <ses:name>user-agent</ses:name>
@@ -67,33 +67,41 @@
          <ses:response>
             <ses:statusCode>200</ses:statusCode>
             <ses:reason/>
-            <ses:responseBody><![CDATA[<!DOCTYPE HTML PUBLIC "-//W3C//DTD =
HTML 4.01 Transitional//EN"
+            <ses:responseBody>&lt;!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4=
.01 Transitional//EN"
 	"http://www.w3.org/TR/html4/loose.dtd">
-<html lang=3D"en">
+&lt;html lang=3D"en">
=20
-    <head>
-        <base href=3D"http://localhost:8080/coreWeb/bugs/j162/index.jsp">
-    </head>
-    <body>
-    <p style=3D"color:green">This test will verify that an anchor
+    &lt;head>
+        &lt;base href=3D"http://localhost:8080/coreWeb/bugs/j162/index.jsp=
">
+    &lt;/head>
+    &lt;body>
+    &lt;p style=3D"color:green">This test will verify that an anchor
 	with just a linkName and tagId attribute will output the
 	lookup JavaScript.
-    </p>
-    <div netui:idScope=3D"one" >
-       <a id=3D"one.top"></a>
-       <h4>Anchor Fragment Identifier Test</h4>
-       <a id=3D"one.linkBottom" href=3D"#one.bottom">Bottom</a>
-       <div style=3D"border: thin solid;height: 400px;">
-       <p id=3D"javaOut"></p>
-       </div>
-       <a id=3D"one.bottom"></a>
-       <a id=3D"one.linkTop" href=3D"#one.top">Top</a>
-    </div>
-    <script language=3D"JavaScript" type=3D"text/JavaScript">
-<!--
+    &lt;/p>
+    &lt;div netui:idScope=3D"one" >
+       &lt;a id=3D"one.top">&lt;/a>
+       &lt;h4>Anchor Fragment Identifier Test&lt;/h4>
+       &lt;a id=3D"one.linkBottom" href=3D"#one.bottom">Bottom&lt;/a>
+       &lt;div style=3D"border: thin solid;height: 400px;">
+       &lt;p id=3D"javaOut">&lt;/p>
+       &lt;/div>
+       &lt;a id=3D"one.bottom">&lt;/a>
+       &lt;a id=3D"one.linkTop" href=3D"#one.top">Top&lt;/a>
+    &lt;/div>
+    &lt;script language=3D"JavaScript" type=3D"text/JavaScript">
+&lt;!--
=20
 // **** Start the NetUI Framework Generated JavaScript ****
=20
+// Build the netui_names table to map the tagId attributes
+// to the real id written into the HTML
+if (netui_tagIdNameMap =3D=3D null)
+   var netui_tagIdNameMap =3D new Object();
+netui_tagIdNameMap.one___one.linkBottom=3D"one.linkBottom"
+netui_tagIdNameMap.one___one.linkTop=3D"one.linkTop"
+
+
 // lookup by tagId to "real id"
 function lookupIdByTagId(id, tag)
 {
@@ -101,12 +109,22 @@
    return (idScope =3D=3D "") ? id : idScope + id;
 }
=20
+// lookup by tagId to "real name"
+function lookupNameByTagId(id, tag)
+{
+   var idScope =3D lookupIdScope(tag,"_");
+   if (idScope =3D=3D "")
+      return netui_tagIdNameMap[id];
+   else
+      return netui_tagIdNameMap[idScope  + "__" + id];
+}
+
 //Non-Legacy lookup method creating a fully qualified scope id
 function lookupIdScope(tag,sep)
 {
    var val =3D "";
    if (sep =3D=3D null) sep =3D "";
-   while (tag !=3D null && tag.getAttribute !=3D null) {
+   while (tag !=3D null &amp;&amp; tag.getAttribute !=3D null) {
       try {
          var attrVal =3D tag.getAttribute("netui:idScope");
       } catch (e) { /* ignore, in IE6 calling on a table results in an exc=
eption */ }
@@ -117,22 +135,22 @@
    return val;
 }
 -->
-</script></body>
-    <script language=3D"JavaScript" type=3D"text/JavaScript">
+&lt;/script>&lt;/body>
+    &lt;script language=3D"JavaScript" type=3D"text/JavaScript">
=20
     var p =3D document.getElementById("javaOut");
-    var val =3D "<b>Document Access</b><br>";
+    var val =3D "&lt;b>Document Access&lt;/b>&lt;br>";
     var anchorTag =3D document.getElementById(lookupIdByTagId("linkBottom"=
,p));
-    val =3D val + "LinkBottom Scope Id: <b>" + lookupIdScope(anchorTag,"."=
) + "</b><br/>";
-    val =3D val + "LinkBottom ID: <b>" + lookupIdByTagId("linkBottom",anch=
orTag) + "</b><br/>";
+    val =3D val + "LinkBottom Scope Id: &lt;b>" + lookupIdScope(anchorTag,=
"=2E") + "&lt;/b>&lt;br/>";
+    val =3D val + "LinkBottom ID: &lt;b>" + lookupIdByTagId("linkBottom",a=
nchorTag) + "&lt;/b>&lt;br/>";
     anchorTag =3D document.getElementById(lookupIdByTagId("linkTop",p));
-    val =3D val + "LinkTop Scope Id: <b>" + lookupIdScope(anchorTag,".") +=
 "</b><br/>";
-    val =3D val + "LinkTop ID: <b>" + lookupIdByTagId("linkTop",anchorTag)=
 + "</b><br/>";
+    val =3D val + "LinkTop Scope Id: &lt;b>" + lookupIdScope(anchorTag,"."=
) + "&lt;/b>&lt;br/>";
+    val =3D val + "LinkTop ID: &lt;b>" + lookupIdByTagId("linkTop",anchorT=
ag) + "&lt;/b>&lt;br/>";
=20
     p.innerHTML =3D val;
-    </script>
+    &lt;/script>
=20
-</html>]]></ses:responseBody>
+&lt;/html></ses:responseBody>
          </ses:response>
          <ses:testResults>
             <ses:testStatus>fail</ses:testStatus>
@@ -151,7 +169,7 @@
             <ses:cookies>
                <ses:cookie>
                   <ses:name>JSESSIONID</ses:name>
-                  <ses:value>BA2FBB0E95DC2FF882CECA0FB3BF9B48</ses:value>
+                  <ses:value>03EE55AB827FC69162943322438E4AAA</ses:value>
                </ses:cookie>
             </ses:cookies>
             <ses:headers>
@@ -181,7 +199,7 @@
                </ses:header>
                <ses:header>
                   <ses:name>cookie</ses:name>
-                  <ses:value>$Version=3D0; JSESSIONID=3DBA2FBB0E95DC2FF882=
CECA0FB3BF9B48; $Path=3D/coreWeb</ses:value>
+                  <ses:value>$Version=3D0; JSESSIONID=3D03EE55AB827FC69162=
943322438E4AAA; $Path=3D/coreWeb</ses:value>
                </ses:header>
                <ses:header>
                   <ses:name>host</ses:name>
@@ -193,7 +211,7 @@
                </ses:header>
                <ses:header>
                   <ses:name>testrecorder.playback.testid</ses:name>
-                  <ses:value>1b325bd5:102ef2c7065:-7ba6</ses:value>
+                  <ses:value>-15ffc26:102ffbc4ce1:-7bab</ses:value>
                </ses:header>
                <ses:header>
                   <ses:name>user-agent</ses:name>
@@ -204,33 +222,41 @@
          <ses:response>
             <ses:statusCode>200</ses:statusCode>
             <ses:reason/>
-            <ses:responseBody><![CDATA[<!DOCTYPE HTML PUBLIC "-//W3C//DTD =
HTML 4.01 Transitional//EN"
+            <ses:responseBody>&lt;!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4=
.01 Transitional//EN"
 	"http://www.w3.org/TR/html4/loose.dtd">
-<html lang=3D"en">
+&lt;html lang=3D"en">
=20
-    <head>
-        <base href=3D"http://localhost:8080/coreWeb/bugs/j162/index.jsp">
-    </head>
-    <body>
-    <p style=3D"color:green">This test will verify that an anchor
+    &lt;head>
+        &lt;base href=3D"http://localhost:8080/coreWeb/bugs/j162/index.jsp=
">
+    &lt;/head>
+    &lt;body>
+    &lt;p style=3D"color:green">This test will verify that an anchor
 	with just a linkName and tagId attribute will output the
 	lookup JavaScript.
-    </p>
-    <div netui:idScope=3D"one" >
-       <a id=3D"one.top"></a>
-       <h4>Anchor Fragment Identifier Test</h4>
-       <a id=3D"one.linkBottom" href=3D"#one.bottom">Bottom</a>
-       <div style=3D"border: thin solid;height: 400px;">
-       <p id=3D"javaOut"></p>
-       </div>
-       <a id=3D"one.bottom"></a>
-       <a id=3D"one.linkTop" href=3D"#one.top">Top</a>
-    </div>
-    <script language=3D"JavaScript" type=3D"text/JavaScript">
-<!--
+    &lt;/p>
+    &lt;div netui:idScope=3D"one" >
+       &lt;a id=3D"one.top">&lt;/a>
+       &lt;h4>Anchor Fragment Identifier Test&lt;/h4>
+       &lt;a id=3D"one.linkBottom" href=3D"#one.bottom">Bottom&lt;/a>
+       &lt;div style=3D"border: thin solid;height: 400px;">
+       &lt;p id=3D"javaOut">&lt;/p>
+       &lt;/div>
+       &lt;a id=3D"one.bottom">&lt;/a>
+       &lt;a id=3D"one.linkTop" href=3D"#one.top">Top&lt;/a>
+    &lt;/div>
+    &lt;script language=3D"JavaScript" type=3D"text/JavaScript">
+&lt;!--
=20
 // **** Start the NetUI Framework Generated JavaScript ****
=20
+// Build the netui_names table to map the tagId attributes
+// to the real id written into the HTML
+if (netui_tagIdNameMap =3D=3D null)
+   var netui_tagIdNameMap =3D new Object();
+netui_tagIdNameMap.one___one.linkBottom=3D"one.linkBottom"
+netui_tagIdNameMap.one___one.linkTop=3D"one.linkTop"
+
+
 // lookup by tagId to "real id"
 function lookupIdByTagId(id, tag)
 {
@@ -238,12 +264,22 @@
    return (idScope =3D=3D "") ? id : idScope + id;
 }
=20
+// lookup by tagId to "real name"
+function lookupNameByTagId(id, tag)
+{
+   var idScope =3D lookupIdScope(tag,"_");
+   if (idScope =3D=3D "")
+      return netui_tagIdNameMap[id];
+   else
+      return netui_tagIdNameMap[idScope  + "__" + id];
+}
+
 //Non-Legacy lookup method creating a fully qualified scope id
 function lookupIdScope(tag,sep)
 {
    var val =3D "";
    if (sep =3D=3D null) sep =3D "";
-   while (tag !=3D null && tag.getAttribute !=3D null) {
+   while (tag !=3D null &amp;&amp; tag.getAttribute !=3D null) {
       try {
          var attrVal =3D tag.getAttribute("netui:idScope");
       } catch (e) { /* ignore, in IE6 calling on a table results in an exc=
eption */ }
@@ -254,29 +290,29 @@
    return val;
 }
 -->
-</script></body>
-    <script language=3D"JavaScript" type=3D"text/JavaScript">
+&lt;/script>&lt;/body>
+    &lt;script language=3D"JavaScript" type=3D"text/JavaScript">
=20
     var p =3D document.getElementById("javaOut");
-    var val =3D "<b>Document Access</b><br>";
+    var val =3D "&lt;b>Document Access&lt;/b>&lt;br>";
     var anchorTag =3D document.getElementById(lookupIdByTagId("linkBottom"=
,p));
-    val =3D val + "LinkBottom Scope Id: <b>" + lookupIdScope(anchorTag,"."=
) + "</b><br/>";
-    val =3D val + "LinkBottom ID: <b>" + lookupIdByTagId("linkBottom",anch=
orTag) + "</b><br/>";
+    val =3D val + "LinkBottom Scope Id: &lt;b>" + lookupIdScope(anchorTag,=
"=2E") + "&lt;/b>&lt;br/>";
+    val =3D val + "LinkBottom ID: &lt;b>" + lookupIdByTagId("linkBottom",a=
nchorTag) + "&lt;/b>&lt;br/>";
     anchorTag =3D document.getElementById(lookupIdByTagId("linkTop",p));
-    val =3D val + "LinkTop Scope Id: <b>" + lookupIdScope(anchorTag,".") +=
 "</b><br/>";
-    val =3D val + "LinkTop ID: <b>" + lookupIdByTagId("linkTop",anchorTag)=
 + "</b><br/>";
+    val =3D val + "LinkTop Scope Id: &lt;b>" + lookupIdScope(anchorTag,"."=
) + "&lt;/b>&lt;br/>";
+    val =3D val + "LinkTop ID: &lt;b>" + lookupIdByTagId("linkTop",anchorT=
ag) + "&lt;/b>&lt;br/>";
=20
     p.innerHTML =3D val;
-    </script>
+    &lt;/script>
=20
-</html>]]></ses:responseBody>
+&lt;/html></ses:responseBody>
          </ses:response>
          <ses:testResults>
             <ses:testStatus>fail</ses:testStatus>
          </ses:testResults>
       </ses:test>
    </ses:tests>
-   <ses:endDate>29 Mar 2005, 09:42:18.874 AM MST</ses:endDate>
+   <ses:endDate>01 Apr 2005, 02:53:08.803 PM MST</ses:endDate>
    <ses:sessionStatus>fail</ses:sessionStatus>
    <ses:testCount>2</ses:testCount>
    <ses:passedCount>0</ses:passedCount>