Update of /cvsroot/hibernate/Hibernate/cirrus/hibernate/type
In directory sc8-pr-cvs1:/tmp/cvs-serv29617/cirrus/hibernate/type
Modified Files:
TimeZoneType.java StringType.java PrimitiveType.java
LocaleType.java CurrencyType.java ClassType.java
Log Message:
* CodeGenerator Improvements:
- fixed some problems with composite-ids
- composite-id classes now implement equals(), hashCCode()
- all generated classes implement toString()
* Use ObjectUtil.equals() in a bunch of places
Index: TimeZoneType.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate/cirrus/hibernate/type/TimeZoneType.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** TimeZoneType.java 26 Nov 2002 03:35:46 -0000 1.3
--- TimeZoneType.java 29 Dec 2002 01:30:54 -0000 1.4
***************
*** 7,10 ****
--- 7,12 ----
import java.util.TimeZone;
+ import org.apache.commons.lang.ObjectUtils;
+
import cirrus.hibernate.Hibernate;
import cirrus.hibernate.HibernateException;
***************
*** 58,62 ****
*/
public boolean equals(Object x, Object y) throws HibernateException {
! return x==y || ( x!=null && y!=null && x.equals(y) );
}
--- 60,64 ----
*/
public boolean equals(Object x, Object y) throws HibernateException {
! return ObjectUtils.equals(x, y);
}
Index: StringType.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate/cirrus/hibernate/type/StringType.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** StringType.java 11 Oct 2002 05:39:15 -0000 1.17
--- StringType.java 29 Dec 2002 01:30:54 -0000 1.18
***************
*** 7,10 ****
--- 7,12 ----
import java.sql.Types;
+ import org.apache.commons.lang.ObjectUtils;
+
public class StringType extends ImmutableType implements DiscriminatorType {
***************
*** 36,43 ****
public boolean equals(Object x, Object y) {
! if (x==y) return true;
! if (x==null || y==null) return false;
! // don't have to check class for String
! return x.equals(y);
}
public String toXML(Object value) {
--- 38,42 ----
public boolean equals(Object x, Object y) {
! return ObjectUtils.equals(x, y);
}
public String toXML(Object value) {
Index: PrimitiveType.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate/cirrus/hibernate/type/PrimitiveType.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** PrimitiveType.java 28 Oct 2002 15:41:53 -0000 1.16
--- PrimitiveType.java 29 Dec 2002 01:30:54 -0000 1.17
***************
*** 2,5 ****
--- 2,7 ----
package cirrus.hibernate.type;
+ import org.apache.commons.lang.ObjectUtils;
+
/**
* Superclass of primitive / primitive wrapper types.
***************
*** 10,17 ****
public boolean equals(Object x, Object y) {
! if (x==y) return true;
! if (x==null || y==null) return false;
! // dont have to check class for primitive types
! return x.equals(y);
}
--- 12,16 ----
public boolean equals(Object x, Object y) {
! return ObjectUtils.equals(x, y);
}
Index: LocaleType.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate/cirrus/hibernate/type/LocaleType.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** LocaleType.java 18 Dec 2002 12:50:39 -0000 1.4
--- LocaleType.java 29 Dec 2002 01:30:54 -0000 1.5
***************
*** 8,11 ****
--- 8,13 ----
import java.util.StringTokenizer;
+ import org.apache.commons.lang.ObjectUtils;
+
import cirrus.hibernate.Hibernate;
import cirrus.hibernate.HibernateException;
***************
*** 44,51 ****
public boolean equals(Object x, Object y) throws HibernateException {
! if (x==y) return true;
! if (x==null || y==null) return false;
! // don't have to check class for Locale
! return x.equals(y);
}
--- 46,50 ----
public boolean equals(Object x, Object y) throws HibernateException {
! return ObjectUtils.equals(x, y);
}
Index: CurrencyType.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate/cirrus/hibernate/type/CurrencyType.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** CurrencyType.java 26 Nov 2002 03:35:45 -0000 1.6
--- CurrencyType.java 29 Dec 2002 01:30:54 -0000 1.7
***************
*** 7,10 ****
--- 7,12 ----
import java.sql.SQLException;
+ import org.apache.commons.lang.ObjectUtils;
+
import cirrus.hibernate.AssertionFailure;
import cirrus.hibernate.Hibernate;
***************
*** 105,109 ****
*/
public boolean equals(Object x, Object y) throws HibernateException {
! return x==y || ( x!=null && y!=null && x.equals(y) );
}
--- 107,111 ----
*/
public boolean equals(Object x, Object y) throws HibernateException {
! return ObjectUtils.equals(x, y);
}
Index: ClassType.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate/cirrus/hibernate/type/ClassType.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ClassType.java 10 Sep 2002 17:59:16 -0000 1.1
--- ClassType.java 29 Dec 2002 01:30:54 -0000 1.2
***************
*** 6,9 ****
--- 6,11 ----
import java.sql.SQLException;
+ import org.apache.commons.lang.ObjectUtils;
+
import cirrus.hibernate.Hibernate;
import cirrus.hibernate.HibernateException;
***************
*** 44,51 ****
public boolean equals(Object x, Object y) throws HibernateException {
! if (x==y) return true;
! if (x==null || y==null) return false;
! // don't have to check class for Class
! return x.equals(y);
}
--- 46,50 ----
public boolean equals(Object x, Object y) throws HibernateException {
! return ObjectUtils.equals(x, y);
}
|
