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
Merge branch 'task/JAL-3608_property_set_laf_and_tests' into develop
[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
bdea000
..
ab4644e
100644
(file)
--- a/
src/jalview/ws/seqfetcher/DbSourceProxyImpl.java
+++ b/
src/jalview/ws/seqfetcher/DbSourceProxyImpl.java
@@
-20,8
+20,10
@@
*/
package jalview.ws.seqfetcher;
*/
package jalview.ws.seqfetcher;
-import jalview.api.FeatureSettingsI;
+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;
@@
-92,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;
}
@@
-147,11
+150,11
@@
public abstract class DbSourceProxyImpl implements DbSourceProxy
@Override
public String getDescription()
{
@Override
public String getDescription()
{
- return null;
+ return "";
}
@Override
}
@Override
- public FeatureSettingsI getFeatureColourScheme()
+ public FeatureSettingsModelI getFeatureColourScheme()
{
return null;
}
{
return null;
}