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-2805 couple of method name changes
[jalview.git]
/
src
/
jalview
/
gui
/
AlignFrame.java
diff --git
a/src/jalview/gui/AlignFrame.java
b/src/jalview/gui/AlignFrame.java
index
774a4f1
..
1c19eb1
100644
(file)
--- a/
src/jalview/gui/AlignFrame.java
+++ b/
src/jalview/gui/AlignFrame.java
@@
-60,6
+60,9
@@
import jalview.datamodel.SeqCigar;
import jalview.datamodel.Sequence;
import jalview.datamodel.SequenceGroup;
import jalview.datamodel.SequenceI;
import jalview.datamodel.Sequence;
import jalview.datamodel.SequenceGroup;
import jalview.datamodel.SequenceI;
+import jalview.ext.forester.io.ExternalTreeParserI;
+import jalview.ext.forester.io.ForesterTreeParser;
+import jalview.ext.forester.io.SupportedTreeFileFilter;
import jalview.gui.ColourMenuHelper.ColourChangeListener;
import jalview.gui.ViewSelectionMenu.ViewSetProvider;
import jalview.io.AlignmentProperties;
import jalview.gui.ColourMenuHelper.ColourChangeListener;
import jalview.gui.ViewSelectionMenu.ViewSetProvider;
import jalview.io.AlignmentProperties;
@@
-3882,9
+3885,13
@@
public class AlignFrame extends GAlignFrame implements DropTargetListener,
jalview.bin.Cache.getProperty("LAST_DIRECTORY"));
chooser.setFileView(new JalviewFileView());
chooser.setDialogTitle(
jalview.bin.Cache.getProperty("LAST_DIRECTORY"));
chooser.setFileView(new JalviewFileView());
chooser.setDialogTitle(
- MessageManager.getString("label.select_newick_like_tree_file"));
+ MessageManager.getString("label.select_newick_like_tree_file")); // modify
chooser.setToolTipText(
MessageManager.getString("label.load_tree_file"));
chooser.setToolTipText(
MessageManager.getString("label.load_tree_file"));
+ for (SupportedTreeFileFilter treeFormat : SupportedTreeFileFilter.values())
+ {
+ chooser.setFileFilter(treeFormat.getTreeFilter());
+ }
int value = chooser.showOpenDialog(null);
int value = chooser.showOpenDialog(null);
@@
-3892,9
+3899,16
@@
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);
+
NewickFile fin = null;
try
{
NewickFile fin = null;
try
{
+ ExternalTreeParserI<?> treeParser = new ForesterTreeParser(
+ filePath);
+ treeParser.loadTreeFile(viewport);
+
+
+
fin = new NewickFile(filePath, DataSourceType.FILE);
viewport.setCurrentTree(showNewickTree(fin, filePath).getTree());
} catch (Exception ex)
fin = new NewickFile(filePath, DataSourceType.FILE);
viewport.setCurrentTree(showNewickTree(fin, filePath).getTree());
} catch (Exception ex)
@@
-3915,6
+3929,18
@@
public class AlignFrame extends GAlignFrame implements DropTargetListener,
}
}
}
}
+ @Override
+ protected void loadTreeUrlItem_actionPerformed(ActionEvent e)
+ {
+
+ }
+
+ @Override
+ protected void loadTreeDbItem_actionPerformed(ActionEvent e)
+ {
+
+ }
+
public TreePanel showNewickTree(NewickFile nf, String treeTitle)
{
return showNewickTree(nf, treeTitle, 600, 500, 4, 5);
public TreePanel showNewickTree(NewickFile nf, String treeTitle)
{
return showNewickTree(nf, treeTitle, 600, 500, 4, 5);