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

Comparing jsr166/src/main/java/util/Stack.java (file contents):
Revision 1.6 by jsr166, Sun May 20 07:54:01 2007 UTC vs.
Revision 1.7 by jsr166, Sun May 18 23:47:56 2008 UTC

# Line 65 | Line 65 | class Stack<E> extends Vector<E> {
65       * @see     java.util.Vector#addElement
66       */
67      public E push(E item) {
68 <        addElement(item);
68 >        addElement(item);
69  
70 <        return item;
70 >        return item;
71      }
72  
73      /**
# Line 79 | Line 79 | class Stack<E> extends Vector<E> {
79       * @exception  EmptyStackException  if this stack is empty.
80       */
81      public synchronized E pop() {
82 <        E       obj;
83 <        int     len = size();
82 >        E       obj;
83 >        int     len = size();
84  
85 <        obj = peek();
86 <        removeElementAt(len - 1);
85 >        obj = peek();
86 >        removeElementAt(len - 1);
87  
88 <        return obj;
88 >        return obj;
89      }
90  
91      /**
# Line 97 | Line 97 | class Stack<E> extends Vector<E> {
97       * @exception  EmptyStackException  if this stack is empty.
98       */
99      public synchronized E peek() {
100 <        int     len = size();
100 >        int     len = size();
101  
102 <        if (len == 0)
103 <            throw new EmptyStackException();
104 <        return elementAt(len - 1);
102 >        if (len == 0)
103 >            throw new EmptyStackException();
104 >        return elementAt(len - 1);
105      }
106  
107      /**
# Line 111 | Line 111 | class Stack<E> extends Vector<E> {
111       *          no items; <code>false</code> otherwise.
112       */
113      public boolean empty() {
114 <        return size() == 0;
114 >        return size() == 0;
115      }
116  
117      /**
# Line 129 | Line 129 | class Stack<E> extends Vector<E> {
129       *          indicates that the object is not on the stack.
130       */
131      public synchronized int search(Object o) {
132 <        int i = lastIndexOf(o);
132 >        int i = lastIndexOf(o);
133  
134 <        if (i >= 0) {
135 <            return size() - i;
136 <        }
137 <        return -1;
134 >        if (i >= 0) {
135 >            return size() - i;
136 >        }
137 >        return -1;
138      }
139  
140      /** use serialVersionUID from JDK 1.0.2 for interoperability */

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines