From c720726362791c6de2cf68e0d413c7855225071b Mon Sep 17 00:00:00 2001 From: amwaterhouse Date: Wed, 3 Aug 2005 13:09:36 +0000 Subject: [PATCH] Trees aren't save in headless state in this version --- src/jalview/gui/Jalview2XML.java | 55 +++++++++++++++++++++----------------- 1 file changed, 30 insertions(+), 25 deletions(-) diff --git a/src/jalview/gui/Jalview2XML.java b/src/jalview/gui/Jalview2XML.java index 403509d..70608c4 100755 --- a/src/jalview/gui/Jalview2XML.java +++ b/src/jalview/gui/Jalview2XML.java @@ -134,6 +134,7 @@ public class Jalview2XML } catch (Exception ex) { + ex.printStackTrace(); } } @@ -199,38 +200,42 @@ public class Jalview2XML /////////////////////////////////// if (af.viewport.currentTree != null) { - // FIND ANY ASSOCIATED TREES + // FIND ANY ASSOCIATED TREES + // NOT IMPLEMENTED FOR HEADLESS STATE AT PRESENT + if (Desktop.desktop != null) + { JInternalFrame[] frames = Desktop.desktop.getAllFrames(); for (int t = 0; t < frames.length; t++) { - if (frames[t] instanceof TreePanel) - { - TreePanel tp = (TreePanel) frames[t]; + if (frames[t] instanceof TreePanel) + { + TreePanel tp = (TreePanel) frames[t]; - if (tp.treeCanvas.av.alignment == jal) - { - Tree tree = new Tree(); - tree.setTitle(tp.getTitle()); - tree.setCurrentTree((af.viewport.currentTree == tp.getTree())); - tree.setNewick(tp.getTree().toString()); - tree.setThreshold(tp.treeCanvas.threshold); - - tree.setFitToWindow(tp.fitToWindow.getState()); - tree.setFontSize(tp.treeCanvas.fontSize); - tree.setMarkUnlinked(tp.placeholdersMenu.getState()); - tree.setShowBootstrap(tp.bootstrapMenu.getState()); - tree.setShowDistances(tp.distanceMenu.getState()); - - tree.setHeight(tp.getHeight()); - tree.setWidth(tp.getWidth()); - tree.setXpos(tp.getX()); - tree.setYpos(tp.getY()); - - jms.addTree(tree); - } + if (tp.treeCanvas.av.alignment == jal) + { + Tree tree = new Tree(); + tree.setTitle(tp.getTitle()); + tree.setCurrentTree( (af.viewport.currentTree == tp.getTree())); + tree.setNewick(tp.getTree().toString()); + tree.setThreshold(tp.treeCanvas.threshold); + + tree.setFitToWindow(tp.fitToWindow.getState()); + tree.setFontSize(tp.treeCanvas.fontSize); + tree.setMarkUnlinked(tp.placeholdersMenu.getState()); + tree.setShowBootstrap(tp.bootstrapMenu.getState()); + tree.setShowDistances(tp.distanceMenu.getState()); + + tree.setHeight(tp.getHeight()); + tree.setWidth(tp.getWidth()); + tree.setXpos(tp.getX()); + tree.setYpos(tp.getY()); + + jms.addTree(tree); } + } } + } } //SAVE ANNOTATIONS -- 1.7.10.2