From: tcofoegbu <tcnofoegbu@dundee.ac.uk>
Date: Tue, 22 Mar 2016 17:02:10 +0000 (+0000)
Subject: resolve conflict with Mungo's merge
X-Git-Tag: Release_2_10_0~290
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=9fe87bd08ab29b6fe53364f387d7a2e3a8d39994;p=jalview.git

resolve conflict with Mungo's merge
---

9fe87bd08ab29b6fe53364f387d7a2e3a8d39994
diff --cc src/jalview/ws/ebi/EBIFetchClient.java
index 468b7f0,b09cbaa..9f6bc65
--- a/src/jalview/ws/ebi/EBIFetchClient.java
+++ b/src/jalview/ws/ebi/EBIFetchClient.java
@@@ -97,15 -98,15 +98,17 @@@ public class EBIFetchClien
     * @return the file holding the response
     * @throws OutOfMemoryError
     */
-   public File fetchDataAsFile(String ids, String f, String s, String ext)
 -  public File fetchDataAsFile(String ids, String format, String s)
++
++  public File fetchDataAsFile(String ids, String format, String s,
++          String ext)
            throws OutOfMemoryError
    {
      File outFile = null;
      try
      {
 -      outFile = File.createTempFile("jalview", ".xml");
 +      outFile = File.createTempFile("jalview", ext);
        outFile.deleteOnExit();
-       fetchData(ids, f, s, outFile);
+       fetchData(ids, format, s, outFile);
        if (outFile.length() == 0)
        {
          outFile.delete();