Merge pull request #112 from ProgrammingLife3/fix/genomeFilter2

mathieupost · mathieupost · commit 6c09fe365cd9 · 2015-06-23T16:19:00.000+02:00
Fix ternary statement in genome filter
diff --git a/src/main/java/tudelft/ti2806/pl3/data/filter/GenomeFilter.java b/src/main/java/tudelft/ti2806/pl3/data/filter/GenomeFilter.java
@@ -61,11 +61,10 @@ public boolean equals(Object o) {
 
 		GenomeFilter that = (GenomeFilter) o;
 
-		if (genomes != null ? !genomes.equals(that.genomes) : that.genomes != null) {
-			return false;
+		if (this.genomes == null) {
+			return that.genomes == null; 
 		}
-
-		return true;
+		return genomes.equals(that.genomes);
 	}
 
 	@Override

Original file line number	Diff line number	Diff line change
`@@ -61,11 +61,10 @@ public boolean equals(Object o) {`
`61`	`61`
`62`	`62`	`GenomeFilter that = (GenomeFilter) o;`
`63`	`63`
`64`		`- if (genomes != null ? !genomes.equals(that.genomes) : that.genomes != null) {`
`65`		`- return false;`
	`64`	`+ if (this.genomes == null) {`
	`65`	`+ return that.genomes == null;`
`66`	`66`	`}`
`67`		`-`
`68`		`- return true;`
	`67`	`+ return genomes.equals(that.genomes);`
`69`	`68`	`}`
`70`	`69`
`71`	`70`	`@Override`