X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=test%2Fjalview%2Fschemes%2FColourSchemesTest.java;h=0184f128bf5c345e3d3f4051bad817d246588caa;hb=f047ab25cc45bfc9d130f67d2c56a940751d9c91;hp=5db374369efc599e7015ba1cd4f78149df03c844;hpb=4265a395749b667cf7d558b8bad40ee2a57b6972;p=jalview.git

diff --git a/test/jalview/schemes/ColourSchemesTest.java b/test/jalview/schemes/ColourSchemesTest.java
index 5db3743..0184f12 100644
--- a/test/jalview/schemes/ColourSchemesTest.java
+++ b/test/jalview/schemes/ColourSchemesTest.java
@@ -1,3 +1,23 @@
+/*
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
+ * 
+ * This file is part of Jalview.
+ * 
+ * Jalview is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * as published by the Free Software Foundation, either version 3
+ * of the License, or (at your option) any later version.
+ *  
+ * Jalview is distributed in the hope that it will be useful, but 
+ * WITHOUT ANY WARRANTY; without even the implied warranty 
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+ * PURPOSE.  See the GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview.  If not, see <http://www.gnu.org/licenses/>.
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
+ */
 package jalview.schemes;
 
 import static org.testng.Assert.assertEquals;
@@ -5,6 +25,14 @@ import static org.testng.Assert.assertFalse;
 import static org.testng.Assert.assertSame;
 import static org.testng.Assert.assertTrue;
 
+import java.awt.Color;
+import java.util.Iterator;
+import java.util.Map;
+
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
+
 import jalview.api.AlignViewportI;
 import jalview.bin.Cache;
 import jalview.bin.Jalview;
@@ -18,14 +46,6 @@ import jalview.io.DataSourceType;
 import jalview.io.FileLoader;
 import jalview.schemes.ClustalxColourScheme.ClustalColour;
 
-import java.awt.Color;
-import java.util.Iterator;
-import java.util.Map;
-
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
-
 public class ColourSchemesTest
 {
   /*
@@ -58,12 +78,12 @@ public class ColourSchemesTest
     public ColourSchemeI getInstance(AlignViewportI view,
             AnnotatedCollectionI sg)
     {
-      final ColourSchemeI cs1 = ColourSchemes.getInstance()
-              .getColourScheme(JalviewColourScheme.Taylor.toString(),
-                      (AnnotatedCollectionI) null);
-      final ColourSchemeI cs2 = ColourSchemes.getInstance()
-              .getColourScheme(JalviewColourScheme.Zappo.toString(),
-                      (AnnotatedCollectionI) null);
+      final ColourSchemeI cs1 = ColourSchemes.getInstance().getColourScheme(
+              JalviewColourScheme.Taylor.toString(),
+              (AnnotatedCollectionI) null);
+      final ColourSchemeI cs2 = ColourSchemes.getInstance().getColourScheme(
+              JalviewColourScheme.Zappo.toString(),
+              (AnnotatedCollectionI) null);
       return new Stripy(cs1, cs2);
     }
 
@@ -86,7 +106,7 @@ public class ColourSchemesTest
       return "stripy";
     }
   };
-  
+
   /*
    * a colour scheme that is Clustal but using AWT colour equivalents
    */
@@ -172,7 +192,8 @@ public class ColourSchemesTest
   @AfterClass(alwaysRun = true)
   public static void tearDownAfterClass() throws Exception
   {
-    Desktop.instance.closeAll_actionPerformed(null);
+    if (Desktop.instance != null)
+      Desktop.instance.closeAll_actionPerformed(null);
   }
 
   @Test(groups = "Functional")
@@ -183,7 +204,8 @@ public class ColourSchemesTest
      * in the order in which they are declared in the JalviewColourScheme enum
      * (this also determines their order in Colour menus)
      */
-    Iterator<ColourSchemeI> schemes = ColourSchemes.getInstance().getColourSchemes().iterator();
+    Iterator<ColourSchemeI> schemes = ColourSchemes.getInstance()
+            .getColourSchemes().iterator();
     JalviewColourScheme[] jalviewSchemes = JalviewColourScheme.values();
     int i = 0;
     while (schemes.hasNext() && i < jalviewSchemes.length)
@@ -210,7 +232,7 @@ public class ColourSchemesTest
     }
     af.closeMenuItem_actionPerformed(true);
   }
-  
+
   @Test(groups = "Functional")
   public void testRegisterColourScheme()
   {