git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' into trialMerge
[jalview.git]
/
src
/
jalview
/
jbgui
/
GFinder.java
diff --git
a/src/jalview/jbgui/GFinder.java
b/src/jalview/jbgui/GFinder.java
index
0b2e6be
..
fef4568
100755
(executable)
--- a/
src/jalview/jbgui/GFinder.java
+++ b/
src/jalview/jbgui/GFinder.java
@@
-21,6
+21,8
@@
package jalview.jbgui;
import jalview.datamodel.AlignmentI;
package jalview.jbgui;
import jalview.datamodel.AlignmentI;
+import jalview.io.DataSourceType;
+import jalview.io.FileFormat;
import jalview.io.FormatAdapter;
import jalview.util.MessageManager;
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));
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()
{
findAll.setText(MessageManager.getString("action.find_all"));
findAll.addActionListener(new java.awt.event.ActionListener()
{
+ @Override
public void actionPerformed(ActionEvent e)
{
findAll_actionPerformed(e);
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()
{
findNext.setText(MessageManager.getString("action.find_next"));
findNext.addActionListener(new java.awt.event.ActionListener()
{
+ @Override
public void actionPerformed(ActionEvent e)
{
findNext_actionPerformed(e);
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()
{
createNewGroup.setText(MessageManager.getString("label.new_feature"));
createNewGroup.addActionListener(new java.awt.event.ActionListener()
{
+ @Override
public void actionPerformed(ActionEvent e)
{
createNewGroup_actionPerformed(e);
public void actionPerformed(ActionEvent e)
{
createNewGroup_actionPerformed(e);
@@
-134,6
+138,7
@@
public class GFinder extends JPanel
textfield.setLineWrap(true);
textfield.addCaretListener(new CaretListener()
{
textfield.setLineWrap(true);
textfield.addCaretListener(new CaretListener()
{
+ @Override
public void caretUpdate(CaretEvent e)
{
textfield_caretUpdate(e);
public void caretUpdate(CaretEvent e)
{
textfield_caretUpdate(e);
@@
-141,6
+146,7
@@
public class GFinder extends JPanel
});
textfield.addKeyListener(new java.awt.event.KeyAdapter()
{
});
textfield.addKeyListener(new java.awt.event.KeyAdapter()
{
+ @Override
public void keyPressed(KeyEvent e)
{
textfield_keyPressed(e);
public void keyPressed(KeyEvent e)
{
textfield_keyPressed(e);
@@
-208,13
+214,15
@@
public class GFinder extends JPanel
{
SwingUtilities.invokeLater(new Runnable()
{
{
SwingUtilities.invokeLater(new Runnable()
{
+ @Override
public void run()
{
String str = textfield.getText();
AlignmentI al = null;
try
{
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)
{
}
} catch (Exception ex)
{
}