Merged gcj-eclipse branch to trunk.

From-SVN: r120621
2007-01-09 19:58:05 +00:00 · 2007-01-09 19:58:05 +00:00 · 97b8365caf
commit 97b8365caf
parent c648dedbde
17478 changed files with 606493 additions and 100744 deletions
--- a/libjava/classpath/javax/naming/spi/ObjectFactoryBuilder.java
+++ b/libjava/classpath/javax/naming/spi/ObjectFactoryBuilder.java
@ -52,7 +52,7 @@ import javax.naming.Referenceable;
 * @author Warren Levy (warrenl@redhat.com)
 */
 public interface ObjectFactoryBuilder
-{ 
+{
  /**
   * Create a new object using the supplied environment.
   * 
@ -65,6 +65,6 @@ public interface ObjectFactoryBuilder
   * @throws NamingException
   */
  ObjectFactory createObjectFactory(Object refInfo,
-  					   Hashtable environment)
+  					   Hashtable<?, ?> environment)
 					   throws NamingException;
 }