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-1683 replace year/version strings with tokens in source
[jalview.git]
/
src
/
jalview
/
ws
/
DasSequenceFeatureFetcher.java
diff --git
a/src/jalview/ws/DasSequenceFeatureFetcher.java
b/src/jalview/ws/DasSequenceFeatureFetcher.java
index
64181ca
..
e22aa12
100644
(file)
--- a/
src/jalview/ws/DasSequenceFeatureFetcher.java
+++ b/
src/jalview/ws/DasSequenceFeatureFetcher.java
@@
-1,6
+1,6
@@
/*
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2)
- * Copyright (C) 2014 The Jalview Authors
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
*
* This file is part of Jalview.
*
*
* This file is part of Jalview.
*
@@
-626,7
+626,9
@@
public class DasSequenceFeatureFetcher
Object[] nextSequence(jalviewSourceI dasSource, SequenceI seq)
{
if (cancelled)
Object[] nextSequence(jalviewSourceI dasSource, SequenceI seq)
{
if (cancelled)
+ {
return null;
return null;
+ }
DBRefEntry[] uprefs = jalview.util.DBRefUtils.selectRefs(
seq.getDBRef(), new String[]
{
DBRefEntry[] uprefs = jalview.util.DBRefUtils.selectRefs(
seq.getDBRef(), new String[]
{
@@
-668,7
+670,9
@@
public class DasSequenceFeatureFetcher
qstring.add(uprefs[j].getAccessionId());
}
else
qstring.add(uprefs[j].getAccessionId());
}
else
+ {
System.out.println("IGNORE " + csys.getAuthority());
System.out.println("IGNORE " + csys.getAuthority());
+ }
}
}
}
}
}
}
@@
-839,7
+843,7
@@
public class DasSequenceFeatureFetcher
{
for (String note : feat.getNOTE())
{
{
for (String note : feat.getNOTE())
{
- desc += (String) note;
+ desc += note;
}
}
}
}