X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fschemes%2FResidueProperties.java;h=0ae32016f27f85852eab566cd9ebb942e21f0fb4;hb=1146ae7f678127be7796772b228d5fc6823435d4;hp=5604ca39c1106e719779b968849b21e284f49ad5;hpb=a442f71fc61f1b8b41cedd2c2fd78a5c5323bafb;p=jalview.git

diff --git a/src/jalview/schemes/ResidueProperties.java b/src/jalview/schemes/ResidueProperties.java
index 5604ca3..0ae3201 100755
--- a/src/jalview/schemes/ResidueProperties.java
+++ b/src/jalview/schemes/ResidueProperties.java
@@ -1,6 +1,6 @@
 /*
  * Jalview - A Sequence Alignment Editor and Viewer
- * Copyright (C) 2006 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
+ * Copyright (C) 2007 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -24,20 +24,21 @@ import java.awt.*;
 
 public class ResidueProperties
 {
-  public static Hashtable scoreMatrices=new Hashtable();
+  public static Hashtable scoreMatrices = new Hashtable();
   //Stores residue codes/names and colours and other things
-  public static final int [] aaIndex; // aaHash version 2.1.1 and below
-  public static final int [] nucleotideIndex;
+  public static final int[] aaIndex; // aaHash version 2.1.1 and below
+  public static final int[] nucleotideIndex;
   public static final Hashtable aa3Hash = new Hashtable();
   public static final Hashtable aa2Triplet = new Hashtable();
   public static final Hashtable nucleotideName = new Hashtable();
 
-
   static
   {
-    aaIndex = new int[132];
-    for(int i=0; i<132; i++)
-      aaIndex[i] = -1;
+    aaIndex = new int[255];
+    for (int i = 0; i < 255; i++)
+    {
+      aaIndex[i] = 23;
+    }
 
     aaIndex['A'] = 0;
     aaIndex['R'] = 1;
@@ -86,18 +87,16 @@ public class ResidueProperties
     aaIndex['b'] = 20;
     aaIndex['z'] = 21;
     aaIndex['x'] = 22;
-    aaIndex['u'] = 22;
-    aaIndex['-'] = 23;
-    aaIndex['*'] = 23;
-    aaIndex['.'] = 23;
-    aaIndex[' '] = 23;
+    aaIndex['u'] = 22; // TODO: selenocystine triplet and codons needed. also extend subt. matrices
   }
 
   static
   {
-    nucleotideIndex = new int[132];
-    for (int i = 0; i < 132; i++)
+    nucleotideIndex = new int[255];
+    for (int i = 0; i < 255; i++)
+    {
       nucleotideIndex[i] = -1;
+    }
 
     nucleotideIndex['A'] = 0;
     nucleotideIndex['a'] = 0;
@@ -120,7 +119,6 @@ public class ResidueProperties
     nucleotideIndex['N'] = 9;
     nucleotideIndex['n'] = 9;
 
-
     nucleotideName.put("A", "Adenine");
     nucleotideName.put("a", "Adenine");
     nucleotideName.put("G", "Guanine");
@@ -143,7 +141,6 @@ public class ResidueProperties
     nucleotideName.put("n", "Unknown");
   }
 
-
   static
   {
     aa3Hash.put("ALA", new Integer(0));
@@ -169,7 +166,7 @@ public class ResidueProperties
     // IUB Nomenclature for ambiguous peptides
     aa3Hash.put("ASX", new Integer(20)); // "B";
     aa3Hash.put("GLX", new Integer(21)); // X
-    aa3Hash.put("XAA", new Integer(22));// X unknown
+    aa3Hash.put("XAA", new Integer(22)); // X unknown
     aa3Hash.put("-", new Integer(23));
     aa3Hash.put("*", new Integer(23));
     aa3Hash.put(".", new Integer(23));
@@ -609,11 +606,13 @@ public class ResidueProperties
   /**
    * register matrices in list
    */
-  static {
-    scoreMatrices.put("BLOSUM62", new ScoreMatrix("BLOSUM62",BLOSUM62, 0));
-    scoreMatrices.put("PAM250", new ScoreMatrix("PAM250",PAM250, 0));
+  static
+  {
+    scoreMatrices.put("BLOSUM62", new ScoreMatrix("BLOSUM62", BLOSUM62, 0));
+    scoreMatrices.put("PAM250", new ScoreMatrix("PAM250", PAM250, 0));
     scoreMatrices.put("DNA", new ScoreMatrix("DNA", DNA, 1));
   }
+
   public static final Color[] pidColours =
       {
       midBlue, new Color(153, 153, 255),
@@ -843,7 +842,6 @@ public class ResidueProperties
     Phe.addElement("TTT");
   }
 
-
   //Stores residue codes/names and colours and other things
   public static Hashtable propHash = new Hashtable();
   public static Hashtable hydrophobic = new Hashtable();
@@ -1224,10 +1222,13 @@ public class ResidueProperties
     return null;
   }
 
-  public static int[][] getDefaultPeptideMatrix() {
+  public static int[][] getDefaultPeptideMatrix()
+  {
     return ResidueProperties.getBLOSUM62();
   }
-  public static int[][] getDefaultDnaMatrix() {
+
+  public static int[][] getDefaultDnaMatrix()
+  {
     return ResidueProperties.getDNA();
   }
 
@@ -1236,10 +1237,13 @@ public class ResidueProperties
    * @param pwtype
    * @return matrix in scoreMatrices with key pwtype or null
    */
-  public static ScoreMatrix getScoreMatrix(String pwtype) {
-    Object val=scoreMatrices.get(pwtype);
-    if (val!=null)
+  public static ScoreMatrix getScoreMatrix(String pwtype)
+  {
+    Object val = scoreMatrices.get(pwtype);
+    if (val != null)
+    {
       return (ScoreMatrix) val;
+    }
     return null;
   }
 }