From ecfe32aed40c7580da5a2a4595c27613261ecd60 Mon Sep 17 00:00:00 2001
From: Chris Povirk <cpovirk@google.com>
Date: Mon, 3 Aug 2020 13:38:46 -0400
Subject: [PATCH] Update collection-object-parameters-may-be-null for new
 annotations.

Merge with https://github.com/typetools/jdk/pull/71
---
 ...ection-object-parameters-may-be-null.astub | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/checker/src/main/java/org/checkerframework/checker/nullness/collection-object-parameters-may-be-null.astub b/checker/src/main/java/org/checkerframework/checker/nullness/collection-object-parameters-may-be-null.astub
index b2cb372f4f0..1249b91ee4b 100644
--- a/checker/src/main/java/org/checkerframework/checker/nullness/collection-object-parameters-may-be-null.astub
+++ b/checker/src/main/java/org/checkerframework/checker/nullness/collection-object-parameters-may-be-null.astub
@@ -182,8 +182,8 @@ class Vector<E> {
 package java.util.concurrent;
 
 public class ArrayBlockingQueue<E> {
-    public boolean removeAll(Collection<?> c);
-    public boolean retainAll(Collection<?> c);
+    public boolean remove(@Nullable Object o);
+    public boolean contains(@Nullable Object o);
 }
 
 public class ConcurrentLinkedDeque<E> {
@@ -210,8 +210,6 @@ public class ConcurrentSkipListSet<E>
 
 public class CopyOnWriteArrayList<E>
     implements List<E>, RandomAccess, Cloneable, java.io.Serializable {
-    public int indexOf(@Nullable Object o);
-    public int lastIndexOf(@Nullable Object o);
     public boolean removeAll(Collection<?> c);
     public boolean retainAll(Collection<?> c);
 }
@@ -229,13 +227,15 @@ public class DelayQueue<E extends Delayed> extends AbstractQueue<E>
 }
 
 class LinkedBlockingDeque<E> {
-    public boolean removeAll(Collection<?> c);
-    public boolean retainAll(Collection<?> c);
+    public boolean removeFirstOccurrence(@Nullable Object o);
+    public boolean removeLastOccurrence(@Nullable Object o);
+    public boolean remove(@Nullable Object o);
+    public boolean contains(@Nullable Object o);
 }
 
 class LinkedBlockingQueue<E> {
-    public boolean removeAll(Collection<?> c);
-    public boolean retainAll(Collection<?> c);
+    public boolean remove(@Nullable Object o);
+    public boolean contains(@Nullable Object o);
 }
 
 class LinkedTransferQueue<E> {
@@ -244,8 +244,8 @@ class LinkedTransferQueue<E> {
 }
 
 class PriorityBlockingQueue<E> {
-    public boolean removeAll(Collection<?> c);
-    public boolean retainAll(Collection<?> c);
+    public boolean remove(@Nullable Object o);
+    public boolean contains(@Nullable Object o);
 }
 
 public class SynchronousQueue<E> extends AbstractQueue<E>