X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fws%2Fseqfetcher%2FDbSourceProxyImpl.java;h=ab4644ebff4bd86d859020784d4447e4e15017c9;hb=e00aedcdf1c30781339cd93e6e812c71f16b86d3;hp=bdea00070b15dea905a9b3f1078c65750bf539ce;hpb=c406d789d51e6ac1ff45e3568d37e9ed53025f03;p=jalview.git diff --git a/src/jalview/ws/seqfetcher/DbSourceProxyImpl.java b/src/jalview/ws/seqfetcher/DbSourceProxyImpl.java index bdea000..ab4644e 100644 --- a/src/jalview/ws/seqfetcher/DbSourceProxyImpl.java +++ b/src/jalview/ws/seqfetcher/DbSourceProxyImpl.java @@ -20,8 +20,10 @@ */ package jalview.ws.seqfetcher; -import jalview.api.FeatureSettingsI; +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,11 +150,11 @@ public abstract class DbSourceProxyImpl implements DbSourceProxy @Override public String getDescription() { - return null; + return ""; } @Override - public FeatureSettingsI getFeatureColourScheme() + public FeatureSettingsModelI getFeatureColourScheme() { return null; }