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 remote-tracking branch 'origin/bug/JAL-3082selectRegex' into merge/JAL-3082
[jalview.git]
/
src
/
jalview
/
ws
/
dbsources
/
Uniprot.java
diff --git
a/src/jalview/ws/dbsources/Uniprot.java
b/src/jalview/ws/dbsources/Uniprot.java
index
74a9ea4
..
d97bf69
100644
(file)
--- a/
src/jalview/ws/dbsources/Uniprot.java
+++ b/
src/jalview/ws/dbsources/Uniprot.java
@@
-178,16
+178,12
@@
public class Uniprot extends DbSourceProxyImpl
SequenceI uniprotEntryToSequence(Entry entry)
{
String id = getUniprotEntryId(entry);
SequenceI uniprotEntryToSequence(Entry entry)
{
String id = getUniprotEntryId(entry);
- String seqString = entry.getSequence().getValue();
-
/*
/*
- * for backwards compatibility with Castor processing,
- * remove any internal spaces
+ * Sequence should not include any whitespace, but JAXB leaves these in
*/
*/
- if (seqString.indexOf(' ') > -1)
- {
- seqString = seqString.replaceAll(" ", "");
- }
+ String seqString = entry.getSequence().getValue().replaceAll("\\s*",
+ "");
+
SequenceI sequence = new Sequence(id,
seqString);
sequence.setDescription(getUniprotEntryDescription(entry));
SequenceI sequence = new Sequence(id,
seqString);
sequence.setDescription(getUniprotEntryDescription(entry));