JAL-3148 SequenceRenderer, ResidueColourFinder overloads and

[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 aea3687..1b5045a 100644 (file)
--- a/test/jalview/structures/models/AAStructureBindingModelTest.java
+++ b/test/jalview/structures/models/AAStructureBindingModelTest.java
@@ -26,7 +26,7 @@ import static org.testng.AssertJUnit.assertTrue;
 
 import jalview.api.AlignmentViewPanel;
 import jalview.api.FeatureRenderer;
-import jalview.api.SequenceRenderer;
+import jalview.api.SequenceRendererI;
 import jalview.datamodel.Alignment;
 import jalview.datamodel.AlignmentI;
 import jalview.datamodel.HiddenColumns;
@@ -139,21 +139,16 @@ public class AAStructureBindingModelTest
       @Override
       public void updateColours(Object source)
       {
-        // TODO Auto-generated method stub
-        
       }
       
       @Override
       public void releaseReferences(Object svl)
       {
-        // TODO Auto-generated method stub
-        
       }
       
       @Override
       public String[] getStructureFiles()
       {
-        // TODO Auto-generated method stub
         return null;
       }
       
@@ -161,57 +156,41 @@ public class AAStructureBindingModelTest
       public String superposeStructures(AlignmentI[] alignments,
               int[] structureIndices, HiddenColumns[] hiddenCols)
       {
-        // TODO Auto-generated method stub
         return null;
       }
       
       @Override
-      public void setJalviewColourScheme(ColourSchemeI cs)
+      public void setSimpleColourScheme(ColourSchemeI cs)
       {
-        // TODO Auto-generated method stub
-        
       }
       
       @Override
       public void setBackgroundColour(Color col)
       {
-        // TODO Auto-generated method stub
         
       }
       
       @Override
       public void highlightAtoms(List<AtomSpec> atoms)
       {
-        // TODO Auto-generated method stub
-        
-      }
-      
-      @Override
-      public SequenceRenderer getSequenceRenderer(AlignmentViewPanel alignment)
-      {
-        // TODO Auto-generated method stub
-        return null;
       }
       
       @Override
       public FeatureRenderer getFeatureRenderer(AlignmentViewPanel alignment)
       {
-        // TODO Auto-generated method stub
         return null;
       }
       
       @Override
       protected StructureMappingcommandSet[] getColourBySequenceCommands(
-              String[] files, SequenceRenderer sr, AlignmentViewPanel avp)
+              String[] files, SequenceRendererI sr, AlignmentViewPanel avp)
       {
-        // TODO Auto-generated method stub
         return null;
       }
       
       @Override
       public List<String> getChainNames()
       {
-        // TODO Auto-generated method stub
         return null;
       }
       
@@ -219,22 +198,16 @@ public class AAStructureBindingModelTest
       protected void colourBySequence(
               StructureMappingcommandSet[] colourBySequenceCommands)
       {
-        // TODO Auto-generated method stub
-        
       }
       
       @Override
       public void colourByCharge()
       {
-        // TODO Auto-generated method stub
-        
       }
       
       @Override
       public void colourByChain()
       {
-        // TODO Auto-generated method stub
-        
       }
     };
     String[][] chains = binder.getChains();
@@ -275,11 +248,11 @@ public class AAStructureBindingModelTest
     StructureSelectionManager ssm = new StructureSelectionManager();
 
     ssm.setMapping(new SequenceI[] { seq1a, seq1b }, null, PDB_1,
-            DataSourceType.PASTE);
+            DataSourceType.PASTE, null);
     ssm.setMapping(new SequenceI[] { seq2 }, null, PDB_2,
-            DataSourceType.PASTE);
+            DataSourceType.PASTE, null);
     ssm.setMapping(new SequenceI[] { seq3 }, null, PDB_3,
-            DataSourceType.PASTE);
+            DataSourceType.PASTE, null);
 
     testee = new AAStructureBindingModel(ssm, pdbFiles, seqs, null)
     {
@@ -311,7 +284,7 @@ public class AAStructureBindingModelTest
       }
 
       @Override
-      public void setJalviewColourScheme(ColourSchemeI cs)
+      public void setSimpleColourScheme(ColourSchemeI cs)
       {
       }
 
@@ -329,14 +302,7 @@ public class AAStructureBindingModelTest
 
       @Override
       protected StructureMappingcommandSet[] getColourBySequenceCommands(
-              String[] files, SequenceRenderer sr, AlignmentViewPanel avp)
-      {
-        return null;
-      }
-
-      @Override
-      public SequenceRenderer getSequenceRenderer(
-              AlignmentViewPanel alignment)
+              String[] files, SequenceRendererI sr, AlignmentViewPanel avp)
       {
         return null;
       }