X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fjbgui%2FGFinder.java;h=fef456868059b631b8d88561e24e15e82234f4d5;hb=76caf07872d92bdc21faaa9278d9cccd7609d9b8;hp=92f5055fecd2e3709d165d564ef4a7222f326366;hpb=c19d2a91ca05e052e3408bf5852d88eb5d0608f1;p=jalview.git diff --git a/src/jalview/jbgui/GFinder.java b/src/jalview/jbgui/GFinder.java index 92f5055..fef4568 100755 --- a/src/jalview/jbgui/GFinder.java +++ b/src/jalview/jbgui/GFinder.java @@ -1,6 +1,6 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9.0b2) - * Copyright (C) 2015 The Jalview Authors + * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$) + * Copyright (C) $$Year-Rel$$ The Jalview Authors * * This file is part of Jalview. * @@ -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; @@ -99,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); @@ -108,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); @@ -123,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); @@ -133,6 +138,7 @@ public class GFinder extends JPanel textfield.setLineWrap(true); textfield.addCaretListener(new CaretListener() { + @Override public void caretUpdate(CaretEvent e) { textfield_caretUpdate(e); @@ -140,6 +146,7 @@ public class GFinder extends JPanel }); textfield.addKeyListener(new java.awt.event.KeyAdapter() { + @Override public void keyPressed(KeyEvent e) { textfield_keyPressed(e); @@ -207,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) { }