Author: markt
Date: Sat Jul 2 21:57:12 2011
New Revision: 1142323
URL: http://svn.apache.org/viewvc?rev=1142323&view=rev
Log:
Fix Eclipse warnings in the o.a.c.startup package
Modified:
tomcat/trunk/java/org/apache/catalina/startup/Bootstrap.java
tomcat/trunk/java/org/apache/catalina/startup/PasswdUserDatabase.java
tomcat/trunk/java/org/apache/catalina/startup/Tool.java
tomcat/trunk/java/org/apache/catalina/startup/UserConfig.java
tomcat/trunk/java/org/apache/catalina/startup/WebRuleSet.java
Modified: tomcat/trunk/java/org/apache/catalina/startup/Bootstrap.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/Bootstrap.java?rev=1142323&r1=1142322&r2=1142323&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/Bootstrap.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/Bootstrap.java Sat Jul 2
21:57:12 2011
@@ -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;
Modified: tomcat/trunk/java/org/apache/catalina/startup/PasswdUserDatabase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/PasswdUserDatabase.java?rev=1142323&r1=1142322&r2=1142323&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/PasswdUserDatabase.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/startup/PasswdUserDatabase.java Sat
Jul 2 21:57:12 2011
@@ -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());
Modified: tomcat/trunk/java/org/apache/catalina/startup/Tool.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/Tool.java?rev=1142323&r1=1142322&r2=1142323&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/Tool.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/Tool.java Sat Jul 2 21:57:12
2011
@@ -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);
Modified: tomcat/trunk/java/org/apache/catalina/startup/UserConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/UserConfig.java?rev=1142323&r1=1142322&r2=1142323&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/UserConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/UserConfig.java Sat Jul 2
21:57:12 2011
@@ -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
Modified: tomcat/trunk/java/org/apache/catalina/startup/WebRuleSet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/WebRuleSet.java?rev=1142323&r1=1142322&r2=1142323&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/WebRuleSet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/WebRuleSet.java Sat Jul 2
21:57:12 2011
@@ -863,6 +863,7 @@ final class CallParamMultiRule extends C
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>();
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
