just tidying up unused imports

diff --git a/src/jalview/schemes/Blosum62ColourScheme.java b/src/jalview/schemes/Blosum62ColourScheme.java
index 2e18c6a..7798672 100755 (executable)
--- a/src/jalview/schemes/Blosum62ColourScheme.java
+++ b/src/jalview/schemes/Blosum62ColourScheme.java
@@ -21,8 +21,6 @@ package jalview.schemes;
 \r
 import java.util.*;\r
 import java.awt.*;\r
-import jalview.gui.*;\r
-import jalview.datamodel.*;\r
 \r
 public class Blosum62ColourScheme extends ResidueColourScheme\r
 {\r

diff --git a/src/jalview/schemes/BuriedColourScheme.java b/src/jalview/schemes/BuriedColourScheme.java
index 66a9ce5..34faf70 100755 (executable)
--- a/src/jalview/schemes/BuriedColourScheme.java
+++ b/src/jalview/schemes/BuriedColourScheme.java
@@ -1,6 +1,5 @@
 package jalview.schemes;\r
 \r
-import java.util.*;\r
 import java.awt.*;\r
 \r
 public class BuriedColourScheme extends ScoreColourScheme {\r

diff --git a/src/jalview/schemes/ColourSchemeI.java b/src/jalview/schemes/ColourSchemeI.java
index fcdaa45..c400251 100755 (executable)
--- a/src/jalview/schemes/ColourSchemeI.java
+++ b/src/jalview/schemes/ColourSchemeI.java
@@ -1,6 +1,5 @@
 package jalview.schemes;\r
 \r
-import jalview.datamodel.*;\r
 import java.awt.*;\r
 import java.util.*;\r
 \r

diff --git a/src/jalview/schemes/ColourSchemeProperty.java b/src/jalview/schemes/ColourSchemeProperty.java
index 169f35e..6831ec2 100755 (executable)
--- 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 (executable)
--- 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 (executable)
--- a/src/jalview/schemes/HelixColourScheme.java
+++ b/src/jalview/schemes/HelixColourScheme.java
@@ -18,8 +18,6 @@
 \r
 package jalview.schemes;\r
 \r
-\r
-import java.util.*;\r
 import java.awt.*;\r
 \r
 public class HelixColourScheme extends ScoreColourScheme {\r

diff --git a/src/jalview/schemes/NucleotideColourScheme.java b/src/jalview/schemes/NucleotideColourScheme.java
index 26aea21..dc06175 100755 (executable)
--- a/src/jalview/schemes/NucleotideColourScheme.java
+++ b/src/jalview/schemes/NucleotideColourScheme.java
@@ -1,8 +1,6 @@
 package jalview.schemes;\r
 \r
 import java.awt.*;\r
-import java.util.*;\r
-\r
 \r
 public class NucleotideColourScheme extends ResidueColourScheme\r
 {\r

diff --git a/src/jalview/schemes/ResidueColourScheme.java b/src/jalview/schemes/ResidueColourScheme.java
index 7eab3dd..ac00389 100755 (executable)
--- a/src/jalview/schemes/ResidueColourScheme.java
+++ b/src/jalview/schemes/ResidueColourScheme.java
@@ -1,6 +1,5 @@
 package jalview.schemes;\r
 \r
-import jalview.datamodel.*;\r
 import java.util.*;\r
 import java.awt.*;\r
 \r

diff --git a/src/jalview/schemes/ResidueProperties.java b/src/jalview/schemes/ResidueProperties.java
index 95acf91..f7c13ef 100755 (executable)
--- a/src/jalview/schemes/ResidueProperties.java
+++ b/src/jalview/schemes/ResidueProperties.java
@@ -19,8 +19,6 @@ package jalview.schemes;
 \r
 import java.awt.Color;\r
 import java.util.*;\r
-import jalview.jbgui.*;\r
-import jalview.datamodel.*;\r
 \r
 public class ResidueProperties {\r
 \r

diff --git a/src/jalview/schemes/ScoreColourScheme.java b/src/jalview/schemes/ScoreColourScheme.java
index b62ca18..220aecc 100755 (executable)
--- a/src/jalview/schemes/ScoreColourScheme.java
+++ b/src/jalview/schemes/ScoreColourScheme.java
@@ -1,9 +1,5 @@
 package jalview.schemes;\r
 \r
-import jalview.datamodel.*;\r
-import jalview.jbgui.*;\r
-\r
-import java.util.*;\r
 import java.awt.*;\r
 \r
 public class ScoreColourScheme extends ResidueColourScheme {\r

diff --git a/src/jalview/schemes/StrandColourScheme.java b/src/jalview/schemes/StrandColourScheme.java
index 9ffed08..1e54a74 100755 (executable)
--- a/src/jalview/schemes/StrandColourScheme.java
+++ b/src/jalview/schemes/StrandColourScheme.java
@@ -19,7 +19,6 @@
 \r
 package jalview.schemes;\r
 \r
-import java.util.*;\r
 import java.awt.*;\r
 \r
 public class StrandColourScheme extends ScoreColourScheme {\r

diff --git a/src/jalview/schemes/TurnColourScheme.java b/src/jalview/schemes/TurnColourScheme.java
index b251c76..6d0f7aa 100755 (executable)
--- a/src/jalview/schemes/TurnColourScheme.java
+++ b/src/jalview/schemes/TurnColourScheme.java
@@ -18,8 +18,6 @@
 \r
 package jalview.schemes;\r
 \r
-\r
-import java.util.*;\r
 import java.awt.*;\r
 \r
 public class TurnColourScheme extends ScoreColourScheme {\r

diff --git a/src/jalview/schemes/UserColourScheme.java b/src/jalview/schemes/UserColourScheme.java
index 24e35bb..bc5e8ea 100755 (executable)
--- a/src/jalview/schemes/UserColourScheme.java
+++ b/src/jalview/schemes/UserColourScheme.java
@@ -18,7 +18,6 @@
 \r
 package jalview.schemes;\r
 \r
-import java.util.*;\r
 import java.awt.*;\r
 \r
 public class UserColourScheme extends ResidueColourScheme\r

diff --git a/src/jalview/schemes/ZappoColourScheme.java b/src/jalview/schemes/ZappoColourScheme.java
index b72ff02..482a5c0 100755 (executable)
--- a/src/jalview/schemes/ZappoColourScheme.java
+++ b/src/jalview/schemes/ZappoColourScheme.java
@@ -1,11 +1,5 @@
 package jalview.schemes;\r
 \r
-import jalview.jbgui.*;\r
-import jalview.datamodel.*;\r
-\r
-import java.util.*;\r
-import java.awt.*;\r
-\r
 public class ZappoColourScheme extends ResidueColourScheme {\r
 \r
   public ZappoColourScheme() {\r