Author: rich
Date: Sat Apr 30 12:39:38 2005
New Revision: 165415
URL: http://svn.apache.org/viewcvs?rev=165415&view=rev
Log:
This is a patch from Carlin Rogers to address
http://issues.apache.org/jira/browse/BEEHIVE-533 : TreeHtmlAttributeInfo should
have a constructor that takes attribute and value
tests: drt in trunk (WinXP)
BB: self (linux)
Added:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/j533/
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/j533/Controller.jpf
(with props)
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/j533/alien.gif
(with props)
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/j533/index.jsp
(with props)
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/j533/join.gif
(with props)
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/j533/joinbottom.gif
(with props)
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/j533/line.gif
(with props)
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/j533/minus.gif
(with props)
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/j533/minusbottom.gif
(with props)
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/j533/plus.gif
(with props)
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/j533/plusbottom.gif
(with props)
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/j533/rootminus.gif
(with props)
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/j533/rootplus.gif
(with props)
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/j533/spacer.gif
(with props)
incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/J533.xml
(with props)
Modified:
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeHtmlAttributeInfo.java
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tree/treeAttribute/Controller.jpf
incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/config/testRecorder-tests.xml
Modified:
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeHtmlAttributeInfo.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeHtmlAttributeInfo.java?rev=165415&r1=165414&r2=165415&view=diff
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeHtmlAttributeInfo.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeHtmlAttributeInfo.java
Sat Apr 30 12:39:38 2005
@@ -37,6 +37,24 @@
private int state;
private TreeElement _parent;
+ /**
+ * Default constructor for creating a TreeHtmlAttributeInfo.
+ */
+ public TreeHtmlAttributeInfo()
+ {
+ }
+
+ /**
+ * Construct a new TreeHtmlAttributeInfo with the specified parameters.
+ * @param attribute The name of the attribute.
+ * @param value Sets HTML attribute value.
+ */
+ public TreeHtmlAttributeInfo( String attribute, String value )
+ {
+ setAttribute(attribute);
+ setValue(value);
+ }
+
public String getAttribute()
{
return _attribute;
Added:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/j533/Controller.jpf
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/j533/Controller.jpf?rev=165415&view=auto
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/j533/Controller.jpf
(added)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/j533/Controller.jpf
Sat Apr 30 12:39:38 2005
@@ -0,0 +1,121 @@
+/*
+ * 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 bugs.j533;
+
+import org.apache.beehive.netui.pageflow.FlowController;
+import org.apache.beehive.netui.pageflow.Forward;
+import org.apache.beehive.netui.pageflow.PageFlowController;
+import org.apache.beehive.netui.pageflow.annotations.Jpf;
+import org.apache.beehive.netui.tags.tree.TreeElement;
+import org.apache.beehive.netui.tags.tree.TreeHtmlAttributeInfo;
+import org.apache.beehive.netui.tags.tree.TreeRootElement;
+
+import java.io.Serializable;
+
[EMAIL PROTECTED] (
+ simpleActions={
+ @Jpf.SimpleAction(name="begin", path="index.jsp"),
+ @Jpf.SimpleAction(name="postback", navigateTo=Jpf.NavigateTo.currentPage)
+ }
+)
+
+public class Controller extends PageFlowController
+{
+
+ //Attributes
+ TreeElement attrJspTree1;
+
+ TreeRootElement attrDynTree1;
+
+ //Methods
+
+ //Tree Creation
+ public TreeRootElement getAttrDynTree1()
+ {
+ return this.attrDynTree1;
+ }
+ public void setAttrDynTree1(TreeRootElement attrDynTree1)
+ {
+ this.attrDynTree1= attrDynTree1;
+ }
+
+ //Attributes
+ public TreeElement getAttrJspTree1()
+ {
+ return this.attrJspTree1;
+ }
+ public void setAttrJspTree1(TreeElement attrJspTree1)
+ {
+ this.attrJspTree1= attrJspTree1;
+ }
+
+
+
+ protected void onCreate() {
+ attrDynTree1 = new TreeRootElement( "Dynamic Tree 1", true );
+ attrDynTree1.setTitle("Title in the HTML source.");
+
+ TreeElement te = new TreeElement("TreeElement1", false);
+ TreeHtmlAttributeInfo thai =
+ new TreeHtmlAttributeInfo("attrall", "TE1.DescendAttr");
+ thai.setOnSelectionLink(false);
+ thai.setOnDiv(true);
+ thai.setOnIcon(false);
+ thai.setApplyToDescendents(true);
+ te.addAttribute(thai);
+ thai = new TreeHtmlAttributeInfo("attrone", "TE1.AttrA");
+ thai.setOnSelectionLink(false);
+ thai.setOnDiv(true);
+ thai.setOnIcon(true);
+ thai.setApplyToDescendents(false);
+ te.addAttribute(thai);
+ attrDynTree1.addChild( te );
+
+ te = new TreeElement("TreeElement2", false);
+ attrDynTree1.getChild(0).addChild( te );
+
+ te = new TreeElement("TreeElement3", false);
+ thai = new TreeHtmlAttributeInfo("attrthree", "TE3.AttrB");
+ thai.setOnSelectionLink(true);
+ thai.setOnDiv(true);
+ thai.setOnIcon(false);
+ thai.setApplyToDescendents(false);
+ te.addAttribute(thai);
+ attrDynTree1.getChild(0).getChild(0).addChild( te );
+
+ te = new TreeElement("TreeElement4", false);
+ attrDynTree1.getChild(0).getChild(0).addChild( te );
+
+ }
+
+ @Jpf.Action(forwards = {
+ @Jpf.Forward(name = "success", navigateTo=Jpf.NavigateTo.currentPage)
+ })
+ protected Forward resetTrees() {
+ Forward forward = new Forward("success");
+
+ onCreate();
+
+ //Attributes
+ attrJspTree1 = null;
+
+ return forward;
+ }
+
+}
+
Propchange:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/j533/Controller.jpf
------------------------------------------------------------------------------
svn:eol-style = native
Added:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/j533/alien.gif
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/j533/alien.gif?rev=165415&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/j533/alien.gif
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/j533/index.jsp
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/j533/index.jsp?rev=165415&view=auto
==============================================================================
--- incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/j533/index.jsp
(added)
+++ incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/j533/index.jsp
Sat Apr 30 12:39:38 2005
@@ -0,0 +1,37 @@
+<%@ page language="java" contentType="text/html;charset=UTF-8"%>
+<%@ taglib uri="http://beehive.apache.org/netui/tags-html-1.0"; prefix="netui"%>
+
+<netui:html>
+ <head>
+ <title>J533 Test</title>
+ </head>
+
+ <netui:body>
+ <p>Simple test of the new requested constructor for
+ TreeHtmlAttributeInfo</p>
+
+ <netui:anchor action="resetTrees">Reset Trees</netui:anchor>
+
+ <p>Dynamic pageFlow tree - images are set in the JSP.
+ TreeHtmlAttributeInfo is also defined in the pageFlow.</p>
+
+ <netui:tree
+ rootNodeCollapsedImage="rootplus.gif"
+ rootNodeExpandedImage="rootminus.gif"
+ itemIcon="alien.gif"
+ disabledStyle="color: #00FF7F; font-weight:bold;"
+ lastNodeCollapsedImage="plusbottom.gif"
+ lastNodeExpandedImage="minusbottom.gif"
+ nodeCollapsedImage="plus.gif"
+ nodeExpandedImage="minus.gif"
+ verticalLineImage="line.gif"
+ lineJoinImage="join.gif"
+ lastLineJoinImage="joinbottom.gif"
+ imageRoot="."
+ dataSource="pageFlow.attrDynTree1"
+ selectionAction="postback"
+ tagId="attrDynTree1" />
+
+ </netui:body>
+
+</netui:html>
Propchange:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/j533/index.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Added: incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/j533/join.gif
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/j533/join.gif?rev=165415&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/j533/join.gif
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/j533/joinbottom.gif
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/j533/joinbottom.gif?rev=165415&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/j533/joinbottom.gif
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/j533/line.gif
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/j533/line.gif?rev=165415&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/j533/line.gif
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/j533/minus.gif
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/j533/minus.gif?rev=165415&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/j533/minus.gif
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/j533/minusbottom.gif
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/j533/minusbottom.gif?rev=165415&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/j533/minusbottom.gif
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/j533/plus.gif
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/j533/plus.gif?rev=165415&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/j533/plus.gif
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/j533/plusbottom.gif
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/j533/plusbottom.gif?rev=165415&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/j533/plusbottom.gif
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/j533/rootminus.gif
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/j533/rootminus.gif?rev=165415&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/j533/rootminus.gif
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/j533/rootplus.gif
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/j533/rootplus.gif?rev=165415&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/j533/rootplus.gif
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/j533/spacer.gif
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/j533/spacer.gif?rev=165415&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/j533/spacer.gif
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tree/treeAttribute/Controller.jpf
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tree/treeAttribute/Controller.jpf?rev=165415&r1=165414&r2=165415&view=diff
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tree/treeAttribute/Controller.jpf
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tree/treeAttribute/Controller.jpf
Sat Apr 30 12:39:38 2005
@@ -40,189 +40,7 @@
}
)
[EMAIL PROTECTED](
- value = {
- "<!-- This data is auto-generated. Hand-editing this section is not
recommended. -->",
- "<view-properties>",
- "<pageflow-object id='pageflow:/treeAttribute/Controller.jpf'/>",
- "<pageflow-object id='action:resetTrees.do'>",
- " <property value='300' name='x'/>",
- " <property value='80' name='y'/>",
- "</pageflow-object>",
- "<pageflow-object id='page:index.jsp'>",
- " <property value='80' name='x'/>",
- " <property value='200' name='y'/>",
- "</pageflow-object>",
- "<pageflow-object id='forward:[EMAIL PROTECTED]:resetTrees.do@'>",
- " <property value='264,190,190,116' name='elbowsX'/>",
- " <property value='72,72,192,192' name='elbowsY'/>",
- " <property value='West_1' name='fromPort'/>",
- " <property value='East_1' name='toPort'/>",
- " <property value='success' name='label'/>",
- "</pageflow-object>",
- "<pageflow-object id='page:attribute1.jsp'>",
- " <property value='380' name='x'/>",
- " <property value='140' name='y'/>",
- "</pageflow-object>",
- "<pageflow-object id='page:attribute2.jsp'>",
- " <property value='380' name='x'/>",
- " <property value='200' name='y'/>",
- "</pageflow-object>",
- "<pageflow-object id='page:attribute3.jsp'>",
- " <property value='380' name='x'/>",
- " <property value='260' name='y'/>",
- "</pageflow-object>",
- "<pageflow-object id='page:attribute4.jsp'>",
- " <property value='380' name='x'/>",
- " <property value='320' name='y'/>",
- "</pageflow-object>",
- "<pageflow-object id='page:attribute5.jsp'>",
- " <property value='380' name='x'/>",
- " <property value='380' name='y'/>",
- "</pageflow-object>",
- "<pageflow-object id='page:attribute6.jsp'>",
- " <property value='380' name='x'/>",
- " <property value='440' name='y'/>",
- "</pageflow-object>",
- "<pageflow-object id='page:attribute7.jsp'>",
- " <property value='380' name='x'/>",
- " <property value='500' name='y'/>",
- "</pageflow-object>",
- "<pageflow-object id='action-call:@page:[EMAIL
PROTECTED]@action:resetTrees.do@'>",
- " <property value='116,190,190,264' name='elbowsX'/>",
- " <property value='181,181,83,83' name='elbowsY'/>",
- " <property value='East_0' name='fromPort'/>",
- " <property value='West_2' name='toPort'/>",
- "</pageflow-object>",
- "<pageflow-object id='action:goAttribute1.do'>",
- " <property value='300' name='x'/>",
- " <property value='140' name='y'/>",
- "</pageflow-object>",
- "<pageflow-object id='action:goAttribute2.do'>",
- " <property value='300' name='x'/>",
- " <property value='200' name='y'/>",
- "</pageflow-object>",
- "<pageflow-object id='action:goAttribute3.do'>",
- " <property value='300' name='x'/>",
- " <property value='260' name='y'/>",
- "</pageflow-object>",
- "<pageflow-object id='action:goAttribute4.do'>",
- " <property value='300' name='x'/>",
- " <property value='320' name='y'/>",
- "</pageflow-object>",
- "<pageflow-object id='action:goAttribute5.do'>",
- " <property value='300' name='x'/>",
- " <property value='380' name='y'/>",
- "</pageflow-object>",
- "<pageflow-object id='action:goAttribute6.do'>",
- " <property value='300' name='x'/>",
- " <property value='440' name='y'/>",
- "</pageflow-object>",
- "<pageflow-object id='action:goAttribute7.do'>",
- " <property value='300' name='x'/>",
- " <property value='500' name='y'/>",
- "</pageflow-object>",
- "<pageflow-object id='action-call:@page:[EMAIL
PROTECTED]@action:goAttribute2.do@'>",
- " <property value='96,170,170,244' name='elbowsX'/>",
- " <property value='171,171,182,182' name='elbowsY'/>",
- " <property value='East_0' name='fromPort'/>",
- " <property value='West_1' name='toPort'/>",
- "</pageflow-object>",
- "<pageflow-object id='action-call:@page:[EMAIL
PROTECTED]@action:goAttribute6.do@'>",
- " <property value='106,180,180,254' name='elbowsX'/>",
- " <property value='204,204,433,433' name='elbowsY'/>",
- " <property value='East_2' name='fromPort'/>",
- " <property value='West_1' name='toPort'/>",
- "</pageflow-object>",
- "<pageflow-object id='action-call:@page:[EMAIL
PROTECTED]@action:goAttribute4.do@'>",
- " <property value='96,170,170,244' name='elbowsX'/>",
- " <property value='205,205,314,314' name='elbowsY'/>",
- " <property value='East_2' name='fromPort'/>",
- " <property value='West_1' name='toPort'/>",
- "</pageflow-object>",
- "<pageflow-object id='action-call:@page:[EMAIL
PROTECTED]@action:goAttribute1.do@'>",
- " <property value='170,170,244' name='elbowsX'/>",
- " <property value='192,132,132' name='elbowsY'/>",
- " <property value='East_1' name='fromPort'/>",
- " <property value='West_1' name='toPort'/>",
- "</pageflow-object>",
- "<pageflow-object id='action-call:@page:[EMAIL
PROTECTED]@action:goAttribute5.do@'>",
- " <property value='96,170,170,244' name='elbowsX'/>",
- " <property value='191,191,360,360' name='elbowsY'/>",
- " <property value='East_2' name='fromPort'/>",
- " <property value='West_1' name='toPort'/>",
- "</pageflow-object>",
- "<pageflow-object id='action-call:@page:[EMAIL
PROTECTED]@action:goAttribute3.do@'>",
- " <property value='96,170,170,244' name='elbowsX'/>",
- " <property value='191,191,240,240' name='elbowsY'/>",
- " <property value='East_2' name='fromPort'/>",
- " <property value='West_1' name='toPort'/>",
- "</pageflow-object>",
- "<pageflow-object id='action-call:@page:[EMAIL
PROTECTED]@action:goAttribute7.do@'>",
- " <property value='116,190,190,264' name='elbowsX'/>",
- " <property value='203,203,492,492' name='elbowsY'/>",
- " <property value='East_2' name='fromPort'/>",
- " <property value='West_1' name='toPort'/>",
- "</pageflow-object>",
- "<pageflow-object id='action:begin.do'>",
- " <property value='80' name='x'/>",
- " <property value='100' name='y'/>",
- "</pageflow-object>",
- "<pageflow-object id='action-call:@page:[EMAIL
PROTECTED]@action:begin.do@'>",
- " <property value='326,212,212,98' name='elbowsX'/>",
- " <property value='115,115,75,75' name='elbowsY'/>",
- " <property value='West_1' name='fromPort'/>",
- " <property value='East_1' name='toPort'/>",
- "</pageflow-object>",
- "<pageflow-object id='action-call:@page:[EMAIL
PROTECTED]@action:begin.do@'>",
- " <property value='326,212,212,98' name='elbowsX'/>",
- " <property value='185,185,96,96' name='elbowsY'/>",
- " <property value='West_1' name='fromPort'/>",
- " <property value='East_2' name='toPort'/>",
- "</pageflow-object>",
- "<pageflow-object id='action-call:@page:[EMAIL
PROTECTED]@action:begin.do@'>",
- " <property value='326,212,212,98' name='elbowsX'/>",
- " <property value='257,257,108,108' name='elbowsY'/>",
- " <property value='West_1' name='fromPort'/>",
- " <property value='East_2' name='toPort'/>",
- "</pageflow-object>",
- "<pageflow-object id='action-call:@page:[EMAIL
PROTECTED]@action:begin.do@'>",
- " <property value='326,212,212,98' name='elbowsX'/>",
- " <property value='305,305,96,96' name='elbowsY'/>",
- " <property value='West_1' name='fromPort'/>",
- " <property value='East_2' name='toPort'/>",
- "</pageflow-object>",
- "<pageflow-object id='action-call:@page:[EMAIL
PROTECTED]@action:begin.do@'>",
- " <property value='326,212,212,98' name='elbowsX'/>",
- " <property value='377,377,108,108' name='elbowsY'/>",
- " <property value='West_1' name='fromPort'/>",
- " <property value='East_2' name='toPort'/>",
- "</pageflow-object>",
- "<pageflow-object id='action-call:@page:[EMAIL
PROTECTED]@action:begin.do@'>",
- " <property value='334,220,220,106' name='elbowsX'/>",
- " <property value='427,427,98,98' name='elbowsY'/>",
- " <property value='West_1' name='fromPort'/>",
- " <property value='East_2' name='toPort'/>",
- "</pageflow-object>",
- "<pageflow-object id='action-call:@page:[EMAIL
PROTECTED]@action:begin.do@'>",
- " <property value='344,230,230,116' name='elbowsX'/>",
- " <property value='492,492,103,103' name='elbowsY'/>",
- " <property value='West_1' name='fromPort'/>",
- " <property value='East_2' name='toPort'/>",
- "</pageflow-object>",
- "<pageflow-object id='page:attribute8.jsp'>",
- " <property value='80' name='x'/>",
- " <property value='60' name='y'/>",
- "</pageflow-object>",
- "<pageflow-object id='action-call:@page:[EMAIL
PROTECTED]@action:begin.do@'>",
- " <property value='80,80,80,80' name='elbowsX'/>",
- " <property value='104,104,56,56' name='elbowsY'/>",
- " <property value='South_1' name='fromPort'/>",
- " <property value='North_1' name='toPort'/>",
- "</pageflow-object>",
- "</view-properties>"
- }
-)
+
public class Controller extends PageFlowController
{
@@ -235,7 +53,7 @@
TreeElement _tree7;
TreeElement _tree8;
- //********************************* TREE PROPERTIES
********************************
+ //**************************** TREE PROPERTIES ***************************
public TreeElement getTree1() {
return _tree1;
@@ -303,8 +121,8 @@
@Jpf.Action(forwards = {
- @Jpf.Forward(name = "success", path = "index.jsp")
-})
+ @Jpf.Forward(name = "success", path = "index.jsp")
+ })
protected Forward resetTrees() {
Forward forward = new Forward("success");
_tree1 = null;
@@ -317,5 +135,5 @@
_tree8 = null;
return forward;
}
-
+
}
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/config/testRecorder-tests.xml
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/config/testRecorder-tests.xml?rev=165415&r1=165414&r2=165415&view=diff
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/config/testRecorder-tests.xml
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/config/testRecorder-tests.xml
Sat Apr 30 12:39:38 2005
@@ -4465,6 +4465,15 @@
</categories>
</test>
<test>
+ <name>J533</name>
+ <description>Simple test of TreeHtmlAttributeInfo
constructor.</description>
+ <webapp>coreWeb</webapp>
+ <categories>
+ <category>bvt</category>
+ <category>jiraBugs</category>
+ </categories>
+ </test>
+ <test>
<name>JpfScopedFormsTest49</name>
<description>JpfScopedFormsTest49</description>
<webapp>coreWeb</webapp>
Added:
incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/J533.xml
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/J533.xml?rev=165415&view=auto
==============================================================================
--- incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/J533.xml
(added)
+++ incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/J533.xml
Sat Apr 30 12:39:38 2005
@@ -0,0 +1,345 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ses:recorderSession
xmlns:ses="http://beehive.apache.org/netui/tools/testrecorder/2004/session";>
+ <ses:sessionName>J533</ses:sessionName>
+ <ses:tester>crogers</ses:tester>
+ <ses:startDate>29 Apr 2005, 05:28:46.628 PM MDT</ses:startDate>
+ <ses:description>Simple test of TreeHtmlAttributeInfo
constructor</ses:description>
+ <ses:tests>
+ <ses:test>
+ <ses:testNumber>1</ses:testNumber>
+ <ses:request>
+ <ses:protocol>HTTP</ses:protocol>
+ <ses:protocolVersion>1.1</ses:protocolVersion>
+ <ses:host>localhost</ses:host>
+ <ses:port>8080</ses:port>
+ <ses:uri>/coreWeb/bugs/j533/Controller.jpf</ses:uri>
+ <ses:method>GET</ses:method>
+ <ses:parameters/>
+ <ses:cookies>
+ <ses:cookie>
+ <ses:name>JSESSIONID</ses:name>
+ <ses:value>4A8A222BE36B2D73D323A77DA3B97749</ses:value>
+ </ses:cookie>
+ </ses:cookies>
+ <ses:headers>
+ <ses:header>
+ <ses:name>accept</ses:name>
+
<ses:value>text/xml,application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5</ses:value>
+ </ses:header>
+ <ses:header>
+ <ses:name>accept-charset</ses:name>
+ <ses:value>UTF-8,*</ses:value>
+ </ses:header>
+ <ses:header>
+ <ses:name>accept-encoding</ses:name>
+ <ses:value>gzip,deflate</ses:value>
+ </ses:header>
+ <ses:header>
+ <ses:name>accept-language</ses:name>
+ <ses:value>en-us,en;q=0.5</ses:value>
+ </ses:header>
+ <ses:header>
+ <ses:name>connection</ses:name>
+ <ses:value>keep-alive</ses:value>
+ </ses:header>
+ <ses:header>
+ <ses:name>cookie</ses:name>
+
<ses:value>JSESSIONID=4A8A222BE36B2D73D323A77DA3B97749</ses:value>
+ </ses:header>
+ <ses:header>
+ <ses:name>host</ses:name>
+ <ses:value>localhost:8080</ses:value>
+ </ses:header>
+ <ses:header>
+ <ses:name>keep-alive</ses:name>
+ <ses:value>300</ses:value>
+ </ses:header>
+ <ses:header>
+ <ses:name>user-agent</ses:name>
+ <ses:value>Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US;
rv:1.7) Gecko/20040803 Firefox/0.9.3</ses:value>
+ </ses:header>
+ </ses:headers>
+ </ses:request>
+ <ses:response>
+ <ses:statusCode>200</ses:statusCode>
+ <ses:reason/>
+ <ses:responseBody><![CDATA[<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML
4.01 Transitional//EN"
+ "http://www.w3.org/TR/html4/loose.dtd";>
+<html lang="en">
+
+ <head>
+ <title>J533 Test</title>
+ </head>
+
+ <body>
+ <p>Simple test of the new requested constructor for
+ TreeHtmlAttributeInfo</p>
+
+ <a href="/coreWeb/bugs/j533/resetTrees.do">Reset Trees</a>
+
+ <p>Dynamic pageFlow tree - images are set in the JSP.
+ TreeHtmlAttributeInfo is also defined in the pageFlow.</p>
+
+ <div>
+ <div>
+ <a
href="/coreWeb/bugs/j533/postback.do?netui_treenode=0&netui_treeid=attrDynTree1"><img
src="./rootminus.gif" style="vertical-align:bottom;" border="0" alt="Collapse
Tree Element"></a>
+ <a
href="/coreWeb/bugs/j533/postback.do?netui_treeselected=0&netui_treeid=attrDynTree1"
title="Title in the HTML source." style="text-decoration: none"> <img
src="./alien.gif" style="vertical-align:text-top" border="0" alt="Dynamic Tree
1"> Dynamic Tree 1 </a>
+ </div>
+ <div attrall="TE1.DescendAttr" attrone="TE1.AttrA">
+ <img src="./spacer.gif" width="16px" border="0" alt="">
+ <a
href="/coreWeb/bugs/j533/postback.do?netui_treenode=0.0&netui_treeid=attrDynTree1"><img
src="./plusbottom.gif" style="vertical-align:bottom;" border="0" alt="Expand
Tree Element"></a>
+ <a
href="/coreWeb/bugs/j533/postback.do?netui_treeselected=0.0&netui_treeid=attrDynTree1"
style="text-decoration: none"> <img src="./alien.gif"
style="vertical-align:text-top" border="0" attrone="TE1.AttrA"
alt="TreeElement1"> TreeElement1 </a>
+ </div>
+</div>
+
+
+ </body>
+
+
+</html>]]></ses:responseBody>
+ </ses:response>
+ </ses:test>
+ <ses:test>
+ <ses:testNumber>2</ses:testNumber>
+ <ses:request>
+ <ses:protocol>HTTP</ses:protocol>
+ <ses:protocolVersion>1.1</ses:protocolVersion>
+ <ses:host>localhost</ses:host>
+ <ses:port>8080</ses:port>
+ <ses:uri>/coreWeb/bugs/j533/postback.do</ses:uri>
+ <ses:method>GET</ses:method>
+ <ses:parameters>
+ <ses:parameter>
+ <ses:name>netui_treeid</ses:name>
+ <ses:value>attrDynTree1</ses:value>
+ </ses:parameter>
+ <ses:parameter>
+ <ses:name>netui_treenode</ses:name>
+ <ses:value>0.0</ses:value>
+ </ses:parameter>
+ </ses:parameters>
+ <ses:cookies>
+ <ses:cookie>
+ <ses:name>JSESSIONID</ses:name>
+ <ses:value>4A8A222BE36B2D73D323A77DA3B97749</ses:value>
+ </ses:cookie>
+ </ses:cookies>
+ <ses:headers>
+ <ses:header>
+ <ses:name>accept</ses:name>
+
<ses:value>text/xml,application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5</ses:value>
+ </ses:header>
+ <ses:header>
+ <ses:name>accept-charset</ses:name>
+ <ses:value>UTF-8,*</ses:value>
+ </ses:header>
+ <ses:header>
+ <ses:name>accept-encoding</ses:name>
+ <ses:value>gzip,deflate</ses:value>
+ </ses:header>
+ <ses:header>
+ <ses:name>accept-language</ses:name>
+ <ses:value>en-us,en;q=0.5</ses:value>
+ </ses:header>
+ <ses:header>
+ <ses:name>connection</ses:name>
+ <ses:value>keep-alive</ses:value>
+ </ses:header>
+ <ses:header>
+ <ses:name>cookie</ses:name>
+
<ses:value>JSESSIONID=4A8A222BE36B2D73D323A77DA3B97749</ses:value>
+ </ses:header>
+ <ses:header>
+ <ses:name>host</ses:name>
+ <ses:value>localhost:8080</ses:value>
+ </ses:header>
+ <ses:header>
+ <ses:name>keep-alive</ses:name>
+ <ses:value>300</ses:value>
+ </ses:header>
+ <ses:header>
+ <ses:name>referer</ses:name>
+
<ses:value>http://localhost:8080/coreWeb/bugs/j533/Controller.jpf</ses:value>
+ </ses:header>
+ <ses:header>
+ <ses:name>user-agent</ses:name>
+ <ses:value>Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US;
rv:1.7) Gecko/20040803 Firefox/0.9.3</ses:value>
+ </ses:header>
+ </ses:headers>
+ </ses:request>
+ <ses:response>
+ <ses:statusCode>200</ses:statusCode>
+ <ses:reason/>
+ <ses:responseBody><![CDATA[<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML
4.01 Transitional//EN"
+ "http://www.w3.org/TR/html4/loose.dtd";>
+<html lang="en">
+
+ <head>
+ <title>J533 Test</title>
+ </head>
+
+ <body>
+ <p>Simple test of the new requested constructor for
+ TreeHtmlAttributeInfo</p>
+
+ <a href="/coreWeb/bugs/j533/resetTrees.do">Reset Trees</a>
+
+ <p>Dynamic pageFlow tree - images are set in the JSP.
+ TreeHtmlAttributeInfo is also defined in the pageFlow.</p>
+
+ <div>
+ <div>
+ <a
href="/coreWeb/bugs/j533/postback.do?netui_treenode=0&netui_treeid=attrDynTree1"><img
src="./rootminus.gif" style="vertical-align:bottom;" border="0" alt="Collapse
Tree Element"></a>
+ <a
href="/coreWeb/bugs/j533/postback.do?netui_treeselected=0&netui_treeid=attrDynTree1"
title="Title in the HTML source." style="text-decoration: none"> <img
src="./alien.gif" style="vertical-align:text-top" border="0" alt="Dynamic Tree
1"> Dynamic Tree 1 </a>
+ </div>
+ <div attrall="TE1.DescendAttr" attrone="TE1.AttrA">
+ <img src="./spacer.gif" width="16px" border="0" alt="">
+ <a
href="/coreWeb/bugs/j533/postback.do?netui_treenode=0.0&netui_treeid=attrDynTree1"><img
src="./minusbottom.gif" style="vertical-align:bottom;" border="0"
alt="Collapse Tree Element"></a>
+ <a
href="/coreWeb/bugs/j533/postback.do?netui_treeselected=0.0&netui_treeid=attrDynTree1"
style="text-decoration: none"> <img src="./alien.gif"
style="vertical-align:text-top" border="0" attrone="TE1.AttrA"
alt="TreeElement1"> TreeElement1 </a>
+ </div>
+ <div attrall="TE1.DescendAttr">
+ <img src="./spacer.gif" width="16px" border="0" alt="">
+ <img src="./spacer.gif" width="16px" border="0" alt="">
+ <a
href="/coreWeb/bugs/j533/postback.do?netui_treenode=0.0.0&netui_treeid=attrDynTree1"><img
src="./plusbottom.gif" style="vertical-align:bottom;" border="0" alt="Expand
Tree Element"></a>
+ <a
href="/coreWeb/bugs/j533/postback.do?netui_treeselected=0.0.0&netui_treeid=attrDynTree1"
style="text-decoration: none"> <img src="./alien.gif"
style="vertical-align:text-top" border="0"
alt="TreeElement2"> TreeElement2 </a>
+ </div>
+</div>
+
+
+ </body>
+
+
+</html>]]></ses:responseBody>
+ </ses:response>
+ </ses:test>
+ <ses:test>
+ <ses:testNumber>3</ses:testNumber>
+ <ses:request>
+ <ses:protocol>HTTP</ses:protocol>
+ <ses:protocolVersion>1.1</ses:protocolVersion>
+ <ses:host>localhost</ses:host>
+ <ses:port>8080</ses:port>
+ <ses:uri>/coreWeb/bugs/j533/postback.do</ses:uri>
+ <ses:method>GET</ses:method>
+ <ses:parameters>
+ <ses:parameter>
+ <ses:name>netui_treeid</ses:name>
+ <ses:value>attrDynTree1</ses:value>
+ </ses:parameter>
+ <ses:parameter>
+ <ses:name>netui_treenode</ses:name>
+ <ses:value>0.0.0</ses:value>
+ </ses:parameter>
+ </ses:parameters>
+ <ses:cookies>
+ <ses:cookie>
+ <ses:name>JSESSIONID</ses:name>
+ <ses:value>4A8A222BE36B2D73D323A77DA3B97749</ses:value>
+ </ses:cookie>
+ </ses:cookies>
+ <ses:headers>
+ <ses:header>
+ <ses:name>accept</ses:name>
+
<ses:value>text/xml,application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5</ses:value>
+ </ses:header>
+ <ses:header>
+ <ses:name>accept-charset</ses:name>
+ <ses:value>UTF-8,*</ses:value>
+ </ses:header>
+ <ses:header>
+ <ses:name>accept-encoding</ses:name>
+ <ses:value>gzip,deflate</ses:value>
+ </ses:header>
+ <ses:header>
+ <ses:name>accept-language</ses:name>
+ <ses:value>en-us,en;q=0.5</ses:value>
+ </ses:header>
+ <ses:header>
+ <ses:name>connection</ses:name>
+ <ses:value>keep-alive</ses:value>
+ </ses:header>
+ <ses:header>
+ <ses:name>cookie</ses:name>
+
<ses:value>JSESSIONID=4A8A222BE36B2D73D323A77DA3B97749</ses:value>
+ </ses:header>
+ <ses:header>
+ <ses:name>host</ses:name>
+ <ses:value>localhost:8080</ses:value>
+ </ses:header>
+ <ses:header>
+ <ses:name>keep-alive</ses:name>
+ <ses:value>300</ses:value>
+ </ses:header>
+ <ses:header>
+ <ses:name>referer</ses:name>
+
<ses:value>http://localhost:8080/coreWeb/bugs/j533/postback.do?netui_treenode=0.0&netui_treeid=attrDynTree1</ses:value>
+ </ses:header>
+ <ses:header>
+ <ses:name>user-agent</ses:name>
+ <ses:value>Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US;
rv:1.7) Gecko/20040803 Firefox/0.9.3</ses:value>
+ </ses:header>
+ </ses:headers>
+ </ses:request>
+ <ses:response>
+ <ses:statusCode>200</ses:statusCode>
+ <ses:reason/>
+ <ses:responseBody><![CDATA[<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML
4.01 Transitional//EN"
+ "http://www.w3.org/TR/html4/loose.dtd";>
+<html lang="en">
+
+ <head>
+ <title>J533 Test</title>
+ </head>
+
+ <body>
+ <p>Simple test of the new requested constructor for
+ TreeHtmlAttributeInfo</p>
+
+ <a href="/coreWeb/bugs/j533/resetTrees.do">Reset Trees</a>
+
+ <p>Dynamic pageFlow tree - images are set in the JSP.
+ TreeHtmlAttributeInfo is also defined in the pageFlow.</p>
+
+ <div>
+ <div>
+ <a
href="/coreWeb/bugs/j533/postback.do?netui_treenode=0&netui_treeid=attrDynTree1"><img
src="./rootminus.gif" style="vertical-align:bottom;" border="0" alt="Collapse
Tree Element"></a>
+ <a
href="/coreWeb/bugs/j533/postback.do?netui_treeselected=0&netui_treeid=attrDynTree1"
title="Title in the HTML source." style="text-decoration: none"> <img
src="./alien.gif" style="vertical-align:text-top" border="0" alt="Dynamic Tree
1"> Dynamic Tree 1 </a>
+ </div>
+ <div attrall="TE1.DescendAttr" attrone="TE1.AttrA">
+ <img src="./spacer.gif" width="16px" border="0" alt="">
+ <a
href="/coreWeb/bugs/j533/postback.do?netui_treenode=0.0&netui_treeid=attrDynTree1"><img
src="./minusbottom.gif" style="vertical-align:bottom;" border="0"
alt="Collapse Tree Element"></a>
+ <a
href="/coreWeb/bugs/j533/postback.do?netui_treeselected=0.0&netui_treeid=attrDynTree1"
style="text-decoration: none"> <img src="./alien.gif"
style="vertical-align:text-top" border="0" attrone="TE1.AttrA"
alt="TreeElement1"> TreeElement1 </a>
+ </div>
+ <div attrall="TE1.DescendAttr">
+ <img src="./spacer.gif" width="16px" border="0" alt="">
+ <img src="./spacer.gif" width="16px" border="0" alt="">
+ <a
href="/coreWeb/bugs/j533/postback.do?netui_treenode=0.0.0&netui_treeid=attrDynTree1"><img
src="./minusbottom.gif" style="vertical-align:bottom;" border="0"
alt="Collapse Tree Element"></a>
+ <a
href="/coreWeb/bugs/j533/postback.do?netui_treeselected=0.0.0&netui_treeid=attrDynTree1"
style="text-decoration: none"> <img src="./alien.gif"
style="vertical-align:text-top" border="0"
alt="TreeElement2"> TreeElement2 </a>
+ </div>
+ <div attrthree="TE3.AttrB" attrall="TE1.DescendAttr">
+ <img src="./spacer.gif" width="16px" border="0" alt="">
+ <img src="./spacer.gif" width="16px" border="0" alt="">
+ <img src="./spacer.gif" width="16px" border="0" alt="">
+ <img src="./join.gif" style="vertical-align:bottom;" border="0" alt="">
+ <a
href="/coreWeb/bugs/j533/postback.do?netui_treeselected=0.0.0.0&netui_treeid=attrDynTree1"
attrthree="TE3.AttrB" style="text-decoration: none"> <img
src="./alien.gif" style="vertical-align:text-top" border="0"
alt="TreeElement3"> TreeElement3 </a>
+ </div>
+ <div attrall="TE1.DescendAttr">
+ <img src="./spacer.gif" width="16px" border="0" alt="">
+ <img src="./spacer.gif" width="16px" border="0" alt="">
+ <img src="./spacer.gif" width="16px" border="0" alt="">
+ <img src="./joinbottom.gif" style="vertical-align:bottom;" border="0"
alt="">
+ <a
href="/coreWeb/bugs/j533/postback.do?netui_treeselected=0.0.0.1&netui_treeid=attrDynTree1"
style="text-decoration: none"> <img src="./alien.gif"
style="vertical-align:text-top" border="0"
alt="TreeElement4"> TreeElement4 </a>
+ </div>
+</div>
+
+
+ </body>
+
+
+</html>]]></ses:responseBody>
+ </ses:response>
+ </ses:test>
+ </ses:tests>
+ <ses:endDate>29 Apr 2005, 05:30:00.374 PM MDT</ses:endDate>
+ <ses:testCount>3</ses:testCount>
+</ses:recorderSession>
\ No newline at end of file
Propchange:
incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/J533.xml
------------------------------------------------------------------------------
svn:eol-style = native
