Merge branch 'develop' into bug/JAL-2323disulfideOverview

[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 cae77b5..4033dcc 100644 (file)
--- a/src/jalview/ext/android/ContainerHelpers.java
+++ b/src/jalview/ext/android/ContainerHelpers.java
@@ -16,6 +16,12 @@ package jalview.ext.android;
  * limitations under the License.
  */
 
+/*
+ * Copied to Jalview September 2016.
+ * Only the members of this class required for SparseIntArray were copied.
+ * Method binarySearch(short[] array, int size, short value) added to support
+ * SparseShortArray.
+ */
 class ContainerHelpers
 {
   static final boolean[] EMPTY_BOOLEANS = new boolean[0];
@@ -74,4 +80,29 @@ class ContainerHelpers
     }
     return ~lo; // value not present
   }
+
+  // This is Arrays.binarySearch(), but doesn't do any argument validation.
+  static int binarySearch(short[] array, int size, short value)
+  {
+    int lo = 0;
+    int hi = size - 1;
+    while (lo <= hi)
+    {
+      final int mid = (lo + hi) >>> 1;
+      final short midVal = array[mid];
+      if (midVal < value)
+      {
+        lo = mid + 1;
+      }
+      else if (midVal > value)
+      {
+        hi = mid - 1;
+      }
+      else
+      {
+        return mid; // value found
+      }
+    }
+    return ~lo; // value not present
+  }
 }