From 547f7f8b9d220841cdd48fe4d09ca6c3add17faf Mon Sep 17 00:00:00 2001 From: Michael Koch Date: Sat, 11 Oct 2003 19:06:23 +0000 Subject: Context.java, [...]: Removing redundant modifiers. 2003-10-11 Michael Koch * javax/naming/Context.java, javax/naming/Name.java, javax/naming/NameParser.java, javax/naming/NamingEnumeration.java, javax/naming/Referenceable.java, javax/naming/directory/Attribute.java, javax/naming/directory/Attributes.java, javax/naming/directory/DirContext.java, javax/naming/event/EventContext.java, javax/naming/event/EventDirContext.java, javax/naming/event/NamespaceChangeListener.java, javax/naming/event/NamingListener.java, javax/naming/event/ObjectChangeListener.java, javax/naming/ldap/Control.java, javax/naming/ldap/ExtendedRequest.java, javax/naming/ldap/ExtendedResponse.java, javax/naming/ldap/HasControls.java, javax/naming/ldap/LdapContext.java, javax/naming/ldap/UnsolicitedNotification.java, javax/naming/ldap/UnsolicitedNotificationListener.java, javax/naming/spi/DirObjectFactory.java, javax/naming/spi/DirStateFactory.java, javax/naming/spi/InitialContextFactory.java, javax/naming/spi/InitialContextFactoryBuilder.java, javax/naming/spi/ObjectFactory.java, javax/naming/spi/ObjectFactoryBuilder.java, javax/naming/spi/Resolver.java, javax/naming/spi/StateFactory.java: Removing redundant modifiers. From-SVN: r72362 --- libjava/javax/naming/spi/DirObjectFactory.java | 2 +- libjava/javax/naming/spi/DirStateFactory.java | 2 +- libjava/javax/naming/spi/InitialContextFactory.java | 2 +- libjava/javax/naming/spi/InitialContextFactoryBuilder.java | 3 ++- libjava/javax/naming/spi/ObjectFactory.java | 11 +++++------ libjava/javax/naming/spi/ObjectFactoryBuilder.java | 2 +- libjava/javax/naming/spi/Resolver.java | 4 ++-- libjava/javax/naming/spi/StateFactory.java | 2 +- 8 files changed, 14 insertions(+), 14 deletions(-) (limited to 'libjava/javax/naming/spi') diff --git a/libjava/javax/naming/spi/DirObjectFactory.java b/libjava/javax/naming/spi/DirObjectFactory.java index c80aeeb..3b7c76d 100644 --- a/libjava/javax/naming/spi/DirObjectFactory.java +++ b/libjava/javax/naming/spi/DirObjectFactory.java @@ -48,7 +48,7 @@ import java.util.Hashtable; public interface DirObjectFactory extends ObjectFactory { - public Object getObjectInstance(Object obj, Name name, Context nameCtx, + Object getObjectInstance(Object obj, Name name, Context nameCtx, Hashtable environment, Attributes attrs) throws Exception; } diff --git a/libjava/javax/naming/spi/DirStateFactory.java b/libjava/javax/naming/spi/DirStateFactory.java index 03d6c8d..4ff39da 100644 --- a/libjava/javax/naming/spi/DirStateFactory.java +++ b/libjava/javax/naming/spi/DirStateFactory.java @@ -72,7 +72,7 @@ public interface DirStateFactory extends StateFactory } } - public DirStateFactory.Result getStateToBind(Object obj, Name name, + DirStateFactory.Result getStateToBind(Object obj, Name name, Context nameCtx, Hashtable environment, Attributes inAttrs) diff --git a/libjava/javax/naming/spi/InitialContextFactory.java b/libjava/javax/naming/spi/InitialContextFactory.java index 57a421e..299bfd6 100644 --- a/libjava/javax/naming/spi/InitialContextFactory.java +++ b/libjava/javax/naming/spi/InitialContextFactory.java @@ -44,5 +44,5 @@ import javax.naming.NamingException; public interface InitialContextFactory { - public Context getInitialContext (Hashtable environment) throws NamingException; + Context getInitialContext (Hashtable environment) throws NamingException; } diff --git a/libjava/javax/naming/spi/InitialContextFactoryBuilder.java b/libjava/javax/naming/spi/InitialContextFactoryBuilder.java index 39d7eeb..53a11aa 100644 --- a/libjava/javax/naming/spi/InitialContextFactoryBuilder.java +++ b/libjava/javax/naming/spi/InitialContextFactoryBuilder.java @@ -43,5 +43,6 @@ import javax.naming.NamingException; public interface InitialContextFactoryBuilder { - public InitialContextFactory createInitialContextFactory (Hashtable environment) throws NamingException; + InitialContextFactory createInitialContextFactory (Hashtable environment) + throws NamingException; } diff --git a/libjava/javax/naming/spi/ObjectFactory.java b/libjava/javax/naming/spi/ObjectFactory.java index 5b291f0..0861b44 100644 --- a/libjava/javax/naming/spi/ObjectFactory.java +++ b/libjava/javax/naming/spi/ObjectFactory.java @@ -39,13 +39,12 @@ exception statement from your version. */ package javax.naming.spi; import java.util.Hashtable; -import javax.naming.*; +import javax.naming.Context; +import javax.naming.Name; public interface ObjectFactory { - public Object getObjectInstance (Object obj, - Name name, - Context nameCtx, - Hashtable environment) - throws Exception; + Object getObjectInstance (Object obj, Name name, Context nameCtx, + Hashtable environment) + throws Exception; } diff --git a/libjava/javax/naming/spi/ObjectFactoryBuilder.java b/libjava/javax/naming/spi/ObjectFactoryBuilder.java index 828f5c9..d6a5fc4e 100644 --- a/libjava/javax/naming/spi/ObjectFactoryBuilder.java +++ b/libjava/javax/naming/spi/ObjectFactoryBuilder.java @@ -47,7 +47,7 @@ import java.util.Hashtable; public interface ObjectFactoryBuilder { - public ObjectFactory createObjectFactory(Object obj, + ObjectFactory createObjectFactory(Object obj, Hashtable environment) throws NamingException; } diff --git a/libjava/javax/naming/spi/Resolver.java b/libjava/javax/naming/spi/Resolver.java index 1cae847f..3c66b18 100644 --- a/libjava/javax/naming/spi/Resolver.java +++ b/libjava/javax/naming/spi/Resolver.java @@ -46,8 +46,8 @@ import javax.naming.*; public interface Resolver { - public ResolveResult resolveToClass(Name name, Class contextType) + ResolveResult resolveToClass(Name name, Class contextType) throws NamingException; - public ResolveResult resolveToClass(String name, Class contextType) + ResolveResult resolveToClass(String name, Class contextType) throws NamingException; } diff --git a/libjava/javax/naming/spi/StateFactory.java b/libjava/javax/naming/spi/StateFactory.java index 3f41b55..50ec77c 100644 --- a/libjava/javax/naming/spi/StateFactory.java +++ b/libjava/javax/naming/spi/StateFactory.java @@ -47,6 +47,6 @@ import java.util.Hashtable; public interface StateFactory { - public Object getStateToBind(Object obj, Name name, Context nameCtx, + Object getStateToBind(Object obj, Name name, Context nameCtx, Hashtable environment) throws NamingException; } -- cgit v1.1