X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fdatamodel%2FGraphLine.java;h=df2f86611c325d7634ee02fe2b0749cb5a2c45ad;hb=ff8c06845590fd9fd423aa59809dcce9610ab295;hp=619dbd221848ec3c6508c2817f5c119e82e3df2e;hpb=a8c9bb134b3146ff69f70dc34cf8951f3a8b139c;p=jalview.git
diff --git a/src/jalview/datamodel/GraphLine.java b/src/jalview/datamodel/GraphLine.java
index 619dbd2..df2f866 100755
--- a/src/jalview/datamodel/GraphLine.java
+++ b/src/jalview/datamodel/GraphLine.java
@@ -1,19 +1,22 @@
/*
- * 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-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
*
* This file is part of Jalview.
*
* Jalview is free software: you can redistribute it and/or
* modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
+ * as published by the Free Software Foundation, either version 3
+ * of the License, or (at your option) any later version.
*
* Jalview is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty
* of MERCHANTABILITY or FITNESS FOR A PARTICULAR
* 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 .
+ * 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;
@@ -51,16 +54,17 @@ public class GraphLine
displayed = from.displayed;
}
}
+
@Override
public boolean equals(Object obj)
{
- if (obj!=null && obj instanceof GraphLine)
+ if (obj != null && obj instanceof 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);
}