cvs commit: jakarta-slide/src/share/org/apache/slide/common Namespace.java

[juergen]

juergen     01/03/28 04:10:31

  Modified:    src/share/org/apache/slide/common Namespace.java
  Log:
  preparation for a store to know its name (e.g. "memory").
  
  Revision  Changes    Path
  1.23      +8 -6      jakarta-slide/src/share/org/apache/slide/common/Namespace.java
  
  Index: Namespace.java
  ===================================================================
  RCS file: /home/cvs/jakarta-slide/src/share/org/apache/slide/common/Namespace.java,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- Namespace.java    2001/02/26 00:57:41     1.22
  +++ Namespace.java    2001/03/28 12:10:31     1.23
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-slide/src/share/org/apache/slide/common/Namespace.java,v 1.22 
2001/02/26 00:57:41 remm Exp $
  - * $Revision: 1.22 $
  - * $Date: 2001/02/26 00:57:41 $
  + * $Header: 
/home/cvs/jakarta-slide/src/share/org/apache/slide/common/Namespace.java,v 1.23 
2001/03/28 12:10:31 juergen Exp $
  + * $Revision: 1.23 $
  + * $Date: 2001/03/28 12:10:31 $
    *
    * ====================================================================
    *
  @@ -93,7 +93,7 @@
    * Namespace class.
    *
    * @author <a href="mailto:[EMAIL PROTECTED]">Remy Maucherat</a>
  - * @version $Revision: 1.22 $
  + * @version $Revision: 1.23 $
    */
   public final class Namespace {
       
  @@ -258,13 +258,14 @@
        * @exception ServiceParameterErrorException Incorrect service parameter
        * @exception ServiceParameterMissingException Service parameter missing
        */
  -    public void registerStore(Class storeClass, Hashtable parameters,
  +    public void registerStore(String storeName, Class storeClass, Hashtable 
parameters,
                                 Scope scope, Hashtable childStores)
           throws ServiceRegistrationFailedException,
           ServiceParameterErrorException, ServiceParameterMissingException {
           if (!stores.containsKey(scope)) {
               try {
                   Store store = (Store) storeClass.newInstance();
  +                //store.setName(storeName);
                   store.setParameters(parameters);
                   stores.put(scope, store);
                   
  @@ -969,7 +970,8 @@
                   (!storesParameters.containsKey(storeName))) {
                   throw new UnknownServiceDeclarationException(storeName);
               }
  -            registerStore((Class) storesClass.get(storeName),
  +            registerStore(storeName,
  +                          (Class) storesClass.get(storeName),
                             (Hashtable) storesParameters.get(storeName),
                             new Scope(match),
                             (Hashtable) childStores.get(storeName));