git://source.jalview.org
/
jalview.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
20468f2
)
popup for non-fatal tree parsing error
author
jprocter
<Jim Procter>
Wed, 22 Aug 2007 13:44:37 +0000
(13:44 +0000)
committer
jprocter
<Jim Procter>
Wed, 22 Aug 2007 13:44:37 +0000
(13:44 +0000)
src/jalview/gui/AlignFrame.java
patch
|
blob
|
history
diff --git
a/src/jalview/gui/AlignFrame.java
b/src/jalview/gui/AlignFrame.java
index
f678915
..
1795c1a
100755
(executable)
--- a/
src/jalview/gui/AlignFrame.java
+++ b/
src/jalview/gui/AlignFrame.java
@@
-3327,21
+3327,28
@@
public class AlignFrame
{
String choice = chooser.getSelectedFile().getPath();
jalview.bin.Cache.setProperty("LAST_DIRECTORY", choice);
{
String choice = chooser.getSelectedFile().getPath();
jalview.bin.Cache.setProperty("LAST_DIRECTORY", choice);
-
+ jalview.io.NewickFile fin = null;
try
{
try
{
- jalview.io.NewickFile fin = new jalview.io.NewickFile(choice,
+ fin = new jalview.io.NewickFile(choice,
"File");
viewport.setCurrentTree(ShowNewickTree(fin, choice).getTree());
}
catch (Exception ex)
{
JOptionPane.showMessageDialog(Desktop.desktop,
"File");
viewport.setCurrentTree(ShowNewickTree(fin, choice).getTree());
}
catch (Exception ex)
{
JOptionPane.showMessageDialog(Desktop.desktop,
- "Problem reading tree file",
ex.getMessage(),
ex.getMessage(),
+ "Problem reading tree file",
JOptionPane.WARNING_MESSAGE);
ex.printStackTrace();
}
JOptionPane.WARNING_MESSAGE);
ex.printStackTrace();
}
+ if (fin!=null && fin.hasWarningMessage())
+ {
+ JOptionPane.showMessageDialog(Desktop.desktop,
+ fin.getWarningMessage(),
+ "Possible problem with tree file",
+ JOptionPane.WARNING_MESSAGE);
+ }
}
}
}
}
@@
-3406,7
+3413,7
@@
public class AlignFrame
{
ex.printStackTrace();
}
{
ex.printStackTrace();
}
-
+
return tp;
}
return tp;
}