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-3878 Add char[] constructor to Sequence
[jalview.git]
/
src
/
jalview
/
datamodel
/
AlignedCodonFrame.java
diff --git
a/src/jalview/datamodel/AlignedCodonFrame.java
b/src/jalview/datamodel/AlignedCodonFrame.java
index
ec11fc1
..
fffa137
100644
(file)
--- a/
src/jalview/datamodel/AlignedCodonFrame.java
+++ b/
src/jalview/datamodel/AlignedCodonFrame.java
@@
-116,7
+116,7
@@
public class AlignedCodonFrame
*/
public AlignedCodonFrame()
{
*/
public AlignedCodonFrame()
{
- mappings = new ArrayList<SequenceToSequenceMapping>();
+ mappings = new ArrayList<>();
}
/**
}
/**
@@
-179,7
+179,7
@@
public class AlignedCodonFrame
{
// TODO return a list instead?
// return dnaSeqs;
{
// TODO return a list instead?
// return dnaSeqs;
- List<SequenceI> seqs = new ArrayList<SequenceI>();
+ List<SequenceI> seqs = new ArrayList<>();
for (SequenceToSequenceMapping ssm : mappings)
{
seqs.add(ssm.fromSeq);
for (SequenceToSequenceMapping ssm : mappings)
{
seqs.add(ssm.fromSeq);
@@
-190,7
+190,7
@@
public class AlignedCodonFrame
public SequenceI[] getAaSeqs()
{
// TODO not used - remove?
public SequenceI[] getAaSeqs()
{
// TODO not used - remove?
- List<SequenceI> seqs = new ArrayList<SequenceI>();
+ List<SequenceI> seqs = new ArrayList<>();
for (SequenceToSequenceMapping ssm : mappings)
{
seqs.add(ssm.mapping.to);
for (SequenceToSequenceMapping ssm : mappings)
{
seqs.add(ssm.mapping.to);
@@
-200,7
+200,7
@@
public class AlignedCodonFrame
public MapList[] getdnaToProt()
{
public MapList[] getdnaToProt()
{
- List<MapList> maps = new ArrayList<MapList>();
+ List<MapList> maps = new ArrayList<>();
for (SequenceToSequenceMapping ssm : mappings)
{
maps.add(ssm.mapping.map);
for (SequenceToSequenceMapping ssm : mappings)
{
maps.add(ssm.mapping.map);
@@
-210,7
+210,7
@@
public class AlignedCodonFrame
public Mapping[] getProtMappings()
{
public Mapping[] getProtMappings()
{
- List<Mapping> maps = new ArrayList<Mapping>();
+ List<Mapping> maps = new ArrayList<>();
for (SequenceToSequenceMapping ssm : mappings)
{
maps.add(ssm.mapping);
for (SequenceToSequenceMapping ssm : mappings)
{
maps.add(ssm.mapping);
@@
-220,7
+220,7
@@
public class AlignedCodonFrame
/**
* Returns the first mapping found which is to or from the given sequence, or
/**
* Returns the first mapping found which is to or from the given sequence, or
- * null.
+ * null if none is found
*
* @param seq
* @return
*
* @param seq
* @return
@@
-485,7
+485,7
@@
public class AlignedCodonFrame
{
MapList ml = null;
SequenceI dnaSeq = null;
{
MapList ml = null;
SequenceI dnaSeq = null;
- List<char[]> result = new ArrayList<char[]>();
+ List<char[]> result = new ArrayList<>();
for (SequenceToSequenceMapping ssm : mappings)
{
for (SequenceToSequenceMapping ssm : mappings)
{
@@
-524,8
+524,8
@@
public class AlignedCodonFrame
*/
public List<Mapping> getMappingsFromSequence(SequenceI seq)
{
*/
public List<Mapping> getMappingsFromSequence(SequenceI seq)
{
- List<Mapping> result = new ArrayList<Mapping>();
- List<SequenceI> related = new ArrayList<SequenceI>();
+ List<Mapping> result = new ArrayList<>();
+ List<SequenceI> related = new ArrayList<>();
SequenceI seqDs = seq.getDatasetSequence();
seqDs = seqDs != null ? seqDs : seq;
SequenceI seqDs = seq.getDatasetSequence();
seqDs = seqDs != null ? seqDs : seq;