Merge branch 'apifix/JAL-1926_JAL-2106' into develop
authorJim Procter <jprocter@issues.jalview.org>
Thu, 21 Jul 2016 12:03:21 +0000 (13:03 +0100)
committerJim Procter <jprocter@issues.jalview.org>
Thu, 21 Jul 2016 12:03:21 +0000 (13:03 +0100)
commit82a6c8e2e25b7534168b68b2c89b9cf195f815a5
tree8e0e03fbb235b9fb310248cad89ce07a6e687887
parent1811f4469c23e9cce0a72649e17b634f60f9fbe0
parent08c202dd3ef0f34bde305c11da9eec03520174dc
Merge branch 'apifix/JAL-1926_JAL-2106' into develop
JAL-1919 JAL-2148 regularise use of jalview.datamodel.PDBEntry.Type for PDB/mmCIF file type
JAL-1919 JAL-2148 use new enum jalview.structure.StructureImportSettings.StructureParser
src/jalview/bin/Cache.java
src/jalview/ext/jmol/JmolParser.java
src/jalview/io/AppletFormatAdapter.java
src/jalview/io/StructureFile.java
src/jalview/structure/StructureImportSettings.java
src/jalview/ws/dbsources/Pdb.java
test/jalview/ext/jmol/JmolParserTest.java
test/jalview/io/AnnotatedPDBFileInputTest.java
test/jalview/ws/PDBSequenceFetcherTest.java