From e5ed660a1ee016f2a7a80f52b92a6d52ec7b47a7 Mon Sep 17 00:00:00 2001
From: amwaterhouse <Andrew Waterhouse>
Date: Fri, 28 Apr 2006 12:33:44 +0000
Subject: [PATCH] Case sensitive

---
 src/jalview/appletgui/Finder.java |   18 +++++++++++++-----
 src/jalview/gui/Finder.java       |    9 +++++++--
 src/jalview/jbgui/GFinder.java    |    9 ++++++---
 3 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/src/jalview/appletgui/Finder.java b/src/jalview/appletgui/Finder.java
index 1201278..570241d 100755
--- a/src/jalview/appletgui/Finder.java
+++ b/src/jalview/appletgui/Finder.java
@@ -25,6 +25,7 @@ import java.awt.*;
 import java.awt.event.*;
 
 import jalview.datamodel.*;
+import java.awt.Rectangle;
 
 public class Finder extends Panel implements ActionListener
 {
@@ -124,7 +125,9 @@ public class Finder extends Panel implements ActionListener
   {
     createNewGroup.setEnabled(false);
 
-    String searchString = textfield.getText().toUpperCase();
+    String searchString = textfield.getText();
+    if(!caseSensitive.getState())
+      searchString = searchString.toUpperCase();
 
     com.stevesoft.pat.Regex regex = new com.stevesoft.pat.Regex(searchString);
 
@@ -182,7 +185,9 @@ public class Finder extends Panel implements ActionListener
         continue;
       }
 
-      item = seq.getSequence().toUpperCase();
+      item = seq.getSequence();
+      if(!caseSensitive.getState())
+        item = item.toUpperCase();
 
       if (selection != null && selection.getEndRes() < av.alignment.getWidth())
       {
@@ -297,7 +302,7 @@ public class Finder extends Panel implements ActionListener
   Panel jPanel1 = new Panel();
   GridLayout gridLayout1 = new GridLayout();
   protected Button createNewGroup = new Button();
-
+  Checkbox caseSensitive = new Checkbox();
 
   private void jbInit() throws Exception {
       jLabel1.setFont(new java.awt.Font("Verdana", 0, 12));
@@ -329,10 +334,13 @@ public class Finder extends Panel implements ActionListener
       createNewGroup.setFont(new java.awt.Font("Verdana", Font.PLAIN, 10));
       createNewGroup.setLabel("New Feature");
       createNewGroup.addActionListener(this);
-      jPanel1.add(findNext, null);
+    caseSensitive.setLabel("Match Case");
+    caseSensitive.setBounds(new Rectangle(40, 49, 126, 23));
+    jPanel1.add(findNext, null);
       jPanel1.add(findAll, null);
       jPanel1.add(createNewGroup, null);
-      this.add(textfield, null);
+    this.add(caseSensitive);
+    this.add(textfield, null);
       this.add(jLabel1, null);
       this.add(jPanel1, null);
   }
diff --git a/src/jalview/gui/Finder.java b/src/jalview/gui/Finder.java
index 6b8df4b..49a9656 100755
--- a/src/jalview/gui/Finder.java
+++ b/src/jalview/gui/Finder.java
@@ -153,7 +153,10 @@ public class Finder extends GFinder
     {
         createNewGroup.setEnabled(false);
 
-        String searchString = textfield.getText().toUpperCase().trim();
+        String searchString = textfield.getText().trim();
+        if(!caseSensitive.isSelected())
+          searchString = searchString.toUpperCase();
+
         if(searchString.length()<1)
           return;
 
@@ -212,7 +215,9 @@ public class Finder extends GFinder
                 continue;
             }
 
-            item = seq.getSequence().toUpperCase();
+            item = seq.getSequence();
+            if(!caseSensitive.isSelected())
+              item = item.toUpperCase();
 
             if ((selection != null) &&
                     (selection.getEndRes() < av.alignment.getWidth()-1))
diff --git a/src/jalview/jbgui/GFinder.java b/src/jalview/jbgui/GFinder.java
index c0b5d0e..c3ed168 100755
--- a/src/jalview/jbgui/GFinder.java
+++ b/src/jalview/jbgui/GFinder.java
@@ -24,6 +24,7 @@ import javax.swing.*;
 import javax.swing.event.*;
 import jalview.io.FormatAdapter;
 import jalview.datamodel.SequenceI;
+import java.awt.BorderLayout;
 
 public class GFinder
     extends JPanel
@@ -41,8 +42,8 @@ public class GFinder
   JPanel jPanel3 = new JPanel();
   JPanel jPanel4 = new JPanel();
   BorderLayout borderLayout2 = new BorderLayout();
-  JPanel jPanel5 = new JPanel();
   JPanel jPanel6 = new JPanel();
+  protected JCheckBox caseSensitive = new JCheckBox();
   public GFinder()
   {
     try
@@ -117,6 +118,8 @@ public class GFinder
     jPanel4.setLayout(borderLayout2);
     jPanel2.setPreferredSize(new Dimension(10, 1));
     jPanel3.setPreferredSize(new Dimension(10, 1));
+    caseSensitive.setHorizontalAlignment(SwingConstants.LEFT);
+    caseSensitive.setText("Match Case");
     jPanel1.add(findNext, null);
     jPanel1.add(findAll, null);
     jPanel1.add(createNewGroup, null);
@@ -126,9 +129,9 @@ public class GFinder
     this.add(jPanel3, java.awt.BorderLayout.NORTH);
     this.add(jPanel4, java.awt.BorderLayout.CENTER);
     jPanel4.add(jScrollPane1, java.awt.BorderLayout.CENTER);
-    jPanel4.add(jPanel5, java.awt.BorderLayout.SOUTH);
-    jPanel4.add(jPanel6, java.awt.BorderLayout.NORTH);
     jScrollPane1.getViewport().add(textfield);
+    jPanel4.add(jPanel6, java.awt.BorderLayout.NORTH);
+    jPanel4.add(caseSensitive, java.awt.BorderLayout.SOUTH);
   }
 
   protected void findNext_actionPerformed(ActionEvent e)
-- 
1.7.10.2