JAL-2089 patch broken merge to master for Release 2.10.0b1

[jalview.git] / src / jalview / schemes / HelixColourScheme.java

diff --git a/src/jalview/schemes/HelixColourScheme.java b/src/jalview/schemes/HelixColourScheme.java
index 35e1a26..1242cd3 100755 (executable)
--- a/src/jalview/schemes/HelixColourScheme.java
+++ b/src/jalview/schemes/HelixColourScheme.java
@@ -1,34 +1,37 @@
-/*\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
-\r
-package jalview.schemes;\r
-\r
-import java.awt.*;\r
-\r
-public class HelixColourScheme extends ScoreColourScheme {\r
-\r
-\r
-  public HelixColourScheme() {\r
-    super(ResidueProperties.helix,ResidueProperties.helixmin,ResidueProperties.helixmax);\r
-  }\r
-\r
-  public Color makeColour(float c) {\r
-    return new Color(c,(float)1.0-c,c);\r
-  }\r
-}\r
+/*
+ * 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.
+ *  
+ * 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.schemes;
+
+import java.awt.Color;
+
+public class HelixColourScheme extends ScoreColourScheme
+{
+  public HelixColourScheme()
+  {
+    super(ResidueProperties.aaIndex, ResidueProperties.helix,
+            ResidueProperties.helixmin, ResidueProperties.helixmax);
+  }
+
+  public Color makeColour(float c)
+  {
+    return new Color(c, (float) 1.0 - c, c);
+  }
+}