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

Comparing jsr166/src/main/java/util/TreeSet.java (file contents):
Revision 1.9 by jsr166, Mon May 2 21:44:01 2005 UTC vs.
Revision 1.13 by jsr166, Tue May 17 07:29:01 2005 UTC

# Line 8 | Line 8
8   package java.util;
9  
10   /**
11 < * This class implements the <tt>Set</tt> interface, backed by a
12 < * <tt>TreeMap</tt> instance.  This class guarantees that the sorted set will
13 < * be in ascending element order, sorted according to the <i>natural order</i>
14 < * of the elements (see <tt>Comparable</tt>), or by the comparator provided at
15 < * set creation time, depending on which constructor is used.<p>
11 > * A {@link NavigableSet} implementation based on a {@link TreeMap}.
12 > * The elements are ordered using their {@linkplain Comparable natural
13 > * ordering}, or by a {@link Comparator} provided at set creation
14 > * time, depending on which constructor is used.
15   *
16 < * This implementation provides guaranteed log(n) time cost for the basic
17 < * operations (<tt>add</tt>, <tt>remove</tt> and <tt>contains</tt>).<p>
16 > * <p>This implementation provides guaranteed log(n) time cost for the basic
17 > * operations (<tt>add</tt>, <tt>remove</tt> and <tt>contains</tt>).
18   *
19 < * Note that the ordering maintained by a set (whether or not an explicit
19 > * <p>Note that the ordering maintained by a set (whether or not an explicit
20   * comparator is provided) must be <i>consistent with equals</i> if it is to
21   * correctly implement the <tt>Set</tt> interface.  (See <tt>Comparable</tt>
22   * or <tt>Comparator</tt> for a precise definition of <i>consistent with
23   * equals</i>.)  This is so because the <tt>Set</tt> interface is defined in
24   * terms of the <tt>equals</tt> operation, but a <tt>TreeSet</tt> instance
25 < * performs all key comparisons using its <tt>compareTo</tt> (or
26 < * <tt>compare</tt>) method, so two keys that are deemed equal by this method
25 > * performs all element comparisons using its <tt>compareTo</tt> (or
26 > * <tt>compare</tt>) method, so two elements that are deemed equal by this method
27   * are, from the standpoint of the set, equal.  The behavior of a set
28   * <i>is</i> well-defined even if its ordering is inconsistent with equals; it
29 < * just fails to obey the general contract of the <tt>Set</tt> interface.<p>
29 > * just fails to obey the general contract of the <tt>Set</tt> interface.
30   *
31 < * <b>Note that this implementation is not synchronized.</b> If multiple
31 > * <p><b>Note that this implementation is not synchronized.</b> If multiple
32   * threads access a set concurrently, and at least one of the threads modifies
33   * the set, it <i>must</i> be synchronized externally.  This is typically
34   * accomplished by synchronizing on some object that naturally encapsulates
# Line 37 | Line 36 | package java.util;
36   * <tt>Collections.synchronizedSet</tt> method.  This is best done at creation
37   * time, to prevent accidental unsynchronized access to the set: <pre>
38   *     SortedSet s = Collections.synchronizedSortedSet(new TreeSet(...));
39 < * </pre><p>
39 > * </pre>
40   *
41 < * The Iterators returned by this class's <tt>iterator</tt> method are
41 > * <p>The iterators returned by this class's <tt>iterator</tt> method are
42   * <i>fail-fast</i>: if the set is modified at any time after the iterator is
43   * created, in any way except through the iterator's own <tt>remove</tt>
44 < * method, the iterator will throw a <tt>ConcurrentModificationException</tt>.
44 > * method, the iterator will throw a {@link ConcurrentModificationException}.
45   * Thus, in the face of concurrent modification, the iterator fails quickly
46   * and cleanly, rather than risking arbitrary, non-deterministic behavior at
47   * an undetermined time in the future.
# Line 53 | Line 52 | package java.util;
52   * throw <tt>ConcurrentModificationException</tt> on a best-effort basis.
53   * Therefore, it would be wrong to write a program that depended on this
54   * exception for its correctness:   <i>the fail-fast behavior of iterators
55 < * should be used only to detect bugs.</i><p>
55 > * should be used only to detect bugs.</i>
56   *
57 < * This class is a member of the
57 > * <p>This class is a member of the
58   * <a href="{@docRoot}/../guide/collections/index.html">
59   * Java Collections Framework</a>.
60   *
61 + * @param <E> the type of elements maintained by this set
62 + *
63   * @author  Josh Bloch
64   * @version %I%, %G%
65   * @see     Collection
# Line 81 | Line 82 | public class TreeSet<E>
82      private static final Object PRESENT = new Object();
83  
84      /**
85 <     * Constructs a set backed by the specified sorted map.
85 >     * Constructs a set backed by the specified navigable map.
86       */
87      private TreeSet(NavigableMap<E,Object> m) {
88          this.m = m;
89      }
90  
91      /**
92 <     * Constructs a new, empty set, sorted according to the elements' natural
93 <     * order.  All elements inserted into the set must implement the
94 <     * <tt>Comparable</tt> interface.  Furthermore, all such elements must be
95 <     * <i>mutually comparable</i>: <tt>e1.compareTo(e2)</tt> must not throw a
92 >     * Constructs a new, empty tree set, sorted according to the
93 >     * natural ordering of its elements.  All elements inserted into
94 >     * the set must implement the {@link Comparable} interface.
95 >     * Furthermore, all such elements must be <i>mutually
96 >     * comparable</i>: <tt>e1.compareTo(e2)</tt> must not throw a
97       * <tt>ClassCastException</tt> for any elements <tt>e1</tt> and
98 <     * <tt>e2</tt> in the set.  If the user attempts to add an element to the
99 <     * set that violates this constraint (for example, the user attempts to
100 <     * add a string element to a set whose elements are integers), the
101 <     * <tt>add(Object)</tt> call will throw a <tt>ClassCastException</tt>.
102 <     *
101 <     * @see Comparable
98 >     * <tt>e2</tt> in the set.  If the user attempts to add an element
99 >     * to the set that violates this constraint (for example, the user
100 >     * attempts to add a string element to a set whose elements are
101 >     * integers), the <tt>add(Object)</tt> call will throw a
102 >     * <tt>ClassCastException</tt>.
103       */
104      public TreeSet() {
105          this(new TreeMap<E,Object>());
106      }
107  
108      /**
109 <     * Constructs a new, empty set, sorted according to the specified
109 >     * Constructs a new, empty tree set, sorted according to the specified
110       * comparator.  All elements inserted into the set must be <i>mutually
111       * comparable</i> by the specified comparator: <tt>comparator.compare(e1,
112       * e2)</tt> must not throw a <tt>ClassCastException</tt> for any elements
# Line 113 | Line 114 | public class TreeSet<E>
114       * an element to the set that violates this constraint, the
115       * <tt>add(Object)</tt> call will throw a <tt>ClassCastException</tt>.
116       *
117 <     * @param c the comparator that will be used to sort this set.  A
118 <     *        <tt>null</tt> value indicates that the elements' <i>natural
119 <     *        ordering</i> should be used.
117 >     * @param comparator the comparator that will be used to order this set.
118 >     *        If <tt>null</tt>, the {@linkplain Comparable natural
119 >     *        ordering} of the elements will be used.
120       */
121 <    public TreeSet(Comparator<? super E> c) {
122 <        this(new TreeMap<E,Object>(c));
121 >    public TreeSet(Comparator<? super E> comparator) {
122 >        this(new TreeMap<E,Object>(comparator));
123      }
124  
125      /**
126 <     * Constructs a new set containing the elements in the specified
127 <     * collection, sorted according to the elements' <i>natural order</i>.
128 <     * All keys inserted into the set must implement the <tt>Comparable</tt>
129 <     * interface.  Furthermore, all such keys must be <i>mutually
130 <     * comparable</i>: <tt>k1.compareTo(k2)</tt> must not throw a
131 <     * <tt>ClassCastException</tt> for any elements <tt>k1</tt> and
132 <     * <tt>k2</tt> in the set.
132 <     *
133 <     * @param c The elements that will comprise the new set.
126 >     * Constructs a new tree set containing the elements in the specified
127 >     * collection, sorted according to the <i>natural ordering</i> of its
128 >     * elements.  All elements inserted into the set must implement the
129 >     * {@link Comparable} interface.  Furthermore, all such elements must be
130 >     * <i>mutually comparable</i>: <tt>e1.compareTo(e2)</tt> must not throw a
131 >     * <tt>ClassCastException</tt> for any elements <tt>e1</tt> and
132 >     * <tt>e2</tt> in the set.
133       *
134 <     * @throws ClassCastException if the keys in the specified collection are
135 <     *         not comparable, or are not mutually comparable.
136 <     * @throws NullPointerException if the specified collection is null.
134 >     * @param c collection whose elements will comprise the new set
135 >     * @throws ClassCastException if the elements in <tt>c</tt> are
136 >     *         not {@link Comparable}, or are not mutually comparable
137 >     * @throws NullPointerException if the specified collection is null
138       */
139      public TreeSet(Collection<? extends E> c) {
140          this();
# Line 142 | Line 142 | public class TreeSet<E>
142      }
143  
144      /**
145 <     * Constructs a new set containing the same elements as the specified
146 <     * sorted set, sorted according to the same ordering.
145 >     * Constructs a new tree set containing the same elements and
146 >     * using the same ordering as the specified sorted set.
147       *
148 <     * @param s sorted set whose elements will comprise the new set.
149 <     * @throws NullPointerException if the specified sorted set is null.
148 >     * @param s sorted set whose elements will comprise the new set
149 >     * @throws NullPointerException if the specified sorted set is null
150       */
151      public TreeSet(SortedSet<E> s) {
152          this(s.comparator());
# Line 154 | Line 154 | public class TreeSet<E>
154      }
155  
156      /**
157 <     * Returns an iterator over the elements in this set.  The elements
158 <     * are returned in ascending order.
157 >     * Returns an iterator over the elements in this set in ascending order.
158       *
159 <     * @return an iterator over the elements in this set.
159 >     * @return an iterator over the elements in this set in ascending order
160       */
161      public Iterator<E> iterator() {
162 <        return m.keySet().iterator();
162 >        return m.keySet().iterator();
163      }
164  
165      /**
166 <     * Returns an iterator over the elements in this set.  The elements
168 <     * are returned in descending order.
166 >     * Returns an iterator over the elements in this set in descending order.
167       *
168 <     * @return an iterator over the elements in this set.
168 >     * @return an iterator over the elements in this set in descending order
169       */
170      public Iterator<E> descendingIterator() {
171          return m.descendingKeySet().iterator();
# Line 176 | Line 174 | public class TreeSet<E>
174      /**
175       * Returns the number of elements in this set (its cardinality).
176       *
177 <     * @return the number of elements in this set (its cardinality).
177 >     * @return the number of elements in this set (its cardinality)
178       */
179      public int size() {
180          return m.size();
# Line 185 | Line 183 | public class TreeSet<E>
183      /**
184       * Returns <tt>true</tt> if this set contains no elements.
185       *
186 <     * @return <tt>true</tt> if this set contains no elements.
186 >     * @return <tt>true</tt> if this set contains no elements
187       */
188      public boolean isEmpty() {
189          return m.isEmpty();
# Line 194 | Line 192 | public class TreeSet<E>
192      /**
193       * Returns <tt>true</tt> if this set contains the specified element.
194       *
195 <     * @param o the object to be checked for containment in this set.
196 <     * @return <tt>true</tt> if this set contains the specified element.
199 <     *
195 >     * @param o the object to be checked for containment in this set
196 >     * @return <tt>true</tt> if this set contains the specified element
197       * @throws ClassCastException if the specified object cannot be compared
198 <     *            with the elements currently in the set.
199 <     * @throws NullPointerException if o is <tt>null</tt> and this map
200 <     * uses natural ordering and is non-empty, or its comparator does
201 <     * not tolerate <tt>null</tt> keys.
198 >     *         with the elements currently in the set
199 >     * @throws NullPointerException if the specified element is null and
200 >     *         this set uses natural ordering and is non-empty, or its
201 >     *         comparator does not permit null elements
202       */
203      public boolean contains(Object o) {
204          return m.containsKey(o);
# Line 210 | Line 207 | public class TreeSet<E>
207      /**
208       * Adds the specified element to this set if it is not already present.
209       *
210 <     * @param e element to be added to this set.
210 >     * @param e element to be added to this set
211       * @return <tt>true</tt> if the set did not already contain the specified
212 <     *         element.
216 <     *
212 >     *         element
213       * @throws ClassCastException if the specified object cannot be compared
214 <     *            with the elements currently in the set.
215 <     * @throws NullPointerException if e is <tt>null</tt> and this map
216 <     * uses natural ordering and is non-empty, or its comparator does
217 <     * not tolerate <tt>null</tt> keys.
214 >     *         with the elements currently in the set
215 >     * @throws NullPointerException if the specified element is null and
216 >     *         this set uses natural ordering and is non-empty, or its
217 >     *         comparator does not permit null elements
218       */
219      public boolean add(E e) {
220          return m.put(e, PRESENT)==null;
# Line 227 | Line 223 | public class TreeSet<E>
223      /**
224       * Removes the specified element from this set if it is present.
225       *
226 <     * @param o object to be removed from this set, if present.
227 <     * @return <tt>true</tt> if the set contained the specified element.
232 <     *
226 >     * @param o object to be removed from this set, if present
227 >     * @return <tt>true</tt> if the set contained the specified element
228       * @throws ClassCastException if the specified object cannot be compared
229 <     *            with the elements currently in the set.
230 <     * @throws NullPointerException if o is <tt>null</tt> and this map
231 <     * uses natural ordering and is non-empty, or its comparator does
232 <     * not tolerate <tt>null</tt> keys.
229 >     *         with the elements currently in the set
230 >     * @throws NullPointerException if the specified element is null and
231 >     *         this set uses natural ordering and is non-empty, or its
232 >     *         comparator does not permit null elements
233       */
234      public boolean remove(Object o) {
235          return m.remove(o)==PRESENT;
# Line 242 | Line 237 | public class TreeSet<E>
237  
238      /**
239       * Removes all of the elements from this set.
240 +     * The set will be empty after this call returns.
241       */
242      public void clear() {
243          m.clear();
# Line 251 | Line 247 | public class TreeSet<E>
247       * Adds all of the elements in the specified collection to this set.
248       *
249       * @param c elements to be added
250 <     * @return <tt>true</tt> if this set changed as a result of the call.
255 <     *
250 >     * @return <tt>true</tt> if this set changed as a result of the call
251       * @throws ClassCastException if the elements provided cannot be compared
252 <     *            with the elements currently in the set.
253 <     * @throws NullPointerException if the specified collection is
254 <     * <tt>null</tt> or if any element is <tt>null</tt> and this map
255 <     * uses natural ordering, or its comparator does not tolerate
261 <     * <tt>null</tt> keys.
252 >     *         with the elements currently in the set
253 >     * @throws NullPointerException if the specified collection is null or
254 >     *         if any element is null and this set uses natural ordering, or
255 >     *         its comparator does not permit null elements
256       */
257      public  boolean addAll(Collection<? extends E> c) {
258          // Use linear-time version if applicable
# Line 278 | Line 272 | public class TreeSet<E>
272      }
273  
274      /**
275 <     * Returns a view of the portion of this set whose elements range
282 <     * from <tt>fromElement</tt>, inclusive, to <tt>toElement</tt>,
283 <     * exclusive.  (If <tt>fromElement</tt> and <tt>toElement</tt> are
284 <     * equal, the returned navigable set is empty.)  The returned
285 <     * navigable set is backed by this set, so changes in the returned
286 <     * navigable set are reflected in this set, and vice-versa.  The
287 <     * returned navigable set supports all optional Set operations.<p>
288 <     *
289 <     * The navigable set returned by this method will throw an
290 <     * <tt>IllegalArgumentException</tt> if the user attempts to insert an
291 <     * element outside the specified range.<p>
292 <     *
293 <     * Note: this method always returns a <i>half-open range</i>
294 <     * (which includes its low endpoint but not its high endpoint).
295 <     * If you need a <i>closed range</i> (which includes both
296 <     * endpoints), and the element type allows for calculation of the
297 <     * successor of a specified value, merely request the subrange
298 <     * from <tt>lowEndpoint</tt> to <tt>successor(highEndpoint)</tt>.
299 <     * For example, suppose that <tt>s</tt> is a navigable set of
300 <     * strings.  The following idiom obtains a view containing all of
301 <     * the strings in <tt>s</tt> from <tt>low</tt> to <tt>high</tt>,
302 <     * inclusive:
303 <     * <pre> NavigableSet sub = s.navigableSubSet(low, high+"\0");
304 <     * </pre>
305 <     *
306 <     * A similar technique can be used to generate an <i>open range</i> (which
307 <     * contains neither endpoint).  The following idiom obtains a view
308 <     * containing all of the strings in <tt>s</tt> from <tt>low</tt> to
309 <     * <tt>high</tt>, exclusive: <pre>
310 <     *     NavigableSet sub = s.navigableSubSet(low+"\0", high);
311 <     * </pre>
312 <     *
313 <     * @param fromElement low endpoint (inclusive) of the range.
314 <     * @param toElement high endpoint (exclusive) of the range.
315 <     * @return a view of the portion of this set whose elements range from
316 <     *         <tt>fromElement</tt>, inclusive, to <tt>toElement</tt>,
317 <     *         exclusive.
318 <     * @throws ClassCastException if <tt>fromElement</tt> and
319 <     *         <tt>toElement</tt> cannot be compared to one another using
320 <     *         this set's comparator (or, if the set has no comparator,
321 <     *         using natural ordering).
322 <     * @throws IllegalArgumentException if <tt>fromElement</tt> is greater than
323 <     *         <tt>toElement</tt>.
275 >     * @throws ClassCastException {@inheritDoc}
276       * @throws NullPointerException if <tt>fromElement</tt> or
277 <     *         <tt>toElement</tt> is <tt>null</tt> and this set uses natural
278 <     *         order, or its comparator does not tolerate <tt>null</tt>
279 <     *         elements.
277 >     *         <tt>toElement</tt> is null and this set uses natural ordering,
278 >     *         or its comparator does not permit null elements
279 >     * @throws IllegalArgumentException {@inheritDoc}
280       */
281      public NavigableSet<E> navigableSubSet(E fromElement, E toElement) {
282          return new TreeSet<E>(m.navigableSubMap(fromElement, toElement));
283      }
284  
285      /**
286 <     * Returns a view of the portion of this set whose elements are
287 <     * strictly less than <tt>toElement</tt>.  The returned navigable
288 <     * set is backed by this set, so changes in the returned navigable
289 <     * set are reflected in this set, and vice-versa.  The returned
290 <     * navigable set supports all optional set operations.<p>
339 <     *
340 <     * The navigable set returned by this method will throw an
341 <     * <tt>IllegalArgumentException</tt> if the user attempts to
342 <     * insert an element greater than or equal to
343 <     * <tt>toElement</tt>.<p>
344 <     *
345 <     * Note: this method always returns a view that does not contain
346 <     * its (high) endpoint.  If you need a view that does contain this
347 <     * endpoint, and the element type allows for calculation of the
348 <     * successor of a specified value, merely request a headSet
349 <     * bounded by <tt>successor(highEndpoint)</tt>.  For example,
350 <     * suppose that <tt>s</tt> is a navigable set of strings.  The
351 <     * following idiom obtains a view containing all of the strings in
352 <     * <tt>s</tt> that are less than or equal to <tt>high</tt>:
353 <     * <pre> NavigableSet head = s.navigableHeadSet(high+"\0");</pre>
354 <     *
355 <     * @param toElement high endpoint (exclusive) of the headSet.
356 <     * @return a view of the portion of this set whose elements are strictly
357 <     *         less than <tt>toElement</tt>.
358 <     * @throws ClassCastException if <tt>toElement</tt> is not compatible
359 <     *         with this set's comparator (or, if the set has no comparator,
360 <     *         if <tt>toElement</tt> does not implement <tt>Comparable</tt>).
361 <     * @throws IllegalArgumentException if this set is itself a subset,
362 <     *         and <tt>toElement</tt> is not within the
363 <     *         specified range of the subset.
364 <     * @throws NullPointerException if <tt>toElement</tt> is <tt>null</tt> and
365 <     *         this set uses natural ordering, or its comparator does
366 <     *         not tolerate <tt>null</tt> elements.
286 >     * @throws ClassCastException {@inheritDoc}
287 >     * @throws NullPointerException if <tt>toElement</tt> is null and
288 >     *         this set uses natural ordering, or its comparator does
289 >     *         not permit null elements
290 >     * @throws IllegalArgumentException {@inheritDoc}
291       */
292      public NavigableSet<E> navigableHeadSet(E toElement) {
293          return new TreeSet<E>(m.navigableHeadMap(toElement));
294      }
295  
296      /**
297 <     * Returns a view of the portion of this set whose elements are
298 <     * greater than or equal to <tt>fromElement</tt>.  The returned
299 <     * navigable set is backed by this set, so changes in the returned
300 <     * navigable set are reflected in this set, and vice-versa.  The
301 <     * returned navigable set supports all optional set operations.<p>
378 <     *
379 <     * The navigable set returned by this method will throw an
380 <     * <tt>IllegalArgumentException</tt> if the user attempts to insert an
381 <     * element less than <tt>fromElement</tt>.
382 <     *
383 <     * Note: this method always returns a view that contains its (low)
384 <     * endpoint.  If you need a view that does not contain this
385 <     * endpoint, and the element type allows for calculation of the
386 <     * successor of a specified value, merely request a tailSet
387 <     * bounded by <tt>successor(lowEndpoint)</tt>.  For example,
388 <     * suppose that <tt>s</tt> is a navigable set of strings.  The
389 <     * following idiom obtains a view containing all of the strings in
390 <     * <tt>s</tt> that are strictly greater than <tt>low</tt>:
391 <     * <pre>  NavigableSet tail = s.navigableTailSet(low+"\0");
392 <     * </pre>
393 <     *
394 <     * @param fromElement low endpoint (inclusive) of the tailSet.
395 <     * @return a view of the portion of this set whose elements are
396 <     *         greater than or equal to <tt>fromElement</tt>.
397 <     * @throws ClassCastException if <tt>fromElement</tt> is not compatible
398 <     *         with this set's comparator (or, if the set has no comparator,
399 <     *         if <tt>fromElement</tt> does not implement <tt>Comparable</tt>).
400 <     * @throws IllegalArgumentException if this set is itself a subset,
401 <     *         and <tt>fromElement</tt> is not within the
402 <     *         specified range of the subset.
403 <     * @throws NullPointerException if <tt>fromElement</tt> is <tt>null</tt>
404 <     *         and this set uses natural ordering, or its comparator does
405 <     *         not tolerate <tt>null</tt> elements.
297 >     * @throws ClassCastException {@inheritDoc}
298 >     * @throws NullPointerException if <tt>fromElement</tt> is null and
299 >     *         this set uses natural ordering, or its comparator does
300 >     *         not permit null elements
301 >     * @throws IllegalArgumentException {@inheritDoc}
302       */
303      public NavigableSet<E> navigableTailSet(E fromElement) {
304          return new TreeSet<E>(m.navigableTailMap(fromElement));
305      }
306  
411
307      /**
308 <     * Equivalent to <tt>navigableSubSet</tt> but with a return
309 <     * type conforming to the <tt>SortedSet</tt> interface.
310 <     * @param fromElement low endpoint (inclusive) of the range.
311 <     * @param toElement high endpoint (exclusive) of the range.
312 <     * @return a view of the portion of this set whose elements range from
313 <     *         <tt>fromElement</tt>, inclusive, to <tt>toElement</tt>,
419 <     *         exclusive.
420 <     * @throws ClassCastException if <tt>fromElement</tt> and
421 <     *         <tt>toElement</tt> cannot be compared to one another using
422 <     *         this set's comparator (or, if the set has no comparator,
423 <     *         using natural ordering).
424 <     * @throws IllegalArgumentException if <tt>fromElement</tt> is greater than
425 <     *         <tt>toElement</tt>.
308 >     * Equivalent to {@link #navigableSubSet} but with a return type
309 >     * conforming to the <tt>SortedSet</tt> interface.
310 >     *
311 >     * <p>{@inheritDoc}
312 >     *
313 >     * @throws ClassCastException {@inheritDoc}
314       * @throws NullPointerException if <tt>fromElement</tt> or
315 <     *         <tt>toElement</tt> is <tt>null</tt> and this set uses natural
316 <     *         order, or its comparator does not tolerate <tt>null</tt>
317 <     *         elements.
315 >     *         <tt>toElement</tt> is null and this set uses natural ordering,
316 >     *         or its comparator does not permit null elements
317 >     * @throws IllegalArgumentException {@inheritDoc}
318       */
319      public SortedSet<E> subSet(E fromElement, E toElement) {
320          return new TreeSet<E>(m.navigableSubMap(fromElement, toElement));
321      }
322  
323      /**
324 <     * Equivalent to <tt>navigableHeadSet</tt> but with a return
325 <     * type conforming to the <tt>SortedSet</tt> interface.
324 >     * Equivalent to {@link #navigableHeadSet} but with a return type
325 >     * conforming to the <tt>SortedSet</tt> interface.
326 >     *
327 >     * <p>{@inheritDoc}
328       *
329 <     * @param toElement high endpoint (exclusive) of the headSet.
330 <     * @return a view of the portion of this set whose elements are strictly
331 <     *         less than <tt>toElement</tt>.
332 <     * @throws ClassCastException if <tt>toElement</tt> is not compatible
333 <     *         with this set's comparator (or, if the set has no comparator,
444 <     *         if <tt>toElement</tt> does not implement <tt>Comparable</tt>).
445 <     * @throws IllegalArgumentException if this set is itself a subset,
446 <     *         and <tt>toElement</tt> is not within the
447 <     *         specified range of the subset.
448 <     * @throws NullPointerException if <tt>toElement</tt> is <tt>null</tt> and
449 <     *         this set uses natural ordering, or its comparator does
450 <     *         not tolerate <tt>null</tt> elements.
329 >     * @throws ClassCastException {@inheritDoc}
330 >     * @throws NullPointerException if <tt>toElement</tt> is null
331 >     *         and this set uses natural ordering, or its comparator does
332 >     *         not permit null elements
333 >     * @throws IllegalArgumentException {@inheritDoc}
334       */
335      public SortedSet<E> headSet(E toElement) {
336          return new TreeSet<E>(m.navigableHeadMap(toElement));
337      }
338  
339      /**
340 <     * Equivalent to <tt>navigableTailSet</tt> but with a return
341 <     * type conforming to the <tt>SortedSet</tt> interface.
342 <     * @param fromElement low endpoint (inclusive) of the tailSet.
343 <     * @return a view of the portion of this set whose elements are
344 <     *         greater than or equal to <tt>fromElement</tt>.
345 <     * @throws ClassCastException if <tt>fromElement</tt> is not compatible
346 <     *         with this set's comparator (or, if the set has no comparator,
347 <     *         if <tt>fromElement</tt> does not implement <tt>Comparable</tt>).
348 <     * @throws IllegalArgumentException if this set is itself a subset,
349 <     *         and <tt>fromElement</tt> is not within the
467 <     *         specified range of the subset.
468 <     * @throws NullPointerException if <tt>fromElement</tt> is <tt>null</tt>
469 <     *         and this set uses natural ordering, or its comparator does
470 <     *         not tolerate <tt>null</tt> elements.
340 >     * Equivalent to {@link #navigableTailSet} but with a return type
341 >     * conforming to the <tt>SortedSet</tt> interface.
342 >     *
343 >     * <p>{@inheritDoc}
344 >     *
345 >     * @throws ClassCastException {@inheritDoc}
346 >     * @throws NullPointerException if <tt>fromElement</tt> is null
347 >     *         and this set uses natural ordering, or its comparator does
348 >     *         not permit null elements
349 >     * @throws IllegalArgumentException {@inheritDoc}
350       */
351      public SortedSet<E> tailSet(E fromElement) {
352          return new TreeSet<E>(m.navigableTailMap(fromElement));
353      }
354  
476    /**
477     * Returns the comparator used to order this sorted set, or <tt>null</tt>
478     * if this tree set uses its elements natural ordering.
479     *
480     * @return the comparator used to order this sorted set, or <tt>null</tt>
481     * if this tree set uses its elements natural ordering.
482     */
355      public Comparator<? super E> comparator() {
356          return m.comparator();
357      }
358  
359      /**
360 <     * Returns the first (lowest) element currently in this sorted set.
489 <     *
490 <     * @return the first (lowest) element currently in this sorted set.
491 <     * @throws    NoSuchElementException sorted set is empty.
360 >     * @throws NoSuchElementException {@inheritDoc}
361       */
362      public E first() {
363          return m.firstKey();
364      }
365  
366      /**
367 <     * Returns the last (highest) element currently in this sorted set.
499 <     *
500 <     * @return the last (highest) element currently in this sorted set.
501 <     * @throws    NoSuchElementException sorted set is empty.
367 >     * @throws NoSuchElementException {@inheritDoc}
368       */
369      public E last() {
370          return m.lastKey();
# Line 506 | Line 372 | public class TreeSet<E>
372  
373      // NavigableSet API methods
374  
509
375      /**
376 <     * Returns an element greater than or equal to the given element, or
377 <     * <tt>null</tt> if there is no such element.
378 <     *
379 <     * @param e the value to match
515 <     * @return an element greater than or equal to given element, or
516 <     * <tt>null</tt> if there is no such element.
517 <     * @throws ClassCastException if e cannot be compared with the elements
518 <     *            currently in the set.
519 <     * @throws NullPointerException if e is <tt>null</tt> and this map
520 <     * uses natural ordering and is non-empty, or its comparator does
521 <     * not tolerate <tt>null</tt> keys.
522 <     */
523 <    public E ceiling(E e) {
524 <        return m.ceilingKey(e);
525 <    }
526 <
527 <    /**
528 <     * Returns an element strictly less than the given element, or
529 <     * <tt>null</tt> if there is no such element.
530 <     *
531 <     * @param e the value to match
532 <     * @return the greatest element less than the given element, or
533 <     * <tt>null</tt> if there is no such element.
534 <     * @throws ClassCastException if e cannot be compared with the elements
535 <     *            currently in the set.
536 <     * @throws NullPointerException if e is <tt>null</tt> and this map
537 <     * uses natural ordering and is non-empty, or its comparator does
538 <     * not tolerate <tt>null</tt> keys.
376 >     * @throws ClassCastException {@inheritDoc}
377 >     * @throws NullPointerException if the specified element is null and
378 >     *         this set uses natural ordering and is non-empty,
379 >     *         or its comparator does not permit null elements
380       */
381      public E lower(E e) {
382          return m.lowerKey(e);
383      }
384  
385      /**
386 <     * Returns an element less than or equal to the given element, or
387 <     * <tt>null</tt> if there is no such element.
388 <     *
389 <     * @param e the value to match
549 <     * @return the greatest element less than or equal to given
550 <     * element, or <tt>null</tt> if there is no such element.
551 <     * @throws ClassCastException if e cannot be compared with the elements
552 <     *            currently in the set.
553 <     * @throws NullPointerException if e is <tt>null</tt> and this map
554 <     * uses natural ordering and is non-empty, or its comparator does
555 <     * not tolerate <tt>null</tt> keys.
386 >     * @throws ClassCastException {@inheritDoc}
387 >     * @throws NullPointerException if the specified element is null and
388 >     *         this set uses natural ordering and is non-empty,
389 >     *         or its comparator does not permit null elements
390       */
391      public E floor(E e) {
392          return m.floorKey(e);
393      }
394  
395      /**
396 <     * Returns an element strictly greater than the given element, or
397 <     * <tt>null</tt> if there is no such element.
398 <     *
399 <     * @param e the value to match
566 <     * @return the least element greater than the given element, or
567 <     * <tt>null</tt> if there is no such element.
568 <     * @throws ClassCastException if e cannot be compared with the elements
569 <     *            currently in the set.
570 <     * @throws NullPointerException if e is <tt>null</tt> and this map
571 <     * uses natural ordering and is non-empty, or its comparator does
572 <     * not tolerate <tt>null</tt> keys.
396 >     * @throws ClassCastException {@inheritDoc}
397 >     * @throws NullPointerException if the specified element is null and
398 >     *         this set uses natural ordering and is non-empty,
399 >     *         or its comparator does not permit null elements
400       */
401 <    public E higher(E e) {
402 <        return m.higherKey(e);
401 >    public E ceiling(E e) {
402 >        return m.ceilingKey(e);
403      }
404  
405      /**
406 <     * Retrieves and removes the first (lowest) element.
407 <     *
408 <     * @return the least element, or <tt>null</tt> if empty.
406 >     * @throws ClassCastException {@inheritDoc}
407 >     * @throws NullPointerException if the specified element is null and
408 >     *         this set uses natural ordering and is non-empty,
409 >     *         or its comparator does not permit null elements
410       */
411 +    public E higher(E e) {
412 +        return m.higherKey(e);
413 +    }
414 +
415      public E pollFirst() {
416          Map.Entry<E,?> e = m.pollFirstEntry();
417          return (e == null)? null : e.getKey();
418      }
419  
588    /**
589     * Retrieves and removes the last (highest) element.
590     *
591     * @return the last element, or <tt>null</tt> if empty.
592     */
420      public E pollLast() {
421          Map.Entry<E,?> e = m.pollLastEntry();
422          return (e == null)? null : e.getKey();
# Line 599 | Line 426 | public class TreeSet<E>
426       * Returns a shallow copy of this <tt>TreeSet</tt> instance. (The elements
427       * themselves are not cloned.)
428       *
429 <     * @return a shallow copy of this set.
429 >     * @return a shallow copy of this set
430       */
431      public Object clone() {
432          TreeSet<E> clone = null;
# Line 619 | Line 446 | public class TreeSet<E>
446       * serialize it).
447       *
448       * @serialData Emits the comparator used to order this set, or
449 <     *             <tt>null</tt> if it obeys its elements' natural ordering
450 <     *             (Object), followed by the size of the set (the number of
451 <     *             elements it contains) (int), followed by all of its
452 <     *             elements (each an Object) in order (as determined by the
453 <     *             set's Comparator, or by the elements' natural ordering if
449 >     *             <tt>null</tt> if it obeys its elements' natural ordering
450 >     *             (Object), followed by the size of the set (the number of
451 >     *             elements it contains) (int), followed by all of its
452 >     *             elements (each an Object) in order (as determined by the
453 >     *             set's Comparator, or by the elements' natural ordering if
454       *             the set has no Comparator).
455       */
456      private void writeObject(java.io.ObjectOutputStream s)

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines