X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fdatamodel%2FGraphLine.java;h=ed4bd8d89ca68a4128f11db548c84ff74889f0cd;hb=84684213f7f7c7b31d3c33dc49ca3b377a295438;hp=619dbd221848ec3c6508c2817f5c119e82e3df2e;hpb=a8c9bb134b3146ff69f70dc34cf8951f3a8b139c;p=jalview.git diff --git a/src/jalview/datamodel/GraphLine.java b/src/jalview/datamodel/GraphLine.java index 619dbd2..ed4bd8d 100755 --- a/src/jalview/datamodel/GraphLine.java +++ b/src/jalview/datamodel/GraphLine.java @@ -1,6 +1,6 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8) - * Copyright (C) 2012 J Procter, AM Waterhouse, LM Lui, J Engelhardt, G Barton, M Clamp, S Searle + * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.1) + * Copyright (C) 2014 The Jalview Authors * * This file is part of Jalview. * @@ -14,6 +14,7 @@ * PURPOSE. See the GNU General Public License for more details. * * You should have received a copy of the GNU General Public License along with Jalview. If not, see . + * The Jalview Authors are detailed in the 'AUTHORS' file. */ package jalview.datamodel; @@ -58,9 +59,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); }