[jboss-cvs] jboss-seam/src/main/org/jboss/seam ...

[Gavin King]

  User: gavin   
  Date: 07/07/16 08:57:59

  Modified:    src/main/org/jboss/seam  Namespace.java
  Log:
  JBSEAM-1490 Namespace no longer a Map
  
  Revision  Changes    Path
  1.3       +13 -68    jboss-seam/src/main/org/jboss/seam/Namespace.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Namespace.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/Namespace.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  --- Namespace.java	22 Jun 2007 09:18:38 -0000	1.2
  +++ Namespace.java	16 Jul 2007 12:57:59 -0000	1.3
  @@ -1,10 +1,7 @@
   package org.jboss.seam;
   
  -import java.util.AbstractMap;
  -import java.util.Collection;
   import java.util.HashMap;
   import java.util.Map;
  -import java.util.Set;
   
   /**
    * A namespace for Seam component names. 
  @@ -12,37 +9,21 @@
    * @author Gavin King
    *
    */
  -public class Namespace extends AbstractMap<String, Object>
  +public class Namespace
   {
      
  -   public Namespace(String name) 
  -   {
  -      this.name = name;
  -   }
  -   
      private String name;
      private Map<String, Namespace> children = new HashMap<String, Namespace>();
   
  -   @Override
  -   public Set entrySet()
  -   {
  -      throw new UnsupportedOperationException();
  -   }
  -   
  -   @Override
  -   public Set<String> keySet()
  -   {
  -      throw new UnsupportedOperationException();
  -   }
  -   
  -   @Override
  -   public int size()
  +   public Namespace(String name) 
      {
  -      throw new UnsupportedOperationException();
  +      this.name = name;
      }
      
  -   @Override
  -   public Object get(Object key)
  +   /**
  +    * Get a component or child namespace
  +    */
  +   public Object get(String key)
      {
         String qualifiedName = name==null ? key.toString() : name + key.toString();
         Object component = Component.getInstance(qualifiedName, true);
  @@ -59,54 +40,12 @@
         return children.containsKey(key);
      }
      
  -   @Override
  -   public boolean containsKey(Object key)
  -   {
  -      return get(key)!=null;
  -   }
  -   
  -   @Override
  -   public boolean containsValue(Object value)
  -   {
  -      throw new UnsupportedOperationException();
  -   }
  -   
  -   @Override
  -   public void clear()
  -   {
  -      throw new UnsupportedOperationException();
  -   }
  -   
  -   @Override
  -   public Object remove(Object key)
  -   {
  -      throw new UnsupportedOperationException();
  -   }
  -   
  -   @Override
  -   public Collection<Object> values()
  -   {
  -      throw new UnsupportedOperationException();
  -   }
  -   
  -   @Override
  -   public void putAll(Map<? extends String, ? extends Object> t)
  -   {
  -      throw new UnsupportedOperationException();
  -   }
  -
      public void addChild(String name, Namespace value)
      {
         children.put(name, value);
      }
   
      @Override
  -   public Object put(String name, Object value)
  -   {
  -      throw new UnsupportedOperationException();
  -   }
  -   
  -   @Override
      public int hashCode()
      {
         return name==null ? 0 : name.hashCode();
  @@ -127,4 +66,10 @@
         }
      }
   
  +   @Override
  +   public String toString()
  +   {
  +      return "Namespace(" + ( name==null ? "Root" : name ) + ')';
  +   }
  +
   }