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 'releases/Release_2_11_1_Branch' into merge/JAL_1842+JAL-3509+releases_R...
[jalview.git]
/
src
/
jalview
/
io
/
JPredFile.java
diff --git
a/src/jalview/io/JPredFile.java
b/src/jalview/io/JPredFile.java
index
026c879
..
8f93b48
100755
(executable)
--- a/
src/jalview/io/JPredFile.java
+++ b/
src/jalview/io/JPredFile.java
@@
-33,6
+33,7
@@
import jalview.util.MessageManager;
import java.io.IOException;
import java.util.Hashtable;
import java.io.IOException;
import java.util.Hashtable;
+import java.util.Locale;
import java.util.StringTokenizer;
import java.util.Vector;
import java.util.StringTokenizer;
import java.util.Vector;
@@
-207,7
+208,7
@@
public class JPredFile extends AlignFile
{
ascore = symbols.nextToken();
{
ascore = symbols.nextToken();
- Float score = new Float(ascore);
+ Float score = Float.valueOf(ascore);
scores.addElement(score);
}
scores.addElement(score);
}
@@
-283,7
+284,7
@@
public class JPredFile extends AlignFile
seq_entries.addElement(newseq.toString());
ids.addElement(id);
seq_entries.addElement(newseq.toString());
ids.addElement(id);
- Symscores.put(id, new Integer(ids.size() - 1));
+ Symscores.put(id, Integer.valueOf(ids.size() - 1));
}
}
}
}
}
}
@@
-408,7
+409,7
@@
public class JPredFile extends AlignFile
// check that no stray annotations have been added at the end.
{
SequenceI sq = seqs.elementAt(j - 1);
// check that no stray annotations have been added at the end.
{
SequenceI sq = seqs.elementAt(j - 1);
- if (sq.getName().toUpperCase().startsWith("JPRED"))
+ if (sq.getName().toUpperCase(Locale.ROOT).startsWith("JPRED"))
{
annotSeqs.addElement(sq);
seqs.removeElementAt(--j);
{
annotSeqs.addElement(sq);
seqs.removeElementAt(--j);