ViewVC Help

View File | Revision Log | Show Annotations | Download File | Root Listing

root/jsr166/jsr166/src/main/java/util/PriorityQueue.java

Comparing jsr166/src/main/java/util/PriorityQueue.java (file contents):
Revision 1.11 by dholmes, Mon Jul 28 04:11:54 2003 UTC vs.
Revision 1.12 by dl, Mon Jul 28 09:40:07 2003 UTC

#	Line 199 | Line 199 | public class PriorityQueue<E> extends Ab
199		return super.add(element);
200		}
201
202	<	/**
203	<	* @throws NullPointerException if any element is <tt>null</tt>.
204	<	*/
205	<	public boolean addAll(Collection c) {
206	<	return super.addAll(c);
207	<	}
202	>	//    /**
203	>	//     * @throws NullPointerException if any element is <tt>null</tt>.
204	>	//     */
205	>	//    public boolean addAll(Collection c) {
206	>	//        return super.addAll(c);
207	>	//    }
208
209		/**
210		* @throws NullPointerException if the specified element is <tt>null</tt>.
211		*/
212	<	public boolean remove(E o) {
212	>	public boolean remove(Object o) {
213		if (o == null)
214		throw new NullPointerException();
215
#	Line 222 | Line 222 | public class PriorityQueue<E> extends Ab
222		}
223		} else {
224		for (int i = 1; i <= size; i++) {
225	<	if (comparator.compare(queue[i], o) == 0) {
225	>	if (comparator.compare(queue[i], (E)o) == 0) {
226		remove(i);
227		return true;
228		}

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines
>	Changed lines