X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fjbgui%2FGFinder.java;h=c3ed1686be5bac42c8f4d3f6499e2edc8a9e764b;hb=2eaaec9b53681e44e6c109e71aecdd3cadd7f727;hp=8ece84d1dfbf548bf8209318c2279d5d48d1dded;hpb=ceb4fd3a8909862e45ac79b242ed112a15998d84;p=jalview.git diff --git a/src/jalview/jbgui/GFinder.java b/src/jalview/jbgui/GFinder.java index 8ece84d..c3ed168 100755 --- a/src/jalview/jbgui/GFinder.java +++ b/src/jalview/jbgui/GFinder.java @@ -24,8 +24,7 @@ import javax.swing.*; import javax.swing.event.*; import jalview.io.FormatAdapter; import jalview.datamodel.SequenceI; -import java.awt.datatransfer.DataFlavor; -import jalview.io.IdentifyFile; +import java.awt.BorderLayout; public class GFinder extends JPanel @@ -43,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 @@ -90,7 +89,7 @@ public class GFinder createNewGroup.setFont(new java.awt.Font("Verdana", 0, 12)); createNewGroup.setToolTipText(""); createNewGroup.setMargin(new Insets(0, 0, 0, 0)); - createNewGroup.setText("Create new group"); + createNewGroup.setText("New Feature"); createNewGroup.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) @@ -119,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); @@ -128,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) @@ -166,7 +167,9 @@ public class GFinder public void run() { String str = textfield.getText(); - SequenceI[] sequences = FormatAdapter.readFile(str, "Paste", "FASTA"); + SequenceI[] sequences = null; + try{sequences = new FormatAdapter().readFile(str, "Paste", "FASTA");} + catch(Exception ex){} if(sequences!=null && sequences.length>0) { str = jalview.analysis.AlignSeq.extractGaps(