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
Dont load trees if copying Viewport
[jalview.git]
/
src
/
jalview
/
gui
/
Jalview2XML.java
diff --git
a/src/jalview/gui/Jalview2XML.java
b/src/jalview/gui/Jalview2XML.java
index
1e449cc
..
df551b7
100755
(executable)
--- a/
src/jalview/gui/Jalview2XML.java
+++ b/
src/jalview/gui/Jalview2XML.java
@@
-901,7
+901,7
@@
public class Jalview2XML
unmar.setValidation(false);
object = (JalviewModel) unmar.unmarshal( in );
unmar.setValidation(false);
object = (JalviewModel) unmar.unmarshal( in );
- af = LoadFromObject(object, file);
+ af = LoadFromObject(object, file, true);
if(af.viewport.gatherViewsHere)
{
gatherToThisFrame.add(af);
if(af.viewport.gatherViewsHere)
{
gatherToThisFrame.add(af);
@@
-1015,7
+1015,9
@@
public class Jalview2XML
}
}
- AlignFrame LoadFromObject(JalviewModel object, String file)
+ AlignFrame LoadFromObject(JalviewModel object,
+ String file,
+ boolean loadTrees )
{
SequenceSet vamsasSet = object.getVamsasModel().getSequenceSet(0);
Sequence[] vamsasSeq = vamsasSet.getSequence();
{
SequenceSet vamsasSet = object.getVamsasModel().getSequenceSet(0);
Sequence[] vamsasSeq = vamsasSet.getSequence();
@@
-1575,7
+1577,7
@@
public class Jalview2XML
//LOAD TREES
///////////////////////////////////////
//LOAD TREES
///////////////////////////////////////
- if (jms.getTreeCount() > 0)
+ if (loadTrees && jms.getTreeCount() > 0)
{
try
{
{
try
{
@@
-1637,7
+1639,7
@@
public class Jalview2XML
viewportsAdded = new Hashtable();
viewportsAdded = new Hashtable();
- AlignFrame af = LoadFromObject(jm, null);
+ AlignFrame af = LoadFromObject(jm, null, false);
af.alignPanels.clear();
af.closeMenuItem_actionPerformed(null);
af.alignPanels.clear();
af.closeMenuItem_actionPerformed(null);