[Hibernate-commits] Hibernate2/src/net/sf/hibernate/impl MessageHelper.java,NONE,1.1 FilterImpl.java,1.6,1.7 SessionImpl.java,1.36,1.37

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

Update of /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/impl
In directory sc8-pr-cvs1:/tmp/cvs-serv6798/hibernate/impl

Modified Files:
	FilterImpl.java SessionImpl.java 
Added Files:
	MessageHelper.java 
Log Message:
* renamed remove() to evict()
* added lots of JavaDoc to SessionImpl
* factored infoString() methods out of SessionImpl

--- NEW FILE: MessageHelper.java ---
//$Id: MessageHelper.java,v 1.1 2003/04/21 06:28:18 oneovthafew Exp $
package net.sf.hibernate.impl;

import java.io.Serializable;

import net.sf.hibernate.collection.CollectionPersister;
import net.sf.hibernate.persister.ClassPersister;

/**
 * helper methods for rendering log messages and exception
 * messages
 */
public final class MessageHelper {

	public 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();
	}

	/**
	 * Generate small message that can be used in traces and exception
	 * messages.
	 * @param persister The persister for the class in question
	 * @param id The id
	 * @return String on the form [FooBar#id]
	 */
	public 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();
		
	}

	public 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();
	}

	public 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();
		
	}
}

Index: FilterImpl.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/impl/FilterImpl.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** FilterImpl.java	8 Apr 2003 09:49:29 -0000	1.6
--- FilterImpl.java	21 Apr 2003 06:28:18 -0000	1.7
***************
*** 1,2 ****
--- 1,3 ----
+ //$Id$
  package net.sf.hibernate.impl;
  

Index: SessionImpl.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/impl/SessionImpl.java,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** SessionImpl.java	19 Apr 2003 03:26:07 -0000	1.36
--- SessionImpl.java	21 Apr 2003 06:28:18 -0000	1.37
***************
*** 144,148 ****
  	
  	private transient Batcher batcher;
! 
  	static final class Status implements Serializable {
  		private String name;
--- 144,154 ----
  	
  	private transient Batcher batcher;
! 	
! 	/**
[...1064 lines suppressed...]
  					actype.getPropertyValues( values[i], this ), 
  					actype.getSubtypes() 
--- 3071,3075 ----
  			else if ( types[i].isComponentType() ) {
  				AbstractComponentType actype = (AbstractComponentType) types[i];
! 				evictCollections( 
  					actype.getPropertyValues( values[i], this ), 
  					actype.getSubtypes() 
***************
*** 3058,3066 ****
  
  }
- 
- 
- 
- 
- 
- 
- 
--- 3080,3081 ----