Merge branch 'develop' into bug/JAL-2399textColour

[jalview.git] / src / jalview / ext / android / ContainerHelpers.java

diff --git a/src/jalview/ext/android/ContainerHelpers.java b/src/jalview/ext/android/ContainerHelpers.java
index f536819..26bd142 100644 (file)
--- a/src/jalview/ext/android/ContainerHelpers.java
+++ b/src/jalview/ext/android/ContainerHelpers.java
@@ -16,12 +16,22 @@ package jalview.ext.android;
  * limitations under the License.
  */
 
+/*
+ * Copied to Jalview September 2016.
+ * Only the members of this class required for SparseIntArray were copied.
+ * Change Log:
+ * Sep 2016: Method binarySearch(short[] array, int size, short value) added to support
+ * SparseShortArray.
+ * Jan 2017: EMPTY_DOUBLES added
+ */
 class ContainerHelpers
 {
   static final boolean[] EMPTY_BOOLEANS = new boolean[0];
 
   static final int[] EMPTY_INTS = new int[0];
 
+  static final double[] EMPTY_DOUBLES = new double[0];
+
   static final long[] EMPTY_LONGS = new long[0];
 
   static final Object[] EMPTY_OBJECTS = new Object[0];
@@ -83,7 +93,7 @@ class ContainerHelpers
     while (lo <= hi)
     {
       final int mid = (lo + hi) >>> 1;
-      final int midVal = array[mid];
+      final short midVal = array[mid];
       if (midVal < value)
       {
         lo = mid + 1;