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-4366 revive broken alignDNAasDNA test
[jalview.git]
/
src
/
jalview
/
datamodel
/
SequenceGroup.java
diff --git
a/src/jalview/datamodel/SequenceGroup.java
b/src/jalview/datamodel/SequenceGroup.java
index
9837104
..
7e53c46
100755
(executable)
--- a/
src/jalview/datamodel/SequenceGroup.java
+++ b/
src/jalview/datamodel/SequenceGroup.java
@@
-303,8
+303,9
@@
public class SequenceGroup implements AnnotatedCollectionI
newannot.restrict(startRes, endRes);
newannot.setSequenceRef(seqs[ipos]);
newannot.adjustForAlignment();
newannot.restrict(startRes, endRes);
newannot.setSequenceRef(seqs[ipos]);
newannot.adjustForAlignment();
- ContactMatrixI cm = seq.getContactMatrixFor(seq.getAnnotation()[a]);
- if (cm!=null)
+ ContactMatrixI cm = seq
+ .getContactMatrixFor(seq.getAnnotation()[a]);
+ if (cm != null)
{
seqs[ipos].addContactListFor(newannot, cm);
}
{
seqs[ipos].addContactListFor(newannot, cm);
}
@@
-644,7
+645,8
@@
public class SequenceGroup implements AnnotatedCollectionI
} catch (java.lang.OutOfMemoryError err)
{
// TODO: catch OOM
} catch (java.lang.OutOfMemoryError err)
{
// TODO: catch OOM
- jalview.bin.Console.outPrintln("Out of memory loading groups: " + err);
+ jalview.bin.Console
+ .outPrintln("Out of memory loading groups: " + err);
}
return upd;
}
}
return upd;
}