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-974 - broken copy of feature settings
[jalview.git]
/
src
/
jalview
/
viewmodel
/
AlignmentViewport.java
diff --git
a/src/jalview/viewmodel/AlignmentViewport.java
b/src/jalview/viewmodel/AlignmentViewport.java
index
36da772
..
8c34f31
100644
(file)
--- a/
src/jalview/viewmodel/AlignmentViewport.java
+++ b/
src/jalview/viewmodel/AlignmentViewport.java
@@
-371,8
+371,8
@@
public abstract class AlignmentViewport implements AlignViewportI
{
return;
}
{
return;
}
- if (!calculator
- .startRegisteredWorkersOfClass(jalview.workers.ConservationThread.class))
+ if (calculator
+ .getRegisteredWorkersOfClass(jalview.workers.ConservationThread.class)==null)
{
calculator.registerWorker(new jalview.workers.ConservationThread(
this, ap));
{
calculator.registerWorker(new jalview.workers.ConservationThread(
this, ap));
@@
-389,7
+389,7
@@
public abstract class AlignmentViewport implements AlignViewportI
{
return;
}
{
return;
}
- if (!calculator.startRegisteredWorkersOfClass(ConsensusThread.class))
+ if (calculator.getRegisteredWorkersOfClass(ConsensusThread.class)==null)
{
calculator.registerWorker(new ConsensusThread(this, ap));
}
{
calculator.registerWorker(new ConsensusThread(this, ap));
}
@@
-409,8
+409,8
@@
public abstract class AlignmentViewport implements AlignViewportI
{
return;
}
{
return;
}
- if (!calculator
- .startRegisteredWorkersOfClass(StrucConsensusThread.class))
+ if (calculator
+ .getRegisteredWorkersOfClass(StrucConsensusThread.class)==null)
{
calculator.registerWorker(new StrucConsensusThread(this, ap));
}
{
calculator.registerWorker(new StrucConsensusThread(this, ap));
}
@@
-1303,8
+1303,8
@@
public abstract class AlignmentViewport implements AlignViewportI
if (sg.cs != null)
{
sg.cs.alignmentChanged(sg, hiddenRepSequences);
if (sg.cs != null)
{
sg.cs.alignmentChanged(sg, hiddenRepSequences);
- sg.recalcConservation();
}
}
+ sg.recalcConservation();
}
}
}
}