[Hibernate-commits] Hibernate/cirrus/hibernate/impl SessionImpl.java,1.155,1.156

[<one...@us...>]

Update of /cvsroot/hibernate/Hibernate/cirrus/hibernate/impl
In directory sc8-pr-cvs1:/tmp/cvs-serv19832/hibernate/impl

Modified Files:
	SessionImpl.java 
Log Message:
more work on infoString() stuff
integrated setter location patch by Alex Staubo
integrated composite-element codegen patch by Wolfgang Jung

Index: SessionImpl.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate/cirrus/hibernate/impl/SessionImpl.java,v
retrieving revision 1.155
retrieving revision 1.156
diff -C2 -d -r1.155 -r1.156
*** SessionImpl.java	6 Dec 2002 12:22:20 -0000	1.155
--- SessionImpl.java	7 Dec 2002 08:10:23 -0000	1.156
***************
*** 241,245 ****
  
   			if ( log.isDebugEnabled() && dirty && loadedPersister!=null ) log.debug(
!  				"Collection dirty: " + loadedPersister.getRole() + '#' + loadedID
   			);
  
--- 241,245 ----
  
   			if ( log.isDebugEnabled() && dirty && loadedPersister!=null ) log.debug(
!  				"Collection dirty: " + infoString(loadedPersister, loadedID)
   			);
  
***************
*** 2035,2043 ****
  		if ( log.isDebugEnabled() ) {
  			log.debug(
! 				"Collection found: " + persister.getRole() + '#' + ce.currentID + ", was: " + (
! 					(ce.loadedPersister==null) ?
! 					"unreferenced" :
! 					ce.loadedPersister.getRole() + "#" + ce.loadedID
! 				)
  			);
  		}
--- 2035,2040 ----
  		if ( log.isDebugEnabled() ) {
  			log.debug(
! 				"Collection found: " + infoString(persister, ce.currentID) + 
! 				", was: " + infoString(ce.loadedPersister, ce.loadedID)
  			);
  		}
***************
*** 2151,2155 ****
  		CollectionEntry entry = getCollectionEntry(coll);
  		if ( log.isDebugEnabled() && entry.loadedPersister!=null ) log.debug(
! 			"Collection dereferenced: " + entry.loadedPersister.getRole() + '#' + entry.loadedID
  		);
  		entry.currentPersister=null;
--- 2148,2152 ----
  		CollectionEntry entry = getCollectionEntry(coll);
  		if ( log.isDebugEnabled() && entry.loadedPersister!=null ) log.debug(
! 			"Collection dereferenced: " + infoString(entry.loadedPersister, entry.loadedID)
  		);
  		entry.currentPersister=null;
***************
*** 2340,2344 ****
  			//if (closed) throw new LazyInitializationException( "Hibernate failed trying to load a collection - the session is closed" );
  
! 			if ( log.isTraceEnabled() ) log.trace( "initializing collection " + ce.loadedPersister.getRole() + '#' + ce.loadedID );
  
  			CollectionPersister p = ce.loadedPersister;
--- 2337,2341 ----
  			//if (closed) throw new LazyInitializationException( "Hibernate failed trying to load a collection - the session is closed" );
  
! 			if ( log.isTraceEnabled() ) log.trace( "initializing collection " + infoString(ce.loadedPersister, ce.loadedID) );
  
  			CollectionPersister p = ce.loadedPersister;
***************
*** 2574,2595 ****
       * @return String on the form [FooBar#id]
       */
!     private String infoString(ClassPersister persister, Serializable id) {
          StringBuffer s = new StringBuffer();
!         s.append("[");
          if(persister==null) {
!            s.append("<ClassPersister is null>");
          } 
          else {
            s.append(persister.getClassName());
          }
!         s.append("#");
  
          if (id==null) {
!                s.append("native");
          } 
          else {
              s.append(id);
          }
!         s.append("]");
  
          return s.toString();
--- 2571,2592 ----
       * @return String on the form [FooBar#id]
       */
!     private static String infoString(ClassPersister persister, Serializable id) {
          StringBuffer s = new StringBuffer();
!         s.append('[');
          if(persister==null) {
!            s.append("<null ClassPersister>");
          } 
          else {
            s.append(persister.getClassName());
          }
!         s.append('#');
  
          if (id==null) {
!                s.append("<null>");
          } 
          else {
              s.append(id);
          }
!         s.append(']');
  
          return s.toString();
***************
*** 2597,2634 ****
      }
      
!     private String infoString(Class clazz, Serializable id) {
          StringBuffer s = new StringBuffer();
!         s.append("[");
          if(clazz==null) {
!            s.append("<Class is null>");
          } 
          else {
!           s.append(clazz.getName());
          }
!         s.append("#");
  
          if (id==null) {
!                s.append("native");
          } 
          else {
              s.append(id);
          }
!         s.append("]");
  
          return s.toString();
      }
  
! 	private String infoString(ClassPersister persister) {
  		StringBuffer s = new StringBuffer();
! 		s.append("[");
  		if (persister == null) {
! 			s.append("<ClassPersister is null>");
  		} 
  		else {
! 			s.append(persister.getClassName());
  		}
! 		s.append("]");
  		return s.toString();
  	}
  
  }
--- 2594,2654 ----
      }
      
!     private static String infoString(Class clazz, Serializable id) {
          StringBuffer s = new StringBuffer();
!         s.append('[');
          if(clazz==null) {
!             s.append("<null Class>");
          } 
          else {
!             s.append( clazz.getName() );
          }
!         s.append('#');
  
          if (id==null) {
!             s.append("<null>");
          } 
          else {
              s.append(id);
          }
!         s.append(']');
  
          return s.toString();
      }
  
! 	private static String infoString(ClassPersister persister) {
  		StringBuffer s = new StringBuffer();
! 		s.append('[');
  		if (persister == null) {
! 			s.append("<null ClassPersister>");
  		} 
  		else {
! 			s.append( persister.getClassName() );
  		}
! 		s.append(']');
  		return s.toString();
  	}
+ 
+     private static String infoString(CollectionPersister persister, Serializable id) {
+         StringBuffer s = new StringBuffer();
+         s.append('[');
+         if(persister==null) {
+            s.append("<unreferenced>");
+         } 
+         else {
+ 	        s.append( persister.getRole() );
+ 	        s.append('#');
+ 	
+ 	        if (id==null) {
+ 	            s.append("<null>");
+ 	        } 
+ 	        else {
+ 	            s.append(id);
+ 	        }
+         }
+         s.append(']');
+ 
+         return s.toString();
+ 
+     }
  
  }