manveen 02/02/11 17:54:37 Modified: webapps/admin/WEB-INF/classes/org/apache/webapp/admin TomcatTreeBuilder.java Log: Displaying the list of contexts alphabetically from the tomcat tree, so that it is easier to locate a context. Revision Changes Path 1.14 +24 -11 jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/TomcatTreeBuilder.java Index: TomcatTreeBuilder.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/TomcatTreeBuilder.java,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- TomcatTreeBuilder.java 7 Feb 2002 05:06:53 -0000 1.13 +++ TomcatTreeBuilder.java 12 Feb 2002 01:54:37 -0000 1.14 @@ -1,7 +1,7 @@ /* - * $Header: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/TomcatTreeBuilder.java,v 1.13 2002/02/07 05:06:53 manveen Exp $ - * $Revision: 1.13 $ - * $Date: 2002/02/07 05:06:53 $ + * $Header: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/TomcatTreeBuilder.java,v 1.14 2002/02/12 01:54:37 manveen Exp $ + * $Revision: 1.14 $ + * $Date: 2002/02/12 01:54:37 $ * * ==================================================================== * @@ -64,6 +64,8 @@ import java.io.IOException; import java.util.Iterator; import java.util.List; +import java.util.ArrayList; +import java.util.Collections; import java.util.Locale; import java.net.URLEncoder; import javax.servlet.ServletException; @@ -93,7 +95,7 @@ * * @author Jazmin Jonson * @author Manveen Kaur - * @version $Revision: 1.13 $ $Date: 2002/02/07 05:06:53 $ + * @version $Revision: 1.14 $ $Date: 2002/02/12 01:54:37 $ */ @@ -117,7 +119,6 @@ public final static String WILDCARD = ",*"; private static MBeanServer mBServer = null; - //private static ObjectInstance mBeanFactory = null; public void buildTree(TreeControl treeControl, ApplicationServlet servlet, @@ -302,20 +303,30 @@ TreeControlNode contextNode = null; String encodedContextName; + // arraylist to store and sort the list of available contexts. + ArrayList contextList = new ArrayList(); while(contextItr.hasNext()){ ObjectInstance contextObj = (ObjectInstance)contextItr.next(); - + contextList.add(contextObj.getObjectName().toString()); + } + + // sorting the list so that the contexts displayed in the tree are in + // alphabetic order. + Collections.sort(contextList); + + for (int i=0; i<contextList.size(); i++) { + String context = (String)contextList.get(i); + ObjectName oName = new ObjectName(context); String contextName = - (String)mBServer.getAttribute(contextObj.getObjectName(), "path"); - - encodedContextName = URLEncoder.encode(contextObj.getObjectName().toString()); + (String)mBServer.getAttribute(oName , "path"); + encodedContextName = URLEncoder.encode(context); String nodeLabel="Context (" + contextName + ")"; String encodedNodeLabel = URLEncoder.encode(nodeLabel); contextNode = - new TreeControlNode(contextObj.getObjectName().toString(), + new TreeControlNode(context, "folder_16_pad.gif", nodeLabel, "setUpContext.do?select=" + encodedContextName @@ -329,6 +340,8 @@ getRealms(contextNode, serviceName, hostName, contextName, 2); } } + + } @@ -471,7 +484,7 @@ new TreeControlNode(realmObj.getObjectName().toString(), "folder_16_pad.gif", nodeLabel, - setUpAction +".do?select=" + encodedRealmName + setUpAction +".do?select=" + encodedRealmName +"&nodeLabel="+ encodedNodeLabel +"&type="+ encodedRealmType, "content", true);
-- To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]> For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>