X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fschemes%2FColourProperties.java;h=1f1e68ef32323cf9cdc7b0883b2a53b56dfdf487;hb=44d9bd9b511490baec5302be3b7756be0adebde3;hp=ff2c6bcdf3f9307d77732b5400c5832b52c59d5f;hpb=1ecf6419aba86993b3c223bf5ec0fa79427baf85;p=jalview.git

diff --git a/src/jalview/schemes/ColourProperties.java b/src/jalview/schemes/ColourProperties.java
index ff2c6bc..1f1e68e 100755
--- a/src/jalview/schemes/ColourProperties.java
+++ b/src/jalview/schemes/ColourProperties.java
@@ -34,30 +34,10 @@ public class ColourProperties {
 					       prefix + "TaylorColourScheme",
 					       "Taylor colours"));
 
-    colourSchemes.add(new ColourSchemeProperty("PID",
-					       prefix + "PIDColourScheme",
-					       "By PID"));
-
-    colourSchemes.add(new ColourSchemeProperty("BLOSUM62",
-					       prefix + "Blosum62ColourScheme",
-					       "By BLOSUM62 Score"));
-
-    colourSchemes.add(new ColourSchemeProperty("Secondary structure",
-					       prefix + "SecondaryColourScheme",
-					       "By Secondary Structure"));
-
-    colourSchemes.add(new ColourSchemeProperty("User defined",
-					       prefix + "ZappoColourScheme",
-					       "User defined colours"));
-
     colourSchemes.add(new ColourSchemeProperty("Hydrophobic",
 					       prefix + "HydrophobicColourScheme",
 					       "By Hydrophobicity"));
 
-   colourSchemes.add(new ColourSchemeProperty("Conservation",
-                                                   prefix + "ZappoColourScheme",
-                                                   null));
-
     colourSchemes.add(new ColourSchemeProperty("Helix",
 					       prefix + "HelixColourScheme",
 					       "Helix propensity"));
@@ -74,9 +54,29 @@ public class ColourProperties {
 					       prefix + "BuriedColourScheme",
 					       "Buried index"));
 
-    //    colourSchemes.add(new ColourSchemeProperty("Features",
-    //                                               prefix + "FeatureColourScheme",
-    //                                               null));
+    colourSchemes.add(new ColourSchemeProperty("BLOSUM62",
+                                            prefix + "Blosum62ColourScheme",
+                                            "By BLOSUM62 Score"));
+
+   colourSchemes.add(new ColourSchemeProperty("User defined",
+                                            prefix + "ZappoColourScheme",
+                                            "User defined colours"));
+
+       colourSchemes.add(new ColourSchemeProperty("PID",
+                                                  prefix + "PIDColourScheme",
+                                                  "By PID"));
+
+    colourSchemes.add(new ColourSchemeProperty("Secondary structure",
+                                               prefix + "SecondaryColourScheme",
+                                               "By Secondary Structure"));
+
+   colourSchemes.add(new ColourSchemeProperty("Conservation",
+                                                   prefix + "ZappoColourScheme",
+                                                   null));
+
+      colourSchemes.add(new ColourSchemeProperty("Features",
+                                                   prefix + "FeatureColourScheme",
+                                                   null));
 
     colourSchemes.add(new ColourSchemeProperty("Clustalx",
                                                prefix + "ClustalXColourScheme",
@@ -91,7 +91,7 @@ public class ColourProperties {
     }
   }
 
-  static int indexOfClass(ColourSchemeI scheme) {
+  public static int indexOfClass(ColourSchemeI scheme) {
     return colourSchemes.indexOfClass(scheme);
   }
 
@@ -114,6 +114,31 @@ public class ColourProperties {
   protected static String getDefaultClassPrefix() {
     return "jalview.schemes.";
   }
+
+  public static ColourSchemeI getColourScheme(int i)
+  {
+    switch(i)
+    {
+        case ColourProperties.HYDROPHOBIC: return new HydrophobicColourScheme();
+
+        case  ColourProperties.TAYLOR:   return new TaylorColourScheme();
+        case  ColourProperties.HELIX:    return new HelixColourScheme();
+        case  ColourProperties.STRAND:   return new StrandColourScheme();
+        case  ColourProperties.TURN:     return new TurnColourScheme();
+        case  ColourProperties.BURIED:   return new BuriedColourScheme();
+        case  ColourProperties.PID:      return new PIDColourScheme();
+        case  ColourProperties.BLOSUM62: return new Blosum62ColourScheme(null);
+        case  ColourProperties.SECONDARY:return new SecondaryColourScheme();
+
+        case  ColourProperties.ZAPPO:
+        case  ColourProperties.USER:
+        case  ColourProperties.CONSERVATION:
+        case  ColourProperties.FEATURES:
+        case  ColourProperties.CLUSTALX:
+       default: return new ZappoColourScheme();
+    }
+
+  }
 }