From: amwaterhouse <Andrew Waterhouse>
Date: Mon, 13 Nov 2006 16:16:53 +0000 (+0000)
Subject: Enable lower case colours
X-Git-Tag: Release_2_2~125
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=7f7fc2e5533f7b00c86465f964e37c55bcf12fd7;p=jalview.git

Enable lower case colours
---

diff --git a/src/jalview/gui/UserDefinedColours.java b/src/jalview/gui/UserDefinedColours.java
index 86c39f9..a8afd43 100755
--- a/src/jalview/gui/UserDefinedColours.java
+++ b/src/jalview/gui/UserDefinedColours.java
@@ -67,10 +67,6 @@ public class UserDefinedColours extends GUserDefinedColours
     {
         super();
 
-        //AW - LOWER CASE DISABLED IN 2.1.01 bug fix release
-        casePanel.setVisible(false);
-
-
         lcaseColour.setEnabled(false);
 
         this.ap = ap;
@@ -137,9 +133,6 @@ public class UserDefinedColours extends GUserDefinedColours
 
     void resetButtonPanel(boolean caseSensitive)
     {
-      //AW - LOWER CASE DISABLED IN 2.1.01 bug fix release
-      caseSensitive = false;
-
       buttonPanel.removeAll();
 
 
@@ -356,12 +349,10 @@ public class UserDefinedColours extends GUserDefinedColours
           {    }
         }
 
-      /* //AW - LOWER CASE DISABLED IN 2.1.01 bug fix release
         if(caseSensitive.isSelected())
           button.setMargin(new java.awt.Insets(2,2,2,2));
         else
          button.setMargin(new java.awt.Insets(2,14,2,14));
-      */
 
         button.setBackground(col);
         button.setText(label);
diff --git a/src/jalview/schemes/UserColourScheme.java b/src/jalview/schemes/UserColourScheme.java
index 007d358..3349283 100755
--- a/src/jalview/schemes/UserColourScheme.java
+++ b/src/jalview/schemes/UserColourScheme.java
@@ -152,8 +152,6 @@ public class UserColourScheme
 
           int colIndex = ResidueProperties.aaIndex[token.charAt(0)];
 
-           //AW - LOWER CASE DISABLED IN 2.1.01 bug fix release
-
           if(token.equalsIgnoreCase("lowerCase"))
           {
             if (lowerCaseColours == null)
@@ -194,7 +192,6 @@ public class UserColourScheme
 
       if ((threshold == 0) || aboveThreshold(ResidueProperties.aa[index], j))
       {
-       //AW - LOWER CASE DISABLED IN 2.1.01 bug fix release
         if(lowerCaseColours!=null && 'a' <= s.charAt(0) && s.charAt(0) <= 'z')
           currentColour = lowerCaseColours[index];
         else