JAL-1645 Version-Rel Version 2.9 Year-Rel 2015 Licensing glob

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

diff --git a/src/jalview/datamodel/GraphLine.java b/src/jalview/datamodel/GraphLine.java
index 2f484ac..5fdd946 100755 (executable)
--- a/src/jalview/datamodel/GraphLine.java
+++ b/src/jalview/datamodel/GraphLine.java
@@ -1,37 +1,73 @@
-/*\r
-* Jalview - A Sequence Alignment Editor and Viewer\r
-* Copyright (C) 2005 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle\r
-*\r
-* This program is free software; you can redistribute it and/or\r
-* modify it under the terms of the GNU General Public License\r
-* as published by the Free Software Foundation; either version 2\r
-* of the License, or (at your option) any later version.\r
-*\r
-* This program is distributed in the hope that it will be useful,\r
-* but WITHOUT ANY WARRANTY; without even the implied warranty of\r
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
-* GNU General Public License for more details.\r
-*\r
-* You should have received a copy of the GNU General Public License\r
-* along with this program; if not, write to the Free Software\r
-* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA\r
-*/\r
-package jalview.datamodel;\r
-\r
-public class GraphLine\r
-{\r
-    public float value;\r
-    public String label = "";\r
-    public java.awt.Color colour = java.awt.Color.black;\r
-    public boolean displayed = true;\r
-\r
-    public GraphLine(float value, String label, java.awt.Color col)\r
-    {\r
-      this.value = value;\r
-      if(label != null)\r
-        this.label = label;\r
-\r
-      if(col != null )\r
-        this.colour = col;\r
-    }\r
-}\r
+/*
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9)
+ * Copyright (C) 2015 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.
+ *  
+ * 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/>.
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
+ */
+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)
+  {
+    this.value = value;
+    if (label != null)
+    {
+      this.label = label;
+    }
+
+    if (col != null)
+    {
+      this.colour = col;
+    }
+  }
+
+  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;
+  }
+}