X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fjbgui%2FGFinder.java;h=df09a614fed9de9acc0054e6295f4193787d9de2;hb=7d67fb613ec026dc9a265e351e7fab542e3f1d61;hp=0b2e6be8d0affe351ad581865d363fe3e3432e2f;hpb=6dd554fdbf34db6b79595d5027159d20225f4894;p=jalview.git diff --git a/src/jalview/jbgui/GFinder.java b/src/jalview/jbgui/GFinder.java index 0b2e6be..fef4568 100755 --- a/src/jalview/jbgui/GFinder.java +++ b/src/jalview/jbgui/GFinder.java @@ -21,6 +21,8 @@ package jalview.jbgui; import jalview.datamodel.AlignmentI; +import jalview.io.DataSourceType; +import jalview.io.FileFormat; import jalview.io.FormatAdapter; import jalview.util.MessageManager; @@ -90,7 +92,6 @@ public class GFinder extends JPanel } } - private void jbInit() throws Exception { jLabelFind.setFont(new java.awt.Font("Verdana", 0, 12)); @@ -100,6 +101,7 @@ public class GFinder extends JPanel findAll.setText(MessageManager.getString("action.find_all")); findAll.addActionListener(new java.awt.event.ActionListener() { + @Override public void actionPerformed(ActionEvent e) { findAll_actionPerformed(e); @@ -109,6 +111,7 @@ public class GFinder extends JPanel findNext.setText(MessageManager.getString("action.find_next")); findNext.addActionListener(new java.awt.event.ActionListener() { + @Override public void actionPerformed(ActionEvent e) { findNext_actionPerformed(e); @@ -124,6 +127,7 @@ public class GFinder extends JPanel createNewGroup.setText(MessageManager.getString("label.new_feature")); createNewGroup.addActionListener(new java.awt.event.ActionListener() { + @Override public void actionPerformed(ActionEvent e) { createNewGroup_actionPerformed(e); @@ -134,6 +138,7 @@ public class GFinder extends JPanel textfield.setLineWrap(true); textfield.addCaretListener(new CaretListener() { + @Override public void caretUpdate(CaretEvent e) { textfield_caretUpdate(e); @@ -141,6 +146,7 @@ public class GFinder extends JPanel }); textfield.addKeyListener(new java.awt.event.KeyAdapter() { + @Override public void keyPressed(KeyEvent e) { textfield_keyPressed(e); @@ -208,13 +214,15 @@ public class GFinder extends JPanel { SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { String str = textfield.getText(); AlignmentI al = null; try { - al = new FormatAdapter().readFile(str, "Paste", "FASTA"); + al = new FormatAdapter().readFile(str, DataSourceType.PASTE, + FileFormat.Fasta); } catch (Exception ex) { }