From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Fri, 7 Jan 2011 10:05:07 +0000 (+0000)
Subject: Fix various warnings
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=1ff5233871d97375b36c9bc2ca99ee7f74ac79b2;p=tomcat7.0

Fix various warnings

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

diff --git a/java/org/apache/naming/factory/DataSourceLinkFactory.java b/java/org/apache/naming/factory/DataSourceLinkFactory.java
index 678cd045b..78974e1a2 100644
--- a/java/org/apache/naming/factory/DataSourceLinkFactory.java
+++ b/java/org/apache/naming/factory/DataSourceLinkFactory.java
@@ -31,11 +31,8 @@ import javax.naming.Name;
 import javax.naming.NamingException;
 import javax.naming.RefAddr;
 import javax.naming.Reference;
-import javax.naming.spi.ObjectFactory;
 import javax.sql.DataSource;
 
-import org.apache.naming.ResourceLinkRef;
-
 
 
 /**
@@ -43,8 +40,7 @@ import org.apache.naming.ResourceLinkRef;
  * 
  * @author Filip Hanik
  */
-public class DataSourceLinkFactory extends ResourceLinkFactory
-    implements ObjectFactory {
+public class DataSourceLinkFactory extends ResourceLinkFactory {
 
 
     // -------------------------------------------------- ObjectFactory Methods
@@ -55,6 +51,7 @@ public class DataSourceLinkFactory extends ResourceLinkFactory
      * 
      * @param obj The reference object describing the DataSource
      */
+    @Override
     public Object getObjectInstance(Object obj, Name name, Context nameCtx,
                                     Hashtable<?,?> environment)
         throws NamingException {
@@ -103,6 +100,7 @@ public class DataSourceLinkFactory extends ResourceLinkFactory
             this.password = password;
         }
         
+        @Override
         public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
             
             if ("getConnection".equals(method.getName()) && args.length==0) {