X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fdatamodel%2FGraphLine.java;h=38a506180f9c7f8bcae5fe381909ea2cb5556b30;hb=cbb46d5c5784c69b3237a97e90bad5dc952b51ac;hp=375fbeaa23fa81edf9447fff6a5b28119e54b0b4;hpb=47168f025aefdaa044802bd5f8f510ffe43a4808;p=jalview.git diff --git a/src/jalview/datamodel/GraphLine.java b/src/jalview/datamodel/GraphLine.java index 375fbea..38a5061 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.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. * @@ -54,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; }