[Arianne-commits] marauroa/src/marauroa/common/game RPObject.java, 1.87, 1.88

[Astrid S. <ast...@us...>]

Update of /cvsroot/arianne/marauroa/src/marauroa/common/game
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv4100/src/marauroa/common/game

Modified Files:
	RPObject.java 
Log Message:
reverting changes to equals

Index: RPObject.java
===================================================================
RCS file: /cvsroot/arianne/marauroa/src/marauroa/common/game/RPObject.java,v
retrieving revision 1.87
retrieving revision 1.88
diff -C2 -d -r1.87 -r1.88
*** RPObject.java	4 Jun 2009 09:01:18 -0000	1.87
--- RPObject.java	10 Jun 2009 11:52:54 -0000	1.88
***************
*** 878,882 ****
--- 878,911 ----
  	}
  
+ 	/**
+ 	 * Returns true if two objects are exactly equal
+ 	 *
+ 	 * @param obj
+ 	 *            the object to compare with this one.
+ 	 */
+ 	@Override
+ 	public boolean equals(Object obj) {
+ 		if (this == obj){
+ 			return true;
+ 		}
+ 		if (obj instanceof RPObject) {
+ 			RPObject object = (RPObject) obj;
+ 			return super.equals(obj) && slots.equals(object.slots) && events.equals(object.events)
+ 			        && links.equals(object.links);
+ 		} else {
+ 			return false;
+ 		}
+ 	}
  
+ 	@Override
+ 	public int hashCode() {
+ 		int hash=0;
+ 		if (has("id")) {
+ 			hash=getInt("id");
+ 		}
+ 		
+ 		return hash;
+ 		
+ 	}
  
  	/**
***************
*** 1376,1380 ****
  
  	/**
! 	 * With the differences computed by getDifferences in added and deleted we
  	 * build an update object by applying the changes.
  	 *
--- 1405,1409 ----
  
  	/**
! 	 * With the diferences computed by getDifferences in added and deleted we
  	 * build an update object by applying the changes.
  	 *
***************
*** 1418,1422 ****
  
  					/*
! 					 * For each of the deleted changes, check if they are
  					 * already on the object so they an update and recursively
  					 * apply differences to it. On the other hand if object is
--- 1447,1451 ----
  
  					/*
! 					 * For each of the deletded changes, check if they are
  					 * already on the object so they an update and recursively
  					 * apply differences to it. On the other hand if object is