Fix some warnings

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1078863 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/org/apache/catalina/core/StandardWrapper.java b/java/org/apache/catalina/core/StandardWrapper.java
index ded6b26..e7b653b 100644 (file)
--- a/java/org/apache/catalina/core/StandardWrapper.java
+++ b/java/org/apache/catalina/core/StandardWrapper.java
@@ -78,6 +78,7 @@ import org.apache.tomcat.util.modeler.Registry;
  * @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 ContainerBase
      *
      * @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
 

diff --git a/java/org/apache/catalina/core/StandardWrapperFacade.java b/java/org/apache/catalina/core/StandardWrapperFacade.java
index e209a47..74023ca 100644 (file)
--- a/java/org/apache/catalina/core/StandardWrapperFacade.java
+++ b/java/org/apache/catalina/core/StandardWrapperFacade.java
@@ -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();
     }