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-2034 fix logic so recalcConservation(true) returns true if conservation updates...
[jalview.git]
/
src
/
jalview
/
datamodel
/
SequenceGroup.java
diff --git
a/src/jalview/datamodel/SequenceGroup.java
b/src/jalview/datamodel/SequenceGroup.java
index
22c537a
..
046f1e6
100755
(executable)
--- a/
src/jalview/datamodel/SequenceGroup.java
+++ b/
src/jalview/datamodel/SequenceGroup.java
@@
-529,6
+529,7
@@
public class SequenceGroup implements AnnotatedCollectionI
}
// TODO: try harder to detect changes in state in order to minimise
// recalculation effort
}
// TODO: try harder to detect changes in state in order to minimise
// recalculation effort
+ boolean upd = false;
try
{
Hashtable cnsns[] = AAFrequency.calculate(sequences, startRes,
try
{
Hashtable cnsns[] = AAFrequency.calculate(sequences, startRes,
@@
-536,10
+537,12
@@
public class SequenceGroup implements AnnotatedCollectionI
if (consensus != null)
{
_updateConsensusRow(cnsns, sequences.size());
if (consensus != null)
{
_updateConsensusRow(cnsns, sequences.size());
+ upd = true;
}
if (cs != null)
{
cs.setConsensus(cnsns);
}
if (cs != null)
{
cs.setConsensus(cnsns);
+ upd = true;
}
if ((conservation != null)
}
if ((conservation != null)
@@
-561,6
+564,8
@@
public class SequenceGroup implements AnnotatedCollectionI
cs.setConservation(c);
}
}
cs.setConservation(c);
}
}
+ // eager update - will cause a refresh of overview regardless
+ upd = true;
}
if (cs != null && !defer)
{
}
if (cs != null && !defer)
{
@@
-570,14
+575,14
@@
public class SequenceGroup implements AnnotatedCollectionI
}
else
{
}
else
{
- return false;
+ return upd;
}
} catch (java.lang.OutOfMemoryError err)
{
// TODO: catch OOM
System.out.println("Out of memory loading groups: " + err);
}
}
} catch (java.lang.OutOfMemoryError err)
{
// TODO: catch OOM
System.out.println("Out of memory loading groups: " + err);
}
- return false;
+ return upd;
}
private void _updateConservationRow(Conservation c)
}
private void _updateConservationRow(Conservation c)