X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fws%2Fseqfetcher%2FDbSourceProxyImpl.java;h=ab4644ebff4bd86d859020784d4447e4e15017c9;hb=88153d5bb04acd2b8e7fbc3e6789622b77b6cf58;hp=20a1e33e224681ba47ad3ef4c6cf477f58a67122;hpb=28c2ec20b26a85cc5634238f1261a14930550594;p=jalview.git diff --git a/src/jalview/ws/seqfetcher/DbSourceProxyImpl.java b/src/jalview/ws/seqfetcher/DbSourceProxyImpl.java index 20a1e33..ab4644e 100644 --- a/src/jalview/ws/seqfetcher/DbSourceProxyImpl.java +++ b/src/jalview/ws/seqfetcher/DbSourceProxyImpl.java @@ -22,6 +22,8 @@ package jalview.ws.seqfetcher; import jalview.api.FeatureSettingsModelI; import jalview.datamodel.AlignmentI; +import jalview.io.DataSourceType; +import jalview.io.FileFormatI; import jalview.io.FormatAdapter; import jalview.io.IdentifyFile; @@ -92,11 +94,12 @@ public abstract class DbSourceProxyImpl implements DbSourceProxy protected AlignmentI parseResult(String result) throws Exception { AlignmentI sequences = null; - String format = new IdentifyFile().identify(result, "Paste"); - if (FormatAdapter.isValidFormat(format)) + FileFormatI format = new IdentifyFile().identify(result, + DataSourceType.PASTE); + if (format != null) { - sequences = new FormatAdapter().readFile(result.toString(), "Paste", - format); + sequences = new FormatAdapter().readFile(result.toString(), + DataSourceType.PASTE, format); } return sequences; } @@ -147,7 +150,7 @@ public abstract class DbSourceProxyImpl implements DbSourceProxy @Override public String getDescription() { - return null; + return ""; } @Override