From 3c947453177af853190071603cc7385c25391c2a Mon Sep 17 00:00:00 2001 From: Jim Procter Date: Fri, 11 Oct 2013 17:20:08 +0100 Subject: [PATCH] JAL-1164 regression on JAL-1292 use bitset to mark graphGroup as rendered --- src/jalview/viewmodel/AlignmentViewport.java | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/jalview/viewmodel/AlignmentViewport.java b/src/jalview/viewmodel/AlignmentViewport.java index cceff86..6f3a2af 100644 --- a/src/jalview/viewmodel/AlignmentViewport.java +++ b/src/jalview/viewmodel/AlignmentViewport.java @@ -42,6 +42,7 @@ import jalview.workers.StrucConsensusThread; import java.awt.Color; import java.util.ArrayList; +import java.util.BitSet; import java.util.Hashtable; import java.util.List; import java.util.Map; @@ -1416,7 +1417,7 @@ public abstract class AlignmentViewport implements AlignViewportI 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) @@ -1430,17 +1431,13 @@ public abstract class AlignmentViewport implements AlignViewportI } 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 { - graphgrp[aa[i].graphGroup] = true; + graphgrp.set(aa[i].graphGroup); } } aa[i].height = 0; -- 1.7.10.2