Gene equals methods less complex

Delfil · Delfil · commit 5852b814eacf · 2015-06-23T12:25:28.000+02:00
diff --git a/src/main/java/tudelft/ti2806/pl3/data/gene/Gene.java b/src/main/java/tudelft/ti2806/pl3/data/gene/Gene.java
@@ -52,13 +52,16 @@ public boolean equals(Object obj) {
 
 		Gene gene = (Gene) obj;
 
-		if (end != gene.end) {
+		if (this.end != gene.end) {
 			return false;
 		}
-		if (start != gene.start) {
+		if (this.start != gene.start) {
 			return false;
 		}
-		return !(name != null ? !name.equals(gene.name) : gene.name != null);
+		if (this.name == null) {
+			return gene.name == null;
+		}
+		return this.name.equals(gene.name);
 	}
 
 	/**

Original file line number	Diff line number	Diff line change
`@@ -52,13 +52,16 @@ public boolean equals(Object obj) {`
`52`	`52`
`53`	`53`	`Gene gene = (Gene) obj;`
`54`	`54`
`55`		`- if (end != gene.end) {`
	`55`	`+ if (this.end != gene.end) {`
`56`	`56`	`return false;`
`57`	`57`	`}`
`58`		`- if (start != gene.start) {`
	`58`	`+ if (this.start != gene.start) {`
`59`	`59`	`return false;`
`60`	`60`	`}`
`61`		`- return !(name != null ? !name.equals(gene.name) : gene.name != null);`
	`61`	`+ if (this.name == null) {`
	`62`	`+ return gene.name == null;`
	`63`	`+ }`
	`64`	`+ return this.name.equals(gene.name);`
`62`	`65`	`}`
`63`	`66`
`64`	`67`	`/**`