[hibernate-commits] Hibernate SVN: r10256 - trunk/HibernateExt/tools/src/java/org/hibernate/tool/hbm2x/visitor

[hibernate-commits at lists.jboss.org]

Author: max.andersen at jboss.com
Date: 2006-08-14 10:28:25 -0400 (Mon, 14 Aug 2006)
New Revision: 10256

Added:
   trunk/HibernateExt/tools/src/java/org/hibernate/tool/hbm2x/visitor/EntityNameFromValueVisitor.java
   trunk/HibernateExt/tools/src/java/org/hibernate/tool/hbm2x/visitor/JavaTypeFromValueVisitor.java
Log:
missing added files for:

detect many-to-many and optimstic lock setting exposed on ant task.

mix fixes/cleanup

Added: trunk/HibernateExt/tools/src/java/org/hibernate/tool/hbm2x/visitor/EntityNameFromValueVisitor.java
===================================================================
--- trunk/HibernateExt/tools/src/java/org/hibernate/tool/hbm2x/visitor/EntityNameFromValueVisitor.java	2006-08-14 14:26:14 UTC (rev 10255)
+++ trunk/HibernateExt/tools/src/java/org/hibernate/tool/hbm2x/visitor/EntityNameFromValueVisitor.java	2006-08-14 14:28:25 UTC (rev 10256)
@@ -0,0 +1,30 @@
+package org.hibernate.tool.hbm2x.visitor;
+
+import org.hibernate.mapping.ManyToOne;
+import org.hibernate.mapping.OneToMany;
+import org.hibernate.mapping.OneToOne;
+import org.hibernate.mapping.ToOne;
+
+public class EntityNameFromValueVisitor extends DefaultValueVisitor {
+
+	public EntityNameFromValueVisitor() {
+		super( true );
+	}
+		
+	public Object accept(OneToOne o) {
+		return acceptToOne(o);
+	}
+	
+	public Object accept(ManyToOne o) {
+		return acceptToOne(o);
+	}
+	
+	private Object acceptToOne(ToOne value) {
+		return value.getReferencedEntityName(); // should get the cfg and lookup the persistenclass.			
+	}
+	
+	public Object accept(OneToMany value) {
+		return value.getAssociatedClass().getEntityName();
+	}
+		
+}

Added: trunk/HibernateExt/tools/src/java/org/hibernate/tool/hbm2x/visitor/JavaTypeFromValueVisitor.java
===================================================================
--- trunk/HibernateExt/tools/src/java/org/hibernate/tool/hbm2x/visitor/JavaTypeFromValueVisitor.java	2006-08-14 14:26:14 UTC (rev 10255)
+++ trunk/HibernateExt/tools/src/java/org/hibernate/tool/hbm2x/visitor/JavaTypeFromValueVisitor.java	2006-08-14 14:28:25 UTC (rev 10256)
@@ -0,0 +1,84 @@
+package org.hibernate.tool.hbm2x.visitor;
+
+import org.hibernate.HibernateException;
+import org.hibernate.mapping.Component;
+import org.hibernate.mapping.ManyToOne;
+import org.hibernate.mapping.OneToMany;
+import org.hibernate.mapping.OneToOne;
+import org.hibernate.mapping.SimpleValue;
+import org.hibernate.mapping.ToOne;
+import org.hibernate.mapping.Value;
+import org.hibernate.tool.hbm2x.Cfg2JavaTool;
+import org.hibernate.type.CompositeCustomType;
+import org.hibernate.type.CustomType;
+import org.hibernate.type.Type;
+
+public class JavaTypeFromValueVisitor extends DefaultValueVisitor {
+
+	
+	private boolean preferRawTypeNames = true;
+
+	public JavaTypeFromValueVisitor() {
+		super( true );
+	}
+	
+	public Object accept(Component value) {
+		// composite-element breaks without it.
+		return value.getComponentClassName();
+	}
+		
+	public Object accept(OneToOne o) {
+		return acceptToOne(o);
+	}
+	
+	public Object accept(ManyToOne o) {
+		return acceptToOne(o);
+	}
+	
+	private Object acceptToOne(ToOne value) {
+		return value.getReferencedEntityName(); // should get the cfg and lookup the persistenclass.			
+	}
+	
+	public Object accept(OneToMany value) {
+		return value.getAssociatedClass().getClassName();
+	}
+	
+	private String toName(Class c) {
+
+		if ( c.isArray() ) {
+			Class a = c.getComponentType();
+			
+			return a.getName() + "[]";
+		}
+		else {
+			return c.getName();
+		}
+	}
+
+	protected Object handle(Object o) {
+		Value value = (Value) o;
+		try {
+			// have to attempt calling gettype to decide if its custom type.
+			Type type = value.getType();
+			if(type instanceof CustomType || type instanceof CompositeCustomType) {
+				return toName( type.getReturnedClass() );
+			}
+		} catch(HibernateException he) {
+			// ignore
+		}
+
+		if ( preferRawTypeNames && value.isSimpleValue() ) {
+			// this logic make us use the raw typename if it is something else than an Hibernate type. So, if user wrote long we will use long...if he meant to have a Long then he should use the java.lang.Long version.
+			String typename = ( (SimpleValue) value ).getTypeName();
+			if ( !Cfg2JavaTool.isNonPrimitiveTypeName( typename ) ) {
+				String val = ( (SimpleValue) value ).getTypeName();
+				if(val!=null) return val; // val can be null when type is any 
+			}
+		} 
+	
+	return toName( value.getType().getReturnedClass() );
+
+	}
+	
+	
+}