refactored

[jalview.git] / forester / java / src / org / forester / archaeopteryx / MainPanel.java

diff --git a/forester/java/src/org/forester/archaeopteryx/MainPanel.java b/forester/java/src/org/forester/archaeopteryx/MainPanel.java
index 8062491..6044baf 100644 (file)
--- a/forester/java/src/org/forester/archaeopteryx/MainPanel.java
+++ b/forester/java/src/org/forester/archaeopteryx/MainPanel.java
@@ -85,23 +85,22 @@ public class MainPanel extends JPanel implements ComponentListener {
         getControlPanel().showWhole();
     }
 
-    void addPhylogenyInNewTab( final Phylogeny phy,
-                               final Configuration config,
-                               final String default_name,
-                               final String full_path ) {
+    public void addPhylogenyInNewTab( final Phylogeny phy,
+                                      final Configuration config,
+                                      final String default_name,
+                                      final String full_path ) {
         final TreePanel treepanel = new TreePanel( phy, config, this );
         getControlPanel().phylogenyAdded( config );
         treepanel.setControlPanel( getControlPanel() );
         _treepanels.add( treepanel );
         String name = "";
-        //  if ( !ForesterUtil.isEmpty( phy.getName() ) ) {
-        //      name = phy.getName();
-        //  }
-        //  else if ( phy.getIdentifier() != null ) {
-        //      name = phy.getIdentifier().toString();
-        //  }
-        /* else */
-        if ( !ForesterUtil.isEmpty( default_name ) ) {
+        if ( !ForesterUtil.isEmpty( phy.getName() ) ) {
+            name = phy.getName();
+        }
+        else if ( phy.getIdentifier() != null ) {
+            name = phy.getIdentifier().toString();
+        }
+        else if ( !ForesterUtil.isEmpty( default_name ) ) {
             name = default_name;
         }
         else {
@@ -262,7 +261,7 @@ public class MainPanel extends JPanel implements ComponentListener {
         }
     }
 
-    TreePanel getCurrentTreePanel() {
+    public TreePanel getCurrentTreePanel() {
         final int selected = getTabbedPane().getSelectedIndex();
         if ( selected >= 0 ) {
             return _treepanels.get( selected );