git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
JAL-2988 JAL-2976 update to latest VAqua release: VAqua5
[jalview.git]
/
src
/
jalview
/
ws
/
seqfetcher
/
DbSourceProxyImpl.java
diff --git
a/src/jalview/ws/seqfetcher/DbSourceProxyImpl.java
b/src/jalview/ws/seqfetcher/DbSourceProxyImpl.java
index
84072c0
..
ab4644e
100644
(file)
--- a/
src/jalview/ws/seqfetcher/DbSourceProxyImpl.java
+++ b/
src/jalview/ws/seqfetcher/DbSourceProxyImpl.java
@@
-20,7
+20,10
@@
*/
package jalview.ws.seqfetcher;
*/
package jalview.ws.seqfetcher;
+import jalview.api.FeatureSettingsModelI;
import jalview.datamodel.AlignmentI;
import jalview.datamodel.AlignmentI;
+import jalview.io.DataSourceType;
+import jalview.io.FileFormatI;
import jalview.io.FormatAdapter;
import jalview.io.IdentifyFile;
import jalview.io.FormatAdapter;
import jalview.io.IdentifyFile;
@@
-91,11
+94,12
@@
public abstract class DbSourceProxyImpl implements DbSourceProxy
protected AlignmentI parseResult(String result) throws Exception
{
AlignmentI sequences = null;
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;
}
}
return sequences;
}
@@
-146,6
+150,12
@@
public abstract class DbSourceProxyImpl implements DbSourceProxy
@Override
public String getDescription()
{
@Override
public String getDescription()
{
+ return "";
+ }
+
+ @Override
+ public FeatureSettingsModelI getFeatureColourScheme()
+ {
return null;
}
}
return null;
}
}