X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fschemes%2FClustalxColourScheme.java;h=d363764857a9c85e105f3f6f2970993e13d4a921;hb=171ca8730ea146d50b2eb00701d8df986d88f519;hp=14f0ce6098555ba01d9b728a83532539a970c245;hpb=797df64fa2a0a30773d0f48f5494d4155e5a8be3;p=jalview.git

diff --git a/src/jalview/schemes/ClustalxColourScheme.java b/src/jalview/schemes/ClustalxColourScheme.java
index 14f0ce6..d363764 100755
--- a/src/jalview/schemes/ClustalxColourScheme.java
+++ b/src/jalview/schemes/ClustalxColourScheme.java
@@ -17,11 +17,15 @@
  */
 package jalview.schemes;
 
-import java.util.*;
+import jalview.datamodel.AnnotatedCollectionI;
+import jalview.datamodel.SequenceCollectionI;
+import jalview.datamodel.SequenceI;
 
-import java.awt.*;
-
-import jalview.datamodel.*;
+import java.awt.Color;
+import java.util.Hashtable;
+import java.util.List;
+import java.util.Map;
+import java.util.Vector;
 
 public class ClustalxColourScheme extends ResidueColourScheme // implements
 // IParameterizable
@@ -55,13 +59,13 @@ public class ClustalxColourScheme extends ResidueColourScheme // implements
     colhash.put("YELLOW", new Color((float) 0.8, (float) 0.8, (float) 0.0));
   }
 
-  public ClustalxColourScheme(Vector seqs, int maxWidth)
+  public ClustalxColourScheme(AnnotatedCollectionI alignment, Map<SequenceI, SequenceCollectionI> hiddenReps)
   {
-    resetClustalX(seqs, maxWidth);
+    alignmentChanged(alignment,hiddenReps);
   }
-
-  public void resetClustalX(Vector seqs, int maxWidth)
-  {
+  public void alignmentChanged(AnnotatedCollectionI alignment, Map<SequenceI, SequenceCollectionI> hiddenReps) {
+    int maxWidth=alignment.getWidth();
+    List<SequenceI> seqs=alignment.getSequences(hiddenReps);
     cons2 = new int[maxWidth][24];
     includeGaps = isIncludeGaps(); // does nothing - TODO replace with call to
     // get the current setting of the
@@ -82,9 +86,9 @@ public class ClustalxColourScheme extends ResidueColourScheme // implements
     int j = 0;
     char[] seq;
 
-    while (j < seqs.size())
+    for (SequenceI sq: seqs)
     {
-      seq = ((SequenceI) seqs.elementAt(j)).getSequence();
+      seq = sq.getSequence();
 
       int end_j = seq.length - 1;
 
@@ -251,12 +255,14 @@ public class ClustalxColourScheme extends ResidueColourScheme // implements
     ResidueColour[19] = colours[0]; // V
   }
 
+  @Override
   public Color findColour(char c)
   {
     return Color.pink;
   }
 
-  public Color findColour(char c, int j)
+  @Override
+  public Color findColour(char c, int j, SequenceI seq)
   {
     Color currentColour;