Merge branch 'develop' into features/JAL-2113_emblXml1.2
authorJim Procter <jprocter@issues.jalview.org>
Tue, 31 May 2016 15:33:21 +0000 (16:33 +0100)
committerJim Procter <jprocter@issues.jalview.org>
Tue, 31 May 2016 15:33:21 +0000 (16:33 +0100)
JAL-2113 JAL-1919 mmcif/pdb configurable retrieval from EBI/PDBe - verfied as working

1  2 
src/jalview/ws/dbsources/Pdb.java

@@@ -1,3 -1,3 +1,4 @@@
++
  /*
   * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
   * Copyright (C) $$Year-Rel$$ The Jalview Authors
@@@ -136,7 -136,7 +137,7 @@@ public class Pdb extends EbiFileRetriev
              : ".xml";
      EBIFetchClient ebi = new EBIFetchClient();
      file = ebi.fetchDataAsFile("pdb:" + id,
-             getCurrentDefaultFomart().toLowerCase(), ext)
 -            getCurrentDefaultFormat().toLowerCase(), "raw", ext)
++            getCurrentDefaultFormat().toLowerCase(), ext)
              .getAbsolutePath();
      stopQuery();
      if (file == null)