git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'features/JAL-2465_No-mapping_Jmol-structures-loaded-via-url' into develop
[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
bdbbe88
..
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.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;
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
testee = new AAStructureBindingModel(ssm, pdbFiles, seqs, null)
{
@Override
- public String[] getPdbFile()
+ public String[] getStructureFiles()
{
return new String[] { "INLINE1YCS", "INLINE3A6S", "INLINE1OOT" };
}
{
return new String[] { "INLINE1YCS", "INLINE3A6S", "INLINE1OOT" };
}
@@
-171,7
+171,7
@@
public class AAStructureBindingModelTest
@Override
public String superposeStructures(AlignmentI[] als, int[] alm,
@Override
public String superposeStructures(AlignmentI[] als, int[] alm,
- ColumnSelection[] alc)
+ HiddenColumns[] alc)
{
return null;
}
{
return null;
}
@@
-183,14
+183,7
@@
public class AAStructureBindingModelTest
@Override
protected StructureMappingcommandSet[] getColourBySequenceCommands(
@Override
protected StructureMappingcommandSet[] getColourBySequenceCommands(
- String[] files, SequenceRenderer sr, FeatureRenderer fr,
- AlignmentI alignment)
- {
- return null;
- }
-
- @Override
- public FeatureRenderer getFeatureRenderer(AlignmentViewPanel alignment)
+ String[] files, SequenceRenderer sr, AlignmentViewPanel avp)
{
return null;
}
{
return null;
}
@@
-217,6
+210,13
@@
public class AAStructureBindingModelTest
public void colourByCharge()
{
}
public void colourByCharge()
{
}
+
+ @Override
+ public FeatureRenderer getFeatureRenderer(
+ AlignmentViewPanel alignment)
+ {
+ return null;
+ }
};
}
};
}
@@
-230,7
+230,7
@@
public class AAStructureBindingModelTest
/*
* create a data bean to hold data per structure file
*/
/*
* 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());
for (int i = 0; i < structs.length; i++)
{
structs[i] = testee.new SuperposeData(al.getWidth());
@@
-308,14
+308,4
@@
public class AAStructureBindingModelTest
assertFalse(matched.get(4)); // superposable, but hidden, column
assertTrue(matched.get(5));
}
assertFalse(matched.get(4)); // superposable, but hidden, column
assertTrue(matched.get(5));
}
-
- public FeatureRenderer getFeatureRenderer(AlignmentViewPanel alignment)
- {
- return null;
- }
-
- public SequenceRenderer getSequenceRenderer(AlignmentViewPanel alignment)
- {
- return null;
- }
}
}