Author: dolander
Date: Tue Feb 1 11:08:57 2005
New Revision: 149432
URL: http://svn.apache.org/viewcvs?view=rev&rev=149432
Log:
Jira 221 -- Multiple Trees in a page in different ScriptContainer were not
running
when both are runAtClient. The problem was that the tree init() method was not
run after the second tree so it was never initialized correctly. I now allow
the init() method to be run multiple times and the code is run after each
runAtClient tree.
I moved all of the generated HTML attributes into a netui:xxx namespace.
Added:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/richTree/treeSC.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/richTree/treeSC2.jsp
Removed:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/richTree/treeScriptContainer.jsp
Modified:
incubator/beehive/trunk/netui/src/javascript/tagshtml/netui-tree.js
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/Tree.java
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeCRI.java
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeElement.java
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeRenderer.java
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/richTree/Controller.jpf
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/richTree/index.jsp
incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/DivPanelTree.xml
incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/RichTreeClientContent.xml
incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/RichTreeClientContentAnchor.xml
incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/RichTreeClientContentForm.xml
incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/RichTreeRunAtClient.xml
incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/RichTreeRunAtClient2.xml
Modified: incubator/beehive/trunk/netui/src/javascript/tagshtml/netui-tree.js
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/javascript/tagshtml/netui-tree.js?view=diff&r1=149431&r2=149432
==============================================================================
--- incubator/beehive/trunk/netui/src/javascript/tagshtml/netui-tree.js
(original)
+++ incubator/beehive/trunk/netui/src/javascript/tagshtml/netui-tree.js Tue Feb
1 11:08:57 2005
@@ -37,11 +37,15 @@
NetUITree.prototype.init = function()
{
for (var i=0;i<document.links.length;i++) {
- var attr = document.links[i].getAttribute("netui-tree-anchor");
+ var attr = document.links[i].getAttribute("netui:treeAnchor");
if (attr != null) {
- document.links[i].onclick = NetUICollapseTree;
- if (attr == "collapse") {
- NetUICollapseTreeNode(document.links[i],false);
+ var isInit = document.links[i].getAttribute("netui:treeAnchorInit");
+ if (isInit != null) {
+ document.links[i].onclick = NetUICollapseTree;
+ if (attr == "collapse") {
+ NetUICollapseTreeNode(document.links[i],false);
+ }
+ document.links[i].removeAttribute("netui:treeAnchorInit");
}
}
}
@@ -147,7 +151,7 @@
nodeName = nodeName[0].childNodes[0].nodeValue;
for (var i=0;i<document.links.length;i++) {
- var attr = document.links[i].getAttribute("netui-tree-id");
+ var attr = document.links[i].getAttribute("netui:treeId");
if (attr != null) {
if (attr == nodeName) {
var dump = "DUMP:\n";
@@ -198,7 +202,7 @@
// Create the XmlHttpRequest that will inform the server of the
// change in the client state.
var treeName = netUI.netUITree.getTreeName(this);
- var nodeName = this.getAttribute("netui-tree-id");
+ var nodeName = this.getAttribute("netui:treeId");
var expandOnServer = this.getAttribute("netui:expandOnServer");
var expandPath = this.getAttribute("netui:expandPath");
var cmd = "treeExpand";
@@ -228,7 +232,7 @@
return reportNetUIError("Expected Node was not an DIV:" +
parentDiv.nodeName);
var depth = netUI.netUITree.getDepth(parentDiv);
- parentDiv.setAttribute("netui-tree-anchor","expand");
+ parentDiv.setAttribute("netui:treeAnchor","expand");
parentDiv = parentDiv.nextSibling;
while (parentDiv != null && parentDiv.nodeName != "DIV") {
parentDiv = parentDiv.nextSibling;
@@ -262,7 +266,7 @@
// change in the client state.
if (raiseCommand) {
var treeName = netUI.netUITree.getTreeName(node);
- var nodeName = node.getAttribute("netui-tree-id");
+ var nodeName = node.getAttribute("netui:treeId");
var url =
netUI.netUITree.getTreeCommandUrl("treeCollapse",treeName,nodeName,"false");
netUI.raiseCommand(url,NetUITreeXmlHttpRequestReturn);
}
@@ -289,7 +293,7 @@
// get the depth and then begin to collapse rows
var depth = netUI.netUITree.getDepth(parentDiv);
- parentDiv.setAttribute("netui-tree-anchor","collapse");
+ parentDiv.setAttribute("netui:treeAnchor","collapse");
netUI.netUITree.collapseTreeSection(depth,parentDiv.nextSibling);
// change the method the
@@ -312,7 +316,7 @@
if (div.nodeName != "DIV")
return reportNetUIError("getDepth only support DIV nodes, found: " +
div.nodeName);
- var attr = div.getAttribute("netui-tree-level");
+ var attr = div.getAttribute("netui:treeLevel");
return attr;
}
@@ -384,7 +388,7 @@
while (true) {
div.style.display = "";
- var at = div.getAttribute("netui-tree-anchor");
+ var at = div.getAttribute("netui:treeAnchor");
// get the next sibling
div = div.nextSibling;
Modified:
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/Tree.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/Tree.java?view=diff&r1=149431&r2=149432
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/Tree.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/Tree.java
Tue Feb 1 11:08:57 2005
@@ -665,7 +665,7 @@
reportErrors();
return;
}
- srs.writeFeature(sr, writer, CoreScriptFeature.TREE_INIT, true,
false, null);
+ srs.writeFeature(sr, writer, CoreScriptFeature.TREE_INIT, false,
false, null);
assert(treeRoot instanceof ITreeRootElement);
ITreeRootElement tre = (ITreeRootElement) treeRoot;
tre.setTreeRenderState(_trs);
Modified:
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeCRI.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeCRI.java?view=diff&r1=149431&r2=149432
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeCRI.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeCRI.java
Tue Feb 1 11:08:57 2005
@@ -18,11 +18,8 @@
package org.apache.beehive.netui.tags.tree;
import org.apache.beehive.netui.pageflow.requeststate.*;
-import org.apache.beehive.netui.pageflow.PageFlowController;
-import org.apache.beehive.netui.pageflow.PageFlowUtils;
import org.apache.beehive.netui.tags.rendering.AbstractRenderAppender;
import org.apache.beehive.netui.tags.rendering.StringBuilderRenderAppender;
-import org.apache.beehive.netui.tags.TagConfig;
import org.apache.beehive.netui.util.logging.Logger;
import javax.servlet.ServletContext;
@@ -54,16 +51,13 @@
// Create the command by striping off the context path and the
extension
String cmd = request.getRequestURI();
- String ctxtPath = request.getContextPath();
// catch any runtime errors here and return.
try {
- System.err.println("cmd:" + cmd);
int dot = cmd.lastIndexOf('.');
int slash = cmd.lastIndexOf('/');
if (slash != -1 && slash != -1) {
cmd = cmd.substring(slash+1,dot);
- System.err.println("cmd:" + cmd);
}
}
catch (RuntimeException e) {
Modified:
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeElement.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeElement.java?view=diff&r1=149431&r2=149432
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeElement.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeElement.java
Tue Feb 1 11:08:57 2005
@@ -41,12 +41,14 @@
/**
* Constant used to indicate an anchor is an expand/collapse tree node
*/
- public static final String TREE_ANCHOR = "netui-tree-anchor";
- public static final String TREE_ANCHOR_ID = "netui-tree-id";
+ public static final String TREE_ANCHOR = "netui:treeAnchor";
+ public static final String TREE_ANCHOR_INIT = "netui:treeAnchorInit";
+ public static final String TREE_ANCHOR_ID = "netui:treeId";
public static final String TREE_EXPAND = "netui:expandOnServer";
public static final String TREE_EXPAND_PATH = "netui:expandPath";
public static final String TREE_EXPAND_STATE = "expand";
public static final String TREE_COLLAPSE_STATE = "collapse";
+ public static final String TREE_LEVEL = "netui:treeLevel";
/**
* Constant used to indicate that a tree node anchor should be set
expanded.
Modified:
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeRenderer.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeRenderer.java?view=diff&r1=149431&r2=149432
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeRenderer.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeRenderer.java
Tue Feb 1 11:08:57 2005
@@ -138,7 +138,7 @@
}
attrs.renderDiv(_divState, node);
if (_trs.runAtClient) {
- _divState.registerAttribute(AbstractHtmlState.ATTR_GENERAL,
"netui-tree-level", Integer.toString(level));
+ _divState.registerAttribute(AbstractHtmlState.ATTR_GENERAL,
TreeElement.TREE_LEVEL, Integer.toString(level));
}
sb.append(" ");
StringBuilderRenderAppender writer = new
StringBuilderRenderAppender(sb);
@@ -488,6 +488,7 @@
_anchorState.href = "";
_anchorState.registerAttribute(AbstractHtmlState.ATTR_GENERAL,
TreeElement.TREE_ANCHOR,
(expanded ? TreeElement.TREE_EXPAND_STATE :
TreeElement.TREE_COLLAPSE_STATE));
+ _anchorState.registerAttribute(AbstractHtmlState.ATTR_GENERAL,
TreeElement.TREE_ANCHOR_INIT,"true");
_anchorState.registerAttribute(AbstractHtmlState.ATTR_GENERAL,
TreeElement.TREE_ANCHOR_ID, encodedNodeName);
if (node.isExpandOnServer() && !node.isExpanded()) {
String path = _req.getServletPath();
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/richTree/Controller.jpf
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/richTree/Controller.jpf?view=diff&r1=149431&r2=149432
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/richTree/Controller.jpf
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/richTree/Controller.jpf
Tue Feb 1 11:08:57 2005
@@ -59,6 +59,8 @@
private TreeElement _tree25;
private TreeElement _tree26;
private TreeElement _tree27;
+ private TreeElement _tree28;
+ private TreeElement _tree29;
private String _expand = " ";
private String _node = " ";
@@ -277,7 +279,22 @@
public void setTree27(TreeElement tn) {
_tree27 = tn;
}
+
+ public TreeElement getTree28() {
+ return _tree28;
+ }
+
+ public void setTree28(TreeElement tn) {
+ _tree28 = tn;
+ }
+ public TreeElement getTree29() {
+ return _tree29;
+ }
+
+ public void setTree29(TreeElement tn) {
+ _tree29 = tn;
+ }
//************************************************************************
@@ -524,6 +541,8 @@
_tree25 = null;
_tree26 = null;
_tree27 = null;
+ _tree28 = null;
+ _tree29 = null;
buildTrees();
return forward;
@@ -791,10 +810,23 @@
}
@Jpf.Action(forwards = {
- @Jpf.Forward(name = "success", path = "treeScriptContainer.jsp")
+ @Jpf.Forward(name = "success", path = "treeSC.jsp")
+})
+ protected Forward goTreeSC() {
+ Forward forward = new Forward("success");
+ clearExpand();
+ NameService ns = NameService.instance(getRequest().getSession());
+ ns.debugSetNameIntValue(223);
+ return forward;
+ }
+
+ @Jpf.Action(forwards = {
+ @Jpf.Forward(name = "success", path = "treeSC2.jsp")
})
- protected Forward goTreeScriptContainer() {
+ protected Forward goTreeSC2() {
Forward forward = new Forward("success");
+ NameService ns = NameService.instance(getRequest().getSession());
+ ns.debugSetNameIntValue(233);
clearExpand();
return forward;
}
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/richTree/index.jsp
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/richTree/index.jsp?view=diff&r1=149431&r2=149432
==============================================================================
--- incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/richTree/index.jsp
(original)
+++ incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/richTree/index.jsp
Tue Feb 1 11:08:57 2005
@@ -72,9 +72,12 @@
<tr><td><netui:anchor
action="goClientContentForm">RichTreeClientContentForm</netui:anchor></td>
<td>Using an Form inside of the
Content</td><td>goClientContentForm</td><td>clientContentForm.jsp</td>
<td>tree22</td></tr>
- <tr><td><netui:anchor action="goTreeScriptContainer">*** RunAtClient
ScriptContainer</netui:anchor></td>
- <td>Running a runAtClient tree in a script
container</td><td>goTreeScriptContainer</td><td>treeScriptContainer.jsp</td>
+ <tr><td><netui:anchor action="goTreeSC">*** RunAtClient
ScriptContainer</netui:anchor></td>
+ <td>Running a runAtClient tree in a script
container</td><td>goTreeSC</td><td>treeSC.jsp</td>
<td>tree24</td></tr>
+ <tr><td><netui:anchor action="goTreeSC2">*** RunAtClient
ScriptContainer</netui:anchor></td>
+ <td>Running a runAtClient tree in a script
container</td><td>goTreeSC2</td><td>treeSC2.jsp</td>
+ <td>tree28 tree29</td></tr>
<tr><td><netui:anchor
action="goRunAtClient2">RichTreeRunAtClient2</netui:anchor></td>
<td>Multiple tree controls doing
runAtClient</td><td>goRunAtClient2</td><td>runAtClient2.jsp</td>
<td>tree25 tree26</td></tr>
Added:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/richTree/treeSC.jsp
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/richTree/treeSC.jsp?view=auto&rev=149432
==============================================================================
--- incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/richTree/treeSC.jsp
(added)
+++ incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/richTree/treeSC.jsp
Tue Feb 1 11:08:57 2005
@@ -0,0 +1,53 @@
+<%@ page language="java" contentType="text/html;charset=UTF-8"%>
+<%@ taglib uri="beehive-netui-tags-databinding.tld" prefix="netui-data"%>
+<%@ taglib uri="beehive-netui-tags-html.tld" prefix="netui"%>
+<%@ taglib uri="beehive-netui-tags-template.tld" prefix="netui-template"%>
+<netui:html idScope="tree">
+ <head>
+ <title>treeSC.jsp</title>
+ <link href="style.css" rel="stylesheet" type="text/css">
+ <netui:base/>
+ </head>
+ <netui:body>
+ <h4 class="title"><netui:anchor action="begin"
styleClass="homeAnchor">Home</netui:anchor>treeSC.jsp [goTreeSC.do] </h4>
+ <!-- Attribute Information -->
+ <div style='float:left;width:300px'>
+ <table cellpadding="2" cellspacing="0" border="1" width="300px">
+ <tr><th>Creation</th><td>Static</td></tr>
+ <tr><th>tree</th><td>{pageFlow.tree24}</td></tr>
+ <tr><th>runAtClient</th><td>true</td></tr>
+ <tr><th>action</th><td>postback</td></tr>
+ </table>
+ </div>
+ <!-- Postback information -->
+ <div style='float:right;width:250px;border:solid 1pt gray;margin:2 4;'>
+ <p style="font-weight:bold;text-align:center;margin:
0;padding:0;">Tree Postback Information</p>
+ <table cellpadding='0' cellspacing='2' width="100%">
+ <tr><th style="text-align:right"
width="100pt">Expand:</th><td><netui:content
value="${pageFlow.expand}"/></td></tr>
+ <tr><th style="text-align:right"
width="100pt">Selection:</th><td><netui:content
value="${pageFlow.node}"/></td></tr>
+ </table>
+ </div>
+ <hr style="clear:left">
+ <div class="content">
+ <netui:scriptContainer generateIdScope="true">
+ <netui:scriptHeader />
+ <netui:tree dataSource="pageFlow.tree24" selectionAction="postback"
+ selectionStyle="color:red" unselectStyle="color:blue"
+ tagId="tree" renderJavaScript="true" runAtClient="true">
+ <netui:treeItem tagId="Item0" expanded="true" action="postback">
+ <netui:treeLabel>0</netui:treeLabel>
+ <netui:treeItem tagId="item00" expanded="true"
action="postback">
+ <netui:treeLabel>0.0</netui:treeLabel>
+ </netui:treeItem>
+ <netui:treeItem expanded="true" action="postback">
+ <netui:treeLabel>0.1</netui:treeLabel>
+ <netui:treeItem action="postback">0.1.0</netui:treeItem>
+ <netui:treeItem action="postback">0.1.1</netui:treeItem>
+ </netui:treeItem>
+ <netui:treeItem expanded="true"
action="postback">0.2</netui:treeItem>
+ </netui:treeItem>
+ </netui:tree>
+ </netui:scriptContainer>
+ </div>
+ </netui:body>
+</netui:html>
Added:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/richTree/treeSC2.jsp
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/richTree/treeSC2.jsp?view=auto&rev=149432
==============================================================================
--- incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/richTree/treeSC2.jsp
(added)
+++ incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/richTree/treeSC2.jsp
Tue Feb 1 11:08:57 2005
@@ -0,0 +1,74 @@
+<%@ page language="java" contentType="text/html;charset=UTF-8"%>
+<%@ taglib uri="beehive-netui-tags-databinding.tld" prefix="netui-data"%>
+<%@ taglib uri="beehive-netui-tags-html.tld" prefix="netui"%>
+<%@ taglib uri="beehive-netui-tags-template.tld" prefix="netui-template"%>
+<netui:html idScope="tree">
+ <head>
+ <title>treeSC2.jsp</title>
+ <link href="style.css" rel="stylesheet" type="text/css">
+ <netui:base/>
+ </head>
+ <netui:body>
+ <h4 class="title"><netui:anchor action="begin"
styleClass="homeAnchor">Home</netui:anchor>treeSC2.jsp [goTreeSC2.do] </h4>
+ <!-- Attribute Information -->
+ <div style='float:left;width:300px'>
+ <table cellpadding="2" cellspacing="0" border="1" width="300px">
+ <tr><th>Creation</th><td>Static</td></tr>
+ <tr><th>tree</th><td>{pageFlow.tree28 and 29}</td></tr>
+ <tr><th>runAtClient</th><td>true</td></tr>
+ <tr><th>action</th><td>postback</td></tr>
+ </table>
+ </div>
+ <!-- Postback information -->
+ <div style='float:right;width:250px;border:solid 1pt gray;margin:2 4;'>
+ <p style="font-weight:bold;text-align:center;margin:
0;padding:0;">Tree Postback Information</p>
+ <table cellpadding='0' cellspacing='2' width="100%">
+ <tr><th style="text-align:right"
width="100pt">Expand:</th><td><netui:content
value="${pageFlow.expand}"/></td></tr>
+ <tr><th style="text-align:right"
width="100pt">Selection:</th><td><netui:content
value="${pageFlow.node}"/></td></tr>
+ </table>
+ </div>
+ <hr style="clear:left">
+ <div class="content">
+ <table width="100%" border="1" cellspacing="0" cellpadding="0">
+ <tr><td widht="50%" valign="top">
+ <netui:scriptContainer generateIdScope="true">
+ <netui:scriptHeader />
+ <netui:tree dataSource="pageFlow.tree28" selectionAction="postback"
+ selectionStyle="color:red" unselectStyle="color:blue"
+ tagId="tree" renderJavaScript="true" runAtClient="true">
+ <netui:treeItem tagId="Item0" expanded="true" action="postback">
+ <netui:treeLabel>0</netui:treeLabel>
+ <netui:treeItem tagId="item00" expanded="true"
action="postback">
+ <netui:treeLabel>0.0</netui:treeLabel>
+ </netui:treeItem>
+ <netui:treeItem expanded="true" action="postback">
+ <netui:treeLabel>0.1</netui:treeLabel>
+ <netui:treeItem action="postback">0.1.0</netui:treeItem>
+ <netui:treeItem action="postback">0.1.1</netui:treeItem>
+ </netui:treeItem>
+ <netui:treeItem expanded="true"
action="postback">0.2</netui:treeItem>
+ </netui:treeItem>
+ </netui:tree>
+ </netui:scriptContainer>
+ </td><td width="50%" valign="top">
+ <netui:tree dataSource="pageFlow.tree29" selectionAction="postback"
+ selectionStyle="color:red" unselectStyle="color:blue"
+ tagId="tree" renderJavaScript="true" runAtClient="true">
+ <netui:treeItem tagId="Item0" expanded="true" action="postback">
+ <netui:treeLabel>0</netui:treeLabel>
+ <netui:treeItem tagId="item00" expanded="true"
action="postback">
+ <netui:treeLabel>0.0</netui:treeLabel>
+ </netui:treeItem>
+ <netui:treeItem expanded="true" action="postback">
+ <netui:treeLabel>0.1</netui:treeLabel>
+ <netui:treeItem action="postback">0.1.0</netui:treeItem>
+ <netui:treeItem action="postback">0.1.1</netui:treeItem>
+ </netui:treeItem>
+ <netui:treeItem expanded="true"
action="postback">0.2</netui:treeItem>
+ </netui:treeItem>
+ </netui:tree>
+ </td></tr>
+ </table>
+ </div>
+ </netui:body>
+</netui:html>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/DivPanelTree.xml
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/DivPanelTree.xml?view=diff&r1=149431&r2=149432
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/DivPanelTree.xml
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/DivPanelTree.xml
Tue Feb 1 11:08:57 2005
@@ -2,7 +2,7 @@
<ses:recorderSession
xmlns:ses="http://beehive.apache.org/netui/tools/testrecorder/2004/session";>
<ses:sessionName>DivPanelTree</ses:sessionName>
<ses:tester>Daryl</ses:tester>
- <ses:startDate>31 Jan 2005, 02:57:47.440 PM MST</ses:startDate>
+ <ses:startDate>01 Feb 2005, 10:25:19.741 AM 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>950D20463B9B64BC44BE41D600BFE91A</ses:value>
+ <ses:value>9D77442FCA18577B05248095141E0A68</ses:value>
</ses:cookie>
</ses:cookies>
<ses:headers>
@@ -44,7 +44,7 @@
</ses:header>
<ses:header>
<ses:name>cookie</ses:name>
- <ses:value>$Version=0;
JSESSIONID=950D20463B9B64BC44BE41D600BFE91A; $Path=/coreWeb</ses:value>
+ <ses:value>$Version=0;
JSESSIONID=9D77442FCA18577B05248095141E0A68; $Path=/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>-df4757d:101cac39363:-7cda</ses:value>
+ <ses:value>4fd0e82:101cef0b80f:-7cda</ses:value>
</ses:header>
<ses:header>
<ses:name>user-agent</ses:name>
@@ -86,59 +86,59 @@
<body>
<table width="100%" cellspacing="5"><tr><td width="20%" valign="top">
<div netui:treeName="Tree233">
- <div netui-tree-level="0">
- <a href="" netui-tree-id="0" netui-tree-anchor="expand"><img
src="/coreWeb/resources/images/handledownlast.gif"
style="vertical-align:middle;" border="0" alt=""></a>
+ <div netui:treeLevel="0">
+ <a href="" netui:treeAnchor="expand" netui:treeAnchorInit="true"
netui:treeId="0"><img src="/coreWeb/resources/images/handledownlast.gif"
style="vertical-align:middle;" border="0" alt=""></a>
<a href="" class="unselected" onclick='return
netUI.action("divPanel.showPage(\"RootPage\");");'> <img
src="/coreWeb/resources/images/folder_16_pad.gif" style="vertical-align:middle"
border="0" alt="Tree Node"> Tree </a>
</div>
- <div netui-tree-level="1">
+ <div netui:treeLevel="1">
<img src="/coreWeb/resources/images/spacer.gif" width="16px" border="0"
alt="">
- <a href="" netui-tree-id="0.0" netui-tree-anchor="expand"><img
src="/coreWeb/resources/images/handledownmiddle.gif"
style="vertical-align:middle;" border="0" alt=""></a>
+ <a href="" netui:treeAnchor="expand" netui:treeAnchorInit="true"
netui:treeId="0.0"><img src="/coreWeb/resources/images/handledownmiddle.gif"
style="vertical-align:middle;" border="0" alt=""></a>
<a href="" class="unselected" onclick='return
netUI.action("divPanel.showPage(\"Page1\");");'> <img
src="/coreWeb/resources/images/folder_16_pad.gif" style="vertical-align:middle"
border="0" alt="Tree Node"> 1 </a>
</div>
- <div netui-tree-level="2">
+ <div netui:treeLevel="2">
<img src="/coreWeb/resources/images/spacer.gif" width="16px" border="0"
alt="">
<img src="/coreWeb/resources/images/linevertical.gif"
style="vertical-align:middle;" width="16px" border="0" alt="">
<img src="/coreWeb/resources/images/linemiddlenode.gif"
style="vertical-align:middle;" border="0" alt="">
<a href="" class="unselected" onclick='return
netUI.action("divPanel.showPage(\"Page11\");");'> <img
src="/coreWeb/resources/images/folder_16_pad.gif" style="vertical-align:middle"
border="0" alt="Tree Node"> 1.1 </a>
</div>
- <div netui-tree-level="2">
+ <div netui:treeLevel="2">
<img src="/coreWeb/resources/images/spacer.gif" width="16px" border="0"
alt="">
<img src="/coreWeb/resources/images/linevertical.gif"
style="vertical-align:middle;" width="16px" border="0" alt="">
<img src="/coreWeb/resources/images/linemiddlenode.gif"
style="vertical-align:middle;" border="0" alt="">
<a href="" class="unselected" onclick='return
netUI.action("divPanel.showPage(\"Page12\");");'> <img
src="/coreWeb/resources/images/folder_16_pad.gif" style="vertical-align:middle"
border="0" alt="Tree Node"> 1.2 </a>
</div>
- <div netui-tree-level="2">
+ <div netui:treeLevel="2">
<img src="/coreWeb/resources/images/spacer.gif" width="16px" border="0"
alt="">
<img src="/coreWeb/resources/images/linevertical.gif"
style="vertical-align:middle;" width="16px" border="0" alt="">
- <a href="" netui-tree-id="0.0.2" netui-tree-anchor="expand"><img
src="/coreWeb/resources/images/handledownmiddle.gif"
style="vertical-align:middle;" border="0" alt=""></a>
+ <a href="" netui:treeAnchor="expand" netui:treeAnchorInit="true"
netui:treeId="0.0.2"><img src="/coreWeb/resources/images/handledownmiddle.gif"
style="vertical-align:middle;" border="0" alt=""></a>
<a href="" class="unselected" onclick='return
netUI.action("divPanel.showPage(\"Page13\");");'> <img
src="/coreWeb/resources/images/folder_16_pad.gif" style="vertical-align:middle"
border="0" alt="Tree Node"> 1.3 </a>
</div>
- <div netui-tree-level="3">
+ <div netui:treeLevel="3">
<img src="/coreWeb/resources/images/spacer.gif" width="16px" border="0"
alt="">
<img src="/coreWeb/resources/images/linevertical.gif"
style="vertical-align:middle;" width="16px" border="0" alt="">
<img src="/coreWeb/resources/images/linevertical.gif"
style="vertical-align:middle;" width="16px" border="0" alt="">
<img src="/coreWeb/resources/images/linemiddlenode.gif"
style="vertical-align:middle;" border="0" alt="">
<a href="" class="unselected" onclick='return
netUI.action("divPanel.showPage(\"Page131\");");'> <img
src="/coreWeb/resources/images/folder_16_pad.gif" style="vertical-align:middle"
border="0" alt="Tree Node"> 1.3.1 </a>
</div>
- <div netui-tree-level="3">
+ <div netui:treeLevel="3">
<img src="/coreWeb/resources/images/spacer.gif" width="16px" border="0"
alt="">
<img src="/coreWeb/resources/images/linevertical.gif"
style="vertical-align:middle;" width="16px" border="0" alt="">
<img src="/coreWeb/resources/images/linevertical.gif"
style="vertical-align:middle;" width="16px" border="0" alt="">
<img src="/coreWeb/resources/images/linelastnode.gif"
style="vertical-align:middle;" border="0" alt="">
<a href="" class="unselected" onclick='return
netUI.action("divPanel.showPage(\"Page132\");");'> <img
src="/coreWeb/resources/images/folder_16_pad.gif" style="vertical-align:middle"
border="0" alt="Tree Node"> 1.3.2 </a>
</div>
- <div netui-tree-level="2">
+ <div netui:treeLevel="2">
<img src="/coreWeb/resources/images/spacer.gif" width="16px" border="0"
alt="">
<img src="/coreWeb/resources/images/linevertical.gif"
style="vertical-align:middle;" width="16px" border="0" alt="">
<img src="/coreWeb/resources/images/linelastnode.gif"
style="vertical-align:middle;" border="0" alt="">
<a href="" class="unselected" onclick='return
netUI.action("divPanel.showPage(\"Page14\");");'> <img
src="/coreWeb/resources/images/folder_16_pad.gif" style="vertical-align:middle"
border="0" alt="Tree Node"> 1.4 </a>
</div>
- <div netui-tree-level="1">
+ <div netui:treeLevel="1">
<img src="/coreWeb/resources/images/spacer.gif" width="16px" border="0"
alt="">
<img src="/coreWeb/resources/images/linemiddlenode.gif"
style="vertical-align:middle;" border="0" alt="">
<a href="" class="unselected" onclick='return
netUI.action("divPanel.showPage(\"Page2\");");'> <img
src="/coreWeb/resources/images/folder_16_pad.gif" style="vertical-align:middle"
border="0" alt="Tree Node"> 2 </a>
</div>
- <div netui-tree-level="1">
+ <div netui:treeLevel="1">
<img src="/coreWeb/resources/images/spacer.gif" width="16px" border="0"
alt="">
<img src="/coreWeb/resources/images/linelastnode.gif"
style="vertical-align:middle;" border="0" alt="">
<a href="" class="unselected" onclick='return
netUI.action("divPanel.showPage(\"Page3\");");'> <img
src="/coreWeb/resources/images/folder_16_pad.gif" style="vertical-align:middle"
border="0" alt="Tree Node"> 3 </a>
@@ -243,7 +243,7 @@
<ses:cookies>
<ses:cookie>
<ses:name>JSESSIONID</ses:name>
- <ses:value>950D20463B9B64BC44BE41D600BFE91A</ses:value>
+ <ses:value>9D77442FCA18577B05248095141E0A68</ses:value>
</ses:cookie>
</ses:cookies>
<ses:headers>
@@ -273,7 +273,7 @@
</ses:header>
<ses:header>
<ses:name>cookie</ses:name>
- <ses:value>$Version=0;
JSESSIONID=950D20463B9B64BC44BE41D600BFE91A; $Path=/coreWeb</ses:value>
+ <ses:value>$Version=0;
JSESSIONID=9D77442FCA18577B05248095141E0A68; $Path=/coreWeb</ses:value>
</ses:header>
<ses:header>
<ses:name>host</ses:name>
@@ -289,7 +289,7 @@
</ses:header>
<ses:header>
<ses:name>testrecorder.playback.testid</ses:name>
- <ses:value>-df4757d:101cac39363:-7cda</ses:value>
+ <ses:value>4fd0e82:101cef0b80f:-7cda</ses:value>
</ses:header>
<ses:header>
<ses:name>user-agent</ses:name>
@@ -328,7 +328,7 @@
<ses:cookies>
<ses:cookie>
<ses:name>JSESSIONID</ses:name>
- <ses:value>950D20463B9B64BC44BE41D600BFE91A</ses:value>
+ <ses:value>9D77442FCA18577B05248095141E0A68</ses:value>
</ses:cookie>
</ses:cookies>
<ses:headers>
@@ -358,7 +358,7 @@
</ses:header>
<ses:header>
<ses:name>cookie</ses:name>
- <ses:value>$Version=0;
JSESSIONID=950D20463B9B64BC44BE41D600BFE91A; $Path=/coreWeb</ses:value>
+ <ses:value>$Version=0;
JSESSIONID=9D77442FCA18577B05248095141E0A68; $Path=/coreWeb</ses:value>
</ses:header>
<ses:header>
<ses:name>host</ses:name>
@@ -374,7 +374,7 @@
</ses:header>
<ses:header>
<ses:name>testrecorder.playback.testid</ses:name>
- <ses:value>-df4757d:101cac39363:-7cda</ses:value>
+ <ses:value>4fd0e82:101cef0b80f:-7cda</ses:value>
</ses:header>
<ses:header>
<ses:name>user-agent</ses:name>
@@ -413,7 +413,7 @@
<ses:cookies>
<ses:cookie>
<ses:name>JSESSIONID</ses:name>
- <ses:value>950D20463B9B64BC44BE41D600BFE91A</ses:value>
+ <ses:value>9D77442FCA18577B05248095141E0A68</ses:value>
</ses:cookie>
</ses:cookies>
<ses:headers>
@@ -443,7 +443,7 @@
</ses:header>
<ses:header>
<ses:name>cookie</ses:name>
- <ses:value>$Version=0;
JSESSIONID=950D20463B9B64BC44BE41D600BFE91A; $Path=/coreWeb</ses:value>
+ <ses:value>$Version=0;
JSESSIONID=9D77442FCA18577B05248095141E0A68; $Path=/coreWeb</ses:value>
</ses:header>
<ses:header>
<ses:name>host</ses:name>
@@ -459,7 +459,7 @@
</ses:header>
<ses:header>
<ses:name>testrecorder.playback.testid</ses:name>
- <ses:value>-df4757d:101cac39363:-7cda</ses:value>
+ <ses:value>4fd0e82:101cef0b80f:-7cda</ses:value>
</ses:header>
<ses:header>
<ses:name>user-agent</ses:name>
@@ -498,7 +498,7 @@
<ses:cookies>
<ses:cookie>
<ses:name>JSESSIONID</ses:name>
- <ses:value>950D20463B9B64BC44BE41D600BFE91A</ses:value>
+ <ses:value>9D77442FCA18577B05248095141E0A68</ses:value>
</ses:cookie>
</ses:cookies>
<ses:headers>
@@ -528,7 +528,7 @@
</ses:header>
<ses:header>
<ses:name>cookie</ses:name>
- <ses:value>$Version=0;
JSESSIONID=950D20463B9B64BC44BE41D600BFE91A; $Path=/coreWeb</ses:value>
+ <ses:value>$Version=0;
JSESSIONID=9D77442FCA18577B05248095141E0A68; $Path=/coreWeb</ses:value>
</ses:header>
<ses:header>
<ses:name>host</ses:name>
@@ -544,7 +544,7 @@
</ses:header>
<ses:header>
<ses:name>testrecorder.playback.testid</ses:name>
- <ses:value>-df4757d:101cac39363:-7cda</ses:value>
+ <ses:value>4fd0e82:101cef0b80f:-7cda</ses:value>
</ses:header>
<ses:header>
<ses:name>user-agent</ses:name>
@@ -583,7 +583,7 @@
<ses:cookies>
<ses:cookie>
<ses:name>JSESSIONID</ses:name>
- <ses:value>950D20463B9B64BC44BE41D600BFE91A</ses:value>
+ <ses:value>9D77442FCA18577B05248095141E0A68</ses:value>
</ses:cookie>
</ses:cookies>
<ses:headers>
@@ -613,7 +613,7 @@
</ses:header>
<ses:header>
<ses:name>cookie</ses:name>
- <ses:value>$Version=0;
JSESSIONID=950D20463B9B64BC44BE41D600BFE91A; $Path=/coreWeb</ses:value>
+ <ses:value>$Version=0;
JSESSIONID=9D77442FCA18577B05248095141E0A68; $Path=/coreWeb</ses:value>
</ses:header>
<ses:header>
<ses:name>host</ses:name>
@@ -629,7 +629,7 @@
</ses:header>
<ses:header>
<ses:name>testrecorder.playback.testid</ses:name>
- <ses:value>-df4757d:101cac39363:-7cda</ses:value>
+ <ses:value>4fd0e82:101cef0b80f:-7cda</ses:value>
</ses:header>
<ses:header>
<ses:name>user-agent</ses:name>
@@ -668,7 +668,7 @@
<ses:cookies>
<ses:cookie>
<ses:name>JSESSIONID</ses:name>
- <ses:value>950D20463B9B64BC44BE41D600BFE91A</ses:value>
+ <ses:value>9D77442FCA18577B05248095141E0A68</ses:value>
</ses:cookie>
</ses:cookies>
<ses:headers>
@@ -698,7 +698,7 @@
</ses:header>
<ses:header>
<ses:name>cookie</ses:name>
- <ses:value>$Version=0;
JSESSIONID=950D20463B9B64BC44BE41D600BFE91A; $Path=/coreWeb</ses:value>
+ <ses:value>$Version=0;
JSESSIONID=9D77442FCA18577B05248095141E0A68; $Path=/coreWeb</ses:value>
</ses:header>
<ses:header>
<ses:name>host</ses:name>
@@ -714,7 +714,7 @@
</ses:header>
<ses:header>
<ses:name>testrecorder.playback.testid</ses:name>
- <ses:value>-df4757d:101cac39363:-7cda</ses:value>
+ <ses:value>4fd0e82:101cef0b80f:-7cda</ses:value>
</ses:header>
<ses:header>
<ses:name>user-agent</ses:name>
@@ -732,7 +732,7 @@
</ses:testResults>
</ses:test>
</ses:tests>
- <ses:endDate>31 Jan 2005, 02:57:48.201 PM MST</ses:endDate>
+ <ses:endDate>01 Feb 2005, 10:25:20.752 AM MST</ses:endDate>
<ses:sessionStatus>fail</ses:sessionStatus>
<ses:testCount>7</ses:testCount>
<ses:passedCount>6</ses:passedCount>
