Jalview 2.8 Source Header

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

diff --git a/src/jalview/schemes/UserColourScheme.java b/src/jalview/schemes/UserColourScheme.java
index 5034134..462b9c6 100755 (executable)
--- a/src/jalview/schemes/UserColourScheme.java
+++ b/src/jalview/schemes/UserColourScheme.java
@@ -1,13 +1,13 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.7)
- * Copyright (C) 2011 J Procter, AM Waterhouse, J Engelhardt, LM Lui, G Barton, M Clamp, S Searle
+ * 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 
@@ -17,9 +17,9 @@
  */
 package jalview.schemes;
 
-import java.util.*;
-
-import java.awt.*;
+import java.awt.Color;
+import java.util.StringTokenizer;
+import jalview.datamodel.SequenceI;
 
 public class UserColourScheme extends ResidueColourScheme
 {
@@ -29,15 +29,18 @@ public class UserColourScheme extends ResidueColourScheme
 
   public UserColourScheme()
   {
+    super(ResidueProperties.aaIndex);
   }
 
   public UserColourScheme(Color[] newColors)
   {
+    super(ResidueProperties.aaIndex);
     colors = newColors;
   }
 
   public UserColourScheme(String colour)
   {
+    super(ResidueProperties.aaIndex);
     Color col = getColourFromString(colour);
 
     if (col == null)
@@ -201,7 +204,8 @@ public class UserColourScheme extends ResidueColourScheme
 
   }
 
-  public Color findColour(char c, int j)
+  @Override
+  public Color findColour(char c, int j, SequenceI seq)
   {
     Color currentColour;
     int index = ResidueProperties.aaIndex[c];