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.3 by jsr166, Sat Oct 1 22:07:26 2005 UTC vs.
Revision 1.7 by jsr166, Sun May 18 23:47:56 2008 UTC

# Line 1 | Line 1
1   /*
2 < * %W% %E%
2 > * Copyright 1994-2005 Sun Microsystems, Inc.  All Rights Reserved.
3 > * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4   *
5 < * Copyright 2005 Sun Microsystems, Inc. All rights reserved.
6 < * SUN PROPRIETARY/CONFIDENTIAL. Use is subject to license terms.
5 > * This code is free software; you can redistribute it and/or modify it
6 > * under the terms of the GNU General Public License version 2 only, as
7 > * published by the Free Software Foundation.  Sun designates this
8 > * particular file as subject to the "Classpath" exception as provided
9 > * by Sun in the LICENSE file that accompanied this code.
10 > *
11 > * This code is distributed in the hope that it will be useful, but WITHOUT
12 > * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
13 > * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
14 > * version 2 for more details (a copy is included in the LICENSE file that
15 > * accompanied this code).
16 > *
17 > * You should have received a copy of the GNU General Public License version
18 > * 2 along with this work; if not, write to the Free Software Foundation,
19 > * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
20 > *
21 > * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
22 > * CA 95054 USA or visit www.sun.com if you need additional information or
23 > * have any questions.
24   */
25  
26   package java.util;
# Line 47 | 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 61 | 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 79 | 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 93 | 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 111 | 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