JAL-3438 spotless for 2.11.2.0

[jalview.git] / test / jalview / schemes / ColourSchemesTest.java

diff --git a/test/jalview/schemes/ColourSchemesTest.java b/test/jalview/schemes/ColourSchemesTest.java
index 0aaa38c..26df9b7 100644 (file)
--- a/test/jalview/schemes/ColourSchemesTest.java
+++ b/test/jalview/schemes/ColourSchemesTest.java
@@ -5,6 +5,7 @@ import static org.testng.Assert.assertFalse;
 import static org.testng.Assert.assertSame;
 import static org.testng.Assert.assertTrue;
 
+import jalview.api.AlignViewportI;
 import jalview.bin.Cache;
 import jalview.bin.Jalview;
 import jalview.datamodel.AnnotatedCollectionI;
@@ -54,15 +55,15 @@ public class ColourSchemesTest
     }
 
     @Override
-    public ColourSchemeI getInstance(AnnotatedCollectionI sg,
-            Map<SequenceI, SequenceCollectionI> hiddenRepSequences)
+    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);
     }
 
@@ -85,7 +86,7 @@ public class ColourSchemesTest
       return "stripy";
     }
   };
-  
+
   /*
    * a colour scheme that is Clustal but using AWT colour equivalents
    */
@@ -144,10 +145,10 @@ public class ColourSchemesTest
     }
 
     @Override
-    public ColourSchemeI getInstance(AnnotatedCollectionI sg,
-            Map<SequenceI, SequenceCollectionI> hiddenRepSequences)
+    public ColourSchemeI getInstance(AlignViewportI view,
+            AnnotatedCollectionI sg)
     {
-      return new MyClustal(sg,              hiddenRepSequences);
+      return new MyClustal(sg, view.getHiddenRepSequences());
     }
 
     @Override
@@ -182,7 +183,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)
@@ -209,7 +211,7 @@ public class ColourSchemesTest
     }
     af.closeMenuItem_actionPerformed(true);
   }
-  
+
   @Test(groups = "Functional")
   public void testRegisterColourScheme()
   {