From 341565559999a3c6a88f263e4ff0a6e8eacf09bd Mon Sep 17 00:00:00 2001
From: amwaterhouse <Andrew Waterhouse>
Date: Tue, 14 Dec 2004 14:54:51 +0000
Subject: [PATCH] Getcolours is not needed ????

---
 src/jalview/schemes/ColourSchemeI.java       |    3 ---
 src/jalview/schemes/PIDColourScheme.java     |    4 ++--
 src/jalview/schemes/ResidueColourScheme.java |   27 +++-----------------------
 src/jalview/schemes/ScoreColourScheme.java   |    4 ++--
 4 files changed, 7 insertions(+), 31 deletions(-)

diff --git a/src/jalview/schemes/ColourSchemeI.java b/src/jalview/schemes/ColourSchemeI.java
index e3d2bbf..8835680 100755
--- a/src/jalview/schemes/ColourSchemeI.java
+++ b/src/jalview/schemes/ColourSchemeI.java
@@ -7,9 +7,6 @@ import java.util.*;
 public interface ColourSchemeI
 {
   public Color   findColour(String aa);
-  public Vector  getColours(SequenceI s, Vector aa);
-  public Color   getColour (SequenceI s, int pos, Vector aa);
-  public Vector  getColours(SequenceGroup sg, Vector aa);
   public Color   findColour(SequenceI seq, String s,int j, Vector aa);
 
   public boolean canThreshold();
diff --git a/src/jalview/schemes/PIDColourScheme.java b/src/jalview/schemes/PIDColourScheme.java
index 69cd269..0a28c33 100755
--- a/src/jalview/schemes/PIDColourScheme.java
+++ b/src/jalview/schemes/PIDColourScheme.java
@@ -14,7 +14,7 @@ public class PIDColourScheme extends ResidueColourScheme {
 	this.pidColours = ResidueProperties.pidColours;
 	this.thresholds = ResidueProperties.pidThresholds;
     }
-  public Color getColour(SequenceI seq, int j,Vector aa) {
+ /* public Color getColour(SequenceI seq, int j,Vector aa) {
     Color c = Color.white;
 
     String       s = seq.getSequence(j,j+1);
@@ -25,7 +25,7 @@ public class PIDColourScheme extends ResidueColourScheme {
 
     return c;
   }
-
+*/
   public Color findColour(SequenceI seq,String s, int j,Vector aa) {
       Color     c    = Color.white;
       Hashtable hash = null;
diff --git a/src/jalview/schemes/ResidueColourScheme.java b/src/jalview/schemes/ResidueColourScheme.java
index 48f7c38..f16bcca 100755
--- a/src/jalview/schemes/ResidueColourScheme.java
+++ b/src/jalview/schemes/ResidueColourScheme.java
@@ -30,7 +30,7 @@ public class ResidueColourScheme implements ColourSchemeI{
     }
 
     // aa should maybe be a class
-    public Color getColour(SequenceI seq, int j,Vector aa) {
+  /*  public Color getColour(SequenceI seq, int j,Vector aa) {
 
 	Color  c       = Color.white;
 	String s       = seq.getSequence(j,j+1);
@@ -45,7 +45,8 @@ public class ResidueColourScheme implements ColourSchemeI{
 
 
       return c;
-    }
+    }*/
+
     public int getThreshold() {
 	return threshold;
     }
@@ -54,28 +55,6 @@ public class ResidueColourScheme implements ColourSchemeI{
 	threshold = ct;
     }
 
-    public Vector  getColours(SequenceI s, Vector aa) {
-	Vector colours = new Vector();
-
-	for (int j = 0; j < s.getLength(); j++)
-	    colours.addElement(getColour(s,j,aa));
-
-	return colours;
-    }
-
-    public Vector getColours(SequenceGroup sg, Vector aa) {
-	Vector colours = new Vector();
-
-	for (int j = 0; j < sg.getSize(); j++) {
-	    SequenceI s = sg.getSequenceAt(j);
-
-	    for (int i = 0; i < s.getLength();i++) {
-		colours.addElement(getColour(s,i,aa));
-	    }
-	}
-	return colours;
-    }
-
     public boolean aboveThreshold(Vector aa,SequenceI seq, int j, int threshold) {
 	String    s    = seq.getSequence(j,j+1);
 	Hashtable hash = (Hashtable)aa.elementAt(j);
diff --git a/src/jalview/schemes/ScoreColourScheme.java b/src/jalview/schemes/ScoreColourScheme.java
index e8d7156..89e94fd 100755
--- a/src/jalview/schemes/ScoreColourScheme.java
+++ b/src/jalview/schemes/ScoreColourScheme.java
@@ -22,7 +22,7 @@ public class ScoreColourScheme extends ResidueColourScheme {
     this.max = max;
   }
 
-  public Color getColour(SequenceI seq, int j, Vector aa) {
+ /* public Color getColour(SequenceI seq, int j, Vector aa) {
       Color c = Color.white;
       String s = seq.getSequence(j,j+1);
 
@@ -37,7 +37,7 @@ public class ScoreColourScheme extends ResidueColourScheme {
 	//  c = Color.white;
 
       return c;
-  }
+  }*/
 
     public Color findColour(SequenceI seq,String s,int j,Vector aa)
     {
-- 
1.7.10.2