Merge branch 'develop' into Release_2_9_Branch

[jalview.git] / src / jalview / io / vamsas / Tree.java

diff --git a/src/jalview/io/vamsas/Tree.java b/src/jalview/io/vamsas/Tree.java
index b5ada26..0bf4096 100644 (file)
--- a/src/jalview/io/vamsas/Tree.java
+++ b/src/jalview/io/vamsas/Tree.java
@@ -20,12 +20,6 @@
  */
 package jalview.io.vamsas;
 
-import java.io.IOException;
-import java.util.Enumeration;
-import java.util.Hashtable;
-import java.util.List;
-import java.util.Vector;
-
 import jalview.analysis.NJTree;
 import jalview.bin.Cache;
 import jalview.datamodel.AlignmentI;
@@ -39,6 +33,13 @@ import jalview.gui.TreePanel;
 import jalview.io.NewickFile;
 import jalview.io.VamsasAppDatastore;
 import jalview.viewmodel.AlignmentViewport;
+
+import java.io.IOException;
+import java.util.Enumeration;
+import java.util.Hashtable;
+import java.util.List;
+import java.util.Vector;
+
 import uk.ac.vamsas.client.Vobject;
 import uk.ac.vamsas.objects.core.AlignmentSequence;
 import uk.ac.vamsas.objects.core.Entry;
@@ -421,8 +422,7 @@ public class Tree extends DatastoreItem
       tnv.copyInto(tn);
       return tn;
     }
-    return new Treenode[]
-    {};
+    return new Treenode[] {};
   }
 
   private String makeNodeSpec(Hashtable nodespecs,
@@ -595,8 +595,7 @@ public class Tree extends DatastoreItem
           // off by
           // one for to
         }
-        return new Object[]
-        { new AlignmentView(view), jal };
+        return new Object[] { new AlignmentView(view), jal };
       }
     }
     Cache.log