X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fjbgui%2FGFinder.java;h=c0b5d0e076a529030ae20f67cd922b59e4220dd5;hb=2aadcc39283c979394f9f79a862d293d960a0335;hp=554d8bc3dc5b186a54007ccb2bcede2e18d326b3;hpb=1cd8649ecb6dbce0c78389b112052542fd8cd7bc;p=jalview.git diff --git a/src/jalview/jbgui/GFinder.java b/src/jalview/jbgui/GFinder.java index 554d8bc..c0b5d0e 100755 --- a/src/jalview/jbgui/GFinder.java +++ b/src/jalview/jbgui/GFinder.java @@ -1,37 +1,39 @@ /* -* Jalview - A Sequence Alignment Editor and Viewer -* Copyright (C) 2005 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle -* -* This program is free software; you can redistribute it and/or -* modify it under the terms of the GNU General Public License -* as published by the Free Software Foundation; either version 2 -* of the License, or (at your option) any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA -*/ + * Jalview - A Sequence Alignment Editor and Viewer + * Copyright (C) 2005 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA + */ package jalview.jbgui; import java.awt.*; import java.awt.event.*; - import javax.swing.*; -import javax.swing.event.CaretListener; -import javax.swing.event.CaretEvent; +import javax.swing.event.*; +import jalview.io.FormatAdapter; +import jalview.datamodel.SequenceI; -public class GFinder extends JPanel { - JLabel jLabel1 = new JLabel(); +public class GFinder + extends JPanel +{ + JLabel jLabel1 = new JLabel(); protected JButton findAll = new JButton(); - protected JButton findNext = new JButton(); - JPanel jPanel1 = new JPanel(); - GridLayout gridLayout1 = new GridLayout(); - protected JButton createNewGroup = new JButton(); + protected JButton findNext = new JButton(); + JPanel jPanel1 = new JPanel(); + GridLayout gridLayout1 = new GridLayout(); + protected JButton createNewGroup = new JButton(); JScrollPane jScrollPane1 = new JScrollPane(); protected JTextArea textfield = new JTextArea(); BorderLayout borderLayout1 = new BorderLayout(); @@ -41,47 +43,59 @@ public class GFinder extends JPanel { BorderLayout borderLayout2 = new BorderLayout(); JPanel jPanel5 = new JPanel(); JPanel jPanel6 = new JPanel(); - public GFinder() { - try { - jbInit(); - } catch (Exception e) { - e.printStackTrace(); - } + public GFinder() + { + try + { + jbInit(); + } + catch (Exception e) + { + e.printStackTrace(); } + } - private void jbInit() throws Exception { - jLabel1.setFont(new java.awt.Font("Verdana", 0, 12)); - jLabel1.setText("Find"); + private void jbInit() + throws Exception + { + jLabel1.setFont(new java.awt.Font("Verdana", 0, 12)); + jLabel1.setText("Find"); this.setLayout(borderLayout1); findAll.setFont(new java.awt.Font("Verdana", 0, 12)); - findAll.setText("Find all"); - findAll.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(ActionEvent e) { - findAll_actionPerformed(e); - } - }); - findNext.setEnabled(false); - findNext.setFont(new java.awt.Font("Verdana", 0, 12)); - findNext.setText("Find Next"); - findNext.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(ActionEvent e) { - findNext_actionPerformed(e); - } - }); + findAll.setText("Find all"); + findAll.addActionListener(new java.awt.event.ActionListener() + { + public void actionPerformed(ActionEvent e) + { + findAll_actionPerformed(e); + } + }); + findNext.setEnabled(false); + findNext.setFont(new java.awt.Font("Verdana", 0, 12)); + findNext.setText("Find Next"); + findNext.addActionListener(new java.awt.event.ActionListener() + { + public void actionPerformed(ActionEvent e) + { + findNext_actionPerformed(e); + } + }); jPanel1.setLayout(gridLayout1); - gridLayout1.setHgap(0); - gridLayout1.setRows(3); - gridLayout1.setVgap(2); - createNewGroup.setEnabled(false); - 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.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(ActionEvent e) { - createNewGroup_actionPerformed(e); - } - }); + gridLayout1.setHgap(0); + gridLayout1.setRows(3); + gridLayout1.setVgap(2); + createNewGroup.setEnabled(false); + createNewGroup.setFont(new java.awt.Font("Verdana", 0, 12)); + createNewGroup.setToolTipText(""); + createNewGroup.setMargin(new Insets(0, 0, 0, 0)); + createNewGroup.setText("New Feature"); + createNewGroup.addActionListener(new java.awt.event.ActionListener() + { + public void actionPerformed(ActionEvent e) + { + createNewGroup_actionPerformed(e); + } + }); textfield.setFont(new java.awt.Font("Verdana", Font.PLAIN, 12)); textfield.setText(""); textfield.setLineWrap(true); @@ -92,14 +106,20 @@ public class GFinder extends JPanel { textfield_caretUpdate(e); } }); + textfield.addKeyListener(new java.awt.event.KeyAdapter() { + public void keyPressed(KeyEvent e) { + textfield_keyPressed(e); + } + }); + borderLayout1.setHgap(5); borderLayout1.setVgap(5); jPanel4.setLayout(borderLayout2); jPanel2.setPreferredSize(new Dimension(10, 1)); jPanel3.setPreferredSize(new Dimension(10, 1)); jPanel1.add(findNext, null); - jPanel1.add(findAll, null); - jPanel1.add(createNewGroup, null); + jPanel1.add(findAll, null); + jPanel1.add(createNewGroup, null); this.add(jLabel1, java.awt.BorderLayout.WEST); this.add(jPanel1, java.awt.BorderLayout.EAST); this.add(jPanel2, java.awt.BorderLayout.SOUTH); @@ -111,35 +131,49 @@ public class GFinder extends JPanel { jScrollPane1.getViewport().add(textfield); } - protected void findNext_actionPerformed(ActionEvent e) { - } + protected void findNext_actionPerformed(ActionEvent e) + { + } - protected void findAll_actionPerformed(ActionEvent e) { - } + protected void findAll_actionPerformed(ActionEvent e) + { + } - protected void textfield_actionPerformed(ActionEvent e) { - } - void textfield_keyTyped(KeyEvent e) { - findNext.setEnabled(true); - } + protected void textfield_keyPressed(KeyEvent e) + { - public void createNewGroup_actionPerformed(ActionEvent e) { + if(e.getKeyCode()==KeyEvent.VK_ENTER) + { + e.consume(); + findNext_actionPerformed(null); } + findNext.setEnabled(true); + } + + public void createNewGroup_actionPerformed(ActionEvent e) + { + } public void textfield_caretUpdate(CaretEvent e) { - if (textfield.getText().indexOf("\t")>-1) + if (textfield.getText().indexOf(">") > -1) { SwingUtilities.invokeLater(new Runnable() { public void run() { - String text = textfield.getText(); - text = text.substring(text.lastIndexOf("\t") + 1).trim(); - text = jalview.analysis.AlignSeq.extractGaps( - jalview.util.Comparison.GapChars, text); - textfield.setText(text); + String str = textfield.getText(); + 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( + jalview.util.Comparison.GapChars, sequences[0].getSequence()); + + textfield.setText(str); + } } }); }