Author: markt
Date: Sun Jul 15 18:53:13 2012
New Revision: 1361753
URL: http://svn.apache.org/viewvc?rev=1361753&view=rev
Log:
Code clean-up for o.a.catalina.manager
- Add final prompted by UCDetector
- Java 7 use of <>
Modified:
tomcat/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java
tomcat/trunk/java/org/apache/catalina/manager/JspHelper.java
tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java
tomcat/trunk/java/org/apache/catalina/manager/StatusManagerServlet.java
tomcat/trunk/java/org/apache/catalina/manager/host/HTMLHostManagerServlet.java
tomcat/trunk/java/org/apache/catalina/manager/host/HostManagerServlet.java
tomcat/trunk/java/org/apache/catalina/manager/util/ReverseComparator.java
tomcat/trunk/java/org/apache/catalina/manager/util/SessionUtils.java
Modified: tomcat/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java?rev=1361753&r1=1361752&r2=1361753&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java Sun
Jul 15 18:53:13 2012
@@ -873,7 +873,7 @@ public final class HTMLManagerServlet ex
RequestUtil.filter(cn.getDisplayName())));
}
Manager manager = ctxt.getManager();
- List<Session> sessions = new ArrayList<Session>();
+ List<Session> sessions = new ArrayList<>();
sessions.addAll(Arrays.asList(manager.findSessions()));
if (manager instanceof DistributedManager && showProxySessions) {
// Add dummy proxy sessions
Modified: tomcat/trunk/java/org/apache/catalina/manager/JspHelper.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/JspHelper.java?rev=1361753&r1=1361752&r2=1361753&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/manager/JspHelper.java (original)
+++ tomcat/trunk/java/org/apache/catalina/manager/JspHelper.java Sun Jul 15
18:53:13 2012
@@ -168,7 +168,8 @@ public class JspHelper {
*/
private static final int HIGHEST_SPECIAL = '>';
- private static char[][] specialCharactersRepresentation = new
char[HIGHEST_SPECIAL + 1][];
+ private static final char[][] specialCharactersRepresentation =
+ new char[HIGHEST_SPECIAL + 1][];
static {
specialCharactersRepresentation['&'] = "&".toCharArray();
specialCharactersRepresentation['<'] = "<".toCharArray();
Modified: tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java?rev=1361753&r1=1361752&r2=1361753&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java Sun Jul
15 18:53:13 2012
@@ -190,7 +190,7 @@ public class ManagerServlet extends Http
/**
* Path used to store context descriptors.
*/
- protected File contextDescriptors = null;
+ protected final File contextDescriptors = null;
/**
@@ -202,7 +202,7 @@ public class ManagerServlet extends Http
/**
* The host appBase.
*/
- protected File appBase = null;
+ protected final File appBase = null;
/**
Modified:
tomcat/trunk/java/org/apache/catalina/manager/StatusManagerServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/StatusManagerServlet.java?rev=1361753&r1=1361752&r2=1361753&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/manager/StatusManagerServlet.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/manager/StatusManagerServlet.java Sun
Jul 15 18:53:13 2012
@@ -65,25 +65,25 @@ public class StatusManagerServlet
/**
* Vector of protocol handlers object names.
*/
- protected Vector<ObjectName> protocolHandlers = new Vector<ObjectName>();
+ protected final Vector<ObjectName> protocolHandlers = new Vector<>();
/**
* Vector of thread pools object names.
*/
- protected Vector<ObjectName> threadPools = new Vector<ObjectName>();
+ protected final Vector<ObjectName> threadPools = new Vector<>();
/**
* Vector of request processors object names.
*/
- protected Vector<ObjectName> requestProcessors = new Vector<ObjectName>();
+ protected final Vector<ObjectName> requestProcessors = new Vector<>();
/**
* Vector of global request processors object names.
*/
- protected Vector<ObjectName> globalRequestProcessors = new
Vector<ObjectName>();
+ protected final Vector<ObjectName> globalRequestProcessors = new
Vector<>();
/**
Modified:
tomcat/trunk/java/org/apache/catalina/manager/host/HTMLHostManagerServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/host/HTMLHostManagerServlet.java?rev=1361753&r1=1361752&r2=1361753&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/catalina/manager/host/HTMLHostManagerServlet.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/manager/host/HTMLHostManagerServlet.java
Sun Jul 15 18:53:13 2012
@@ -287,8 +287,7 @@ public final class HTMLHostManagerServle
for (int i = 0; i < children.length; i++)
hostNames[i] = children[i].getName();
- TreeMap<String,String> sortedHostNamesMap =
- new TreeMap<String,String>();
+ TreeMap<String,String> sortedHostNamesMap = new TreeMap<>();
for (int i = 0; i < hostNames.length; i++) {
String displayPath = hostNames[i];
Modified:
tomcat/trunk/java/org/apache/catalina/manager/host/HostManagerServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/host/HostManagerServlet.java?rev=1361753&r1=1361752&r2=1361753&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/manager/host/HostManagerServlet.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/manager/host/HostManagerServlet.java
Sun Jul 15 18:53:13 2012
@@ -26,7 +26,6 @@ import java.util.Enumeration;
import java.util.Locale;
import java.util.StringTokenizer;
-import javax.management.MBeanServer;
import javax.servlet.ServletException;
import javax.servlet.UnavailableException;
import javax.servlet.http.HttpServlet;
@@ -43,7 +42,6 @@ import org.apache.catalina.core.Containe
import org.apache.catalina.core.StandardHost;
import org.apache.catalina.startup.HostConfig;
import org.apache.tomcat.util.ExceptionUtils;
-import org.apache.tomcat.util.modeler.Registry;
import org.apache.tomcat.util.res.StringManager;
@@ -123,12 +121,6 @@ public class HostManagerServlet
/**
- * MBean server.
- */
- protected transient MBeanServer mBeanServer = null;
-
-
- /**
* The string manager for this package.
*/
protected static final StringManager sm =
@@ -173,10 +165,6 @@ public class HostManagerServlet
installedHost = (Host) context.getParent();
engine = (Engine) installedHost.getParent();
}
-
- // Retrieve the MBean server
- mBeanServer = Registry.getRegistry(null, null).getMBeanServer();
-
}
Modified:
tomcat/trunk/java/org/apache/catalina/manager/util/ReverseComparator.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/util/ReverseComparator.java?rev=1361753&r1=1361752&r2=1361753&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/manager/util/ReverseComparator.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/manager/util/ReverseComparator.java
Sun Jul 15 18:53:13 2012
@@ -26,7 +26,7 @@ import org.apache.catalina.Session;
* @author Cédrik LIME
*/
public class ReverseComparator implements Comparator<Session> {
- protected Comparator<Session> comparator;
+ protected final Comparator<Session> comparator;
/**
*
Modified: tomcat/trunk/java/org/apache/catalina/manager/util/SessionUtils.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/util/SessionUtils.java?rev=1361753&r1=1361752&r2=1361753&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/manager/util/SessionUtils.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/manager/util/SessionUtils.java Sun
Jul 15 18:53:13 2012
@@ -110,7 +110,7 @@ public class SessionUtils {
// Tapestry 3.0: Engine stored in session under
"org.apache.tapestry.engine:" + config.getServletName()
// TODO: Tapestry 4+
{
- final List<Object> tapestryArray = new ArrayList<Object>();
+ final List<Object> tapestryArray = new ArrayList<>();
for (Enumeration<String> enumeration =
in_session.getAttributeNames(); enumeration.hasMoreElements();) {
String name = enumeration.nextElement();
if (name.indexOf("tapestry") > -1 &&
name.indexOf("engine") > -1 && null != in_session.getAttribute(name))
{//$NON-NLS-1$ //$NON-NLS-2$
@@ -147,7 +147,7 @@ public class SessionUtils {
// Last guess: iterate over all attributes, to find a Locale
// If there is only one, consider it to be /the/ locale
{
- final List<Object> localeArray = new ArrayList<Object>();
+ final List<Object> localeArray = new ArrayList<>();
for (Enumeration<String> enumeration =
in_session.getAttributeNames(); enumeration.hasMoreElements();) {
String name = enumeration.nextElement();
Object obj = in_session.getAttribute(name);
@@ -211,7 +211,7 @@ public class SessionUtils {
// Last guess: iterate over all attributes, to find a
java.security.Principal or javax.security.auth.Subject
// If there is only one, consider it to be /the/ user
{
- final List<Object> principalArray = new ArrayList<Object>();
+ final List<Object> principalArray = new ArrayList<>();
for (Enumeration<String> enumeration =
httpSession.getAttributeNames(); enumeration.hasMoreElements();) {
String name = enumeration.nextElement();
Object obj = httpSession.getAttribute(name);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
