X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fdatamodel%2FGraphLine.java;h=001f6b2e44bbecb441968b22f135e7ab7876801e;hb=0e6d6540d646bd5496f0bcb1657063162aa40323;hp=77b7ef598d3db21597d6f763559bccd37b302a70;hpb=3de2a606531d25cfb36e42276c44e75dca32f591;p=jalview.git diff --git a/src/jalview/datamodel/GraphLine.java b/src/jalview/datamodel/GraphLine.java index 77b7ef5..001f6b2 100755 --- a/src/jalview/datamodel/GraphLine.java +++ b/src/jalview/datamodel/GraphLine.java @@ -1,28 +1,30 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer - * Copyright (C) 2007 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle - * - * This program 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 2 - * of the License, or (at your option) any later version. - * - * This program 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 this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA + * 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 + * + * 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. + * + * 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 . */ package jalview.datamodel; public class GraphLine { public float value; + public String label = ""; + public java.awt.Color colour = java.awt.Color.black; + public boolean displayed = true; public GraphLine(float value, String label, java.awt.Color col) @@ -38,12 +40,30 @@ public class GraphLine this.colour = col; } } - public GraphLine(GraphLine from) { - if (from!=null) { + + public GraphLine(GraphLine from) + { + if (from != null) + { value = from.value; label = new String(from.label); colour = from.colour; displayed = from.displayed; } } + @Override + public boolean equals(Object obj) + { + 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 false; + } }