git://source.jalview.org
/
jalview.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
6671b10
)
JAL-3253-applet JAL-3397 delete fix
author
hansonr
<hansonr@STO24954W.ad.stolaf.edu>
Fri, 16 Aug 2019 17:49:26 +0000
(12:49 -0500)
committer
hansonr
<hansonr@STO24954W.ad.stolaf.edu>
Sat, 17 Aug 2019 14:25:56 +0000
(09:25 -0500)
src/intervalstore/nonc/IntervalStore.java
patch
|
blob
|
history
swingjs/SwingJS-site.zip
patch
|
blob
|
history
swingjs/timestamp
patch
|
blob
|
history
swingjs/ver/3.2.4/SwingJS-site.zip
patch
|
blob
|
history
swingjs/ver/3.2.4/timestamp
patch
|
blob
|
history
diff --git
a/src/intervalstore/nonc/IntervalStore.java
b/src/intervalstore/nonc/IntervalStore.java
index
23a9d1c
..
5914516
100644
(file)
--- a/
src/intervalstore/nonc/IntervalStore.java
+++ b/
src/intervalstore/nonc/IntervalStore.java
@@
-895,21
+895,27
@@
public class IntervalStore<T extends IntervalI>
// ......^i,pt
// ...... .......
// ............
// ......^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;
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;
break;
- System.arraycopy(intervals, i, intervals, pt, pt1 - i);
+ }
i = pt1;
}
i = pt1;
}
- intervalCount -= deleted;
- deleted = 0;
- bsDeleted.clear();
+
}
}
diff --git
a/swingjs/SwingJS-site.zip
b/swingjs/SwingJS-site.zip
index
59db2ca
..
f252799
100644
(file)
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
(file)
--- 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
(file)
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
(file)
--- a/
swingjs/ver/3.2.4/timestamp
+++ b/
swingjs/ver/3.2.4/timestamp
@@
-1
+1
@@
-20190730143639
+20190816123836