Author: markt
Date: Mon Mar 7 17:42:52 2011
New Revision: 1078863
URL: http://svn.apache.org/viewvc?rev=1078863&view=rev
Log:
Fix some warnings
Modified:
tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java
tomcat/trunk/java/org/apache/catalina/core/StandardWrapperFacade.java
Modified: tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java?rev=1078863&r1=1078862&r2=1078863&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java Mon Mar 7
17:42:52 2011
@@ -78,6 +78,7 @@ import org.apache.tomcat.util.modeler.Re
* @author Remy Maucherat
* @version $Id$
*/
+@SuppressWarnings("deprecation") // SingleThreadModel
public class StandardWrapper extends ContainerBase
implements ServletConfig, Wrapper, NotificationEmitter {
@@ -1602,8 +1603,7 @@ public class StandardWrapper extends Con
*
* @param mapperClass Java class name of the default Mapper
*/
- protected void addDefaultMapper(
- @SuppressWarnings("unused") String mapperClass) {
+ protected void addDefaultMapper(String mapperClass) {
// No need for a default Mapper on a Wrapper
Modified: tomcat/trunk/java/org/apache/catalina/core/StandardWrapperFacade.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardWrapperFacade.java?rev=1078863&r1=1078862&r2=1078863&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/StandardWrapperFacade.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardWrapperFacade.java Mon
Mar 7 17:42:52 2011
@@ -68,11 +68,13 @@ public final class StandardWrapperFacade
// -------------------------------------------------- ServletConfig Methods
+ @Override
public String getServletName() {
return config.getServletName();
}
+ @Override
public ServletContext getServletContext() {
if (context == null) {
context = config.getServletContext();
@@ -83,11 +85,13 @@ public final class StandardWrapperFacade
}
+ @Override
public String getInitParameter(String name) {
return config.getInitParameter(name);
}
+ @Override
public Enumeration<String> getInitParameterNames() {
return config.getInitParameterNames();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]