JAL-1712 fixes/tests for Castor binding and 'show flanking regions' bug/JAL-1712annotationsWithFlanking
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Tue, 12 May 2015 15:35:32 +0000 (16:35 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Thu, 14 May 2015 12:49:02 +0000 (13:49 +0100)
commitd71500a42803f307500c16250b40f0fc31e74aad
tree8652f693241fc462e3fd9b075bd6f2a42a6b8335
parentdac9672dba85c9bb2d7b7313e015d7561f252fe1
JAL-1712 fixes/tests for Castor binding and 'show flanking regions'

Conflicts:
src/jalview/datamodel/PDBEntry.java
src/jalview/datamodel/Sequence.java
src/jalview/ws/dbsources/Uniprot.java
test/jalview/analysis/AlignmentUtilsTests.java
34 files changed:
.classpath
resources/embl_mapping.xml
src/jalview/analysis/AlignmentUtils.java
src/jalview/datamodel/AlignmentAnnotation.java
src/jalview/datamodel/PDBEntry.java
src/jalview/datamodel/Sequence.java
src/jalview/datamodel/SequenceI.java
src/jalview/datamodel/UniprotEntry.java
src/jalview/datamodel/UniprotFile.java
src/jalview/datamodel/UniprotProteinName.java
src/jalview/datamodel/UniprotSequence.java
src/jalview/datamodel/xdb/embl/BasePosition.java
src/jalview/datamodel/xdb/embl/EmblEntry.java
src/jalview/datamodel/xdb/embl/EmblError.java
src/jalview/datamodel/xdb/embl/EmblFeature.java
src/jalview/datamodel/xdb/embl/EmblFeatureLocElement.java
src/jalview/datamodel/xdb/embl/EmblFeatureLocations.java
src/jalview/datamodel/xdb/embl/EmblFile.java
src/jalview/datamodel/xdb/embl/EmblSequence.java
src/jalview/datamodel/xdb/embl/Qualifier.java
src/jalview/ws/dbsources/EmblXmlSource.java
src/jalview/ws/dbsources/Uniprot.java
src/jalview/ws/ebi/EBIFetchClient.java
test/jalview/analysis/AlignmentUtilsTests.java
test/jalview/datamodel/AlignmentAnnotationTests.java
test/jalview/datamodel/SequenceTest.java
test/jalview/datamodel/xdb/embl/EmblFileTest.java [new file with mode: 0644]
test/jalview/ext/rbvi/chimera/testProps.jvprops
test/jalview/gui/AnnotationChooserTest.java
test/jalview/io/testProps.jvprops
test/jalview/schemes/ScoreMatrixPrinter.java
test/jalview/ws/dbsources/UniprotTest.java [new file with mode: 0644]
test/jalview/ws/jabaws/JpredJabaStructExportImport.java
test/jalview/ws/jabaws/RNAStructExportImport.java