diff options
author | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2007-01-09 19:58:05 +0000 |
---|---|---|
committer | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2007-01-09 19:58:05 +0000 |
commit | 65bf3316cf384588453604be6b4f0ed3751a8b0f (patch) | |
tree | 996a5f57d4a68c53473382e45cb22f574cb3e4db /libjava/classpath/javax/naming/InitialContext.java | |
parent | 8fc56618a84446beccd45b80381cdfe0e94050df (diff) | |
download | ppe42-gcc-65bf3316cf384588453604be6b4f0ed3751a8b0f.tar.gz ppe42-gcc-65bf3316cf384588453604be6b4f0ed3751a8b0f.zip |
Merged gcj-eclipse branch to trunk.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@120621 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/classpath/javax/naming/InitialContext.java')
-rw-r--r-- | libjava/classpath/javax/naming/InitialContext.java | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/libjava/classpath/javax/naming/InitialContext.java b/libjava/classpath/javax/naming/InitialContext.java index d4a9587f21c..1a3b1e38b03 100644 --- a/libjava/classpath/javax/naming/InitialContext.java +++ b/libjava/classpath/javax/naming/InitialContext.java @@ -73,7 +73,7 @@ public class InitialContext implements Context /** * The environment, associated with this initial context. */ - protected Hashtable myProps; + protected Hashtable<Object,Object> myProps; /** * The list of the properties, to that the second alternative value must @@ -111,7 +111,7 @@ public class InitialContext implements Context * created. * @throws NamingException */ - public InitialContext(Hashtable environment) throws NamingException + public InitialContext(Hashtable<?,?> environment) throws NamingException { init(environment); } @@ -166,13 +166,13 @@ public class InitialContext implements Context * not later reuse this structure for other purposes. * @since 1.3 */ - protected void init(Hashtable environment) throws NamingException + protected void init(Hashtable<?, ?> environment) throws NamingException { // If is documented that the caller should not modify the environment. if (environment != null) - myProps = environment; + myProps = (Hashtable<Object, Object>) environment; else - myProps = new Hashtable(); + myProps = new Hashtable<Object, Object>(); Applet napplet = (Applet) myProps.get(Context.APPLET); @@ -424,25 +424,25 @@ public class InitialContext implements Context } /** @inheritDoc */ - public NamingEnumeration list (Name name) throws NamingException + public NamingEnumeration<NameClassPair> list (Name name) throws NamingException { return getURLOrDefaultInitCtx (name).list (name); } /** @inheritDoc */ - public NamingEnumeration list (String name) throws NamingException + public NamingEnumeration<NameClassPair> list (String name) throws NamingException { return getURLOrDefaultInitCtx (name).list (name); } /** @inheritDoc */ - public NamingEnumeration listBindings (Name name) throws NamingException + public NamingEnumeration<Binding> listBindings (Name name) throws NamingException { return getURLOrDefaultInitCtx (name).listBindings (name); } /** @inheritDoc */ - public NamingEnumeration listBindings (String name) throws NamingException + public NamingEnumeration<Binding> listBindings (String name) throws NamingException { return getURLOrDefaultInitCtx (name).listBindings (name); } @@ -522,7 +522,7 @@ public class InitialContext implements Context } /** @inheritDoc */ - public Hashtable getEnvironment () throws NamingException + public Hashtable<?,?> getEnvironment () throws NamingException { return myProps; } |