patrickl 01/12/16 11:38:02
Modified: webapps/admin/WEB-INF web.xml
webapps/admin/WEB-INF/classes/org/apache/webapp/admin
SetUpTreeAction.java TreeControlTag.java
Log:
In the webadmin navigation tree display, the label for the root node was hardcoded
to "Root Node". I've made the label to be displayed for the root node configurable as
an init-param in web.xml. If this init-param is absent, then the root node does not
get rendered (the rest of the tree does ofcourse!).
Submitted by: Manveen Kaur
Revision Changes Path
1.7 +5 -0 jakarta-tomcat-4.0/webapps/admin/WEB-INF/web.xml
Index: web.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/web.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- web.xml 2001/11/27 02:46:28 1.6
+++ web.xml 2001/12/16 19:38:02 1.7
@@ -42,6 +42,11 @@
<param-name>validate</param-name>
<param-value>true</param-value>
</init-param>
+ <!-- Label to be displayed for rootnode. If absent, rootnode is not rendered -->
+ <init-param>
+ <param-name>rootnodename</param-name>
+ <param-value>Tomcat Root</param-value>
+ </init-param>
<init-param>
<param-name>treebuilders</param-name>
<param-value>org.apache.webapp.admin.TomcatTreeBuilder</param-value>
1.3 +24 -13
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/SetUpTreeAction.java
Index: SetUpTreeAction.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/SetUpTreeAction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SetUpTreeAction.java 2001/11/27 02:46:28 1.2
+++ SetUpTreeAction.java 2001/12/16 19:38:02 1.3
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/SetUpTreeAction.java,v
1.2 2001/11/27 02:46:28 patrickl Exp $
- * $Revision: 1.2 $
- * $Date: 2001/11/27 02:46:28 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/SetUpTreeAction.java,v
1.3 2001/12/16 19:38:02 patrickl Exp $
+ * $Revision: 1.3 $
+ * $Date: 2001/12/16 19:38:02 $
*
* ====================================================================
*
@@ -85,13 +85,15 @@
* for tree widget
*
* @author Jazmin Jonson
- * @version $Revision: 1.2 $ $Date: 2001/11/27 02:46:28 $
+ * @author Manveen Kaur
+ * @version $Revision: 1.3 $ $Date: 2001/12/16 19:38:02 $
*/
public class SetUpTreeAction extends Action {
public static final int INIT_PLUGIN_MAX = 10;
public static final String TREEBUILDER_KEY = "treebuilders";
+ public static final String ROOTNODENAME_KEY = "rootnodename";
// --------------------------------------------------------- Public Methods
@@ -116,21 +118,30 @@
HttpServletResponse response)
throws IOException, ServletException {
- // Make the root node and tree control
-
- TreeControlNode root =
- new TreeControlNode("ROOT-NODE",
- null, "Root Node",
- "treeControlTest.do?select=ROOT-NODE",
- null, true);
- TreeControl control = new TreeControl(root);
ApplicationServlet servlet = (ApplicationServlet)getServlet();
// Getting init parms from web.xml
+ // Get the string to be displayed as root node while rendering the tree
+ String rootnodeName =
+ (String)servlet.getServletConfig().getInitParameter(ROOTNODENAME_KEY);
+
String treeBuildersStr =
(String)servlet.getServletConfig().getInitParameter(TREEBUILDER_KEY);
-
+
+ // Make the root node and tree control
+
+ // The root node gets rendered only if its value
+ // is set as an init-param in web.xml
+
+ TreeControlNode root =
+ new TreeControlNode("ROOT-NODE",
+ null, rootnodeName,
+ "treeControlTest.do?select=ROOT-NODE",
+ null, true);
+
+ TreeControl control = new TreeControl(root);
+
if(treeBuildersStr != null) {
Class treeBuilderImpl;
TreeBuilder treeBuilderBase;
1.5 +20 -5
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/TreeControlTag.java
Index: TreeControlTag.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/TreeControlTag.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TreeControlTag.java 2001/11/27 02:46:28 1.4
+++ TreeControlTag.java 2001/12/16 19:38:02 1.5
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/TreeControlTag.java,v
1.4 2001/11/27 02:46:28 patrickl Exp $
- * $Revision: 1.4 $
- * $Date: 2001/11/27 02:46:28 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/TreeControlTag.java,v
1.5 2001/12/16 19:38:02 patrickl Exp $
+ * $Revision: 1.5 $
+ * $Date: 2001/12/16 19:38:02 $
*
* ====================================================================
*
@@ -104,7 +104,7 @@
* <strong>FIXME</strong> - Internationalize the exception messages!
*
* @author Craig R. McClanahan
- * @version $Revision: 1.4 $ $Date: 2001/11/27 02:46:28 $
+ * @version $Revision: 1.5 $ $Date: 2001/12/16 19:38:02 $
*/
public class TreeControlTag extends TagSupport {
@@ -350,7 +350,22 @@
HttpServletResponse response =
(HttpServletResponse) pageContext.getResponse();
-
+
+ // if the node is root node and the label value is
+ // null, then do not render root node in the tree.
+
+ if ("ROOT-NODE".equalsIgnoreCase(node.getName()) &&
+ (node.getLabel() == null)) {
+ // Render the children of this node
+ TreeControlNode children[] = node.findChildren();
+ int lastIndex = children.length - 1;
+ int newLevel = level + 1;
+ for (int i = 0; i < children.length; i++) {
+ render(out, children[i], newLevel, width, i == lastIndex);
+ }
+ return;
+ }
+
// Render the beginning of this node
out.println(" <tr valign=\"middle\">");
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
