[jboss-cvs] JBossAS SVN: r79033 - in projects/naming/trunk/jnpserver/src/main/java/org/jnp: server and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: scott.stark at jboss.org
Date: 2008-10-02 11:17:01 -0400 (Thu, 02 Oct 2008)
New Revision: 79033

Modified:
   projects/naming/trunk/jnpserver/src/main/java/org/jnp/interfaces/Naming.java
   projects/naming/trunk/jnpserver/src/main/java/org/jnp/server/NamingServer.java
Log:
Improve Naming interface type safety

Modified: projects/naming/trunk/jnpserver/src/main/java/org/jnp/interfaces/Naming.java
===================================================================
--- projects/naming/trunk/jnpserver/src/main/java/org/jnp/interfaces/Naming.java	2008-10-02 15:14:29 UTC (rev 79032)
+++ projects/naming/trunk/jnpserver/src/main/java/org/jnp/interfaces/Naming.java	2008-10-02 15:17:01 UTC (rev 79033)
@@ -26,14 +26,17 @@
 import java.util.Collection;
 
 
+import javax.naming.Binding;
 import javax.naming.Context;
 import javax.naming.Name;
+import javax.naming.NameClassPair;
 import javax.naming.NamingException;
 
 /**
  *   The naming server/proxy interface
  *      
- *   @see <related>
+ *   @see NamingContext
+ *
  *   @author Scott.Stark at jboss.org
  *   @version $Revision$
  */
@@ -53,10 +56,10 @@
    public Object lookup(Name name)
       throws NamingException, RemoteException;
 
-   public Collection list(Name name)
+   public Collection<NameClassPair> list(Name name)
       throws NamingException, RemoteException;
 
-   public Collection listBindings(Name name)
+   public Collection<Binding> listBindings(Name name)
       throws NamingException, RemoteException;
       
    public Context createSubcontext(Name name)

Modified: projects/naming/trunk/jnpserver/src/main/java/org/jnp/server/NamingServer.java
===================================================================
--- projects/naming/trunk/jnpserver/src/main/java/org/jnp/server/NamingServer.java	2008-10-02 15:14:29 UTC (rev 79032)
+++ projects/naming/trunk/jnpserver/src/main/java/org/jnp/server/NamingServer.java	2008-10-02 15:17:01 UTC (rev 79033)
@@ -26,7 +26,6 @@
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Map;
-import java.util.Vector;
 import java.util.concurrent.ConcurrentHashMap;
 import javax.naming.Binding;
 import javax.naming.CannotProceedException;
@@ -447,7 +446,7 @@
 		return result;
    }
    
-   public Collection list(Name name)
+   public Collection<NameClassPair> list(Name name)
       throws NamingException
    {
       if (name.isEmpty())
@@ -460,10 +459,8 @@
          }
 
          ArrayList<NameClassPair> list = new ArrayList<NameClassPair>();
-         for(Map.Entry<String, Binding> entry : table.entrySet())
+         for(Binding b : table.values())
          {
-            String key = (String)entry.getKey();
-            Binding b = (Binding)entry.getValue();
             NameClassPair ncp = new NameClassPair(b.getName(),b.getClassName(), true);
             list.add(ncp);
          }
@@ -485,18 +482,20 @@
                cpe.setResolvedObj(ctx);
                cpe.setRemainingName(name.getSuffix(1));
                throw cpe;
-            } else
+            }
+            else
             {
                throw new NotContextException();
             }
-         } else
+         }
+         else
          {
             throw new NotContextException();
          }
       } 
    }
     
-   public Collection listBindings(Name name)
+   public Collection<Binding> listBindings(Name name)
       throws NamingException
    {
       if (name.isEmpty())
@@ -508,12 +507,10 @@
             sm.checkPermission(perm);
          }
 
-         Collection bindings = table.values();
-         Collection newBindings = new Vector(bindings.size());
-         Iterator iter = bindings.iterator();
-         while (iter.hasNext())
+         Collection<Binding> bindings = table.values();
+         Collection<Binding> newBindings = new ArrayList<Binding>(bindings.size());
+         for(Binding b : bindings)
          {
-            Binding b = (Binding)iter.next();
             if (b.getObject() instanceof NamingServer)
             {
                Name n = (Name)prefix.clone();
@@ -521,7 +518,8 @@
                newBindings.add(new Binding(b.getName(), 
                                            b.getClassName(),
                                            new NamingContext(null, n, getRoot())));
-            } else
+            }
+            else
             {
                newBindings.add(b);
             }
@@ -714,6 +712,7 @@
    }
 
    // Private -------------------------------------------------------
+
    private Binding setBinding(Name name, Object obj, String className)
    {
       String n = name.toString();