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.9 by jsr166, Sun Sep 5 21:32:19 2010 UTC

# Line 1 | Line 1
1   /*
2 < * Copyright 1994-2005 Sun Microsystems, Inc.  All Rights Reserved.
2 > * Copyright (c) 1994, 2005, Oracle and/or its affiliates. All rights reserved.
3   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4   *
5   * This code is free software; you can redistribute it and/or modify it
# Line 18 | Line 18
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.
21 > * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
22 > * or visit www.oracle.com if you need additional information or have any
23 > * questions.
24   */
25  
26   package java.util;
# Line 43 | Line 43 | package java.util;
43   *   Deque<Integer> stack = new ArrayDeque<Integer>();}</pre>
44   *
45   * @author  Jonathan Payne
46 – * @version %I%, %G%
46   * @since   JDK1.0
47   */
48   public
# Line 65 | Line 64 | class Stack<E> extends Vector<E> {
64       * @see     java.util.Vector#addElement
65       */
66      public E push(E item) {
67 <        addElement(item);
67 >        addElement(item);
68  
69 <        return item;
69 >        return item;
70      }
71  
72      /**
# Line 79 | Line 78 | class Stack<E> extends Vector<E> {
78       * @exception  EmptyStackException  if this stack is empty.
79       */
80      public synchronized E pop() {
81 <        E       obj;
82 <        int     len = size();
81 >        E       obj;
82 >        int     len = size();
83  
84 <        obj = peek();
85 <        removeElementAt(len - 1);
84 >        obj = peek();
85 >        removeElementAt(len - 1);
86  
87 <        return obj;
87 >        return obj;
88      }
89  
90      /**
# Line 97 | Line 96 | class Stack<E> extends Vector<E> {
96       * @exception  EmptyStackException  if this stack is empty.
97       */
98      public synchronized E peek() {
99 <        int     len = size();
99 >        int     len = size();
100  
101 <        if (len == 0)
102 <            throw new EmptyStackException();
103 <        return elementAt(len - 1);
101 >        if (len == 0)
102 >            throw new EmptyStackException();
103 >        return elementAt(len - 1);
104      }
105  
106      /**
# Line 111 | Line 110 | class Stack<E> extends Vector<E> {
110       *          no items; <code>false</code> otherwise.
111       */
112      public boolean empty() {
113 <        return size() == 0;
113 >        return size() == 0;
114      }
115  
116      /**
# Line 129 | Line 128 | class Stack<E> extends Vector<E> {
128       *          indicates that the object is not on the stack.
129       */
130      public synchronized int search(Object o) {
131 <        int i = lastIndexOf(o);
131 >        int i = lastIndexOf(o);
132  
133 <        if (i >= 0) {
134 <            return size() - i;
135 <        }
136 <        return -1;
133 >        if (i >= 0) {
134 >            return size() - i;
135 >        }
136 >        return -1;
137      }
138  
139      /** use serialVersionUID from JDK 1.0.2 for interoperability */

Diff Legend

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