Merge branch 'develop' into features/JAL-2446NCList

[jalview.git] / test / jalview / structures / models / AAStructureBindingModelTest.java

diff --git a/test/jalview/structures/models/AAStructureBindingModelTest.java b/test/jalview/structures/models/AAStructureBindingModelTest.java
index 30f9e68..c125ef6 100644 (file)
--- a/test/jalview/structures/models/AAStructureBindingModelTest.java
+++ b/test/jalview/structures/models/AAStructureBindingModelTest.java
@@ -29,7 +29,7 @@ import jalview.api.FeatureRenderer;
 import jalview.api.SequenceRenderer;
 import jalview.datamodel.Alignment;
 import jalview.datamodel.AlignmentI;
-import jalview.datamodel.ColumnSelection;
+import jalview.datamodel.HiddenColumns;
 import jalview.datamodel.PDBEntry;
 import jalview.datamodel.PDBEntry.Type;
 import jalview.datamodel.Sequence;
@@ -138,7 +138,7 @@ public class AAStructureBindingModelTest
     testee = new AAStructureBindingModel(ssm, pdbFiles, seqs, null)
     {
       @Override
-      public String[] getPdbFile()
+      public String[] getStructureFiles()
       {
         return new String[] { "INLINE1YCS", "INLINE3A6S", "INLINE1OOT" };
       }
@@ -171,7 +171,7 @@ public class AAStructureBindingModelTest
 
       @Override
       public String superposeStructures(AlignmentI[] als, int[] alm,
-              ColumnSelection[] alc)
+              HiddenColumns[] alc)
       {
         return null;
       }
@@ -212,7 +212,7 @@ public class AAStructureBindingModelTest
       }
 
       @Override
-      protected FeatureRenderer getFeatureRenderer(
+      public FeatureRenderer getFeatureRenderer(
               AlignmentViewPanel alignment)
       {
         return null;
@@ -230,7 +230,7 @@ public class AAStructureBindingModelTest
     /*
      * create a data bean to hold data per structure file
      */
-    SuperposeData[] structs = new SuperposeData[testee.getPdbFile().length];
+    SuperposeData[] structs = new SuperposeData[testee.getStructureFiles().length];
     for (int i = 0; i < structs.length; i++)
     {
       structs[i] = testee.new SuperposeData(al.getWidth());