From 85867b5d46751cfce6500002e098a431fec0950e Mon Sep 17 00:00:00 2001
From: amwaterhouse <Andrew Waterhouse>
Date: Fri, 29 Apr 2005 15:26:51 +0000
Subject: [PATCH] just tidying up unused imports

---
 src/jalview/schemes/Blosum62ColourScheme.java     |    2 --
 src/jalview/schemes/BuriedColourScheme.java       |    1 -
 src/jalview/schemes/ColourSchemeI.java            |    1 -
 src/jalview/schemes/ColourSchemeProperty.java     |   35 +++++++++++++++++----
 src/jalview/schemes/ConservationColourScheme.java |    2 --
 src/jalview/schemes/HelixColourScheme.java        |    2 --
 src/jalview/schemes/NucleotideColourScheme.java   |    2 --
 src/jalview/schemes/ResidueColourScheme.java      |    1 -
 src/jalview/schemes/ResidueProperties.java        |    2 --
 src/jalview/schemes/ScoreColourScheme.java        |    4 ---
 src/jalview/schemes/StrandColourScheme.java       |    1 -
 src/jalview/schemes/TurnColourScheme.java         |    2 --
 src/jalview/schemes/UserColourScheme.java         |    1 -
 src/jalview/schemes/ZappoColourScheme.java        |    6 ----
 14 files changed, 29 insertions(+), 33 deletions(-)

diff --git a/src/jalview/schemes/Blosum62ColourScheme.java b/src/jalview/schemes/Blosum62ColourScheme.java
index 2e18c6a..7798672 100755
--- a/src/jalview/schemes/Blosum62ColourScheme.java
+++ b/src/jalview/schemes/Blosum62ColourScheme.java
@@ -21,8 +21,6 @@ package jalview.schemes;
 
 import java.util.*;
 import java.awt.*;
-import jalview.gui.*;
-import jalview.datamodel.*;
 
 public class Blosum62ColourScheme extends ResidueColourScheme
 {
diff --git a/src/jalview/schemes/BuriedColourScheme.java b/src/jalview/schemes/BuriedColourScheme.java
index 66a9ce5..34faf70 100755
--- a/src/jalview/schemes/BuriedColourScheme.java
+++ b/src/jalview/schemes/BuriedColourScheme.java
@@ -1,6 +1,5 @@
 package jalview.schemes;
 
-import java.util.*;
 import java.awt.*;
 
 public class BuriedColourScheme extends ScoreColourScheme {
diff --git a/src/jalview/schemes/ColourSchemeI.java b/src/jalview/schemes/ColourSchemeI.java
index fcdaa45..c400251 100755
--- a/src/jalview/schemes/ColourSchemeI.java
+++ b/src/jalview/schemes/ColourSchemeI.java
@@ -1,6 +1,5 @@
 package jalview.schemes;
 
-import jalview.datamodel.*;
 import java.awt.*;
 import java.util.*;
 
diff --git a/src/jalview/schemes/ColourSchemeProperty.java b/src/jalview/schemes/ColourSchemeProperty.java
index 169f35e..6831ec2 100755
--- a/src/jalview/schemes/ColourSchemeProperty.java
+++ b/src/jalview/schemes/ColourSchemeProperty.java
@@ -15,6 +15,34 @@ public class ColourSchemeProperty
   public static final int USER_DEFINED = 10;
   public static final int NONE = 11;
 
+  public static int getColourIndexFromName(String name)
+  {
+    int ret=11;
+    if(name.equals("Clustal"))
+      ret = CLUSTAL;
+    else if(name.equals("Blosum62"))
+      ret = BLOSUM;
+    else if(name.equals("% Identity"))
+      ret = PID;
+    else if(name.equals("Zappo"))
+      ret = ZAPPO;
+    else if(name.equals("Hydrophobic"))
+      ret = HYDROPHOBIC;
+    else if(name.equals("Helix Propensity"))
+      ret = HELIX;
+    else if(name.equals("Strand Propensity"))
+      ret = STRAND;
+    else if(name.equals("Turn Propensity"))
+      ret = TURN;
+    else if(name.equals("Buried Index"))
+      ret = BURIED;
+    else if(name.equals("Nucleotide"))
+      ret = NUCLEOTIDE;
+    else if(name.equals("User Defined"))
+      ret =  USER_DEFINED;
+
+    return ret;
+  }
 
   public static String getColourName(int index)
   {
@@ -39,12 +67,7 @@ public class ColourSchemeProperty
 
   public static ColourSchemeI getColour(jalview.datamodel.AlignmentI al, String name)
   {
-    for(int i=0; i<12; i++)
-    {
-      if(getColourName(i).equals(name))
-        return getColour(al, i);
-    }
-    return null;
+    return getColour(al, getColourIndexFromName(name));
   }
 
   public static ColourSchemeI getColour(jalview.datamodel.AlignmentI al, int index)
diff --git a/src/jalview/schemes/ConservationColourScheme.java b/src/jalview/schemes/ConservationColourScheme.java
index 0a68682..88a6686 100755
--- a/src/jalview/schemes/ConservationColourScheme.java
+++ b/src/jalview/schemes/ConservationColourScheme.java
@@ -18,8 +18,6 @@
 
 package jalview.schemes;
 import java.awt.*;
-import jalview.gui.*;
-import jalview.datamodel.*;
 import jalview.analysis.*;
 import java.util.Vector;
 
diff --git a/src/jalview/schemes/HelixColourScheme.java b/src/jalview/schemes/HelixColourScheme.java
index 7fdba76..6c2f744 100755
--- a/src/jalview/schemes/HelixColourScheme.java
+++ b/src/jalview/schemes/HelixColourScheme.java
@@ -18,8 +18,6 @@
 
 package jalview.schemes;
 
-
-import java.util.*;
 import java.awt.*;
 
 public class HelixColourScheme extends ScoreColourScheme {
diff --git a/src/jalview/schemes/NucleotideColourScheme.java b/src/jalview/schemes/NucleotideColourScheme.java
index 26aea21..dc06175 100755
--- a/src/jalview/schemes/NucleotideColourScheme.java
+++ b/src/jalview/schemes/NucleotideColourScheme.java
@@ -1,8 +1,6 @@
 package jalview.schemes;
 
 import java.awt.*;
-import java.util.*;
-
 
 public class NucleotideColourScheme extends ResidueColourScheme
 {
diff --git a/src/jalview/schemes/ResidueColourScheme.java b/src/jalview/schemes/ResidueColourScheme.java
index 7eab3dd..ac00389 100755
--- a/src/jalview/schemes/ResidueColourScheme.java
+++ b/src/jalview/schemes/ResidueColourScheme.java
@@ -1,6 +1,5 @@
 package jalview.schemes;
 
-import jalview.datamodel.*;
 import java.util.*;
 import java.awt.*;
 
diff --git a/src/jalview/schemes/ResidueProperties.java b/src/jalview/schemes/ResidueProperties.java
index 95acf91..f7c13ef 100755
--- a/src/jalview/schemes/ResidueProperties.java
+++ b/src/jalview/schemes/ResidueProperties.java
@@ -19,8 +19,6 @@ package jalview.schemes;
 
 import java.awt.Color;
 import java.util.*;
-import jalview.jbgui.*;
-import jalview.datamodel.*;
 
 public class ResidueProperties {
 
diff --git a/src/jalview/schemes/ScoreColourScheme.java b/src/jalview/schemes/ScoreColourScheme.java
index b62ca18..220aecc 100755
--- a/src/jalview/schemes/ScoreColourScheme.java
+++ b/src/jalview/schemes/ScoreColourScheme.java
@@ -1,9 +1,5 @@
 package jalview.schemes;
 
-import jalview.datamodel.*;
-import jalview.jbgui.*;
-
-import java.util.*;
 import java.awt.*;
 
 public class ScoreColourScheme extends ResidueColourScheme {
diff --git a/src/jalview/schemes/StrandColourScheme.java b/src/jalview/schemes/StrandColourScheme.java
index 9ffed08..1e54a74 100755
--- a/src/jalview/schemes/StrandColourScheme.java
+++ b/src/jalview/schemes/StrandColourScheme.java
@@ -19,7 +19,6 @@
 
 package jalview.schemes;
 
-import java.util.*;
 import java.awt.*;
 
 public class StrandColourScheme extends ScoreColourScheme {
diff --git a/src/jalview/schemes/TurnColourScheme.java b/src/jalview/schemes/TurnColourScheme.java
index b251c76..6d0f7aa 100755
--- a/src/jalview/schemes/TurnColourScheme.java
+++ b/src/jalview/schemes/TurnColourScheme.java
@@ -18,8 +18,6 @@
 
 package jalview.schemes;
 
-
-import java.util.*;
 import java.awt.*;
 
 public class TurnColourScheme extends ScoreColourScheme {
diff --git a/src/jalview/schemes/UserColourScheme.java b/src/jalview/schemes/UserColourScheme.java
index 24e35bb..bc5e8ea 100755
--- a/src/jalview/schemes/UserColourScheme.java
+++ b/src/jalview/schemes/UserColourScheme.java
@@ -18,7 +18,6 @@
 
 package jalview.schemes;
 
-import java.util.*;
 import java.awt.*;
 
 public class UserColourScheme extends ResidueColourScheme
diff --git a/src/jalview/schemes/ZappoColourScheme.java b/src/jalview/schemes/ZappoColourScheme.java
index b72ff02..482a5c0 100755
--- a/src/jalview/schemes/ZappoColourScheme.java
+++ b/src/jalview/schemes/ZappoColourScheme.java
@@ -1,11 +1,5 @@
 package jalview.schemes;
 
-import jalview.jbgui.*;
-import jalview.datamodel.*;
-
-import java.util.*;
-import java.awt.*;
-
 public class ZappoColourScheme extends ResidueColourScheme {
 
   public ZappoColourScheme() {
-- 
1.7.10.2