From: <one...@us...> - 2003-04-06 02:29:00
|
Update of /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/impl In directory sc8-pr-cvs1:/tmp/cvs-serv13138/impl Modified Files: SessionImpl.java Log Message: added CompositeUserType refactored handling of component path expressions PersistentIdentifierGenerators now aware of schema Index: SessionImpl.java =================================================================== RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/impl/SessionImpl.java,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** SessionImpl.java 3 Apr 2003 12:34:29 -0000 1.31 --- SessionImpl.java 6 Apr 2003 02:28:57 -0000 1.32 *************** *** 773,777 **** else if ( type.isComponentType() ) { AbstractComponentType actype = (AbstractComponentType) type; ! Object[] subvalues = actype.getPropertyValues(value); Type[] subtypes = actype.getSubtypes(); boolean substitute=false; --- 773,777 ---- else if ( type.isComponentType() ) { AbstractComponentType actype = (AbstractComponentType) type; ! Object[] subvalues = actype.getPropertyValues(value, this); Type[] subtypes = actype.getSubtypes(); boolean substitute=false; *************** *** 1062,1066 **** Type[] types = actype.getSubtypes(); for ( int i=0; i<types.length; i++ ) { ! removeCollectionsFor( types[i], id, actype.getPropertyValue(value, i) ); } } --- 1062,1066 ---- Type[] types = actype.getSubtypes(); for ( int i=0; i<types.length; i++ ) { ! removeCollectionsFor( types[i], id, actype.getPropertyValue(value, i, this) ); } } *************** *** 2230,2234 **** Boolean isUnsaved = (id==null) ? Boolean.TRUE : interceptor.isUnsaved(object); if ( ( isUnsaved!=null && isUnsaved.booleanValue() ) || persister.isUnsaved(id) ) { ! throw new HibernateException( "object references an unsaved transient instance - save the transient instance before flushing" ); --- 2230,2234 ---- Boolean isUnsaved = (id==null) ? Boolean.TRUE : interceptor.isUnsaved(object); if ( ( isUnsaved!=null && isUnsaved.booleanValue() ) || persister.isUnsaved(id) ) { ! throw new TransientObjectException( "object references an unsaved transient instance - save the transient instance before flushing" ); *************** *** 2336,2340 **** if ( type.isComponentType() ) { AbstractComponentType componentType = (AbstractComponentType) type; ! Object[] values = componentType.getPropertyValues(obj); if ( wrap( values, componentType.getSubtypes() ) ) componentType.setPropertyValues(obj, values); } --- 2336,2340 ---- if ( type.isComponentType() ) { AbstractComponentType componentType = (AbstractComponentType) type; ! Object[] values = componentType.getPropertyValues(obj, this); if ( wrap( values, componentType.getSubtypes() ) ) componentType.setPropertyValues(obj, values); } *************** *** 2426,2430 **** AbstractComponentType componentType = (AbstractComponentType) type; ! Object[] values = componentType.getPropertyValues(obj); Type[] types = componentType.getSubtypes(); if ( wrap( values, types ) ) componentType.setPropertyValues(obj, values); --- 2426,2430 ---- AbstractComponentType componentType = (AbstractComponentType) type; ! Object[] values = componentType.getPropertyValues(obj, this); Type[] types = componentType.getSubtypes(); if ( wrap( values, types ) ) componentType.setPropertyValues(obj, values); *************** *** 2532,2536 **** AbstractComponentType componentType = (AbstractComponentType) type; ! Object[] values = componentType.getPropertyValues(obj); Type[] types = componentType.getSubtypes(); for ( int i=0; i<values.length; i++ ) { --- 2532,2536 ---- AbstractComponentType componentType = (AbstractComponentType) type; ! Object[] values = componentType.getPropertyValues(obj, this); Type[] types = componentType.getSubtypes(); for ( int i=0; i<values.length; i++ ) { |