From 31dd1ab954b26762dc8382ffb7ea1e61c868ddc2 Mon Sep 17 00:00:00 2001
From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Sat, 2 Jul 2011 21:57:12 +0000
Subject: [PATCH] Fix Eclipse warnings in the o.a.c.startup package

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1142323 13f79535-47bb-0310-9956-ffa450edef68
---
 java/org/apache/catalina/startup/Bootstrap.java          | 3 ++-
 java/org/apache/catalina/startup/PasswdUserDatabase.java | 4 ++++
 java/org/apache/catalina/startup/Tool.java               | 2 +-
 java/org/apache/catalina/startup/UserConfig.java         | 1 +
 java/org/apache/catalina/startup/WebRuleSet.java         | 1 +
 5 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/java/org/apache/catalina/startup/Bootstrap.java b/java/org/apache/catalina/startup/Bootstrap.java
index c7e477492..dfde85946 100644
--- a/java/org/apache/catalina/startup/Bootstrap.java
+++ b/java/org/apache/catalina/startup/Bootstrap.java
@@ -123,7 +123,8 @@ public final class Bootstrap {
 
             // Check for a JAR URL repository
             try {
-                new URL(repository);
+                @SuppressWarnings("unused")
+                URL url = new URL(repository);
                 repositories.add(
                         new Repository(repository, RepositoryType.URL));
                 continue;
diff --git a/java/org/apache/catalina/startup/PasswdUserDatabase.java b/java/org/apache/catalina/startup/PasswdUserDatabase.java
index 23fe20397..1fd2f606c 100644
--- a/java/org/apache/catalina/startup/PasswdUserDatabase.java
+++ b/java/org/apache/catalina/startup/PasswdUserDatabase.java
@@ -78,6 +78,7 @@ public final class PasswdUserDatabase
     /**
      * Return the UserConfig listener with which we are associated.
      */
+    @Override
     public UserConfig getUserConfig() {
 
         return (this.userConfig);
@@ -90,6 +91,7 @@ public final class PasswdUserDatabase
      *
      * @param userConfig The new UserConfig listener
      */
+    @Override
     public void setUserConfig(UserConfig userConfig) {
 
         this.userConfig = userConfig;
@@ -106,6 +108,7 @@ public final class PasswdUserDatabase
      *
      * @param user User for which a home directory should be retrieved
      */
+    @Override
     public String getHome(String user) {
 
         return homes.get(user);
@@ -116,6 +119,7 @@ public final class PasswdUserDatabase
     /**
      * Return an enumeration of the usernames defined on this server.
      */
+    @Override
     public Enumeration<String> getUsers() {
 
         return (homes.keys());
diff --git a/java/org/apache/catalina/startup/Tool.java b/java/org/apache/catalina/startup/Tool.java
index e9f3c314b..ae7cce9a5 100644
--- a/java/org/apache/catalina/startup/Tool.java
+++ b/java/org/apache/catalina/startup/Tool.java
@@ -118,6 +118,7 @@ public final class Tool {
      *
      * @param args Command line arguments to be processed
      */
+    @SuppressWarnings("null")
     public static void main(String args[]) {
 
         // Verify that "catalina.home" was passed.
@@ -204,7 +205,6 @@ public final class Tool {
             System.exit(1);
         }
 
-        // Locate the static main() method of the application class
         Method method = null;
         String params[] = new String[args.length - index];
         System.arraycopy(args, index, params, 0, params.length);
diff --git a/java/org/apache/catalina/startup/UserConfig.java b/java/org/apache/catalina/startup/UserConfig.java
index 34862b72a..cebf79558 100644
--- a/java/org/apache/catalina/startup/UserConfig.java
+++ b/java/org/apache/catalina/startup/UserConfig.java
@@ -215,6 +215,7 @@ public final class UserConfig
      *
      * @param event The lifecycle event that has occurred
      */
+    @Override
     public void lifecycleEvent(LifecycleEvent event) {
 
         // Identify the host we are associated with
diff --git a/java/org/apache/catalina/startup/WebRuleSet.java b/java/org/apache/catalina/startup/WebRuleSet.java
index b05daaac0..5cd206efe 100644
--- a/java/org/apache/catalina/startup/WebRuleSet.java
+++ b/java/org/apache/catalina/startup/WebRuleSet.java
@@ -863,6 +863,7 @@ final class CallParamMultiRule extends CallParamRule {
         if (bodyTextStack != null && !bodyTextStack.empty()) {
             // what we do now is push one parameter onto the top set of parameters
             Object parameters[] = (Object[]) digester.peekParams();
+            @SuppressWarnings("unchecked")
             ArrayList<String> params = (ArrayList<String>) parameters[paramIndex];
             if (params == null) {
                 params = new ArrayList<String>();
-- 
2.11.0