incubator-aries-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject svn commit: r821652 - in /incubator/aries/trunk/jndi/jndi-core/src/main/java/org/apache/aries/jndi: DelegateContext.java OSGiObjectFactoryBuilder.java
Date Mon, 05 Oct 2009 01:56:24 GMT
Author: adc
Date: Mon Oct  5 01:56:24 2009
New Revision: 821652

URL: http://svn.apache.org/viewvc?rev=821652&view=rev
Log:
These methods don't override anything.

Modified:
    incubator/aries/trunk/jndi/jndi-core/src/main/java/org/apache/aries/jndi/DelegateContext.java
    incubator/aries/trunk/jndi/jndi-core/src/main/java/org/apache/aries/jndi/OSGiObjectFactoryBuilder.java

Modified: incubator/aries/trunk/jndi/jndi-core/src/main/java/org/apache/aries/jndi/DelegateContext.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/jndi/jndi-core/src/main/java/org/apache/aries/jndi/DelegateContext.java?rev=821652&r1=821651&r2=821652&view=diff
==============================================================================
--- incubator/aries/trunk/jndi/jndi-core/src/main/java/org/apache/aries/jndi/DelegateContext.java
(original)
+++ incubator/aries/trunk/jndi/jndi-core/src/main/java/org/apache/aries/jndi/DelegateContext.java
Mon Oct  5 01:56:24 2009
@@ -249,132 +249,106 @@
         urlContexts.put(url, ctx);
     }
 
-    @Override
     public Attributes getAttributes(Name name) throws NamingException {
         return ((DirContext)findContext(name)).getAttributes(name);
     }
 
-    @Override
     public Attributes getAttributes(String name) throws NamingException {
         return ((DirContext)findContext(name)).getAttributes(name);
     }
 
-    @Override
     public Attributes getAttributes(Name name, String[] attrIds) throws NamingException {
         return ((DirContext)findContext(name)).getAttributes(name, attrIds);
     }
 
-    @Override
     public Attributes getAttributes(String name, String[] attrIds) throws NamingException
{
         return ((DirContext)findContext(name)).getAttributes(name, attrIds);
     }
 
-    @Override
     public void modifyAttributes(Name name, int mod_op, Attributes attrs) throws NamingException
{
         ((DirContext)findContext(name)).modifyAttributes(name, mod_op, attrs);
     }
 
-    @Override
     public void modifyAttributes(String name, int mod_op, Attributes attrs) throws NamingException
{
         ((DirContext)findContext(name)).modifyAttributes(name, mod_op, attrs);
     }
 
-    @Override
     public void modifyAttributes(Name name, ModificationItem[] mods) throws NamingException
{
         ((DirContext)findContext(name)).modifyAttributes(name, mods);
     }
 
-    @Override
     public void modifyAttributes(String name, ModificationItem[] mods) throws NamingException
{
         ((DirContext)findContext(name)).modifyAttributes(name, mods);
     }
 
-    @Override
     public void bind(Name name, Object obj, Attributes attrs) throws NamingException {
         ((DirContext)findContext(name)).bind(name, obj, attrs);
     }
 
-    @Override
     public void bind(String name, Object obj, Attributes attrs) throws NamingException {
         ((DirContext)findContext(name)).bind(name, obj, attrs);
     }
 
-    @Override
     public void rebind(Name name, Object obj, Attributes attrs) throws NamingException {
         ((DirContext)findContext(name)).rebind(name, obj, attrs);
     }
 
-    @Override
     public void rebind(String name, Object obj, Attributes attrs) throws NamingException
{
         ((DirContext)findContext(name)).rebind(name, obj, attrs);
     }
 
-    @Override
     public DirContext createSubcontext(Name name, Attributes attrs) throws NamingException
{
         return ((DirContext)findContext(name)).createSubcontext(name, attrs);
     }
 
-    @Override
     public DirContext createSubcontext(String name, Attributes attrs) throws NamingException
{
         return ((DirContext)findContext(name)).createSubcontext(name, attrs);
     }
 
-    @Override
     public DirContext getSchema(Name name) throws NamingException {
         return ((DirContext)findContext(name)).getSchema(name);
     }
 
-    @Override
     public DirContext getSchema(String name) throws NamingException {
         return ((DirContext)findContext(name)).getSchema(name);
     }
 
-    @Override
     public DirContext getSchemaClassDefinition(Name name) throws NamingException {
         return ((DirContext)findContext(name)).getSchemaClassDefinition(name);
     }
 
-    @Override
     public DirContext getSchemaClassDefinition(String name) throws NamingException {
         return ((DirContext)findContext(name)).getSchemaClassDefinition(name);
     }
 
-    @Override
     public NamingEnumeration search(Name name, Attributes matchingAttributes, String[] attributesToReturn)
throws NamingException {
         return ((DirContext)findContext(name)).search(name, matchingAttributes, attributesToReturn);
     }
 
-    @Override
     public NamingEnumeration search(String name, Attributes matchingAttributes, String[]
attributesToReturn) throws NamingException {
         return ((DirContext)findContext(name)).search(name, matchingAttributes, attributesToReturn);
     }
 
-    @Override
     public NamingEnumeration search(Name name, Attributes matchingAttributes) throws NamingException
{
         return ((DirContext)findContext(name)).search(name, matchingAttributes);
     }
 
-    @Override
     public NamingEnumeration search(String name, Attributes matchingAttributes) throws NamingException
{
         return ((DirContext)findContext(name)).search(name, matchingAttributes);
     }
 
-    @Override
     public NamingEnumeration search(Name name, String filter, SearchControls cons) throws
NamingException {
         return ((DirContext)findContext(name)).search(name, filter, cons);
     }
 
-    @Override
     public NamingEnumeration search(String name, String filter, SearchControls cons) throws
NamingException {
         return ((DirContext)findContext(name)).search(name, filter, cons);
     }
 
-    @Override
     public NamingEnumeration search(Name name, String filterExpr, Object[] filterArgs, SearchControls
cons) throws NamingException {
         return ((DirContext)findContext(name)).search(name, filterExpr, filterArgs, cons);
     }
 
-    @Override
     public NamingEnumeration search(String name, String filterExpr, Object[] filterArgs,
SearchControls cons) throws NamingException {
         return ((DirContext)findContext(name)).search(name, filterExpr, filterArgs, cons);
     }

Modified: incubator/aries/trunk/jndi/jndi-core/src/main/java/org/apache/aries/jndi/OSGiObjectFactoryBuilder.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/jndi/jndi-core/src/main/java/org/apache/aries/jndi/OSGiObjectFactoryBuilder.java?rev=821652&r1=821651&r2=821652&view=diff
==============================================================================
--- incubator/aries/trunk/jndi/jndi-core/src/main/java/org/apache/aries/jndi/OSGiObjectFactoryBuilder.java
(original)
+++ incubator/aries/trunk/jndi/jndi-core/src/main/java/org/apache/aries/jndi/OSGiObjectFactoryBuilder.java
Mon Oct  5 01:56:24 2009
@@ -18,10 +18,6 @@
  */
 package org.apache.aries.jndi;
 
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.InvalidSyntaxException;
-import org.osgi.framework.ServiceReference;
-
 import javax.naming.Context;
 import javax.naming.Name;
 import javax.naming.NamingException;
@@ -36,6 +32,10 @@
 import java.util.Enumeration;
 import java.util.Hashtable;
 
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.InvalidSyntaxException;
+import org.osgi.framework.ServiceReference;
+
 public class OSGiObjectFactoryBuilder implements ObjectFactoryBuilder, ObjectFactory, DirObjectFactory
{
     /**
      * The bundle context we use for accessing the SR
@@ -231,7 +231,6 @@
      * when we get called by DirectoryManager#getObjectInstance if we can't find the object

      * instance, we just need to return the passed in refInfo  
      */
-    @Override
     public Object getObjectInstance(Object refInfo, Name name, Context nameCtx, 
                                     Hashtable<?, ?> environment, Attributes attrs)
throws Exception {
         Object result = getObjectInstance(refInfo, name, nameCtx, environment);



Mime
View raw message