From: Jim Procter <jprocter@issues.jalview.org>
Date: Tue, 31 May 2016 15:33:21 +0000 (+0100)
Subject: Merge branch 'develop' into features/JAL-2113_emblXml1.2
X-Git-Tag: Release_2_10_0~196^2~2^2
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=18e78fa415a301cf4423037a713b2b088b9fc656;p=jalview.git

Merge branch 'develop' into features/JAL-2113_emblXml1.2
JAL-2113 JAL-1919 mmcif/pdb configurable retrieval from EBI/PDBe - verfied as working
---

18e78fa415a301cf4423037a713b2b088b9fc656
diff --cc src/jalview/ws/dbsources/Pdb.java
index 0d590b0,b2063c1..c87a111
--- a/src/jalview/ws/dbsources/Pdb.java
+++ b/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)