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-2089 patch broken merge to master for Release 2.10.0b1
[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
..
5bed720
100644
(file)
--- a/
src/jalview/ws/seqfetcher/DbSourceProxyImpl.java
+++ b/
src/jalview/ws/seqfetcher/DbSourceProxyImpl.java
@@
-20,7
+20,7
@@
*/
package jalview.ws.seqfetcher;
*/
package jalview.ws.seqfetcher;
-import jalview.api.FeatureSettingsI;
+import jalview.api.FeatureSettingsModelI;
import jalview.datamodel.AlignmentI;
import jalview.io.FormatAdapter;
import jalview.io.IdentifyFile;
import jalview.datamodel.AlignmentI;
import jalview.io.FormatAdapter;
import jalview.io.IdentifyFile;
@@
-147,11
+147,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;
}