Author: markt
Date: Wed Sep 8 19:39:36 2010
New Revision: 995218
URL: http://svn.apache.org/viewvc?rev=995218&view=rev
Log:
Fix @Override warnings
Modified:
tomcat/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java
Modified: tomcat/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java?rev=995218&r1=995217&r2=995218&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java Wed
Sep 8 19:39:36 2010
@@ -112,16 +112,19 @@ public class DefaultInstanceManager impl
this.injectionMap = injectionMap;
}
+ @Override
public Object newInstance(String className) throws IllegalAccessException,
InvocationTargetException, NamingException, InstantiationException,
ClassNotFoundException {
Class<?> clazz = loadClassMaybePrivileged(className, classLoader);
return newInstance(clazz.newInstance(), clazz);
}
+ @Override
public Object newInstance(final String className, final ClassLoader
classLoader) throws IllegalAccessException, NamingException,
InvocationTargetException, InstantiationException, ClassNotFoundException {
Class<?> clazz = classLoader.loadClass(className);
return newInstance(clazz.newInstance(), clazz);
}
+ @Override
public void newInstance(Object o)
throws IllegalAccessException, InvocationTargetException,
NamingException {
newInstance(o, o.getClass());
@@ -136,6 +139,7 @@ public class DefaultInstanceManager impl
return instance;
}
+ @Override
public void destroyInstance(Object instance) throws
IllegalAccessException, InvocationTargetException {
if (!ignoreAnnotations) {
preDestroy(instance, instance.getClass());
@@ -162,6 +166,7 @@ public class DefaultInstanceManager impl
if (Globals.IS_SECURITY_ENABLED) {
methods = AccessController.doPrivileged(
new PrivilegedAction<Method[]>(){
+ @Override
public Method[] run(){
return clazz.getDeclaredMethods();
}
@@ -215,6 +220,7 @@ public class DefaultInstanceManager impl
if (Globals.IS_SECURITY_ENABLED) {
methods = AccessController.doPrivileged(
new PrivilegedAction<Method[]>(){
+ @Override
public Method[] run(){
return clazz.getDeclaredMethods();
}
@@ -275,6 +281,7 @@ public class DefaultInstanceManager impl
final Class<?> clazz2 = clazz;
fields = AccessController.doPrivileged(
new PrivilegedAction<Field[]>(){
+ @Override
public Field[] run(){
return clazz2.getDeclaredFields();
}
@@ -318,6 +325,7 @@ public class DefaultInstanceManager impl
final Class<?> clazz2 = clazz;
methods = AccessController.doPrivileged(
new PrivilegedAction<Method[]>(){
+ @Override
public Method[] run(){
return clazz2.getDeclaredMethods();
}
@@ -372,6 +380,7 @@ public class DefaultInstanceManager impl
try {
clazz = AccessController.doPrivileged(new
PrivilegedExceptionAction<Class<?>>() {
+ @Override
public Class<?> run() throws Exception {
return loadClass(className, classLoader);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
