X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fdatamodel%2FGraphLine.java;h=38a506180f9c7f8bcae5fe381909ea2cb5556b30;hb=747167089ecf8d6afc70d417f5a20352e029bd95;hp=6b3195e4113ac579885e59ff29f60d6cbb1bacab;hpb=a8f483d04205bb8273ee311c12968b7e86d205fa;p=jalview.git
diff --git a/src/jalview/datamodel/GraphLine.java b/src/jalview/datamodel/GraphLine.java
index 6b3195e..38a5061 100755
--- a/src/jalview/datamodel/GraphLine.java
+++ b/src/jalview/datamodel/GraphLine.java
@@ -1,19 +1,21 @@
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2)
- * Copyright (C) 2014 The Jalview Authors
+ * 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;
@@ -52,18 +54,21 @@ 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
- && (colour != null ? (other.colour != null && other.colour
- .equals(colour)) : other.colour == null)
- && (label != null ? (other.label != null && other.label
- .equals(label)) : other.label == null);
+ return displayed == other.displayed && value == other.value
+ && (colour != null
+ ? (other.colour != null
+ && other.colour.equals(colour))
+ : other.colour == null)
+ && (label != null
+ ? (other.label != null && other.label.equals(label))
+ : other.label == null);
}
return false;
}