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 'develop' into update_212_Dec_merge_with_21125_chamges
[jalview.git]
/
src
/
jalview
/
ws
/
seqfetcher
/
ASequenceFetcher.java
diff --git
a/src/jalview/ws/seqfetcher/ASequenceFetcher.java
b/src/jalview/ws/seqfetcher/ASequenceFetcher.java
index
2a27cce
..
0d0a314
100644
(file)
--- a/
src/jalview/ws/seqfetcher/ASequenceFetcher.java
+++ b/
src/jalview/ws/seqfetcher/ASequenceFetcher.java
@@
-21,7
+21,7
@@
package jalview.ws.seqfetcher;
import jalview.api.FeatureSettingsModelI;
package jalview.ws.seqfetcher;
import jalview.api.FeatureSettingsModelI;
-import jalview.bin.Cache;
+import jalview.bin.Console;
import jalview.datamodel.AlignmentI;
import jalview.datamodel.DBRefEntry;
import jalview.datamodel.SequenceI;
import jalview.datamodel.AlignmentI;
import jalview.datamodel.DBRefEntry;
import jalview.datamodel.SequenceI;
@@
-112,7
+112,7
@@
public class ASequenceFetcher
return true;
}
}
return true;
}
}
- Cache.log.warn("isFetchable doesn't know about '" + source + "'");
+ Console.warn("isFetchable doesn't know about '" + source + "'");
return false;
}
return false;
}
@@
-208,7
+208,8
@@
public class ASequenceFetcher
// BH 2015.01.25 check about version/accessid being null here
List<DBRefEntry> frefs = DBRefUtils.searchRefs(
seqs[is].getDBRefs(),
// BH 2015.01.25 check about version/accessid being null here
List<DBRefEntry> frefs = DBRefUtils.searchRefs(
seqs[is].getDBRefs(),
- new DBRefEntry(db, null, null), DBRefUtils.SEARCH_MODE_FULL);
+ new DBRefEntry(db, null, null),
+ DBRefUtils.SEARCH_MODE_FULL);
for (DBRefEntry dbr : frefs)
{
queriesFound.add(dbr.getAccessionId());
for (DBRefEntry dbr : frefs)
{
queriesFound.add(dbr.getAccessionId());
@@
-365,8
+366,7
@@
public class ASequenceFetcher
.get(proxy.getDbSource());
if (slist == null)
{
.get(proxy.getDbSource());
if (slist == null)
{
- fetchableDbs.put(proxy.getDbSource(),
- slist = new Hashtable<>());
+ fetchableDbs.put(proxy.getDbSource(), slist = new Hashtable<>());
}
slist.put(proxy.getDbName(), proxy);
}
}
slist.put(proxy.getDbName(), proxy);
}