diff options
Diffstat (limited to 'libjava/classpath/javax/naming/directory')
6 files changed, 57 insertions, 30 deletions
diff --git a/libjava/classpath/javax/naming/directory/Attribute.java b/libjava/classpath/javax/naming/directory/Attribute.java index 59bf66dabc8..d29e1eae0b2 100644 --- a/libjava/classpath/javax/naming/directory/Attribute.java +++ b/libjava/classpath/javax/naming/directory/Attribute.java @@ -51,7 +51,7 @@ public interface Attribute extends Cloneable, Serializable { long serialVersionUID = 8707690322213556804L; - NamingEnumeration getAll() throws NamingException; + NamingEnumeration<?> getAll() throws NamingException; Object get() throws NamingException; int size(); String getID(); diff --git a/libjava/classpath/javax/naming/directory/Attributes.java b/libjava/classpath/javax/naming/directory/Attributes.java index 3d5ef9f4fa7..2dc2c610155 100644 --- a/libjava/classpath/javax/naming/directory/Attributes.java +++ b/libjava/classpath/javax/naming/directory/Attributes.java @@ -52,8 +52,8 @@ public interface Attributes extends Cloneable, Serializable 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); diff --git a/libjava/classpath/javax/naming/directory/BasicAttribute.java b/libjava/classpath/javax/naming/directory/BasicAttribute.java index c6419794f10..5a1bb0e881f 100644 --- a/libjava/classpath/javax/naming/directory/BasicAttribute.java +++ b/libjava/classpath/javax/naming/directory/BasicAttribute.java @@ -62,7 +62,7 @@ public class BasicAttribute implements Attribute /** 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 () @@ -182,7 +182,7 @@ public class BasicAttribute implements Attribute return values.get (index); } - public NamingEnumeration getAll () + public NamingEnumeration<?> getAll () throws NamingException { return new BasicAttributeEnumeration (); diff --git a/libjava/classpath/javax/naming/directory/BasicAttributes.java b/libjava/classpath/javax/naming/directory/BasicAttributes.java index 9318fbb2be7..6880f5b3362 100644 --- a/libjava/classpath/javax/naming/directory/BasicAttributes.java +++ b/libjava/classpath/javax/naming/directory/BasicAttributes.java @@ -126,12 +126,12 @@ public class BasicAttributes implements Attributes return null; } - public NamingEnumeration getAll () + public NamingEnumeration<Attribute> getAll () { return new BasicAttributesEnumeration (false); } - public NamingEnumeration getIDs () + public NamingEnumeration<String> getIDs () { return new BasicAttributesEnumeration (true); } diff --git a/libjava/classpath/javax/naming/directory/DirContext.java b/libjava/classpath/javax/naming/directory/DirContext.java index 002cb78a913..d7d94a3456b 100644 --- a/libjava/classpath/javax/naming/directory/DirContext.java +++ b/libjava/classpath/javax/naming/directory/DirContext.java @@ -72,12 +72,32 @@ public interface DirContext extends Context 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; } diff --git a/libjava/classpath/javax/naming/directory/InitialDirContext.java b/libjava/classpath/javax/naming/directory/InitialDirContext.java index c946f416bff..8c7852fbba6 100644 --- a/libjava/classpath/javax/naming/directory/InitialDirContext.java +++ b/libjava/classpath/javax/naming/directory/InitialDirContext.java @@ -66,7 +66,7 @@ public class InitialDirContext extends InitialContext implements DirContext super (lazy); } - public InitialDirContext (Hashtable environment) + public InitialDirContext (Hashtable<?, ?> environment) throws NamingException { super (environment); @@ -205,58 +205,65 @@ public class InitialDirContext extends InitialContext implements DirContext return getURLOrDefaultInitDirCtx (name).getSchemaClassDefinition (name); } - public NamingEnumeration search(Name name, Attributes matchingAttributes, - String[] attributesToReturn) + public NamingEnumeration<SearchResult> search(Name name, + Attributes matchingAttributes, + String[] attributesToReturn) throws NamingException { return getURLOrDefaultInitDirCtx (name).search (name, matchingAttributes, attributesToReturn); } - public NamingEnumeration search(String name, Attributes matchingAttributes, - String[] attributesToReturn) + public NamingEnumeration<SearchResult> search(String name, + Attributes matchingAttributes, + String[] attributesToReturn) throws NamingException { return getURLOrDefaultInitDirCtx (name).search (name, matchingAttributes, attributesToReturn); } - public NamingEnumeration search(Name name, Attributes matchingAttributes) + public NamingEnumeration<SearchResult> search(Name name, + Attributes matchingAttributes) throws NamingException { return getURLOrDefaultInitDirCtx (name).search (name, matchingAttributes); } - public NamingEnumeration search(String name, Attributes matchingAttributes) + public NamingEnumeration<SearchResult> search(String name, + Attributes matchingAttributes) throws NamingException { return getURLOrDefaultInitDirCtx (name).search (name, matchingAttributes); } - public NamingEnumeration search(Name name, String filter, - SearchControls cons) + public NamingEnumeration<SearchResult> search(Name name, String filter, + SearchControls cons) throws NamingException { return getURLOrDefaultInitDirCtx (name).search (name, filter, cons); } - public NamingEnumeration search(String name, String filter, - SearchControls cons) + public NamingEnumeration<SearchResult> search(String name, String filter, + SearchControls cons) throws NamingException { return getURLOrDefaultInitDirCtx (name).search (name, filter, cons); } - public NamingEnumeration search(Name name, String filterExpr, - Object[] filterArgs, SearchControls cons) + public NamingEnumeration<SearchResult> search(Name name, String filterExpr, + Object[] filterArgs, + SearchControls cons) throws NamingException { return getURLOrDefaultInitDirCtx (name).search (name, filterExpr, filterArgs, cons); } - public NamingEnumeration search(String name, String filterExpr, - Object[] filterArgs, SearchControls cons) + public NamingEnumeration<SearchResult> search(String name, + String filterExpr, + Object[] filterArgs, + SearchControls cons) throws NamingException { return getURLOrDefaultInitDirCtx (name).search (name, filterExpr, |
