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-1164 regression on JAL-1292 use bitset to mark graphGroup as rendered
[jalview.git]
/
src
/
jalview
/
viewmodel
/
AlignmentViewport.java
diff --git
a/src/jalview/viewmodel/AlignmentViewport.java
b/src/jalview/viewmodel/AlignmentViewport.java
index
dc352f4
..
dca968e
100644
(file)
--- a/
src/jalview/viewmodel/AlignmentViewport.java
+++ b/
src/jalview/viewmodel/AlignmentViewport.java
@@
-41,6
+41,7
@@
import jalview.workers.ConsensusThread;
import jalview.workers.StrucConsensusThread;
import java.util.ArrayList;
import jalview.workers.StrucConsensusThread;
import java.util.ArrayList;
+import java.util.BitSet;
import java.util.Hashtable;
import java.util.List;
import java.util.Map;
import java.util.Hashtable;
import java.util.List;
import java.util.Map;
@@
-1413,7
+1414,7
@@
public abstract class AlignmentViewport implements AlignViewportI
int charHeight = getCharHeight();
if (aa != null)
{
int charHeight = getCharHeight();
if (aa != null)
{
- boolean graphgrp[] = null;
+ BitSet graphgrp = new BitSet();
for (int i = 0; i < aa.length; i++)
{
if (aa[i] == null)
for (int i = 0; i < aa.length; i++)
{
if (aa[i] == null)
@@
-1427,17
+1428,13
@@
public abstract class AlignmentViewport implements AlignViewportI
}
if (aa[i].graphGroup > -1)
{
}
if (aa[i].graphGroup > -1)
{
- if (graphgrp == null)
- {
- graphgrp = new boolean[aa.length];
- }
- if (graphgrp[aa[i].graphGroup])
+ if (graphgrp.get(aa[i].graphGroup))
{
continue;
}
else
{
{
continue;
}
else
{
- graphgrp[aa[i].graphGroup] = true;
+ graphgrp.set(aa[i].graphGroup);
}
}
aa[i].height = 0;
}
}
aa[i].height = 0;