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

Comparing jsr166/src/main/java/util/NavigableMap.java (file contents):
Revision 1.17 by jsr166, Fri Apr 21 03:53:57 2006 UTC vs.
Revision 1.21 by jsr166, Fri Apr 21 23:11:14 2006 UTC

# Line 214 | Line 214 | public interface NavigableMap<K,V> exten
214       * {@code remove} operation), the results of the iteration are undefined.
215       *
216       * @return a navigable map view of the mappings contained in this map,
217 <     *     sorted in descending order
217 >     *         sorted in descending order
218       */
219      NavigableMap<K,V> descendingMap();
220  
# Line 226 | Line 226 | public interface NavigableMap<K,V> exten
226       * {@code remove} operation), the results of the iteration are undefined.
227       * The set supports element removal, which removes the corresponding
228       * mapping from the map, via the {@code Iterator.remove},
229 <     * {@code Set.remove}, {@code removeAll} {@code retainAll}, and
229 >     * {@code Set.remove}, {@code removeAll}, {@code retainAll}, and
230       * {@code clear} operations.  It does not support the {@code add} or
231       * {@code addAll} operations.
232       *
# Line 240 | Line 240 | public interface NavigableMap<K,V> exten
240       * The set is backed by the map, so changes to the map are
241       * reflected in the set, and vice-versa.  If the map is modified
242       * while an iteration over the set is in progress (except through
243 <     * the iterator's own <tt>remove</tt> operation), the results of
243 >     * the iterator's own {@code remove} operation), the results of
244       * the iteration are undefined.  The set supports element removal,
245       * which removes the corresponding mapping from the map, via the
246 <     * <tt>Iterator.remove</tt>, <tt>Set.remove</tt>,
247 <     * <tt>removeAll</tt>, <tt>retainAll</tt>, and <tt>clear</tt>
248 <     * operations.  It does not support the <tt>add</tt> or <tt>addAll</tt>
246 >     * {@code Iterator.remove}, {@code Set.remove},
247 >     * {@code removeAll}, {@code retainAll}, and {@code clear}
248 >     * operations.  It does not support the {@code add} or {@code addAll}
249       * operations.
250       *
251       * @return a set view of the keys contained in this map, sorted in
# Line 267 | Line 267 | public interface NavigableMap<K,V> exten
267       * submap either of whose endpoints lie outside its range.
268       *
269       * @param fromKey low endpoint of the keys in the returned map
270 <     * @param fromInclusive true if the low endpoint ({@code fromKey}) is
271 <     *        to be included in the returned view
270 >     * @param fromInclusive {@code true} if the low endpoint
271 >     *        is to be included in the returned view
272       * @param toKey high endpoint of the keys in the returned map
273 <     * @param toInclusive true if the high endpoint ({@code toKey}) is
274 <     *        to be included in the returned view
273 >     * @param toInclusive {@code true} if the high endpoint
274 >     *        is to be included in the returned view
275       * @return a view of the portion of this map whose keys range from
276       *         {@code fromKey} to {@code toKey}
277       * @throws ClassCastException if {@code fromKey} and {@code toKey}
# Line 301 | Line 301 | public interface NavigableMap<K,V> exten
301       * on an attempt to insert a key outside its range.
302       *
303       * @param toKey high endpoint of the keys in the returned map
304 <     * @param inclusive true if the high endpoint ({@code toKey}) is
305 <     *        to be included in the returned view
304 >     * @param inclusive {@code true} if the high endpoint
305 >     *        is to be included in the returned view
306       * @return a view of the portion of this map whose keys are less than
307       *         (or equal to, if {@code inclusive} is true) {@code toKey}
308       * @throws ClassCastException if {@code toKey} is not compatible
# Line 330 | Line 330 | public interface NavigableMap<K,V> exten
330       * on an attempt to insert a key outside its range.
331       *
332       * @param fromKey low endpoint of the keys in the returned map
333 <     * @param inclusive true if the low endpoint ({@code fromKey}) is
334 <     *        to be included in the returned view
333 >     * @param inclusive {@code true} if the low endpoint
334 >     *        is to be included in the returned view
335       * @return a view of the portion of this map whose keys are greater than
336       *         (or equal to, if {@code inclusive} is true) {@code fromKey}
337       * @throws ClassCastException if {@code fromKey} is not compatible
# Line 347 | Line 347 | public interface NavigableMap<K,V> exten
347       *         bounds of the range
348       */
349      NavigableMap<K,V> tailMap(K fromKey, boolean inclusive);
350 +
351 +    /**
352 +     * Equivalent to {@code subMap(fromKey, true, toKey, false)}
353 +     * but with a return type conforming to the {@code SortedMap} interface.
354 +     *
355 +     * <p>{@inheritDoc}
356 +     *
357 +     * @throws ClassCastException       {@inheritDoc}
358 +     * @throws NullPointerException     {@inheritDoc}
359 +     * @throws IllegalArgumentException {@inheritDoc}
360 +     */
361 +    SortedMap<K,V> subMap(K fromKey, K toKey);
362 +
363 +    /**
364 +     * Equivalent to {@code headMap(toKey, false)}
365 +     * but with a return type conforming to the {@code SortedMap} interface.
366 +     *
367 +     * <p>{@inheritDoc}
368 +     *
369 +     * @throws ClassCastException       {@inheritDoc}
370 +     * @throws NullPointerException     {@inheritDoc}
371 +     * @throws IllegalArgumentException {@inheritDoc}
372 +     */
373 +    SortedMap<K,V> headMap(K toKey);
374 +
375 +    /**
376 +     * Equivalent to {@code tailMap(fromKey, true)}
377 +     * but with a return type conforming to the {@code SortedMap} interface.
378 +     *
379 +     * <p>{@inheritDoc}
380 +     *
381 +     * @throws ClassCastException       {@inheritDoc}
382 +     * @throws NullPointerException     {@inheritDoc}
383 +     * @throws IllegalArgumentException {@inheritDoc}
384 +     */
385 +    SortedMap<K,V> tailMap(K fromKey);
386   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines