You are viewing a plain text version of this content. The canonical link for it is here.
Posted to ojb-dev@db.apache.org by ar...@apache.org on 2002/11/28 23:14:36 UTC

cvs commit: jakarta-ojb/src/java/org/apache/ojb/broker PersistenceBrokerFactory.java

arminw      2002/11/28 14:14:36

  Modified:    src/java/org/apache/ojb/broker PersistenceBrokerFactory.java
  Log:
  add method setDefaultPersistenceBroker
  
  Revision  Changes    Path
  1.14      +14 -10    jakarta-ojb/src/java/org/apache/ojb/broker/PersistenceBrokerFactory.java
  
  Index: PersistenceBrokerFactory.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ojb/src/java/org/apache/ojb/broker/PersistenceBrokerFactory.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- PersistenceBrokerFactory.java	23 Nov 2002 10:25:00 -0000	1.13
  +++ PersistenceBrokerFactory.java	28 Nov 2002 22:14:36 -0000	1.14
  @@ -60,7 +60,6 @@
   /**
    * Factory class that produces PersistenceBroker instances.
    *
  - *
    * @author Thomas Mahler
    * @version $Id$
    */
  @@ -78,13 +77,21 @@
       }
   
       /**
  +     * Set the default PersistenceBroker used within OJB
  +     * to find OJB internal tables.
  +     */
  +    public void setDefaultPersistenceBroker(PBKey key)
  +    {
  +        PersistenceBrokerFactoryFactory.instance().setDefaultPersistenceBroker(key);
  +    }
  +
  +    /**
        * Return a default broker instance, specified in configuration.
        */
       public static PersistenceBroker defaultPersistenceBroker() throws PBFactoryException
       {
  -        PersistenceBroker broker = PersistenceBrokerFactoryFactory.instance().
  +        return PersistenceBrokerFactoryFactory.instance().
                   defaultPersistenceBroker();
  -        return broker;
       }
   
       /**
  @@ -93,9 +100,8 @@
       public static PersistenceBroker defaultPersistenceBroker(String user, String password)
               throws PBFactoryException
       {
  -        PersistenceBroker broker = PersistenceBrokerFactoryFactory.instance().
  +        return PersistenceBrokerFactoryFactory.instance().
                   defaultPersistenceBroker(user, password);
  -        return broker;
       }
   
       /**
  @@ -108,9 +114,8 @@
                                                               String user, String password)
               throws PBFactoryException
       {
  -        PersistenceBroker broker = PersistenceBrokerFactoryFactory.instance().
  +        return PersistenceBrokerFactoryFactory.instance().
                   createPersistenceBroker(repositoryFile, user, password);
  -        return broker;
       }
   
       /**
  @@ -121,8 +126,7 @@
       public static PersistenceBroker createPersistenceBroker(PBKey key)
               throws PBFactoryException
       {
  -        PersistenceBroker broker = PersistenceBrokerFactoryFactory.instance().createPersistenceBroker(key);
  -        return broker;
  +        return PersistenceBrokerFactoryFactory.instance().createPersistenceBroker(key);
       }
   
       /**