[Pydev-cvs] org.python.pydev.core/src/org/python/pydev/core Tuple.java,1.5,1.6
Brought to you by:
fabioz
From: Fabio Z. <fa...@us...> - 2006-05-31 19:45:27
|
Update of /cvsroot/pydev/org.python.pydev.core/src/org/python/pydev/core In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24746/src/org/python/pydev/core Modified Files: Tuple.java Log Message: Index: Tuple.java =================================================================== RCS file: /cvsroot/pydev/org.python.pydev.core/src/org/python/pydev/core/Tuple.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Tuple.java 25 May 2006 19:47:26 -0000 1.5 --- Tuple.java 31 May 2006 19:45:23 -0000 1.6 *************** *** 28,31 **** --- 28,49 ---- Tuple t2 = (Tuple) obj; + if(o1 == t2.o1 && o2 == t2.o2){ //all the same + return true; + } + + if(o1 == null && t2.o1 != null){ + return false; + } + if(o2 == null && t2.o2 != null){ + return false; + } + if(o1 != null && t2.o1 == null){ + return false; + } + if(o2 != null && t2.o2 == null){ + return false; + } + + if(!o1.equals(t2.o1)){ return false; |