getSequencesArray

[jalview.git] / src / jalview / appletgui / Finder.java

diff --git a/src/jalview/appletgui/Finder.java b/src/jalview/appletgui/Finder.java
index 8905b52..570241d 100755 (executable)
--- a/src/jalview/appletgui/Finder.java
+++ b/src/jalview/appletgui/Finder.java
@@ -25,6 +25,7 @@ import java.awt.*;
 import java.awt.event.*;\r
 \r
 import jalview.datamodel.*;\r
+import java.awt.Rectangle;\r
 \r
 public class Finder extends Panel implements ActionListener\r
 {\r
@@ -107,7 +108,7 @@ public class Finder extends Panel implements ActionListener
         SequenceFeature sf = new SequenceFeature(featureName,\r
             null, null,\r
             searchResults.getResultStart(i),\r
-           searchResults.getResultEnd(i));\r
+           searchResults.getResultEnd(i), "Search Results");\r
 \r
         ap.seqPanel.seqCanvas.getFeatureRenderer().addNewFeature(\r
             featureName, new Color(60,160,115));\r
@@ -124,7 +125,9 @@ public class Finder extends Panel implements ActionListener
   {\r
     createNewGroup.setEnabled(false);\r
 \r
-    String searchString = textfield.getText().toUpperCase();\r
+    String searchString = textfield.getText();\r
+    if(!caseSensitive.getState())\r
+      searchString = searchString.toUpperCase();\r
 \r
     com.stevesoft.pat.Regex regex = new com.stevesoft.pat.Regex(searchString);\r
 \r
@@ -182,7 +185,9 @@ public class Finder extends Panel implements ActionListener
         continue;\r
       }\r
 \r
-      item = seq.getSequence().toUpperCase();\r
+      item = seq.getSequence();\r
+      if(!caseSensitive.getState())\r
+        item = item.toUpperCase();\r
 \r
       if (selection != null && selection.getEndRes() < av.alignment.getWidth())\r
       {\r
@@ -297,7 +302,7 @@ public class Finder extends Panel implements ActionListener
   Panel jPanel1 = new Panel();\r
   GridLayout gridLayout1 = new GridLayout();\r
   protected Button createNewGroup = new Button();\r
-\r
+  Checkbox caseSensitive = new Checkbox();\r
 \r
   private void jbInit() throws Exception {\r
       jLabel1.setFont(new java.awt.Font("Verdana", 0, 12));\r
@@ -329,10 +334,13 @@ public class Finder extends Panel implements ActionListener
       createNewGroup.setFont(new java.awt.Font("Verdana", Font.PLAIN, 10));\r
       createNewGroup.setLabel("New Feature");\r
       createNewGroup.addActionListener(this);\r
-      jPanel1.add(findNext, null);\r
+    caseSensitive.setLabel("Match Case");\r
+    caseSensitive.setBounds(new Rectangle(40, 49, 126, 23));\r
+    jPanel1.add(findNext, null);\r
       jPanel1.add(findAll, null);\r
       jPanel1.add(createNewGroup, null);\r
-      this.add(textfield, null);\r
+    this.add(caseSensitive);\r
+    this.add(textfield, null);\r
       this.add(jLabel1, null);\r
       this.add(jPanel1, null);\r
   }\r