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 'develop' into features/JAL-2295setChimeraAttributes
[jalview.git]
/
src
/
jalview
/
ext
/
rbvi
/
chimera
/
JalviewChimeraBinding.java
diff --git
a/src/jalview/ext/rbvi/chimera/JalviewChimeraBinding.java
b/src/jalview/ext/rbvi/chimera/JalviewChimeraBinding.java
index
cc1de6a
..
1ff0466
100644
(file)
--- a/
src/jalview/ext/rbvi/chimera/JalviewChimeraBinding.java
+++ b/
src/jalview/ext/rbvi/chimera/JalviewChimeraBinding.java
@@
-32,6
+32,7
@@
import jalview.datamodel.SearchResults;
import jalview.datamodel.SequenceFeature;
import jalview.datamodel.SequenceI;
import jalview.httpserver.AbstractRequestHandler;
import jalview.datamodel.SequenceFeature;
import jalview.datamodel.SequenceI;
import jalview.httpserver.AbstractRequestHandler;
+import jalview.io.DataSourceType;
import jalview.schemes.ColourSchemeI;
import jalview.schemes.ResidueProperties;
import jalview.structure.AtomSpec;
import jalview.schemes.ColourSchemeI;
import jalview.schemes.ResidueProperties;
import jalview.structure.AtomSpec;
@@
-197,7
+198,7
@@
public abstract class JalviewChimeraBinding extends AAStructureBindingModel
* @param protocol
*/
public JalviewChimeraBinding(StructureSelectionManager ssm,
* @param protocol
*/
public JalviewChimeraBinding(StructureSelectionManager ssm,
- PDBEntry[] pdbentry, SequenceI[][] sequenceIs, String protocol)
+ PDBEntry[] pdbentry, SequenceI[][] sequenceIs, DataSourceType protocol)
{
super(ssm, pdbentry, sequenceIs, protocol);
viewer = new ChimeraManager(
{
super(ssm, pdbentry, sequenceIs, protocol);
viewer = new ChimeraManager(