[Hibernate-commits] Hibernate2/src/net/sf/hibernate/util PropertiesHelper.java,1.3,1.4 StringHelper.java,1.3,1.4

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

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

Modified Files:
	PropertiesHelper.java StringHelper.java 
Log Message:
redesigned id generator package
applied Mark Woon's patch for generated alias lengths
minor refactoring of Transaction package

Index: PropertiesHelper.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/util/PropertiesHelper.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** PropertiesHelper.java	5 Jan 2003 02:11:25 -0000	1.3
--- PropertiesHelper.java	9 Jan 2003 12:24:52 -0000	1.4
***************
*** 19,23 ****
  	}
  	
! 	
  	
  	public static Integer getInteger(String property, Properties properties) {
--- 19,26 ----
  	}
  	
! 	public static String getString(String property, Properties properties, String defaultValue) {
! 		String propValue = properties.getProperty(property);
! 		return (propValue==null) ? defaultValue : propValue;
! 	}
  	
  	public static Integer getInteger(String property, Properties properties) {

Index: StringHelper.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/util/StringHelper.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** StringHelper.java	5 Jan 2003 02:11:25 -0000	1.3
--- StringHelper.java	9 Jan 2003 12:24:52 -0000	1.4
***************
*** 95,107 ****
  	}
  	
! 	public static String suffix(String table, String suffix) {
! 		if (suffix==null) return table;
! 		char quote = table.charAt(0);
! 		if ( Dialect.QUOTE.indexOf(quote) > -1 ) {
! 			return table.substring( 0, table.length()-1 ) + suffix + quote;
  		}
  		else {
! 			return table + suffix;
  		}
  	}
  	
--- 95,130 ----
  	}
  	
! 	public static String suffix(String name, String suffix) {
! 
! 		if (suffix==null) {
! 			/*if (name.length() > 20) {
! 				return name.substring(name.length()-20);
! 			}
! 			else {*/
! 				return name;
! 			//}
! 		}
! 
! 		char quote = name.charAt(0);
! 		boolean nameEscaped = Dialect.QUOTE.indexOf(quote) > -1;
! 		StringBuffer nameBuffer = new StringBuffer(30);
! 
! 		if (nameEscaped) {
! 			nameBuffer.append( name.substring(1, name.length()-1) ).append(suffix);
  		}
  		else {
! 			nameBuffer.append(name).append(suffix);
  		}
+ 
+ 		if (nameBuffer.length() > 15) {
+ 			nameBuffer.delete(0, nameBuffer.length()-15);
+ 			if ( !Character.isLetter( nameBuffer.charAt(0) ) ) nameBuffer.setCharAt(0, 'x');
+ 		}
+ 
+ 		if (nameEscaped) {
+ 			nameBuffer.insert(0, quote);
+ 			nameBuffer.append(quote);
+ 		}
+ 		return nameBuffer.toString();
  	}