[MOBY-guts] biomoby commit

[Paul Gordon]

gordonp
Sat Apr 10 18:42:09 EDT 2010
Update of /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/data
In directory dev.open-bio.org:/tmp/cvs-serv14466/src/main/org/biomoby/shared/data

Modified Files:
	MobyDataObject.java 
Log Message:
Improved equals() for base object equivalency...value not instance based
moby-live/Java/src/main/org/biomoby/shared/data MobyDataObject.java,1.26,1.27
===================================================================
RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/data/MobyDataObject.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/data/MobyDataObject.java	2008/01/07 22:11:36	1.26
+++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/data/MobyDataObject.java	2010/04/10 22:42:09	1.27
@@ -302,7 +302,7 @@
     public boolean equals(Object passedInObject) throws ClassCastException{
       Object ourObject = getObject();
       if(passedInObject != null && passedInObject instanceof MobyDataObject){
-	  if(((MobyDataObject) passedInObject).getDataType() == getDataType()){
+	  if(((MobyDataObject) passedInObject).getDataType().equals(getDataType())){
 	      // An object of the same class.  See if their XMLs are equivalent.
 	      int ourOldXMLMode = getXmlMode();
 	      int itsOldXMLMode = ((MobyDataObject) passedInObject).getXmlMode();