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-1791 sign the applet with/out timestamps
[jalview.git]
/
src
/
jalview
/
datamodel
/
SequenceGroup.java
diff --git
a/src/jalview/datamodel/SequenceGroup.java
b/src/jalview/datamodel/SequenceGroup.java
index
3439248
..
cc70e25
100755
(executable)
--- a/
src/jalview/datamodel/SequenceGroup.java
+++ b/
src/jalview/datamodel/SequenceGroup.java
@@
-20,6
+20,11
@@
*/
package jalview.datamodel;
*/
package jalview.datamodel;
+import jalview.analysis.AAFrequency;
+import jalview.analysis.Conservation;
+import jalview.schemes.ColourSchemeI;
+import jalview.schemes.ResidueProperties;
+
import java.awt.Color;
import java.util.ArrayList;
import java.util.Hashtable;
import java.awt.Color;
import java.util.ArrayList;
import java.util.Hashtable;
@@
-27,11
+32,6
@@
import java.util.List;
import java.util.Map;
import java.util.Vector;
import java.util.Map;
import java.util.Vector;
-import jalview.analysis.AAFrequency;
-import jalview.analysis.Conservation;
-import jalview.schemes.ColourSchemeI;
-import jalview.schemes.ResidueProperties;
-
/**
* Collects a set contiguous ranges on a set of sequences
*
/**
* Collects a set contiguous ranges on a set of sequences
*
@@
-613,13
+613,13
@@
public class SequenceGroup implements AnnotatedCollectionI
{
synchronized (sequences)
{
{
synchronized (sequences)
{
- if (sequences.contains(s))
- {
- deleteSequence(s, recalc);
- }
- else
- {
- addSequence(s, recalc);
+ if (sequences.contains(s))
+ {
+ deleteSequence(s, recalc);
+ }
+ else
+ {
+ addSequence(s, recalc);
}
}
}
}
}
}
@@
-775,8
+775,9
@@
public class SequenceGroup implements AnnotatedCollectionI
synchronized (sequences)
{
// MC This needs to get reset when characters are inserted and deleted
synchronized (sequences)
{
// MC This needs to get reset when characters are inserted and deleted
- boolean first=true;
- for (SequenceI seq:sequences) {
+ boolean first = true;
+ for (SequenceI seq : sequences)
+ {
if (first || seq.getLength() > width)
{
width = seq.getLength();
if (first || seq.getLength() > width)
{
width = seq.getLength();