Update of /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/mapping
In directory sc8-pr-cvs1:/tmp/cvs-serv11660/sf/hibernate/mapping
Modified Files:
Any.java Property.java
Log Message:
* imporvements to CompositeUserType
* cascades for <any> mappings
* fixed some bugs withy collection Filter parameters
* correct Type for avg(int)
Index: Any.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/mapping/Any.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Any.java 29 Mar 2003 04:15:10 -0000 1.1
--- Any.java 8 Apr 2003 09:49:30 -0000 1.2
***************
*** 1,2 ****
--- 1,3 ----
+ //$Id$
package net.sf.hibernate.mapping;
***************
*** 12,18 ****
}
- /**
- * Constructor for Any.
- */
public Any(Table table) {
super(table);
--- 13,16 ----
***************
*** 20,25 ****
/**
! * Returns the identifierType.
! * @return Type
*/
public Type getIdentifierType() {
--- 18,22 ----
/**
! * Returns the identifier type.
*/
public Type getIdentifierType() {
***************
*** 28,33 ****
/**
! * Sets the identifierType.
! * @param identifierType The identifierType to set
*/
public void setIdentifierType(Type identifierType) {
--- 25,29 ----
/**
! * Sets the identifier type.
*/
public void setIdentifierType(Type identifierType) {
Index: Property.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/mapping/Property.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** Property.java 2 Feb 2003 00:29:06 -0000 1.9
--- Property.java 8 Apr 2003 09:49:31 -0000 1.10
***************
*** 47,52 ****
public Cascades.CascadeStyle getCascadeStyle() throws MappingException {
! if ( value.getType().isComponentType() ) {
! AbstractComponentType actype = (AbstractComponentType) value.getType();
int length = actype.getSubtypes().length;
for ( int i=0; i<length; i++ ) {
--- 47,53 ----
public Cascades.CascadeStyle getCascadeStyle() throws MappingException {
! Type type = value.getType();
! if ( type.isComponentType() && !type.isObjectType() ) {
! AbstractComponentType actype = (AbstractComponentType) type;
int length = actype.getSubtypes().length;
for ( int i=0; i<length; i++ ) {
***************
*** 62,66 ****
return Cascades.STYLE_NONE;
}
! else if ( cascade.equals("save/update") || cascade.equals("save-update") ) {
return Cascades.STYLE_EXCEPT_DELETE;
}
--- 63,67 ----
return Cascades.STYLE_NONE;
}
! else if ( cascade.equals("save-update") ) {
return Cascades.STYLE_EXCEPT_DELETE;
}
|
