From: Jim Procter Date: Fri, 21 Jun 2013 11:20:11 +0000 (+0100) Subject: JAL-1294 JAL-1325 bugfix equals X-Git-Tag: Jalview_2_9~234^2~3 X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=2ab244c2574a37aafb9b10cd8f2b27bf61dbe905;p=jalview.git JAL-1294 JAL-1325 bugfix equals --- diff --git a/src/jalview/datamodel/GraphLine.java b/src/jalview/datamodel/GraphLine.java index 619dbd2..001f6b2 100755 --- a/src/jalview/datamodel/GraphLine.java +++ b/src/jalview/datamodel/GraphLine.java @@ -58,9 +58,9 @@ public class GraphLine { GraphLine other = (GraphLine) obj; return displayed == other.displayed - && value != other.value + && value == other.value && (colour != null ? (other.colour != null && other.colour - .equals(label)) : other.colour == null) + .equals(colour)) : other.colour == null) && (label != null ? (other.label != null && other.label .equals(label)) : other.label == null); }