[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[cp-patches] [generics] Patch: FYI: genericize javax.naming
|
From: |
Tom Tromey |
|
Subject: |
[cp-patches] [generics] Patch: FYI: genericize javax.naming |
|
Date: |
Sun, 27 Nov 2005 11:12:04 -0700 |
I'm checking this in on the generics branch.
This genericizes javax.naming.
Tom
2005-11-27 Tom Tromey <address@hidden>
* javax/naming/spi/StateFactory.java (getStateToBind): Genericized.
* javax/naming/spi/Resolver.java (resolveToClass): Genericized.
* javax/naming/spi/ObjectFactoryBuilder.java (createObjectFactory):
Genericized.
* javax/naming/spi/NamingManager.java (getInitialContext):
Genericized.
(getURLContext): Likewise.
(getObjectInstance): Likewise.
(getStateToBind): Likewise.
* javax/naming/spi/InitialContextFactoryBuilder.java
(createInitialContextFactory): Genericized.
* javax/naming/spi/InitialContextFactory.java (getInitialContext):
Genericized.
* javax/naming/spi/DirectoryManager.java (getObjectInstance):
Genericized.
(getStateToBind): Likewise.
* javax/naming/spi/DirStateFactory.java (getStateToBind):
Genericized.
* javax/naming/spi/ObjectFactory.java (getObjectInstance):
Genericized.
* javax/naming/spi/DirObjectFactory.java (getObjectInstance):
Genericized.
* javax/naming/ldap/LdapReferralException.java (getReferralContext):
Genericized.
* javax/naming/ldap/ControlFactory.java (getControlInstance):
Genericized.
* javax/naming/ldap/InitialLdapContext.java (InitialLdapContext):
Genericized.
* javax/naming/directory/DirContext.java (search): Genericized.
* javax/naming/directory/Attributes.java (getAll): Genericized.
(getIDs): Likewise.
* javax/naming/directory/Attribute.java (getAll): Genericized.
* javax/naming/directory/BasicAttribute.java (values): Genericized.
(getAll): Likewise.
* javax/naming/directory/InitialDirContext.java (InitialDirContext):
Genericized.
* javax/naming/ReferralException.java (getReferralContext):
Genericized.
* javax/naming/Name.java (getAll): Genericized.
* javax/naming/Context.java (getEnvironment): Genericized.
(list): Likewise.
(listBindings): Likewise.
* javax/naming/NamingEnumeration.java: Genericized.
(next): Likewise.
* javax/naming/Reference.java (addrs): Genericized.
(getAll): Likewise.
* javax/naming/CannotProceedException.java (environment): Genericized.
(getEnvironment): Likewise.
(setEnvironment): Likewise.
* javax/naming/InitialContext.java (myProps): Genericized.
(InitialContext): Likewise.
(init): Likewise.
* javax/naming/CompoundName.java (CompoundName): Genericized.
* javax/naming/CompositeName.java (CompositeName): Genericized.
Index: javax/naming/CannotProceedException.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/javax/naming/CannotProceedException.java,v
retrieving revision 1.2.2.2
diff -u -r1.2.2.2 CannotProceedException.java
--- javax/naming/CannotProceedException.java 2 Aug 2005 20:12:35 -0000
1.2.2.2
+++ javax/naming/CannotProceedException.java 27 Nov 2005 18:18:06 -0000
@@ -49,7 +49,7 @@
{
// Serialized fields.
protected Name remainingNewName;
- protected Hashtable environment;
+ protected Hashtable<?, ?> environment;
protected Name altName;
protected Context altNameCtx;
@@ -63,12 +63,12 @@
super (msg);
}
- public Hashtable getEnvironment()
+ public Hashtable<?, ?> getEnvironment()
{
return environment;
}
- public void setEnvironment(Hashtable environment)
+ public void setEnvironment(Hashtable<?, ?> environment)
{
this.environment = environment;
}
Index: javax/naming/CompositeName.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/naming/CompositeName.java,v
retrieving revision 1.2.2.2
diff -u -r1.2.2.2 CompositeName.java
--- javax/naming/CompositeName.java 2 Aug 2005 20:12:35 -0000 1.2.2.2
+++ javax/naming/CompositeName.java 27 Nov 2005 18:18:06 -0000
@@ -59,7 +59,7 @@
elts = new Vector ();
}
- protected CompositeName (Enumeration comps)
+ protected CompositeName (Enumeration<String> comps)
{
elts = new Vector ();
try
Index: javax/naming/CompoundName.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/naming/CompoundName.java,v
retrieving revision 1.6.2.4
diff -u -r1.6.2.4 CompoundName.java
--- javax/naming/CompoundName.java 20 Sep 2005 18:46:30 -0000 1.6.2.4
+++ javax/naming/CompoundName.java 27 Nov 2005 18:18:06 -0000
@@ -69,7 +69,7 @@
initializeSyntax ();
}
- protected CompoundName (Enumeration comps, Properties syntax)
+ protected CompoundName (Enumeration<String> comps, Properties syntax)
{
elts = new Vector ();
mySyntax = syntax;
Index: javax/naming/Context.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/naming/Context.java,v
retrieving revision 1.2.2.1
diff -u -r1.2.2.1 Context.java
--- javax/naming/Context.java 2 Aug 2005 20:12:35 -0000 1.2.2.1
+++ javax/naming/Context.java 27 Nov 2005 18:18:06 -0000
@@ -124,11 +124,13 @@
void rename (Name oldName, Name newName) throws NamingException;
void rename (String oldName, String newName) throws NamingException;
- NamingEnumeration list (Name name) throws NamingException;
- NamingEnumeration list (String name) throws NamingException;
+ NamingEnumeration<NameClassPair> list (Name name) throws NamingException;
+ NamingEnumeration<NameClassPair> list (String name) throws NamingException;
- NamingEnumeration listBindings (Name name) throws NamingException;
- NamingEnumeration listBindings (String name) throws NamingException;
+ NamingEnumeration<Binding> listBindings (Name name)
+ throws NamingException;
+ NamingEnumeration<Binding> listBindings (String name)
+ throws NamingException;
void destroySubcontext (Name name) throws NamingException;
void destroySubcontext (String name) throws NamingException;
@@ -151,7 +153,7 @@
Object removeFromEnvironment (String propName) throws NamingException;
- Hashtable getEnvironment () throws NamingException;
+ Hashtable<?, ?> getEnvironment () throws NamingException;
void close () throws NamingException;
Index: javax/naming/InitialContext.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/naming/InitialContext.java,v
retrieving revision 1.7.2.1
diff -u -r1.7.2.1 InitialContext.java
--- javax/naming/InitialContext.java 2 Aug 2005 20:12:35 -0000 1.7.2.1
+++ javax/naming/InitialContext.java 27 Nov 2005 18:18:06 -0000
@@ -52,9 +52,9 @@
{
protected Context defaultInitCtx;
protected boolean gotDefault = false;
- protected Hashtable myProps;
+ protected Hashtable<Object, Object> myProps;
- public InitialContext (Hashtable environment)
+ public InitialContext (Hashtable<?, ?> environment)
throws NamingException
{
init (environment);
@@ -74,7 +74,7 @@
}
/** @since 1.3 */
- protected void init (Hashtable environment)
+ protected void init (Hashtable<?, ?> environment)
throws NamingException
{
// FIXME: Is this enough?
Index: javax/naming/Name.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/naming/Name.java,v
retrieving revision 1.5.2.3
diff -u -r1.5.2.3 Name.java
--- javax/naming/Name.java 27 Sep 2005 16:59:23 -0000 1.5.2.3
+++ javax/naming/Name.java 27 Nov 2005 18:18:06 -0000
@@ -80,7 +80,7 @@
* Returns a non-null (but possibly empty) <code>Enumeration</code> of the
* components of the <code>Name</code> as <code>String</code>s.
*/
- Enumeration getAll();
+ Enumeration<String> getAll();
/**
* Gets the component at the given index.
Index: javax/naming/NamingEnumeration.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/naming/NamingEnumeration.java,v
retrieving revision 1.2.2.1
diff -u -r1.2.2.1 NamingEnumeration.java
--- javax/naming/NamingEnumeration.java 2 Aug 2005 20:12:35 -0000 1.2.2.1
+++ javax/naming/NamingEnumeration.java 27 Nov 2005 18:18:06 -0000
@@ -40,9 +40,9 @@
import java.util.Enumeration;
-public interface NamingEnumeration extends Enumeration
+public interface NamingEnumeration<T> extends Enumeration<T>
{
void close() throws NamingException;
boolean hasMore() throws NamingException;
- Object next() throws NamingException;
+ T next() throws NamingException;
}
Index: javax/naming/Reference.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/naming/Reference.java,v
retrieving revision 1.1.2.2
diff -u -r1.1.2.2 Reference.java
--- javax/naming/Reference.java 2 Aug 2005 20:12:35 -0000 1.1.2.2
+++ javax/naming/Reference.java 27 Nov 2005 18:18:06 -0000
@@ -135,7 +135,7 @@
return null;
}
- public Enumeration getAll ()
+ public Enumeration<RefAddr> getAll ()
{
return addrs.elements ();
}
@@ -187,7 +187,7 @@
return x + "]";
}
- protected Vector addrs;
+ protected Vector<RefAddr> addrs;
protected String classFactory;
protected String classFactoryLocation;
protected String className;
Index: javax/naming/ReferralException.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/naming/ReferralException.java,v
retrieving revision 1.3.2.2
diff -u -r1.3.2.2 ReferralException.java
--- javax/naming/ReferralException.java 2 Aug 2005 20:12:35 -0000 1.3.2.2
+++ javax/naming/ReferralException.java 27 Nov 2005 18:18:06 -0000
@@ -61,7 +61,7 @@
public abstract Object getReferralInfo();
public abstract Context getReferralContext() throws NamingException;
- public abstract Context getReferralContext(Hashtable env)
+ public abstract Context getReferralContext(Hashtable<?, ?> env)
throws NamingException;
public abstract boolean skipReferral();
public abstract void retryReferral();
Index: javax/naming/directory/Attribute.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/naming/directory/Attribute.java,v
retrieving revision 1.5.2.2
diff -u -r1.5.2.2 Attribute.java
--- javax/naming/directory/Attribute.java 2 Aug 2005 20:12:35 -0000
1.5.2.2
+++ javax/naming/directory/Attribute.java 27 Nov 2005 18:18:06 -0000
@@ -51,7 +51,7 @@
{
long serialVersionUID = 8707690322213556804L;
- NamingEnumeration getAll() throws NamingException;
+ NamingEnumeration<?> getAll() throws NamingException;
Object get() throws NamingException;
int size();
String getID();
Index: javax/naming/directory/Attributes.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/naming/directory/Attributes.java,v
retrieving revision 1.4.2.2
diff -u -r1.4.2.2 Attributes.java
--- javax/naming/directory/Attributes.java 2 Aug 2005 20:12:35 -0000
1.4.2.2
+++ javax/naming/directory/Attributes.java 27 Nov 2005 18:18:06 -0000
@@ -52,8 +52,8 @@
boolean isCaseIgnored();
int size();
Attribute get(String attrID);
- NamingEnumeration getAll();
- NamingEnumeration getIDs();
+ NamingEnumeration<? extends Attribute> getAll();
+ NamingEnumeration<String> getIDs();
Attribute put(String attrID, Object val);
Attribute put(Attribute attr);
Attribute remove(String attrID);
Index: javax/naming/directory/BasicAttribute.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/javax/naming/directory/BasicAttribute.java,v
retrieving revision 1.2.2.2
diff -u -r1.2.2.2 BasicAttribute.java
--- javax/naming/directory/BasicAttribute.java 2 Aug 2005 20:12:35 -0000
1.2.2.2
+++ javax/naming/directory/BasicAttribute.java 27 Nov 2005 18:18:06 -0000
@@ -58,7 +58,7 @@
/** True if this attribute's values are ordered. */
protected boolean ordered;
/** Values for this attribute. */
- protected transient Vector values;
+ protected transient Vector<Object> values;
// Used by cloning.
private BasicAttribute ()
@@ -178,7 +178,7 @@
return values.get (index);
}
- public NamingEnumeration getAll ()
+ public NamingEnumeration<Attribute> getAll ()
throws NamingException
{
return new BasicAttributeEnumeration ();
Index: javax/naming/directory/DirContext.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/naming/directory/DirContext.java,v
retrieving revision 1.3.2.2
diff -u -r1.3.2.2 DirContext.java
--- javax/naming/directory/DirContext.java 2 Aug 2005 20:12:35 -0000
1.3.2.2
+++ javax/naming/directory/DirContext.java 27 Nov 2005 18:18:07 -0000
@@ -72,12 +72,32 @@
DirContext getSchema(String name) throws NamingException;
DirContext getSchemaClassDefinition(Name name) throws NamingException;
DirContext getSchemaClassDefinition(String name) throws NamingException;
- NamingEnumeration search(Name name, Attributes matchingAttributes, String[]
attributesToReturn) throws NamingException;
- NamingEnumeration search(String name, Attributes matchingAttributes,
String[] attributesToReturn) throws NamingException;
- NamingEnumeration search(Name name, Attributes matchingAttributes) throws
NamingException;
- NamingEnumeration search(String name, Attributes matchingAttributes) throws
NamingException;
- NamingEnumeration search(Name name, String filter, SearchControls cons)
throws NamingException;
- NamingEnumeration search(String name, String filter, SearchControls cons)
throws NamingException;
- NamingEnumeration search(Name name, String filterExpr, Object[] filterArgs,
SearchControls cons) throws NamingException;
- NamingEnumeration search(String name, String filterExpr, Object[]
filterArgs, SearchControls cons) throws NamingException;
+ NamingEnumeration<SearchResult> search(Name name,
+ Attributes matchingAttributes,
+ String[] attributesToReturn)
+ throws NamingException;
+ NamingEnumeration<SearchResult> search(String name,
+ Attributes matchingAttributes,
+ String[] attributesToReturn)
+ throws NamingException;
+ NamingEnumeration<SearchResult> search(Name name,
+ Attributes matchingAttributes)
+ throws NamingException;
+ NamingEnumeration<SearchResult> search(String name,
+ Attributes matchingAttributes)
+ throws NamingException;
+ NamingEnumeration<SearchResult> search(Name name, String filter,
+ SearchControls cons)
+ throws NamingException;
+ NamingEnumeration<SearchResult> search(String name, String filter,
+ SearchControls cons)
+ throws NamingException;
+ NamingEnumeration<SearchResult> search(Name name, String filterExpr,
+ Object[] filterArgs,
+ SearchControls cons)
+ throws NamingException;
+ NamingEnumeration<SearchResult> search(String name, String filterExpr,
+ Object[] filterArgs,
+ SearchControls cons)
+ throws NamingException;
}
Index: javax/naming/directory/InitialDirContext.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/javax/naming/directory/InitialDirContext.java,v
retrieving revision 1.2.2.2
diff -u -r1.2.2.2 InitialDirContext.java
--- javax/naming/directory/InitialDirContext.java 2 Aug 2005 20:12:35
-0000 1.2.2.2
+++ javax/naming/directory/InitialDirContext.java 27 Nov 2005 18:18:07
-0000
@@ -66,7 +66,7 @@
super (lazy);
}
- public InitialDirContext (Hashtable environment)
+ public InitialDirContext (Hashtable<?, ?> environment)
throws NamingException
{
super (environment);
Index: javax/naming/ldap/ControlFactory.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/naming/ldap/ControlFactory.java,v
retrieving revision 1.2.2.2
diff -u -r1.2.2.2 ControlFactory.java
--- javax/naming/ldap/ControlFactory.java 2 Aug 2005 20:12:36 -0000
1.2.2.2
+++ javax/naming/ldap/ControlFactory.java 27 Nov 2005 18:18:07 -0000
@@ -59,7 +59,7 @@
public static Control getControlInstance (Control control,
Context ctx,
- Hashtable env)
+ Hashtable<?, ?> env)
throws NamingException
{
String path = (String) env.get (LdapContext.CONTROL_FACTORIES);
Index: javax/naming/ldap/InitialLdapContext.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/javax/naming/ldap/InitialLdapContext.java,v
retrieving revision 1.2.2.2
diff -u -r1.2.2.2 InitialLdapContext.java
--- javax/naming/ldap/InitialLdapContext.java 2 Aug 2005 20:12:36 -0000
1.2.2.2
+++ javax/naming/ldap/InitialLdapContext.java 27 Nov 2005 18:18:07 -0000
@@ -60,22 +60,24 @@
this (null, null);
}
- public InitialLdapContext (Hashtable environment, Control[] connControls)
+ public InitialLdapContext (Hashtable<?, ?> environment,
+ Control[] connControls)
throws NamingException
{
super (false);
+ Hashtable myenv = null;
if (connControls != null)
{
if (environment == null)
- environment = new Hashtable ();
+ myenv = new Hashtable ();
else
- environment = (Hashtable) environment.clone ();
- environment.put ("java.naming.ldap.control.connect",
+ myenv = (Hashtable) environment.clone ();
+ myenv.put ("java.naming.ldap.control.connect",
connControls);
}
- init (environment);
+ init (myenv);
}
private LdapContext getDefaultInitLdapCtx ()
Index: javax/naming/ldap/LdapReferralException.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/javax/naming/ldap/LdapReferralException.java,v
retrieving revision 1.2.2.2
diff -u -r1.2.2.2 LdapReferralException.java
--- javax/naming/ldap/LdapReferralException.java 2 Aug 2005 20:12:36
-0000 1.2.2.2
+++ javax/naming/ldap/LdapReferralException.java 27 Nov 2005 18:18:07
-0000
@@ -61,8 +61,9 @@
}
public abstract Context getReferralContext() throws NamingException;
- public abstract Context getReferralContext(Hashtable env)
+ public abstract Context getReferralContext(Hashtable<?, ?> env)
throws NamingException;
- public abstract Context getReferralContext(Hashtable env, Control[] reqCtls)
+ public abstract Context getReferralContext(Hashtable<?, ?> env,
+ Control[] reqCtls)
throws NamingException;
}
Index: javax/naming/spi/DirObjectFactory.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/naming/spi/DirObjectFactory.java,v
retrieving revision 1.3.2.2
diff -u -r1.3.2.2 DirObjectFactory.java
--- javax/naming/spi/DirObjectFactory.java 2 Aug 2005 20:12:36 -0000
1.3.2.2
+++ javax/naming/spi/DirObjectFactory.java 27 Nov 2005 18:18:07 -0000
@@ -51,6 +51,6 @@
public interface DirObjectFactory extends ObjectFactory
{
Object getObjectInstance(Object obj, Name name, Context nameCtx,
- Hashtable environment, Attributes attrs)
+ Hashtable<?, ?> environment, Attributes attrs)
throws Exception;
}
Index: javax/naming/spi/DirStateFactory.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/naming/spi/DirStateFactory.java,v
retrieving revision 1.5.2.2
diff -u -r1.5.2.2 DirStateFactory.java
--- javax/naming/spi/DirStateFactory.java 2 Aug 2005 20:12:36 -0000
1.5.2.2
+++ javax/naming/spi/DirStateFactory.java 27 Nov 2005 18:18:07 -0000
@@ -77,7 +77,7 @@
DirStateFactory.Result getStateToBind(Object obj, Name name,
Context nameCtx,
- Hashtable environment,
+ Hashtable<?, ?> environment,
Attributes inAttrs)
throws NamingException;
}
Index: javax/naming/spi/DirectoryManager.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/naming/spi/DirectoryManager.java,v
retrieving revision 1.2.2.3
diff -u -r1.2.2.3 DirectoryManager.java
--- javax/naming/spi/DirectoryManager.java 2 Aug 2005 20:12:36 -0000
1.2.2.3
+++ javax/naming/spi/DirectoryManager.java 27 Nov 2005 18:18:07 -0000
@@ -93,7 +93,7 @@
public static Object getObjectInstance (Object refInfo, Name name,
Context nameCtx,
- Hashtable environment,
+ Hashtable<?, ?> environment,
Attributes attrs)
throws Exception
{
@@ -186,7 +186,7 @@
public static DirStateFactory.Result getStateToBind (Object obj,
Name name,
Context nameCtx,
- Hashtable environment,
+ Hashtable<?, ?>
environment,
Attributes attrs)
throws NamingException
{
Index: javax/naming/spi/InitialContextFactory.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/javax/naming/spi/InitialContextFactory.java,v
retrieving revision 1.2.2.2
diff -u -r1.2.2.2 InitialContextFactory.java
--- javax/naming/spi/InitialContextFactory.java 2 Aug 2005 20:12:36 -0000
1.2.2.2
+++ javax/naming/spi/InitialContextFactory.java 27 Nov 2005 18:18:07 -0000
@@ -45,5 +45,6 @@
public interface InitialContextFactory
{
- Context getInitialContext (Hashtable environment) throws NamingException;
+ Context getInitialContext (Hashtable<?, ?> environment)
+ throws NamingException;
}
Index: javax/naming/spi/InitialContextFactoryBuilder.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/javax/naming/spi/InitialContextFactoryBuilder.java,v
retrieving revision 1.2.2.2
diff -u -r1.2.2.2 InitialContextFactoryBuilder.java
--- javax/naming/spi/InitialContextFactoryBuilder.java 2 Aug 2005 20:12:36
-0000 1.2.2.2
+++ javax/naming/spi/InitialContextFactoryBuilder.java 27 Nov 2005 18:18:07
-0000
@@ -44,6 +44,6 @@
public interface InitialContextFactoryBuilder
{
- InitialContextFactory createInitialContextFactory (Hashtable environment)
+ InitialContextFactory createInitialContextFactory (Hashtable<?, ?>
environment)
throws NamingException;
}
Index: javax/naming/spi/NamingManager.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/naming/spi/NamingManager.java,v
retrieving revision 1.6.2.2
diff -u -r1.6.2.2 NamingManager.java
--- javax/naming/spi/NamingManager.java 2 Aug 2005 20:12:36 -0000 1.6.2.2
+++ javax/naming/spi/NamingManager.java 27 Nov 2005 18:18:07 -0000
@@ -71,7 +71,7 @@
return icfb != null;
}
- public static Context getInitialContext (Hashtable environment)
+ public static Context getInitialContext (Hashtable<?, ?> environment)
throws NamingException
{
InitialContextFactory icf = null;
@@ -117,7 +117,7 @@
Name name,
Context nameCtx,
String scheme,
- Hashtable environment)
+ Hashtable<?, ?> environment)
throws NamingException
{
String prefixes = null;
@@ -184,7 +184,7 @@
}
public static Context getURLContext (String scheme,
- Hashtable environment)
+ Hashtable<?, ?> environment)
throws NamingException
{
return getURLContext (null, null, null, scheme, environment);
@@ -221,7 +221,7 @@
public static Object getObjectInstance (Object refInfo,
Name name,
Context nameCtx,
- Hashtable environment)
+ Hashtable<?, ?> environment)
throws Exception
{
ObjectFactory factory = null;
@@ -353,7 +353,7 @@
}
public static Object getStateToBind (Object obj, Name name,
- Context nameCtx, Hashtable environment)
+ Context nameCtx, Hashtable<?, ?>
environment)
throws NamingException
{
StringTokenizer tokens = getPlusPath (Context.STATE_FACTORIES,
Index: javax/naming/spi/ObjectFactory.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/naming/spi/ObjectFactory.java,v
retrieving revision 1.2.2.2
diff -u -r1.2.2.2 ObjectFactory.java
--- javax/naming/spi/ObjectFactory.java 2 Aug 2005 20:12:36 -0000 1.2.2.2
+++ javax/naming/spi/ObjectFactory.java 27 Nov 2005 18:18:07 -0000
@@ -46,6 +46,6 @@
public interface ObjectFactory
{
Object getObjectInstance (Object obj, Name name, Context nameCtx,
- Hashtable environment)
+ Hashtable<?, ?> environment)
throws Exception;
}
Index: javax/naming/spi/ObjectFactoryBuilder.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/javax/naming/spi/ObjectFactoryBuilder.java,v
retrieving revision 1.3.2.2
diff -u -r1.3.2.2 ObjectFactoryBuilder.java
--- javax/naming/spi/ObjectFactoryBuilder.java 2 Aug 2005 20:12:36 -0000
1.3.2.2
+++ javax/naming/spi/ObjectFactoryBuilder.java 27 Nov 2005 18:18:07 -0000
@@ -49,6 +49,6 @@
public interface ObjectFactoryBuilder
{
ObjectFactory createObjectFactory(Object obj,
- Hashtable environment)
+ Hashtable<?, ?> environment)
throws NamingException;
}
Index: javax/naming/spi/Resolver.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/naming/spi/Resolver.java,v
retrieving revision 1.3.2.2
diff -u -r1.3.2.2 Resolver.java
--- javax/naming/spi/Resolver.java 2 Aug 2005 20:12:36 -0000 1.3.2.2
+++ javax/naming/spi/Resolver.java 27 Nov 2005 18:18:07 -0000
@@ -38,6 +38,7 @@
package javax.naming.spi;
+import javax.naming.Context;
import javax.naming.Name;
import javax.naming.NamingException;
@@ -48,8 +49,10 @@
public interface Resolver
{
- ResolveResult resolveToClass(Name name, Class contextType)
+ ResolveResult resolveToClass(Name name,
+ Class<? extends Context> contextType)
throws NamingException;
- ResolveResult resolveToClass(String name, Class contextType)
+ ResolveResult resolveToClass(String name,
+ Class<? extends Context> contextType)
throws NamingException;
}
Index: javax/naming/spi/StateFactory.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/naming/spi/StateFactory.java,v
retrieving revision 1.3.2.2
diff -u -r1.3.2.2 StateFactory.java
--- javax/naming/spi/StateFactory.java 2 Aug 2005 20:12:36 -0000 1.3.2.2
+++ javax/naming/spi/StateFactory.java 27 Nov 2005 18:18:07 -0000
@@ -51,5 +51,5 @@
public interface StateFactory
{
Object getStateToBind(Object obj, Name name, Context nameCtx,
- Hashtable environment) throws NamingException;
+ Hashtable<?, ?> environment) throws
NamingException;
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [cp-patches] [generics] Patch: FYI: genericize javax.naming,
Tom Tromey <=