Index: modules/jndi/src/main/java/javax/naming/Context.java =================================================================== --- modules/jndi/src/main/java/javax/naming/Context.java.orig 2006-06-01 08:13:12.000000000 +0100 +++ modules/jndi/src/main/java/javax/naming/Context.java 2006-06-01 08:27:49.000000000 +0100 @@ -660,7 +660,8 @@ * specified name excluding any bindings for any subcontexts * @throws NamingException if an error occurs. */ - public NamingEnumeration list(Name n) throws NamingException; + public NamingEnumeration list(Name n) + throws NamingException; /** * Returns an enumeration of the bindings of the context for the specified @@ -674,7 +675,8 @@ * specified name excluding any bindings for any subcontexts * @throws NamingException if an error occurs. */ - public NamingEnumeration list(String s) throws NamingException; + public NamingEnumeration list(String s) + throws NamingException; /** * Returns an enumeration of the bindings of the context for the specified @@ -688,7 +690,8 @@ * name excluding any bindings for any subcontexts * @throws NamingException if an error occurs. */ - public NamingEnumeration listBindings(Name n) throws NamingException; + public NamingEnumeration listBindings(Name n) + throws NamingException; /** * Returns an enumeration of the bindings of the context for the specified Index: modules/jndi/src/main/java/javax/naming/InitialContext.java =================================================================== --- modules/jndi/src/main/java/javax/naming/InitialContext.java.orig 2006-06-01 08:13:01.000000000 +0100 +++ modules/jndi/src/main/java/javax/naming/InitialContext.java 2006-06-01 08:27:39.000000000 +0100 @@ -119,7 +119,7 @@ * of the the sources of JNDI environment properties. * Initially null. */ - protected Hashtable myProps; + protected Hashtable myProps; /* * ------------------------------------------------------------------- @@ -147,7 +147,7 @@ * the context * @throws NamingException If failed to create an InitialContext. */ - public InitialContext(Hashtable environment) throws NamingException { + public InitialContext(Hashtable environment) throws NamingException { internalInit(environment); } @@ -190,9 +190,9 @@ // 1. Read the environment parameter used to create this Context if (null == env) { - myProps = new Hashtable(); + myProps = new Hashtable(); } else { - myProps = (Hashtable) env.clone(); + myProps = (Hashtable) env.clone(); } // 2. Read Applet parameters @@ -388,19 +388,23 @@ getURLOrDefaultInitCtx(oldName).rename(oldName, newName); } - public NamingEnumeration list(Name name) throws NamingException { + public NamingEnumeration list(Name name) + throws NamingException { return getURLOrDefaultInitCtx(name).list(name); } - public NamingEnumeration list(String name) throws NamingException { + public NamingEnumeration list(String name) + throws NamingException { return getURLOrDefaultInitCtx(name).list(name); } - public NamingEnumeration listBindings(Name name) throws NamingException { + public NamingEnumeration listBindings(Name name) + throws NamingException { return getURLOrDefaultInitCtx(name).listBindings(name); } - public NamingEnumeration listBindings(String name) throws NamingException { + public NamingEnumeration listBindings(String name) + throws NamingException { return getURLOrDefaultInitCtx(name).listBindings(name); } @@ -466,7 +470,7 @@ return getDefaultInitCtx().removeFromEnvironment(propName); } - public Hashtable getEnvironment() throws NamingException { + public Hashtable getEnvironment() throws NamingException { return getDefaultInitCtx().getEnvironment(); } Index: modules/jndi/src/main/java/javax/naming/Name.java =================================================================== --- modules/jndi/src/main/java/javax/naming/Name.java.orig 2006-06-01 08:13:07.000000000 +0100 +++ modules/jndi/src/main/java/javax/naming/Name.java 2006-06-01 08:15:18.000000000 +0100 @@ -39,7 +39,7 @@ * @see CompositeName * @see CompoundName */ -public interface Name extends Cloneable, Serializable { +public interface Name extends Cloneable, Serializable, Comparable { /* * SUID declared publically in the spec.