From: kjvdheide <kjvanderheide@dundee.ac.uk>
Date: Mon, 11 Dec 2017 20:57:51 +0000 (+0000)
Subject: JAL-2877 disabled Jalview's default tree viewer when loading files
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=0945b9c86976a185f1796430f91756f7d24e7af5;p=jalview.git

JAL-2877 disabled Jalview's default tree viewer when loading files
---

diff --git a/src/jalview/ext/forester/io/TreeParser.java b/src/jalview/ext/forester/io/TreeParser.java
index e11591d..cbdc3e8 100644
--- a/src/jalview/ext/forester/io/TreeParser.java
+++ b/src/jalview/ext/forester/io/TreeParser.java
@@ -5,7 +5,6 @@ import jalview.gui.AlignViewport;
 //import jalview.ext.treeviewer.ExternalTreeParserI;
 import jalview.gui.Desktop;
 import jalview.gui.JvOptionPane;
-import jalview.io.DataSourceType;
 import jalview.io.NewickFile;
 import jalview.util.MessageManager;
 
@@ -40,9 +39,9 @@ public class TreeParser // implements ExternalTreeParserI<MainFrame>
       {
         AptxInit.createInstancesFromFile(filePath, viewport);
 
-        fin = new NewickFile(filePath, DataSourceType.FILE);
-        viewport.setCurrentTree(viewport.getAlignPanel().alignFrame
-                .showNewickTree(fin, filePath).getTree());
+      // fin = new NewickFile(filePath, DataSourceType.FILE);
+      // viewport.setCurrentTree(viewport.getAlignPanel().alignFrame
+      // .showNewickTree(fin, filePath).getTree());
 
       } catch (Exception ex)
       {
@@ -51,14 +50,14 @@ public class TreeParser // implements ExternalTreeParserI<MainFrame>
                 JvOptionPane.WARNING_MESSAGE);
         ex.printStackTrace();
       }
-      if (fin != null && fin.hasWarningMessage())
-      {
-        JvOptionPane.showMessageDialog(Desktop.desktop,
-                fin.getWarningMessage(),
-                MessageManager
-                        .getString("label.possible_problem_with_tree_file"),
-                JvOptionPane.WARNING_MESSAGE);
-      }
+    // if (fin != null && fin.hasWarningMessage())
+    // {
+    // JvOptionPane.showMessageDialog(Desktop.desktop,
+    // fin.getWarningMessage(),
+    // MessageManager
+    // .getString("label.possible_problem_with_tree_file"),
+    // JvOptionPane.WARNING_MESSAGE);
+    // }
     }
   }