ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/jsr166/jsr166/src/jdk7/java/util/Deque.java
(Generate patch)

Comparing jsr166/src/jdk7/java/util/Deque.java (file contents):
Revision 1.2 by jsr166, Wed Jan 16 01:39:37 2013 UTC vs.
Revision 1.3 by jsr166, Sat Jul 20 19:33:38 2013 UTC

# Line 29 | Line 29 | package java.util;
29   *
30   * <p>
31   * <table BORDER CELLPADDING=3 CELLSPACING=1>
32 + * <caption>Summary of Deque methods</caption>
33   *  <tr>
34   *    <td></td>
35   *    <td ALIGN=CENTER COLSPAN = 2> <b>First Element (Head)</b></td>
# Line 43 | Line 44 | package java.util;
44   *  </tr>
45   *  <tr>
46   *    <td><b>Insert</b></td>
47 < *    <td>{@link #addFirst addFirst(e)}</td>
48 < *    <td>{@link #offerFirst offerFirst(e)}</td>
49 < *    <td>{@link #addLast addLast(e)}</td>
50 < *    <td>{@link #offerLast offerLast(e)}</td>
47 > *    <td>{@link Deque#addFirst addFirst(e)}</td>
48 > *    <td>{@link Deque#offerFirst offerFirst(e)}</td>
49 > *    <td>{@link Deque#addLast addLast(e)}</td>
50 > *    <td>{@link Deque#offerLast offerLast(e)}</td>
51   *  </tr>
52   *  <tr>
53   *    <td><b>Remove</b></td>
54 < *    <td>{@link #removeFirst removeFirst()}</td>
55 < *    <td>{@link #pollFirst pollFirst()}</td>
56 < *    <td>{@link #removeLast removeLast()}</td>
57 < *    <td>{@link #pollLast pollLast()}</td>
54 > *    <td>{@link Deque#removeFirst removeFirst()}</td>
55 > *    <td>{@link Deque#pollFirst pollFirst()}</td>
56 > *    <td>{@link Deque#removeLast removeLast()}</td>
57 > *    <td>{@link Deque#pollLast pollLast()}</td>
58   *  </tr>
59   *  <tr>
60   *    <td><b>Examine</b></td>
61 < *    <td>{@link #getFirst getFirst()}</td>
62 < *    <td>{@link #peekFirst peekFirst()}</td>
63 < *    <td>{@link #getLast getLast()}</td>
64 < *    <td>{@link #peekLast peekLast()}</td>
61 > *    <td>{@link Deque#getFirst getFirst()}</td>
62 > *    <td>{@link Deque#peekFirst peekFirst()}</td>
63 > *    <td>{@link Deque#getLast getLast()}</td>
64 > *    <td>{@link Deque#peekLast peekLast()}</td>
65   *  </tr>
66   * </table>
67   *
# Line 72 | Line 73 | package java.util;
73   *
74   * <p>
75   * <table BORDER CELLPADDING=3 CELLSPACING=1>
76 + * <caption>Comparison of Queue and Deque methods</caption>
77   *  <tr>
78   *    <td ALIGN=CENTER> <b>{@code Queue} Method</b></td>
79   *    <td ALIGN=CENTER> <b>Equivalent {@code Deque} Method</b></td>
# Line 110 | Line 112 | package java.util;
112   *
113   * <p>
114   * <table BORDER CELLPADDING=3 CELLSPACING=1>
115 + * <caption>Comparison of Stack and Deque methods</caption>
116   *  <tr>
117   *    <td ALIGN=CENTER> <b>Stack Method</b></td>
118   *    <td ALIGN=CENTER> <b>Equivalent {@code Deque} Method</b></td>
# Line 164 | Line 167 | package java.util;
167   public interface Deque<E> extends Queue<E> {
168      /**
169       * Inserts the specified element at the front of this deque if it is
170 <     * possible to do so immediately without violating capacity restrictions.
171 <     * When using a capacity-restricted deque, it is generally preferable to
172 <     * use method {@link #offerFirst}.
170 >     * possible to do so immediately without violating capacity restrictions,
171 >     * throwing an {@code IllegalStateException} if no space is currently
172 >     * available.  When using a capacity-restricted deque, it is generally
173 >     * preferable to use method {@link #offerFirst}.
174       *
175       * @param e the element to add
176       * @throws IllegalStateException if the element cannot be added at this
# Line 182 | Line 186 | public interface Deque<E> extends Queue<
186  
187      /**
188       * Inserts the specified element at the end of this deque if it is
189 <     * possible to do so immediately without violating capacity restrictions.
190 <     * When using a capacity-restricted deque, it is generally preferable to
191 <     * use method {@link #offerLast}.
189 >     * possible to do so immediately without violating capacity restrictions,
190 >     * throwing an {@code IllegalStateException} if no space is currently
191 >     * available.  When using a capacity-restricted deque, it is generally
192 >     * preferable to use method {@link #offerLast}.
193       *
194       * <p>This method is equivalent to {@link #add}.
195       *
# Line 450 | Line 455 | public interface Deque<E> extends Queue<
455      /**
456       * Pushes an element onto the stack represented by this deque (in other
457       * words, at the head of this deque) if it is possible to do so
458 <     * immediately without violating capacity restrictions, returning
454 <     * {@code true} upon success and throwing an
458 >     * immediately without violating capacity restrictions, throwing an
459       * {@code IllegalStateException} if no space is currently available.
460       *
461       * <p>This method is equivalent to {@link #addFirst}.
# Line 492 | Line 496 | public interface Deque<E> extends Queue<
496       * Returns {@code true} if this deque contained the specified element
497       * (or equivalently, if this deque changed as a result of the call).
498       *
499 <     * <p>This method is equivalent to {@link #removeFirstOccurrence}.
499 >     * <p>This method is equivalent to {@link #removeFirstOccurrence(Object)}.
500       *
501       * @param o element to be removed from this deque, if present
502       * @return {@code true} if an element was removed as a result of this call

Diff Legend

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