[jboss-cvs] JBossCache/src/org/jboss/cache/loader ...

[Manik Surtani]

  User: msurtani
  Date: 07/06/29 13:40:49

  Modified:    src/org/jboss/cache/loader   CacheLoader.java
                        ChainingCacheLoader.java
  Log:
  JBCACHE-1116 and JBCACHE-1117
  
  Revision  Changes    Path
  1.19      +6 -2      JBossCache/src/org/jboss/cache/loader/CacheLoader.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: CacheLoader.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/loader/CacheLoader.java,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -b -r1.18 -r1.19
  --- CacheLoader.java	18 Jun 2007 21:42:20 -0000	1.18
  +++ CacheLoader.java	29 Jun 2007 17:40:49 -0000	1.19
  @@ -79,17 +79,21 @@
   
   
      /**
  -    * Returns a set of children node names as Strings.
  +    * Returns a set of children node names.
       * All names are <em>relative</em> to this parent {@link Fqn}.
       * Returns null if the named node is not found or there are no children.
       * The returned set must not be modifiable.  Implementors can use
       * {@link java.util.Collections#unmodifiableSet(java.util.Set)} to make the set unmodifiable.
  +    * <p/>
  +    * Implementors may impose restrictions on the contents of an Fqn (such as Strings-only) and as such, indirectly
  +    * impose the same restriction on the contents of a Set returned by getChildrenNames().
  +    * <p/>
       *
       * @param fqn The {@link Fqn} of the parent
       * @return Set a set of children.  Returns null if no children nodes are
       *         present, or the parent is not present
       */
  -   Set<String> getChildrenNames(Fqn fqn) throws Exception;
  +   Set<?> getChildrenNames(Fqn fqn) throws Exception;
   
      /**
       * Returns all keys and values from the persistent store, given a {@link org.jboss.cache.Fqn}
  
  
  
  1.16      +3 -3      JBossCache/src/org/jboss/cache/loader/ChainingCacheLoader.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ChainingCacheLoader.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/loader/ChainingCacheLoader.java,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -b -r1.15 -r1.16
  --- ChainingCacheLoader.java	11 Jun 2007 12:58:16 -0000	1.15
  +++ ChainingCacheLoader.java	29 Jun 2007 17:40:49 -0000	1.16
  @@ -56,12 +56,12 @@
       * The returned set must not be modified, e.g. use Collections.unmodifiableSet(s) to return the result
       *
       * @param fqn The FQN of the parent
  -    * @return Set<String>. A list of children. Returns null if no children nodes are present, or the parent is
  +    * @return Set<?>. A list of children. Returns null if no children nodes are present, or the parent is
       *         not present
       */
  -   public Set<String> getChildrenNames(Fqn fqn) throws Exception
  +   public Set<?> getChildrenNames(Fqn fqn) throws Exception
      {
  -      Set<String> answer = null;
  +      Set<?> answer = null;
         for (CacheLoader l : cacheLoaders)
         {
            answer = l.getChildrenNames(fqn);