db-ojb-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From arm...@apache.org
Subject cvs commit: jakarta-ojb/src/java/org/apache/ojb/odmg DatabaseImpl.java
Date Thu, 09 Jan 2003 17:14:41 GMT
arminw      2003/01/09 09:14:40

  Modified:    src/java/org/apache/ojb/odmg/collections DListImpl.java
                        DSetImpl.java
               src/java/org/apache/ojb/odmg DatabaseImpl.java
  Log:
  - rename DescriptorRepository#getExtentClass
  to #getTopLevelClass, deprecate PB#getExtentClass
  and add PB#getTopLevelClass
  
  Revision  Changes    Path
  1.14      +1 -1      jakarta-ojb/src/java/org/apache/ojb/odmg/collections/DListImpl.java
  
  Index: DListImpl.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ojb/src/java/org/apache/ojb/odmg/collections/DListImpl.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- DListImpl.java	24 Dec 2002 13:32:45 -0000	1.13
  +++ DListImpl.java	9 Jan 2003 17:14:40 -0000	1.14
  @@ -427,7 +427,7 @@
           // we ll have to compute the most general extent class here !!!
           DListEntry entry = (DListEntry) elements.get(0);
           Class elementsClass = entry.getRealSubject().getClass();
  -        Class extentClass = brokerForClass.getExtentClass(elementsClass);
  +        Class extentClass = brokerForClass.getTopLevelClass(elementsClass);
           return extentClass;
       }
   
  
  
  
  1.13      +1 -1      jakarta-ojb/src/java/org/apache/ojb/odmg/collections/DSetImpl.java
  
  Index: DSetImpl.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ojb/src/java/org/apache/ojb/odmg/collections/DSetImpl.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- DSetImpl.java	24 Dec 2002 13:32:45 -0000	1.12
  +++ DSetImpl.java	9 Jan 2003 17:14:40 -0000	1.13
  @@ -384,7 +384,7 @@
           // we ll have to compute the most general extent class here !!!
           DListEntry entry = (DListEntry) elements.get(0);
           Class elementsClass = entry.getRealSubject().getClass();
  -        Class extentClass = broker.getExtentClass(elementsClass);
  +        Class extentClass = broker.getTopLevelClass(elementsClass);
           return extentClass;
       }
   
  
  
  
  1.20      +4 -4      jakarta-ojb/src/java/org/apache/ojb/odmg/DatabaseImpl.java
  
  Index: DatabaseImpl.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ojb/src/java/org/apache/ojb/odmg/DatabaseImpl.java,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- DatabaseImpl.java	28 Nov 2002 17:14:18 -0000	1.19
  +++ DatabaseImpl.java	9 Jan 2003 17:14:40 -0000	1.20
  @@ -152,7 +152,7 @@
           {
               if (name == null)
               {
  -                if (log.isDebugEnabled()) log.debug("name was null, open default database");
  +                log.info("Given argument was 'null', open default database");
                   broker = PersistenceBrokerFactory.defaultPersistenceBroker();
               }
               else
  @@ -170,7 +170,7 @@
           {
               log.error("Open database failed: " + ex.getMessage(), ex);
               throw new DatabaseNotFoundException(
  -                    "OJB can't open repository " + name + "\n" + ex.getMessage());
  +                    "OJB can't open database " + name + "\n" + ex.getMessage());
           }
           finally
           {
  @@ -251,7 +251,7 @@
               throw new TransactionNotInProgressException("Tx is not open. Must have an open
TX to call bind.");
           }
   
  -        Identity identity = new Identity(object);
  +        Identity identity = new Identity(object, tx.getBroker());
           // mark object as persistent first
           this.makePersistent(object);
           nrm.put(name, identity);
  
  
  

Mime
View raw message