X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fappletgui%2FFinder.java;h=570241dc2f96b110d9baee421c8b74249c579335;hb=c1ffd6dd15b79a56ec0a37eebbe4df05341ca57c;hp=8905b5256026cb3cb9830312ada0e9bb9fac5003;hpb=dedbb25d7f54f28aaa36592be27c80487090e10d;p=jalview.git diff --git a/src/jalview/appletgui/Finder.java b/src/jalview/appletgui/Finder.java index 8905b52..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 { @@ -107,7 +108,7 @@ public class Finder extends Panel implements ActionListener SequenceFeature sf = new SequenceFeature(featureName, null, null, searchResults.getResultStart(i), - searchResults.getResultEnd(i)); + searchResults.getResultEnd(i), "Search Results"); ap.seqPanel.seqCanvas.getFeatureRenderer().addNewFeature( featureName, new Color(60,160,115)); @@ -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); }