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
added default ClustalWS or MuscleWS to remove gaps.
[jalview.git]
/
src
/
jalview
/
gui
/
AlignFrame.java
diff --git
a/src/jalview/gui/AlignFrame.java
b/src/jalview/gui/AlignFrame.java
index
b0eca3e
..
343ca2b
100755
(executable)
--- a/
src/jalview/gui/AlignFrame.java
+++ b/
src/jalview/gui/AlignFrame.java
@@
-1004,7
+1004,8
@@
public class AlignFrame extends GAlignFrame
public void pairwiseAlignmentMenuItem_actionPerformed(ActionEvent e)
{
public void pairwiseAlignmentMenuItem_actionPerformed(ActionEvent e)
{
- if(viewport.getSelectionGroup().getSize()<2)
+ if((viewport.getSelectionGroup()==null) ||
+ viewport.getSelectionGroup().getSize()<2)
JOptionPane.showInternalMessageDialog(this, "You must select at least 2 sequences.", "Invalid Selection", JOptionPane.WARNING_MESSAGE);
else
{
JOptionPane.showInternalMessageDialog(this, "You must select at least 2 sequences.", "Invalid Selection", JOptionPane.WARNING_MESSAGE);
else
{
@@
-1186,7
+1187,7
@@
public class AlignFrame extends GAlignFrame
}
if (msa!=null) {
}
if (msa!=null) {
- jalview.ws.MsaWSClient ct = new jalview.ws.MsaWSClient("ClustalWS", title, msa, true, true);
+ jalview.ws.MsaWSClient ct = new jalview.ws.MsaWSClient("ClustalWS", title, msa, false, true);
}
}
}
}
@@
-1272,7
+1273,7
@@
public class AlignFrame extends GAlignFrame
}
if (msa!=null) {
}
if (msa!=null) {
- MsaWSClient ct = new jalview.ws.MsaWSClient("MuscleWS",title, msa, true, true);
+ MsaWSClient ct = new jalview.ws.MsaWSClient("MuscleWS",title, msa, false, true);
}
}
protected void LoadtreeMenuItem_actionPerformed(ActionEvent e) {
}
}
protected void LoadtreeMenuItem_actionPerformed(ActionEvent e) {