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
JAL-2847 small things, filled in actionperformeds
[jalview.git]
/
src
/
jalview
/
gui
/
AlignFrame.java
diff --git
a/src/jalview/gui/AlignFrame.java
b/src/jalview/gui/AlignFrame.java
index
427cb00
..
deb8d11
100644
(file)
--- a/
src/jalview/gui/AlignFrame.java
+++ b/
src/jalview/gui/AlignFrame.java
@@
-3898,46
+3898,41
@@
public class AlignFrame extends GAlignFrame implements DropTargetListener,
}
@Override
}
@Override
- protected void loadTreeDbItem_actionPerformed(ActionEvent e)
- {
- chooseTreeDb();
- }
-
- @Override
protected void loadTreeBaseStudy_actionPerformed(ActionEvent e)
{
protected void loadTreeBaseStudy_actionPerformed(ActionEvent e)
{
- // TODO Auto-generated method stub
+ chooseTreeDb();
}
@Override
protected void loadTreeOfLife_actionPerformed(ActionEvent e)
{
}
@Override
protected void loadTreeOfLife_actionPerformed(ActionEvent e)
{
- // TODO Auto-generated method stub
+ chooseTreeDb();
}
@Override
protected void loadTreeFam_actionPerformed(ActionEvent e)
{
}
@Override
protected void loadTreeFam_actionPerformed(ActionEvent e)
{
- // TODO Auto-generated method stub
+ chooseTreeDb();
}
@Override
protected void loadTreePfam_actionPerformed(ActionEvent e)
{
}
@Override
protected void loadTreePfam_actionPerformed(ActionEvent e)
{
- // TODO Auto-generated method stub
+ chooseTreeDb();
}
@Override
protected void loadTreeBase_actionPerformed(ActionEvent e)
{
}
@Override
protected void loadTreeBase_actionPerformed(ActionEvent e)
{
- // TODO Auto-generated method stub
+ chooseTreeDb();
}
}
+
public void chooseTreeFile()
{
// Pick the tree file
public void chooseTreeFile()
{
// Pick the tree file
@@
-3960,7
+3955,8
@@
public class AlignFrame extends GAlignFrame implements DropTargetListener,
{
String filePath = chooser.getSelectedFile().getPath();
Cache.setProperty("LAST_DIRECTORY", filePath);
{
String filePath = chooser.getSelectedFile().getPath();
Cache.setProperty("LAST_DIRECTORY", filePath);
-
+
+
TreeParser treeParser = new TreeParser(filePath);
treeParser.loadTree(viewport);
TreeParser treeParser = new TreeParser(filePath);
treeParser.loadTree(viewport);
@@
-4038,6
+4034,7
@@
public class AlignFrame extends GAlignFrame implements DropTargetListener,
{
{
+
}
public TreePanel showNewickTree(NewickFile nf, String treeTitle)
}
public TreePanel showNewickTree(NewickFile nf, String treeTitle)