projects / tomcat7.0 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 3f0b18a)
Fix Eclipse/FindBugs warnings apart from those that trigger bug 50984
authormarkt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Wed, 30 Mar 2011 15:41:02 +0000 (15:41 +0000)
committermarkt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Wed, 30 Mar 2011 15:41:02 +0000 (15:41 +0000)
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1086992 13f79535-47bb-0310-9956-ffa450edef68

java/org/apache/catalina/manager/Constants.java patch | blob | history
java/org/apache/catalina/manager/LocalStrings.properties patch | blob | history
java/org/apache/catalina/manager/ManagerServlet.java patch | blob | history
java/org/apache/catalina/manager/StatusManagerServlet.java patch | blob | history
java/org/apache/catalina/manager/host/Constants.java patch | blob | history
java/org/apache/catalina/manager/host/HTMLHostManagerServlet.java patch | blob | history
java/org/apache/catalina/manager/util/BaseSessionComparator.java patch | blob | history
java/org/apache/catalina/manager/util/ReverseComparator.java patch | blob | history
res/findbugs/filter-false-positives.xml patch | blob | history

diff --git a/java/org/apache/catalina/manager/Constants.java b/java/org/apache/catalina/manager/Constants.java
index 057763f..c0b6842 100644 (file)
--- a/java/org/apache/catalina/manager/Constants.java
+++ b/java/org/apache/catalina/manager/Constants.java
@@ -23,176 +23,187 @@ public class Constants {
 
     public static final String Package = "org.apache.catalina.manager";
 
-    public static final String HTML_HEADER_SECTION =
-        "<html>\n" +
-        "<head>\n" +
-        "<style>\n" +
-        org.apache.catalina.util.TomcatCSS.TOMCAT_CSS + "\n" +
-        "  table {\n" +
-        "    width: 100%;\n" +
-        "  }\n" +
-        "  td.page-title {\n" +
-        "    text-align: center;\n" +
-        "    vertical-align: top;\n" +
-        "    font-family:sans-serif,Tahoma,Arial;\n" +
-        "    font-weight: bold;\n" +
-        "    background: white;\n" +
-        "    color: black;\n" +
-        "  }\n" +
-        "  td.title {\n" +
-        "    text-align: left;\n" +
-        "    vertical-align: top;\n" +
-        "    font-family:sans-serif,Tahoma,Arial;\n" +
-        "    font-style:italic;\n" +
-        "    font-weight: bold;\n" +
-        "    background: #D2A41C;\n" +
-        "  }\n" +
-        "  td.header-left {\n" +
-        "    text-align: left;\n" +
-        "    vertical-align: top;\n" +
-        "    font-family:sans-serif,Tahoma,Arial;\n" +
-        "    font-weight: bold;\n" +
-        "    background: #FFDC75;\n" +
-        "  }\n" +
-        "  td.header-center {\n" +
-        "    text-align: center;\n" +
-        "    vertical-align: top;\n" +
-        "    font-family:sans-serif,Tahoma,Arial;\n" +
-        "    font-weight: bold;\n" +
-        "    background: #FFDC75;\n" +
-        "  }\n" +
-        "  td.row-left {\n" +
-        "    text-align: left;\n" +
-        "    vertical-align: middle;\n" +
-        "    font-family:sans-serif,Tahoma,Arial;\n" +
-        "    color: black;\n" +
-        "  }\n" +
-        "  td.row-center {\n" +
-        "    text-align: center;\n" +
-        "    vertical-align: middle;\n" +
-        "    font-family:sans-serif,Tahoma,Arial;\n" +
-        "    color: black;\n" +
-        "  }\n" +
-        "  td.row-right {\n" +
-        "    text-align: right;\n" +
-        "    vertical-align: middle;\n" +
-        "    font-family:sans-serif,Tahoma,Arial;\n" +
-        "    color: black;\n" +
-        "  }\n" +
-        "  TH {\n" +
-        "    text-align: center;\n" +
-        "    vertical-align: top;\n" +
-        "    font-family:sans-serif,Tahoma,Arial;\n" +
-        "    font-weight: bold;\n" +
-        "    background: #FFDC75;\n" +
-        "  }\n" +
-        "  TD {\n" +
-        "    text-align: center;\n" +
-        "    vertical-align: middle;\n" +
-        "    font-family:sans-serif,Tahoma,Arial;\n" +
-        "    color: black;\n" +
-        "  }\n" +
-        "  form {\n" +
-        "    margin: 1;\n" +
-        "  }\n" +
-        "  form.inline {\n" +
-        "    display: inline;\n" +
-        "  }\n" +
-        "</style>\n";
+    public static final String HTML_HEADER_SECTION;
+    public static final String BODY_HEADER_SECTION;
+    public static final String MESSAGE_SECTION;
+    public static final String MANAGER_SECTION;
+    public static final String SERVER_HEADER_SECTION;
+    public static final String SERVER_ROW_SECTION;
+    public static final String HTML_TAIL_SECTION;
+    
+    static {
+        HTML_HEADER_SECTION =
+            "<html>\n" +
+            "<head>\n" +
+            "<style>\n" +
+            org.apache.catalina.util.TomcatCSS.TOMCAT_CSS + "\n" +
+            "  table {\n" +
+            "    width: 100%;\n" +
+            "  }\n" +
+            "  td.page-title {\n" +
+            "    text-align: center;\n" +
+            "    vertical-align: top;\n" +
+            "    font-family:sans-serif,Tahoma,Arial;\n" +
+            "    font-weight: bold;\n" +
+            "    background: white;\n" +
+            "    color: black;\n" +
+            "  }\n" +
+            "  td.title {\n" +
+            "    text-align: left;\n" +
+            "    vertical-align: top;\n" +
+            "    font-family:sans-serif,Tahoma,Arial;\n" +
+            "    font-style:italic;\n" +
+            "    font-weight: bold;\n" +
+            "    background: #D2A41C;\n" +
+            "  }\n" +
+            "  td.header-left {\n" +
+            "    text-align: left;\n" +
+            "    vertical-align: top;\n" +
+            "    font-family:sans-serif,Tahoma,Arial;\n" +
+            "    font-weight: bold;\n" +
+            "    background: #FFDC75;\n" +
+            "  }\n" +
+            "  td.header-center {\n" +
+            "    text-align: center;\n" +
+            "    vertical-align: top;\n" +
+            "    font-family:sans-serif,Tahoma,Arial;\n" +
+            "    font-weight: bold;\n" +
+            "    background: #FFDC75;\n" +
+            "  }\n" +
+            "  td.row-left {\n" +
+            "    text-align: left;\n" +
+            "    vertical-align: middle;\n" +
+            "    font-family:sans-serif,Tahoma,Arial;\n" +
+            "    color: black;\n" +
+            "  }\n" +
+            "  td.row-center {\n" +
+            "    text-align: center;\n" +
+            "    vertical-align: middle;\n" +
+            "    font-family:sans-serif,Tahoma,Arial;\n" +
+            "    color: black;\n" +
+            "  }\n" +
+            "  td.row-right {\n" +
+            "    text-align: right;\n" +
+            "    vertical-align: middle;\n" +
+            "    font-family:sans-serif,Tahoma,Arial;\n" +
+            "    color: black;\n" +
+            "  }\n" +
+            "  TH {\n" +
+            "    text-align: center;\n" +
+            "    vertical-align: top;\n" +
+            "    font-family:sans-serif,Tahoma,Arial;\n" +
+            "    font-weight: bold;\n" +
+            "    background: #FFDC75;\n" +
+            "  }\n" +
+            "  TD {\n" +
+            "    text-align: center;\n" +
+            "    vertical-align: middle;\n" +
+            "    font-family:sans-serif,Tahoma,Arial;\n" +
+            "    color: black;\n" +
+            "  }\n" +
+            "  form {\n" +
+            "    margin: 1;\n" +
+            "  }\n" +
+            "  form.inline {\n" +
+            "    display: inline;\n" +
+            "  }\n" +
+            "</style>\n";
+    
+        BODY_HEADER_SECTION =
+            "<title>{0}</title>\n" +
+            "</head>\n" +
+            "\n" +
+            "<body bgcolor=\"#FFFFFF\">\n" +
+            "\n" +
+            "<table cellspacing=\"4\" border=\"0\">\n" +
+            " <tr>\n" +
+            "  <td colspan=\"2\">\n" +
+            "   <a href=\"http://www.apache.org/\">\n" +
+            "    <img border=\"0\" alt=\"The Apache Software Foundation\" align=\"left\"\n" +
+            "         src=\"{0}/images/asf-logo.gif\">\n" +
+            "   </a>\n" +
+            "   <a href=\"http://tomcat.apache.org/\">\n" +
+            "    <img border=\"0\" alt=\"The Tomcat Servlet/JSP Container\"\n" +
+            "         align=\"right\" src=\"{0}/images/tomcat.gif\">\n" +
+            "   </a>\n" +
+            "  </td>\n" +
+            " </tr>\n" +
+            "</table>\n" +
+            "<hr size=\"1\" noshade=\"noshade\">\n" +
+            "<table cellspacing=\"4\" border=\"0\">\n" +
+            " <tr>\n" +
+            "  <td class=\"page-title\" bordercolor=\"#000000\" " +
+            "align=\"left\" nowrap>\n" +
+            "   <font size=\"+2\">{1}</font>\n" +
+            "  </td>\n" +
+            " </tr>\n" +
+            "</table>\n" +
+            "<br>\n" +
+            "\n";
+    
+        MESSAGE_SECTION =
+            "<table border=\"1\" cellspacing=\"0\" cellpadding=\"3\">\n" +
+            " <tr>\n" +
+            "  <td class=\"row-left\" width=\"10%\">" +
+            "<small><strong>{0}</strong></small>&nbsp;</td>\n" +
+            "  <td class=\"row-left\"><pre>{1}</pre></td>\n" +
+            " </tr>\n" +
+            "</table>\n" +
+            "<br>\n" +
+            "\n";
+    
+        MANAGER_SECTION =
+            "<table border=\"1\" cellspacing=\"0\" cellpadding=\"3\">\n" +
+            "<tr>\n" +
+            " <td colspan=\"4\" class=\"title\">{0}</td>\n" +
+            "</tr>\n" +
+            " <tr>\n" +
+            "  <td class=\"row-left\"><a href=\"{1}\">{2}</a></td>\n" +
+            "  <td class=\"row-center\"><a href=\"{3}\">{4}</a></td>\n" +
+            "  <td class=\"row-center\"><a href=\"{5}\">{6}</a></td>\n" +
+            "  <td class=\"row-right\"><a href=\"{7}\">{8}</a></td>\n" +
+            " </tr>\n" +
+            "</table>\n" +
+            "<br>\n" +
+            "\n";
+    
+        SERVER_HEADER_SECTION =
+            "<table border=\"1\" cellspacing=\"0\" cellpadding=\"3\">\n" +
+            "<tr>\n" +
+            " <td colspan=\"6\" class=\"title\">{0}</td>\n" +
+            "</tr>\n" +
+            "<tr>\n" +
+            " <td class=\"header-center\"><small>{1}</small></td>\n" +
+            " <td class=\"header-center\"><small>{2}</small></td>\n" +
+            " <td class=\"header-center\"><small>{3}</small></td>\n" +
+            " <td class=\"header-center\"><small>{4}</small></td>\n" +
+            " <td class=\"header-center\"><small>{5}</small></td>\n" +
+            " <td class=\"header-center\"><small>{6}</small></td>\n" +
+            "</tr>\n";
+    
+        SERVER_ROW_SECTION =
+            "<tr>\n" +
+            " <td class=\"row-center\"><small>{0}</small></td>\n" +
+            " <td class=\"row-center\"><small>{1}</small></td>\n" +
+            " <td class=\"row-center\"><small>{2}</small></td>\n" +
+            " <td class=\"row-center\"><small>{3}</small></td>\n" +
+            " <td class=\"row-center\"><small>{4}</small></td>\n" +
+            " <td class=\"row-center\"><small>{5}</small></td>\n" +
+            "</tr>\n" +
+            "</table>\n" +
+            "<br>\n" +
+            "\n";
+    
+        HTML_TAIL_SECTION =
+            "<hr size=\"1\" noshade=\"noshade\">\n" +
+            "<center><font size=\"-1\" color=\"#525D76\">\n" +
+            " <em>Copyright &copy; 1999-2011, Apache Software Foundation</em>" +
+            "</font></center>\n" +
+            "\n" +
+            "</body>\n" +
+            "</html>";
+    }
 
-    public static final String BODY_HEADER_SECTION =
-        "<title>{0}</title>\n" +
-        "</head>\n" +
-        "\n" +
-        "<body bgcolor=\"#FFFFFF\">\n" +
-        "\n" +
-        "<table cellspacing=\"4\" border=\"0\">\n" +
-        " <tr>\n" +
-        "  <td colspan=\"2\">\n" +
-        "   <a href=\"http://www.apache.org/\">\n" +
-        "    <img border=\"0\" alt=\"The Apache Software Foundation\" align=\"left\"\n" +
-        "         src=\"{0}/images/asf-logo.gif\">\n" +
-        "   </a>\n" +
-        "   <a href=\"http://tomcat.apache.org/\">\n" +
-        "    <img border=\"0\" alt=\"The Tomcat Servlet/JSP Container\"\n" +
-        "         align=\"right\" src=\"{0}/images/tomcat.gif\">\n" +
-        "   </a>\n" +
-        "  </td>\n" +
-        " </tr>\n" +
-        "</table>\n" +
-        "<hr size=\"1\" noshade=\"noshade\">\n" +
-        "<table cellspacing=\"4\" border=\"0\">\n" +
-        " <tr>\n" +
-        "  <td class=\"page-title\" bordercolor=\"#000000\" " +
-        "align=\"left\" nowrap>\n" +
-        "   <font size=\"+2\">{1}</font>\n" +
-        "  </td>\n" +
-        " </tr>\n" +
-        "</table>\n" +
-        "<br>\n" +
-        "\n";
-
-    public static final String MESSAGE_SECTION =
-        "<table border=\"1\" cellspacing=\"0\" cellpadding=\"3\">\n" +
-        " <tr>\n" +
-        "  <td class=\"row-left\" width=\"10%\">" +
-        "<small><strong>{0}</strong></small>&nbsp;</td>\n" +
-        "  <td class=\"row-left\"><pre>{1}</pre></td>\n" +
-        " </tr>\n" +
-        "</table>\n" +
-        "<br>\n" +
-        "\n";
-
-    public static final String MANAGER_SECTION =
-        "<table border=\"1\" cellspacing=\"0\" cellpadding=\"3\">\n" +
-        "<tr>\n" +
-        " <td colspan=\"4\" class=\"title\">{0}</td>\n" +
-        "</tr>\n" +
-        " <tr>\n" +
-        "  <td class=\"row-left\"><a href=\"{1}\">{2}</a></td>\n" +
-        "  <td class=\"row-center\"><a href=\"{3}\">{4}</a></td>\n" +
-        "  <td class=\"row-center\"><a href=\"{5}\">{6}</a></td>\n" +
-        "  <td class=\"row-right\"><a href=\"{7}\">{8}</a></td>\n" +
-        " </tr>\n" +
-        "</table>\n" +
-        "<br>\n" +
-        "\n";
-
-    public static final String SERVER_HEADER_SECTION =
-        "<table border=\"1\" cellspacing=\"0\" cellpadding=\"3\">\n" +
-        "<tr>\n" +
-        " <td colspan=\"6\" class=\"title\">{0}</td>\n" +
-        "</tr>\n" +
-        "<tr>\n" +
-        " <td class=\"header-center\"><small>{1}</small></td>\n" +
-        " <td class=\"header-center\"><small>{2}</small></td>\n" +
-        " <td class=\"header-center\"><small>{3}</small></td>\n" +
-        " <td class=\"header-center\"><small>{4}</small></td>\n" +
-        " <td class=\"header-center\"><small>{5}</small></td>\n" +
-        " <td class=\"header-center\"><small>{6}</small></td>\n" +
-        "</tr>\n";
-
-    public static final String SERVER_ROW_SECTION =
-        "<tr>\n" +
-        " <td class=\"row-center\"><small>{0}</small></td>\n" +
-        " <td class=\"row-center\"><small>{1}</small></td>\n" +
-        " <td class=\"row-center\"><small>{2}</small></td>\n" +
-        " <td class=\"row-center\"><small>{3}</small></td>\n" +
-        " <td class=\"row-center\"><small>{4}</small></td>\n" +
-        " <td class=\"row-center\"><small>{5}</small></td>\n" +
-        "</tr>\n" +
-        "</table>\n" +
-        "<br>\n" +
-        "\n";
-
-    public static final String HTML_TAIL_SECTION =
-        "<hr size=\"1\" noshade=\"noshade\">\n" +
-        "<center><font size=\"-1\" color=\"#525D76\">\n" +
-        " <em>Copyright &copy; 1999-2011, Apache Software Foundation</em>" +
-        "</font></center>\n" +
-        "\n" +
-        "</body>\n" +
-        "</html>";
     public static final String CHARSET="utf-8";
 
     public static final String XML_DECLARATION =
diff --git a/java/org/apache/catalina/manager/LocalStrings.properties b/java/org/apache/catalina/manager/LocalStrings.properties
index 3b02e01..9ed856a 100644 (file)
--- a/java/org/apache/catalina/manager/LocalStrings.properties
+++ b/java/org/apache/catalina/manager/LocalStrings.properties
@@ -91,6 +91,7 @@ managerServlet.noRole=FAIL - User does not possess role {0}
 managerServlet.noSelf=FAIL - The manager can not reload, undeploy, stop, or undeploy itself
 managerServlet.noWrapper=Container has not called setWrapper() for this servlet
 managerServlet.notDeployed=FAIL - Context {0} is defined in server.xml and may not be undeployed
+managerServlet.objectNameFail=FAIL - Unable to register object name [{0}] for Manager Servlet
 managerServlet.postCommand=FAIL - Tried to use command {0} via a GET request but POST is required
 managerServlet.reloaded=OK - Reloaded application at context path {0}
 managerServlet.resourcesAll=OK - Listed global resources of all types
diff --git a/java/org/apache/catalina/manager/ManagerServlet.java b/java/org/apache/catalina/manager/ManagerServlet.java
index 72cf687..ab27730 100644 (file)
--- a/java/org/apache/catalina/manager/ManagerServlet.java
+++ b/java/org/apache/catalina/manager/ManagerServlet.java
@@ -168,7 +168,7 @@ public class ManagerServlet extends HttpServlet implements ContainerServlet {
     /**
      * The Context container associated with our web application.
      */
-    protected Context context = null;
+    protected transient Context context = null;
 
 
     /**
@@ -200,7 +200,7 @@ public class ManagerServlet extends HttpServlet implements ContainerServlet {
     /**
      * The associated host.
      */
-    protected Host host = null;
+    protected transient Host host = null;
 
     
     /**
@@ -212,7 +212,7 @@ public class ManagerServlet extends HttpServlet implements ContainerServlet {
     /**
      * MBean server.
      */
-    protected MBeanServer mBeanServer = null;
+    protected transient MBeanServer mBeanServer = null;
 
 
     /**
@@ -225,7 +225,7 @@ public class ManagerServlet extends HttpServlet implements ContainerServlet {
      * The global JNDI <code>NamingContext</code> for this server,
      * if available.
      */
-    protected javax.naming.Context global = null;
+    protected transient javax.naming.Context global = null;
 
 
     /**
@@ -238,7 +238,7 @@ public class ManagerServlet extends HttpServlet implements ContainerServlet {
     /**
      * The Wrapper container associated with this servlet.
      */
-    protected Wrapper wrapper = null;
+    protected transient Wrapper wrapper = null;
 
 
     // ----------------------------------------------- ContainerServlet Methods
@@ -272,11 +272,12 @@ public class ManagerServlet extends HttpServlet implements ContainerServlet {
             context = (Context) wrapper.getParent();
             host = (Host) context.getParent();
             Engine engine = (Engine) host.getParent();
+            String name = engine.getName() + ":type=Deployer,host=" +
+                    host.getName();
             try {
-                oname = new ObjectName(engine.getName() 
-                        + ":type=Deployer,host=" + host.getName());
+                oname = new ObjectName(name);
             } catch (Exception e) {
-                // ?
+                log(sm.getString("managerServlet.objectNameFail", name), e);
             }
         }
 
@@ -785,6 +786,7 @@ public class ManagerServlet extends HttpServlet implements ContainerServlet {
         if (!validateContextName(cn, writer, smClient)) {
             return;
         }
+        @SuppressWarnings("null") // checked in call above
         String name = cn.getName();
         String baseName = cn.getBaseName();
         String displayPath = cn.getDisplayName();
diff --git a/java/org/apache/catalina/manager/StatusManagerServlet.java b/java/org/apache/catalina/manager/StatusManagerServlet.java
index 22a54fe..4bf6051 100644 (file)
--- a/java/org/apache/catalina/manager/StatusManagerServlet.java
+++ b/java/org/apache/catalina/manager/StatusManagerServlet.java
@@ -299,6 +299,7 @@ public class StatusManagerServlet
     // ------------------------------------------- NotificationListener Methods
 
 
+    @Override
     public void handleNotification(Notification notification,
                                    java.lang.Object handback) {
 
diff --git a/java/org/apache/catalina/manager/host/Constants.java b/java/org/apache/catalina/manager/host/Constants.java
index 973ae92..92d76bd 100644 (file)
--- a/java/org/apache/catalina/manager/host/Constants.java
+++ b/java/org/apache/catalina/manager/host/Constants.java
@@ -23,86 +23,6 @@ public class Constants {
 
     public static final String Package = "org.apache.catalina.manager.host";
 
-    public static final String HTML_HEADER_SECTION =
-        "<html>\n" +
-        "<head>\n" +
-        "<style>\n" +
-        org.apache.catalina.util.TomcatCSS.TOMCAT_CSS + "\n" +
-        "  table {\n" +
-        "    width: 100%;\n" +
-        "  }\n" +
-        "  td.page-title {\n" +
-        "    text-align: center;\n" +
-        "    vertical-align: top;\n" +
-        "    font-family:sans-serif,Tahoma,Arial;\n" +
-        "    font-weight: bold;\n" +
-        "    background: white;\n" +
-        "    color: black;\n" +
-        "  }\n" +
-        "  td.title {\n" +
-        "    text-align: left;\n" +
-        "    vertical-align: top;\n" +
-        "    font-family:sans-serif,Tahoma,Arial;\n" +
-        "    font-style:italic;\n" +
-        "    font-weight: bold;\n" +
-        "    background: #D2A41C;\n" +
-        "  }\n" +
-        "  td.header-left {\n" +
-        "    text-align: left;\n" +
-        "    vertical-align: top;\n" +
-        "    font-family:sans-serif,Tahoma,Arial;\n" +
-        "    font-weight: bold;\n" +
-        "    background: #FFDC75;\n" +
-        "  }\n" +
-        "  td.header-center {\n" +
-        "    text-align: center;\n" +
-        "    vertical-align: top;\n" +
-        "    font-family:sans-serif,Tahoma,Arial;\n" +
-        "    font-weight: bold;\n" +
-        "    background: #FFDC75;\n" +
-        "  }\n" +
-        "  td.row-left {\n" +
-        "    text-align: left;\n" +
-        "    vertical-align: middle;\n" +
-        "    font-family:sans-serif,Tahoma,Arial;\n" +
-        "    color: black;\n" +
-        "    background: white;\n" +
-        "  }\n" +
-        "  td.row-center {\n" +
-        "    text-align: center;\n" +
-        "    vertical-align: middle;\n" +
-        "    font-family:sans-serif,Tahoma,Arial;\n" +
-        "    color: black;\n" +
-        "    background: white;\n" +
-        "  }\n" +
-        "  td.row-right {\n" +
-        "    text-align: right;\n" +
-        "    vertical-align: middle;\n" +
-        "    font-family:sans-serif,Tahoma,Arial;\n" +
-        "    color: black;\n" +
-        "    background: white;\n" +
-        "  }\n" +
-        "  TH {\n" +
-        "    text-align: center;\n" +
-        "    vertical-align: top;\n" +
-        "    font-family:sans-serif,Tahoma,Arial;\n" +
-        "    font-weight: bold;\n" +
-        "    background: #FFDC75;\n" +
-        "  }\n" +
-        "  TD {\n" +
-        "    text-align: center;\n" +
-        "    vertical-align: middle;\n" +
-        "    font-family:sans-serif,Tahoma,Arial;\n" +
-        "    color: black;\n" +
-        "    background: white;\n" +
-        "  }\n" +
-        "  form {\n" +
-        "    margin: 1;\n" +
-        "  }\n" +
-        "  form.inline {\n" +
-        "    display: inline;\n" +
-        "  }\n" +        "</style>\n";
-
     public static final String BODY_HEADER_SECTION =
         "<title>{0}</title>\n" +
         "</head>\n" +
diff --git a/java/org/apache/catalina/manager/host/HTMLHostManagerServlet.java b/java/org/apache/catalina/manager/host/HTMLHostManagerServlet.java
index 16238e2..9f8cd10 100644 (file)
--- a/java/org/apache/catalina/manager/host/HTMLHostManagerServlet.java
+++ b/java/org/apache/catalina/manager/host/HTMLHostManagerServlet.java
@@ -237,7 +237,7 @@ public final class HTMLHostManagerServlet extends HostManagerServlet {
         PrintWriter writer = response.getWriter();
 
         // HTML Header Section
-        writer.print(Constants.HTML_HEADER_SECTION);
+        writer.print(org.apache.catalina.manager.Constants.HTML_HEADER_SECTION);
 
         // Body Header Section
         Object[] args = new Object[2];
diff --git a/java/org/apache/catalina/manager/util/BaseSessionComparator.java b/java/org/apache/catalina/manager/util/BaseSessionComparator.java
index 73dc9a7..ffc5c64 100644 (file)
--- a/java/org/apache/catalina/manager/util/BaseSessionComparator.java
+++ b/java/org/apache/catalina/manager/util/BaseSessionComparator.java
@@ -39,6 +39,8 @@ public abstract class BaseSessionComparator<T> implements Comparator<Session> {
     /* (non-Javadoc)
      * @see java.util.Comparator#compare(java.lang.Object, java.lang.Object)
      */
+    @SuppressWarnings("unchecked")
+    @Override
     public final int compare(Session s1, Session s2) {
         Comparable<T> c1 = getComparableObject(s1);
         Comparable<T> c2 = getComparableObject(s2);
diff --git a/java/org/apache/catalina/manager/util/ReverseComparator.java b/java/org/apache/catalina/manager/util/ReverseComparator.java
index 6bbbb9d..b699ef8 100644 (file)
--- a/java/org/apache/catalina/manager/util/ReverseComparator.java
+++ b/java/org/apache/catalina/manager/util/ReverseComparator.java
@@ -39,6 +39,7 @@ public class ReverseComparator implements Comparator<Session> {
     /* (non-Javadoc)
      * @see java.util.Comparator#compare(java.lang.Object, java.lang.Object)
      */
+    @Override
     public int compare(Session o1, Session o2) {
         int returnValue = comparator.compare(o1, o2);
         return (- returnValue);
diff --git a/res/findbugs/filter-false-positives.xml b/res/findbugs/filter-false-positives.xml
index 616535d..c571dcc 100644 (file)
--- a/res/findbugs/filter-false-positives.xml
+++ b/res/findbugs/filter-false-positives.xml
@@ -73,6 +73,12 @@
     <Bug code="MSF" />
   </Match>
   <Match>
+    <!-- Catching exception is simpler than handling all the individual ones -->
+    <Class name="org.apache.catalina.manager.util.SessionUtils" />
+    <Method name="guessLocaleFromSession" />
+    <Bug code="REC" />
+  </Match>
+  <Match>
     <Class name="org.apache.catalina.realm.JDBCRealm" />
     <Field name="containerLog" />
     <Bug code="IS" />
Unnamed repository; edit this file to name it for gitweb.