From: hansonr <hansonr@STO24954W.ad.stolaf.edu>
Date: Fri, 16 Aug 2019 17:49:26 +0000 (-0500)
Subject: JAL-3253-applet JAL-3397 delete fix
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=3d3e55de36d0a906952e1655cc93886bfe93d05a;p=jalview.git

JAL-3253-applet JAL-3397 delete fix
---

diff --git a/src/intervalstore/nonc/IntervalStore.java b/src/intervalstore/nonc/IntervalStore.java
index 23a9d1c..5914516 100644
--- a/src/intervalstore/nonc/IntervalStore.java
+++ b/src/intervalstore/nonc/IntervalStore.java
@@ -895,21 +895,27 @@ public class IntervalStore<T extends IntervalI>
     // ......^i,pt
     // ...... .......
     // ............
-    for (int i = bsDeleted.nextSetBit(0); i >= 0;)
+    for (int i = bsDeleted.nextSetBit(0), pt = i; i >= 0;)
     {
-      int pt = i;
       i = bsDeleted.nextClearBit(i + 1);
       int pt1 = bsDeleted.nextSetBit(i + 1);
       if (pt1 < 0)
         pt1 = intervalCount;
-      if (pt1 == pt)
+      int n = pt1 - i;
+      System.arraycopy(intervals, i, intervals, pt, n);
+      pt += n;
+      if (pt1 == intervalCount)
+      {
+        for (i = pt1; --i >= pt;)
+          intervals[i] = null;
+        intervalCount -= deleted;
+        deleted = 0;
+        bsDeleted.clear();
         break;
-      System.arraycopy(intervals, i, intervals, pt, pt1 - i);
+      }
       i = pt1;
     }
-    intervalCount -= deleted;
-    deleted = 0;
-    bsDeleted.clear();
+
 
   }
 
diff --git a/swingjs/SwingJS-site.zip b/swingjs/SwingJS-site.zip
index 59db2ca..f252799 100644
Binary files a/swingjs/SwingJS-site.zip and b/swingjs/SwingJS-site.zip differ
diff --git a/swingjs/timestamp b/swingjs/timestamp
index e1897ae..0b2fcf6 100644
--- a/swingjs/timestamp
+++ b/swingjs/timestamp
@@ -1 +1 @@
-20190730143639 
+20190816123836 
diff --git a/swingjs/ver/3.2.4/SwingJS-site.zip b/swingjs/ver/3.2.4/SwingJS-site.zip
index 59db2ca..f252799 100644
Binary files a/swingjs/ver/3.2.4/SwingJS-site.zip and b/swingjs/ver/3.2.4/SwingJS-site.zip differ
diff --git a/swingjs/ver/3.2.4/timestamp b/swingjs/ver/3.2.4/timestamp
index e1897ae..0b2fcf6 100644
--- a/swingjs/ver/3.2.4/timestamp
+++ b/swingjs/ver/3.2.4/timestamp
@@ -1 +1 @@
-20190730143639 
+20190816123836