[Hibernate-commits] Hibernate Code SVN: r9885 - in trunk/Hibernate3/src/org/hibernate/bytecode: . cglib javassist

[<hib...@li...>]

Author: ste...@jb...
Date: 2006-05-04 20:45:49 -0400 (Thu, 04 May 2006)
New Revision: 9885

Modified:
   trunk/Hibernate3/src/org/hibernate/bytecode/AbstractClassTransformerImpl.java
   trunk/Hibernate3/src/org/hibernate/bytecode/ClassTransformer.java
   trunk/Hibernate3/src/org/hibernate/bytecode/cglib/CglibClassTransformer.java
   trunk/Hibernate3/src/org/hibernate/bytecode/javassist/JavassistClassTransformer.java
Log:
minor clean ups

Modified: trunk/Hibernate3/src/org/hibernate/bytecode/AbstractClassTransformerImpl.java
===================================================================
--- trunk/Hibernate3/src/org/hibernate/bytecode/AbstractClassTransformerImpl.java	2006-05-04 22:39:06 UTC (rev 9884)
+++ trunk/Hibernate3/src/org/hibernate/bytecode/AbstractClassTransformerImpl.java	2006-05-05 00:45:49 UTC (rev 9885)
@@ -10,7 +10,7 @@
  */
 public abstract class AbstractClassTransformerImpl implements ClassTransformer {
 
-	final private Set<String> entities;
+	final private Set entities;
 	final private String[] packages;
 
 
@@ -20,20 +20,21 @@
 			this.entities = null;
 		}
 		else {
-			this.entities = new HashSet<String>();
-			for ( String clazz : classes ) {
-				entities.add( clazz );
+			this.entities = new HashSet();
+			for ( int i = 0; i < classes.length; i++ ) {
+				entities.add( classes[i] );
 			}
 		}
 	}
 
-	public byte[]
-			transform(
-			ClassLoader loader, String className, Class<?> classBeingRedefined,
-			ProtectionDomain protectionDomain, byte[] classfileBuffer
-	) {
+	public byte[] transform(
+			ClassLoader loader,
+			String className,
+			Class classBeingRedefined,
+			ProtectionDomain protectionDomain,
+			byte[] classfileBuffer) {
 		boolean enhance = false;
-		String safeClassName = className.replace( "/", "." );
+		String safeClassName = className.replace( '/', '.' );
 		if ( entities == null && packages == null ) {
 			enhance = true;
 		}
@@ -41,8 +42,8 @@
 			enhance = true;
 		}
 		if ( ! enhance && packages != null ) {
-			for ( String packageName : packages ) {
-				if ( safeClassName.startsWith( packageName ) ) {
+			for ( int i = 0; i < packages.length; i++ ) {
+				if ( safeClassName.startsWith( packages[i] ) ) {
 					enhance = true;
 					break;
 				}
@@ -54,7 +55,9 @@
 	}
 
 	protected abstract byte[] doTransform(
-			ClassLoader loader, String className, Class<?> classBeingRedefined,
-			ProtectionDomain protectionDomain, byte[] classfileBuffer
-	);
+			ClassLoader loader,
+			String className,
+			Class classBeingRedefined,
+			ProtectionDomain protectionDomain,
+			byte[] classfileBuffer);
 }

Modified: trunk/Hibernate3/src/org/hibernate/bytecode/ClassTransformer.java
===================================================================
--- trunk/Hibernate3/src/org/hibernate/bytecode/ClassTransformer.java	2006-05-04 22:39:06 UTC (rev 9884)
+++ trunk/Hibernate3/src/org/hibernate/bytecode/ClassTransformer.java	2006-05-05 00:45:49 UTC (rev 9885)
@@ -26,9 +26,9 @@
 	* @param classfileBuffer The input byte buffer in class file format
 	* @return A well-formed class file that can be loaded
 	*/
-   byte[] transform(ClassLoader loader,
+   public byte[] transform(ClassLoader loader,
 					String classname,
-					Class<?> classBeingRedefined,
+					Class classBeingRedefined,
 					ProtectionDomain protectionDomain,
 					byte[] classfileBuffer);
 }

Modified: trunk/Hibernate3/src/org/hibernate/bytecode/cglib/CglibClassTransformer.java
===================================================================
--- trunk/Hibernate3/src/org/hibernate/bytecode/cglib/CglibClassTransformer.java	2006-05-04 22:39:06 UTC (rev 9884)
+++ trunk/Hibernate3/src/org/hibernate/bytecode/cglib/CglibClassTransformer.java	2006-05-05 00:45:49 UTC (rev 9885)
@@ -40,9 +40,11 @@
 	}
 
 	protected byte[] doTransform(
-			ClassLoader loader, String className, Class<?> classBeingRedefined, ProtectionDomain protectionDomain,
-			byte[] classfileBuffer
-	) {
+			ClassLoader loader,
+			String className,
+			Class classBeingRedefined,
+			ProtectionDomain protectionDomain,
+			byte[] classfileBuffer) {
 		ClassReader reader;
 		try {
 			reader = new ClassReader( new ByteArrayInputStream( classfileBuffer ) );
@@ -52,9 +54,9 @@
 			throw new HibernateException( "Unable to read class: " + e.getMessage() );
 		}
 
-		String name[] = ClassNameReader.getClassInfo( reader );
+		String[] names = ClassNameReader.getClassInfo( reader );
 		ClassWriter w = new DebuggingClassWriter( true );
-		ClassTransformer t = getClassTransformer( name );
+		ClassTransformer t = getClassTransformer( names );
 		if ( t != null ) {
 			if ( log.isDebugEnabled() ) {
 				log.debug( "Enhancing " + className );
@@ -64,10 +66,7 @@
 			try {
 				reader = new ClassReader( new ByteArrayInputStream( classfileBuffer ) );
 				new TransformingClassGenerator(
-						new ClassReaderGenerator(
-								reader,
-								attributes(), skipDebug()
-						), t
+						new ClassReaderGenerator( reader, attributes(), skipDebug() ), t
 				).generateClass( w );
 				out = new ByteArrayOutputStream();
 				out.write( w.toByteArray() );
@@ -93,7 +92,6 @@
 	}
 
 	private ClassTransformer getClassTransformer(String[] classInfo) {
-
 		if ( Arrays.asList( classInfo ).contains( InterceptFieldEnabled.class.getName() ) ) {
 			return null;
 		}
@@ -110,6 +108,5 @@
 					}
 			);
 		}
-
 	}
 }

Modified: trunk/Hibernate3/src/org/hibernate/bytecode/javassist/JavassistClassTransformer.java
===================================================================
--- trunk/Hibernate3/src/org/hibernate/bytecode/javassist/JavassistClassTransformer.java	2006-05-04 22:39:06 UTC (rev 9884)
+++ trunk/Hibernate3/src/org/hibernate/bytecode/javassist/JavassistClassTransformer.java	2006-05-05 00:45:49 UTC (rev 9885)
@@ -32,10 +32,12 @@
 	}
 
 	protected byte[] doTransform(
-			ClassLoader loader, String className, Class<?> classBeingRedefined,
-			ProtectionDomain protectionDomain, byte[] classfileBuffer
-	) {
-		ClassFile classfile = null;
+			ClassLoader loader,
+			String className,
+			Class classBeingRedefined,
+			ProtectionDomain protectionDomain,
+			byte[] classfileBuffer) {
+		ClassFile classfile;
 		try {
 			// WARNING: classfile only
 			classfile = new ClassFile( new DataInputStream( new ByteArrayInputStream( classfileBuffer ) ) );