Thread: [Ejtools-cvs] CVS: applications/jmx.browser/src/main/net/sourceforge/ejtools/jmxbrowser/web/action D
Brought to you by:
letiemble
From: Laurent E. <let...@us...> - 2002-04-25 20:24:10
|
Update of /cvsroot/ejtools/applications/jmx.browser/src/main/net/sourceforge/ejtools/jmxbrowser/web/action In directory usw-pr-cvs1:/tmp/cvs-serv28556/action Modified Files: DetailAction.java FilterAction.java Log Message: Pretty print the code Index: DetailAction.java =================================================================== RCS file: /cvsroot/ejtools/applications/jmx.browser/src/main/net/sourceforge/ejtools/jmxbrowser/web/action/DetailAction.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** DetailAction.java 24 Apr 2002 20:01:13 -0000 1.1 --- DetailAction.java 25 Apr 2002 20:24:07 -0000 1.2 *************** *** 57,61 **** ActionErrors errors = new ActionErrors(); ! // TODO : put in Constants String ref = request.getParameter("reference"); --- 57,61 ---- ActionErrors errors = new ActionErrors(); ! // TODO : put in Constants String ref = request.getParameter("reference"); *************** *** 63,67 **** HttpSession session = request.getSession(); ! System.out.println("perform session "+session.getId()); System.out.println("Session " + session); --- 63,67 ---- HttpSession session = request.getSession(); ! System.out.println("perform session " + session.getId()); System.out.println("Session " + session); *************** *** 73,79 **** { session.setAttribute(Constants.DETAIL, o); ! System.out.println("Object " + o); session.setAttribute(Constants.DETAIL_INFO, o.getMBeanInfo()); ! System.out.println("Object " + o.getMBeanInfo()); } --- 73,79 ---- { session.setAttribute(Constants.DETAIL, o); ! System.out.println("Object " + o); session.setAttribute(Constants.DETAIL_INFO, o.getMBeanInfo()); ! System.out.println("Object " + o.getMBeanInfo()); } Index: FilterAction.java =================================================================== RCS file: /cvsroot/ejtools/applications/jmx.browser/src/main/net/sourceforge/ejtools/jmxbrowser/web/action/FilterAction.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** FilterAction.java 24 Apr 2002 20:01:31 -0000 1.1 --- FilterAction.java 25 Apr 2002 20:24:07 -0000 1.2 *************** *** 33,37 **** ! public FilterAction() { } --- 33,40 ---- ! /**Constructor for the FilterAction object */ ! public FilterAction() ! { ! } *************** *** 49,62 **** public ActionForward perform(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException { ! JMXTree tree = null; ! String filter = "*:*"; ! if (form != null) { ! filter = ((FilterForm) form).getFilter(); ! } ! if ((filter == null) ||("".equals(filter))) { ! // TODO Put in Constants ! filter = "*:*"; ! } System.out.println("filter " + filter); --- 52,67 ---- public ActionForward perform(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException { ! JMXTree tree = null; ! String filter = "*:*"; ! if (form != null) ! { ! filter = ((FilterForm) form).getFilter(); ! } ! if ((filter == null) || ("".equals(filter))) ! { ! // TODO Put in Constants ! filter = "*:*"; ! } System.out.println("filter " + filter); *************** *** 79,83 **** HttpSession session = request.getSession(); ! tree = (JMXTree) session.getAttribute(Constants.TREE); System.out.println("perform session " + session.getId()); --- 84,88 ---- HttpSession session = request.getSession(); ! tree = (JMXTree) session.getAttribute(Constants.TREE); System.out.println("perform session " + session.getId()); *************** *** 85,110 **** if (tree == null) { ! tree = new JMXTree(); session.setAttribute(Constants.TREE, tree); } ! tree.view(filter); // Remove the obsolete form bean ! /* ! if (mapping.getAttribute() != null) ! { ! if ("request".equals(mapping.getScope())) ! { ! request.removeAttribute(mapping.getAttribute()); ! } ! else ! { ! session.removeAttribute(mapping.getAttribute()); ! } ! } ! */ ! return (mapping.findForward("view")); } } --- 90,115 ---- if (tree == null) { ! tree = new JMXTree(); session.setAttribute(Constants.TREE, tree); } ! tree.view(filter); // Remove the obsolete form bean ! /* ! * if (mapping.getAttribute() != null) ! * { ! * if ("request".equals(mapping.getScope())) ! * { ! * request.removeAttribute(mapping.getAttribute()); ! * } ! * else ! * { ! * session.removeAttribute(mapping.getAttribute()); ! * } ! * } ! */ return (mapping.findForward("view")); } } + |