From: Mateusz Warowny <mmzwarowny@dundee.ac.uk>
Date: Tue, 27 Jul 2021 15:36:15 +0000 (+0200)
Subject: Merge branch 'bug/JAL-3807_jpred-with-slivka' into alpha/JAL-3066_Jalview_212_slivka... 
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=eb6d7c560434c986f1dc76f6243d1493688f397e;p=jalview.git

Merge branch 'bug/JAL-3807_jpred-with-slivka' into alpha/JAL-3066_Jalview_212_slivka-integration
---

eb6d7c560434c986f1dc76f6243d1493688f397e
diff --cc src/jalview/ws/slivkaws/SlivkaWSInstance.java
index 75e5722,138b432..fa54cf0
--- a/src/jalview/ws/slivkaws/SlivkaWSInstance.java
+++ b/src/jalview/ws/slivkaws/SlivkaWSInstance.java
@@@ -13,21 -27,7 +27,8 @@@ import jalview.ws.params.ArgumentI
  import jalview.ws.params.ParamDatastoreI;
  import jalview.ws.params.ParamManager;
  import jalview.ws.params.WsParamSetI;
- 
- import java.io.ByteArrayInputStream;
- import java.io.ByteArrayOutputStream;
- import java.io.IOError;
- import java.io.IOException;
- import java.io.InputStream;
- import java.util.Arrays;
- import java.util.EnumMap;
- import java.util.HashSet;
- import java.util.List;
- import java.util.Optional;
- import java.util.Set;
- 
  import uk.ac.dundee.compbio.slivkaclient.FieldType;
 +import uk.ac.dundee.compbio.slivkaclient.FileField;
  import uk.ac.dundee.compbio.slivkaclient.FormField;
  import uk.ac.dundee.compbio.slivkaclient.FormValidationException;
  import uk.ac.dundee.compbio.slivkaclient.JobState;