JAL-1517 source formatting

[jalview.git] / src / jalview / datamodel / GraphLine.java

diff --git a/src/jalview/datamodel/GraphLine.java b/src/jalview/datamodel/GraphLine.java
index 619dbd2..aab55a1 100755 (executable)
--- 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 2.8.2)
+ * Copyright (C) 2014 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 <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview.  If not, see <http://www.gnu.org/licenses/>.
+ * 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);
     }