Author: rich
Date: Fri Apr 29 00:40:51 2005
New Revision: 165271
URL: http://svn.apache.org/viewcvs?rev=165271&view=rev
Log:
This is a contribution from Carlin Rogers to address
http://issues.apache.org/jira/browse/BEEHIVE-582 : Add the response as a
parameter to the onExpand() method of TreeElement.
tests: bvt in netui (WinXP)
BB: self (linux)
Modified:
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/TreeHelpers.java
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tree/expand/Controller.jpf
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?rev=165271&r1=165270&r2=165271&view=diff
==============================================================================
---
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
Fri Apr 29 00:40:51 2005
@@ -781,7 +781,7 @@
String treeId = request.getParameter(TreeElement.TREE_ID);
if (treeId != null && _trs.tagId.equals(treeId)) {
- TreeHelpers.processTreeRequest(treeId, treeRoot, request);
+ TreeHelpers.processTreeRequest(treeId, treeRoot, request,
response);
}
// check for the nodes that are expanded...
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?rev=165271&r1=165270&r2=165271&view=diff
==============================================================================
---
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
Fri Apr 29 00:40:51 2005
@@ -111,7 +111,7 @@
System.err.println("Element '" + node + "' not found in the tree");
return;
}
- elem.onExpand(req);
+ elem.onExpand(req, response);
elem.setExpanded(expand);
if (expandSvr != null) {
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?rev=165271&r1=165270&r2=165271&view=diff
==============================================================================
---
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
Fri Apr 29 00:40:51 2005
@@ -22,7 +22,7 @@
import org.apache.beehive.netui.util.ParamHelper;
import javax.servlet.ServletRequest;
-import javax.servlet.jsp.JspException;
+import javax.servlet.ServletResponse;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.HashMap;
@@ -545,7 +545,7 @@
/**
* Code that runs when the node is expanded.
*/
- public void onExpand(ServletRequest request)
+ public void onExpand(ServletRequest request, ServletResponse response)
{
//do nothing
}
Modified:
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeHelpers.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeHelpers.java?rev=165271&r1=165270&r2=165271&view=diff
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeHelpers.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeHelpers.java
Fri Apr 29 00:40:51 2005
@@ -21,6 +21,7 @@
import javax.servlet.ServletRequest;
import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
/**
@@ -36,7 +37,7 @@
* @param treeRoot
* @param request
*/
- public static void processTreeRequest(String treeId, TreeElement treeRoot,
HttpServletRequest request)
+ public static void processTreeRequest(String treeId, TreeElement treeRoot,
HttpServletRequest request, HttpServletResponse response)
{
assert(treeId != null) : "parameter treeId must not be null.";
assert(treeRoot != null) : "parameter treeRoot must not be null.";
@@ -66,7 +67,7 @@
if (expandNode != null) {
TreeElement n = treeRoot.findNode(expandNode);
if (n != null) {
- n.onExpand(request);
+ n.onExpand(request, response);
n.setExpanded(!n.isExpanded());
}
}
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tree/expand/Controller.jpf
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tree/expand/Controller.jpf?rev=165271&r1=165270&r2=165271&view=diff
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tree/expand/Controller.jpf
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tree/expand/Controller.jpf
Fri Apr 29 00:40:51 2005
@@ -1,198 +1,199 @@
-package tree.expand;
-
-import org.apache.beehive.netui.pageflow.PageFlowController;
-import org.apache.beehive.netui.pageflow.annotations.Jpf;
-import org.apache.beehive.netui.tags.tree.ITreeRootElement;
-import org.apache.beehive.netui.tags.tree.TreeElement;
-import org.apache.beehive.netui.tags.tree.TreeRenderState;
-import org.apache.beehive.netui.pageflow.requeststate.NameService;
-
-import javax.servlet.ServletRequest;
-import javax.servlet.http.HttpSession;
-import org.apache.beehive.netui.pageflow.Forward;
-
[EMAIL PROTECTED] (
- simpleActions = {
- @Jpf.SimpleAction(name = "select", path = "Test.jsp")
- }
-)
-public class Controller extends PageFlowController
-{
- private TreeElement _root;
- private int[] _children = {3,2,0,2,0,2,1,1,2};
- private int _child = 0;
-
- public TreeElement getRoot()
- {
- return _root;
- }
-
- @Jpf.Action(
- forwards={
- @Jpf.Forward(name="index", path="Test.jsp")
- }
- )
- protected Forward begin()
- {
- NameService ns = NameService.instance(getRequest().getSession());
- ns.debugSetNameIntValue(6);
- return new Forward("index");
- }
-
- @Jpf.Action(
- forwards={
- @Jpf.Forward(name="index", path="Test.jsp")
- }
- )
- protected Forward reset()
- {
- _child = 0;
- _root = new ToolTreeRootElement("0", false, getChildCount());
- return new Forward("index");
- }
-
- /**
- * Callback that is invoked when this controller instance is created.
- */
- protected void onCreate()
- {
- _root = new ToolTreeRootElement("0", false, getChildCount());
- }
-
- /**
- * Callback that is invoked when this controller instance is destroyed.
- */
- protected void onDestroy(HttpSession session)
- {
- }
-
- private int getChildCount()
- {
- if (_child == _children.length)
- return 0;
- return _children[_child++];
- }
-
- class ToolTreeElement extends TreeElement
- {
- private boolean _leaf;
- private int _children;
-
- public ToolTreeElement(String s, boolean b, int children)
- {
- super(s, b);
- _leaf = (children == 0);
- _children = children;
- setExpandOnServer(!_leaf);
- }
-
- public void onExpand(ServletRequest request)
- {
- if (_children > 0 && size() == 0) {
- for (int i=0;i<_children;i++) {
- String name = getLabel() + "." + i;
- ToolTreeElement m = new ToolTreeElement(name, false,
getChildCount());
- addChild(m);
- }
- }
- }
-
- public boolean isLeaf()
- {
- return _leaf;
- }
- }
-
- class ToolTreeRootElement extends ToolTreeElement implements
ITreeRootElement
- {
- private String _name = null;
- private TreeRenderState _trs = null;
- private TreeElement _selectedNode;
- private String _rootNodeExpandedImage;
- private String _rootNodeCollapsedImage;
-
- public ToolTreeRootElement(String s, boolean b, int children)
- {
- super(s, b, children);
- }
-
- public TreeElement getSelectedNode() {
- return _selectedNode;
- }
-
- public void changeSelected(String selectNode,ServletRequest request)
- {
- // if there is a selectedNode then we need to raise the onSelect
- // event on that node indicating it will soon not be selected
- TreeElement n = findNode(selectNode);
- if (n == null) {
- return;
- }
-
- // change the node that was selected so it is no longer selected
- if (_selectedNode != null) {
- _selectedNode.onSelect(request);
- _selectedNode.setSelected(false);
- }
-
- // change the node that is to be selected
- n.onSelect(request);
- n.setSelected(true);
- _selectedNode = n;
- return;
- }
-
- public TreeRenderState getTreeRenderState()
- {
- return _trs;
- }
-
- public void setTreeRenderState(TreeRenderState treeRenderState)
- {
- _trs = treeRenderState;
- }
-
- public void setObjectName(String s)
- {
- _name = s;
- }
-
- public String getObjectName()
- {
- return _name;
- }
-
- /**
- * @return
- */
- public String getRootNodeExpandedImage()
- {
- return _rootNodeExpandedImage;
- }
-
- /**
- * @param rootNodeExpandedImage
- */
- public void setRootNodeExpandedImage(String rootNodeExpandedImage)
- {
- _rootNodeExpandedImage = rootNodeExpandedImage;
- }
-
- /**
- * @return
- */
- public String getRootNodeCollapsedImage()
- {
- return _rootNodeCollapsedImage;
- }
-
- /**
- * @param rootNodeCollapsedImage
- */
- public void setRootNodeCollapsedImage(String rootNodeCollapsedImage)
- {
- _rootNodeCollapsedImage = rootNodeCollapsedImage;
- }
- }
-}
-
+package tree.expand;
+
+import org.apache.beehive.netui.pageflow.PageFlowController;
+import org.apache.beehive.netui.pageflow.annotations.Jpf;
+import org.apache.beehive.netui.tags.tree.ITreeRootElement;
+import org.apache.beehive.netui.tags.tree.TreeElement;
+import org.apache.beehive.netui.tags.tree.TreeRenderState;
+import org.apache.beehive.netui.pageflow.requeststate.NameService;
+
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import javax.servlet.http.HttpSession;
+import org.apache.beehive.netui.pageflow.Forward;
+
[EMAIL PROTECTED] (
+ simpleActions = {
+ @Jpf.SimpleAction(name = "select", path = "Test.jsp")
+ }
+)
+public class Controller extends PageFlowController
+{
+ private TreeElement _root;
+ private int[] _children = {3,2,0,2,0,2,1,1,2};
+ private int _child = 0;
+
+ public TreeElement getRoot()
+ {
+ return _root;
+ }
+
+ @Jpf.Action(
+ forwards={
+ @Jpf.Forward(name="index", path="Test.jsp")
+ }
+ )
+ protected Forward begin()
+ {
+ NameService ns = NameService.instance(getRequest().getSession());
+ ns.debugSetNameIntValue(6);
+ return new Forward("index");
+ }
+
+ @Jpf.Action(
+ forwards={
+ @Jpf.Forward(name="index", path="Test.jsp")
+ }
+ )
+ protected Forward reset()
+ {
+ _child = 0;
+ _root = new ToolTreeRootElement("0", false, getChildCount());
+ return new Forward("index");
+ }
+
+ /**
+ * Callback that is invoked when this controller instance is created.
+ */
+ protected void onCreate()
+ {
+ _root = new ToolTreeRootElement("0", false, getChildCount());
+ }
+
+ /**
+ * Callback that is invoked when this controller instance is destroyed.
+ */
+ protected void onDestroy(HttpSession session)
+ {
+ }
+
+ private int getChildCount()
+ {
+ if (_child == _children.length)
+ return 0;
+ return _children[_child++];
+ }
+
+ class ToolTreeElement extends TreeElement
+ {
+ private boolean _leaf;
+ private int _children;
+
+ public ToolTreeElement(String s, boolean b, int children)
+ {
+ super(s, b);
+ _leaf = (children == 0);
+ _children = children;
+ setExpandOnServer(!_leaf);
+ }
+
+ public void onExpand(ServletRequest request, ServletResponse response)
+ {
+ if (_children > 0 && size() == 0) {
+ for (int i=0;i<_children;i++) {
+ String name = getLabel() + "." + i;
+ ToolTreeElement m = new ToolTreeElement(name, false,
getChildCount());
+ addChild(m);
+ }
+ }
+ }
+
+ public boolean isLeaf()
+ {
+ return _leaf;
+ }
+ }
+
+ class ToolTreeRootElement extends ToolTreeElement implements
ITreeRootElement
+ {
+ private String _name = null;
+ private TreeRenderState _trs = null;
+ private TreeElement _selectedNode;
+ private String _rootNodeExpandedImage;
+ private String _rootNodeCollapsedImage;
+
+ public ToolTreeRootElement(String s, boolean b, int children)
+ {
+ super(s, b, children);
+ }
+
+ public TreeElement getSelectedNode() {
+ return _selectedNode;
+ }
+
+ public void changeSelected(String selectNode,ServletRequest request)
+ {
+ // if there is a selectedNode then we need to raise the onSelect
+ // event on that node indicating it will soon not be selected
+ TreeElement n = findNode(selectNode);
+ if (n == null) {
+ return;
+ }
+
+ // change the node that was selected so it is no longer selected
+ if (_selectedNode != null) {
+ _selectedNode.onSelect(request);
+ _selectedNode.setSelected(false);
+ }
+
+ // change the node that is to be selected
+ n.onSelect(request);
+ n.setSelected(true);
+ _selectedNode = n;
+ return;
+ }
+
+ public TreeRenderState getTreeRenderState()
+ {
+ return _trs;
+ }
+
+ public void setTreeRenderState(TreeRenderState treeRenderState)
+ {
+ _trs = treeRenderState;
+ }
+
+ public void setObjectName(String s)
+ {
+ _name = s;
+ }
+
+ public String getObjectName()
+ {
+ return _name;
+ }
+
+ /**
+ * @return
+ */
+ public String getRootNodeExpandedImage()
+ {
+ return _rootNodeExpandedImage;
+ }
+
+ /**
+ * @param rootNodeExpandedImage
+ */
+ public void setRootNodeExpandedImage(String rootNodeExpandedImage)
+ {
+ _rootNodeExpandedImage = rootNodeExpandedImage;
+ }
+
+ /**
+ * @return
+ */
+ public String getRootNodeCollapsedImage()
+ {
+ return _rootNodeCollapsedImage;
+ }
+
+ /**
+ * @param rootNodeCollapsedImage
+ */
+ public void setRootNodeCollapsedImage(String rootNodeCollapsedImage)
+ {
+ _rootNodeCollapsedImage = rootNodeCollapsedImage;
+ }
+ }
+}
+
