one less cast

[jalview.git] / src / jalview / analysis / Conservation.java

diff --git a/src/jalview/analysis/Conservation.java b/src/jalview/analysis/Conservation.java
index 0af0689..99c6e89 100755 (executable)
--- a/src/jalview/analysis/Conservation.java
+++ b/src/jalview/analysis/Conservation.java
@@ -100,7 +100,7 @@ public class Conservation
 
         if ((i > -1) && (i < sSize))
         {
-            sq = sequences[i].getSequence();
+            sq = sequences[i].getSequenceAsString();
 
             if (seqNums.size() <= i)
             {
@@ -131,7 +131,7 @@ public class Conservation
                 seqNums.setElementAt(sqnum, i);
             }
             else
-              System.out.println("NEVER THE EXCEPTION");
+              System.out.println("SEQUENCE HAS BEEN DELETED!!!");
         }
         else
         {
@@ -187,12 +187,12 @@ public class Conservation
 
             //loop over all the found residues
             resultHash = new Hashtable();
-            for (int v = '-'; v < 'Z'; v++)
+            for (char v = '-'; v < 'Z'; v++)
             {
 
                 if (values[v] > thresh)
                 {
-                  res =  String.valueOf( (char) v);
+                  res =  String.valueOf( v );
 
                     //Now loop over the properties
                     enumeration2 = propHash.keys();
@@ -295,6 +295,12 @@ public class Conservation
         Hashtable resultHash ;
         Enumeration enumeration;
 
+        //NOTE THIS SHOULD CHECK IF THE CONSEQUENCE ALREADY
+        //EXISTS AND NOT OVERWRITE WITH '-', BUT THIS CASE
+        //DOES NOT EXIST IN JALVIEW 2.1.2
+        for(int i=0; i<start; i++)
+          consString.append('-');
+
 
         for (int i = start; i <= end; i++)
         {
@@ -343,7 +349,7 @@ public class Conservation
             }
             else
             {
-                consString.append("-");
+                consString.append('-');
             }
         }