[Arianne-commits] stendhal/src/games/stendhal/server/entity/npc/parser Expression.java, 1.26, 1.27

[Martin F. <mar...@us...>]

Update of /cvsroot/arianne/stendhal/src/games/stendhal/server/entity/npc/parser
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv29357/src/games/stendhal/server/entity/npc/parser

Modified Files:
	Expression.java 
Log Message:
synchronize equals() and toString()

Index: Expression.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/server/entity/npc/parser/Expression.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** Expression.java	2 Mar 2008 20:32:30 -0000	1.26
--- Expression.java	2 Mar 2008 23:34:14 -0000	1.27
***************
*** 432,436 ****
  			return false;
  		} else if (other.getClass() == Expression.class) {
! 	        return original.equals(((Expression) other).original);
          } else {
          	return false;
--- 432,440 ----
  			return false;
  		} else if (other.getClass() == Expression.class) {
! 			if (normalized.length() > 0) {
! 				return normalized.equals(((Expression) other).normalized);
! 			} else {
! 				return original.equals(((Expression) other).original);
! 			}
          } else {
          	return false;
***************
*** 458,462 ****
  		}
  
! 		if (normalized != null && normalized.length() > 0) {
  			b.append(normalized);
  		} else {
--- 462,466 ----
  		}
  
! 		if (normalized.length() > 0) {
  			b.append(normalized);
  		} else {