--- jsr166/src/main/java/util/TreeSet.java	2005/03/29 15:00:48	1.4
+++ jsr166/src/main/java/util/TreeSet.java	2005/05/02 08:35:49	1.7
@@ -1,7 +1,7 @@
 /*
  * %W% %E%
  *
- * Copyright 2004 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2005 Sun Microsystems, Inc. All rights reserved.
  * SUN PROPRIETARY/CONFIDENTIAL. Use is subject to license terms.
  */
 
@@ -210,18 +210,18 @@ public class TreeSet<E>
     /**
      * Adds the specified element to this set if it is not already present.
      *
-     * @param o element to be added to this set.
+     * @param e element to be added to this set.
      * @return <tt>true</tt> if the set did not already contain the specified
      *         element.
      *
      * @throws ClassCastException if the specified object cannot be compared
      * 		  with the elements currently in the set.
-     * @throws NullPointerException if o is <tt>null</tt> and this map
+     * @throws NullPointerException if e is <tt>null</tt> and this map
      * uses natural ordering and is non-empty, or its comparator does
      * not tolerate <tt>null</tt> keys.
      */
-    public boolean add(E o) {
-	return m.put(o, PRESENT)==null;
+    public boolean add(E e) {
+	return m.put(e, PRESENT)==null;
     }
 
     /**
@@ -442,7 +442,7 @@ public class TreeSet<E>
      * @throws ClassCastException if <tt>toElement</tt> is not compatible
      *         with this set's comparator (or, if the set has no comparator,
      *         if <tt>toElement</tt> does not implement <tt>Comparable</tt>).
-     * @throws IllegalArgumentException if this set is itself a subSet,
+     * @throws IllegalArgumentException if this set is itself a subset,
      *         and <tt>toElement</tt> is not within the
      *         specified range of the subset.
      * @throws NullPointerException if <tt>toElement</tt> is <tt>null</tt> and
@@ -511,68 +511,68 @@ public class TreeSet<E>
      * Returns an element greater than or equal to the given element, or
      * <tt>null</tt> if there is no such element.
      * 
-     * @param o the value to match
+     * @param e the value to match
      * @return an element greater than or equal to given element, or
      * <tt>null</tt> if there is no such element.
-     * @throws ClassCastException if o cannot be compared with the elements
+     * @throws ClassCastException if e cannot be compared with the elements
      *            currently in the set.
-     * @throws NullPointerException if o is <tt>null</tt> and this map
+     * @throws NullPointerException if e is <tt>null</tt> and this map
      * uses natural ordering and is non-empty, or its comparator does
      * not tolerate <tt>null</tt> keys.
      */
-    public E ceiling(E o) {
-        return m.ceilingKey(o);
+    public E ceiling(E e) {
+        return m.ceilingKey(e);
     }
 
     /**
      * Returns an element strictly less than the given element, or
      * <tt>null</tt> if there is no such element.
      * 
-     * @param o the value to match
+     * @param e the value to match
      * @return the greatest element less than the given element, or
      * <tt>null</tt> if there is no such element.
-     * @throws ClassCastException if o cannot be compared with the elements
+     * @throws ClassCastException if e cannot be compared with the elements
      *            currently in the set.
-     * @throws NullPointerException if o is <tt>null</tt> and this map
+     * @throws NullPointerException if e is <tt>null</tt> and this map
      * uses natural ordering and is non-empty, or its comparator does
      * not tolerate <tt>null</tt> keys.
      */
-    public E lower(E o) {
-        return m.lowerKey(o);
+    public E lower(E e) {
+        return m.lowerKey(e);
     }
 
     /**
      * Returns an element less than or equal to the given element, or
      * <tt>null</tt> if there is no such element.
      * 
-     * @param o the value to match
+     * @param e the value to match
      * @return the greatest element less than or equal to given
      * element, or <tt>null</tt> if there is no such element.
-     * @throws ClassCastException if o cannot be compared with the elements
+     * @throws ClassCastException if e cannot be compared with the elements
      *            currently in the set.
-     * @throws NullPointerException if o is <tt>null</tt> and this map
+     * @throws NullPointerException if e is <tt>null</tt> and this map
      * uses natural ordering and is non-empty, or its comparator does
      * not tolerate <tt>null</tt> keys.
      */
-    public E floor(E o) {
-        return m.floorKey(o);
+    public E floor(E e) {
+        return m.floorKey(e);
     }
 
     /**
      * Returns an element strictly greater than the given element, or
      * <tt>null</tt> if there is no such element.
      * 
-     * @param o the value to match
+     * @param e the value to match
      * @return the least element greater than the given element, or
      * <tt>null</tt> if there is no such element.
-     * @throws ClassCastException if o cannot be compared with the elements
+     * @throws ClassCastException if e cannot be compared with the elements
      *            currently in the set.
-     * @throws NullPointerException if o is <tt>null</tt> and this map
+     * @throws NullPointerException if e is <tt>null</tt> and this map
      * uses natural ordering and is non-empty, or its comparator does
      * not tolerate <tt>null</tt> keys.
      */
-    public E higher(E o) {
-        return m.higherKey(o);
+    public E higher(E e) {
+        return m.higherKey(e);
     }
 
     /**