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 bug/JAL-2837
[jalview.git]
/
src
/
jalview
/
ws
/
SequenceFetcher.java
diff --git
a/src/jalview/ws/SequenceFetcher.java
b/src/jalview/ws/SequenceFetcher.java
index
37946b1
..
a0b77de
100644
(file)
--- a/
src/jalview/ws/SequenceFetcher.java
+++ b/
src/jalview/ws/SequenceFetcher.java
@@
-78,7
+78,8
@@
public class SequenceFetcher extends ASequenceFetcher
public String[] getOrderedSupportedSources()
{
String[] srcs = this.getSupportedDb();
public String[] getOrderedSupportedSources()
{
String[] srcs = this.getSupportedDb();
- ArrayList<String> dassrc = new ArrayList<String>(), nondas = new ArrayList<String>();
+ ArrayList<String> dassrc = new ArrayList<String>(),
+ nondas = new ArrayList<String>();
for (int i = 0; i < srcs.length; i++)
{
boolean das = false, skip = false;
for (int i = 0; i < srcs.length; i++)
{
boolean das = false, skip = false;
@@
-94,7
+95,8
@@
public class SequenceFetcher extends ASequenceFetcher
else
{
nm = dbs.getDbName();
else
{
nm = dbs.getDbName();
- if (getSourceProxy(srcs[i]) instanceof jalview.ws.dbsources.das.datamodel.DasSequenceSource)
+ if (getSourceProxy(
+ srcs[i]) instanceof jalview.ws.dbsources.das.datamodel.DasSequenceSource)
{
if (nm.startsWith("das:"))
{
{
if (nm.startsWith("das:"))
{
@@
-118,8
+120,8
@@
public class SequenceFetcher extends ASequenceFetcher
nondas.add(srcs[i]);
}
}
nondas.add(srcs[i]);
}
}
- String[] tosort = nondas.toArray(new String[0]), sorted = nondas
- .toArray(new String[0]);
+ String[] tosort = nondas.toArray(new String[0]),
+ sorted = nondas.toArray(new String[0]);
for (int j = 0, jSize = sorted.length; j < jSize; j++)
{
tosort[j] = tosort[j].toLowerCase();
for (int j = 0, jSize = sorted.length; j < jSize; j++)
{
tosort[j] = tosort[j].toLowerCase();