JAL-2798 added != null check for Aptx trees

[jalview.git] / src / jalview / gui / Jalview2XML.java

diff --git a/src/jalview/gui/Jalview2XML.java b/src/jalview/gui/Jalview2XML.java
index b4ded67..c0246c3 100644 (file)
--- a/src/jalview/gui/Jalview2XML.java
+++ b/src/jalview/gui/Jalview2XML.java
@@ -1115,8 +1115,8 @@ public class Jalview2XML
         try
         {
           tree.writeToXml(new File("word"));
-          copyFileToJar(jout, "word", tree.getTreeName());
-          jms.addExtTreeViewer(treeView);
+          copyFileToJar(jout, "word", "aptx-test");
+
 
         } catch (IOException e)
         {
@@ -3574,10 +3574,17 @@ public class Jalview2XML
   private void loadExternalTrees(jarInputStreamProvider jprovider,
           JalviewModelSequence jms, AlignViewport av)
   {
-   for (TreeFrameI externalTreeViewer: jms.getExtTreeViewer()) {
-      // String treeFile = copyJarEntry(jprovider, errorMessage, "aptx", null);
-      TreeViewerUtils.addTreeViewFrameToJalview(externalTreeViewer);
-
+    String treeFile = copyJarEntry(jprovider, "aptx-test", "aptx", null);
+    if (treeFile != null)
+    {
+    try
+    {
+      AptxInit.createInstancesFromFile(treeFile, av);
+    } catch (IOException e)
+    {
+      // TODO Auto-generated catch block
+      e.printStackTrace();
+      }
     }
     
   }