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

Comparing jsr166/src/jsr166x/ConcurrentSkipListSet.java (file contents):
Revision 1.8 by jsr166, Tue Nov 24 03:57:04 2009 UTC vs.
Revision 1.14 by jsr166, Sun Oct 21 06:14:11 2012 UTC

# Line 1 | Line 1
1   /*
2   * Written by Doug Lea with assistance from members of JCP JSR-166
3   * Expert Group and released to the public domain, as explained at
4 < * http://creativecommons.org/licenses/publicdomain
4 > * http://creativecommons.org/publicdomain/zero/1.0/
5   */
6  
7   package jsr166x;
# Line 253 | Line 253 | public class ConcurrentSkipListSet<E>
253          Collection c = (Collection) o;
254          try {
255              return containsAll(c) && c.containsAll(this);
256 <        } catch(ClassCastException unused)   {
256 >        } catch (ClassCastException unused) {
257              return false;
258 <        } catch(NullPointerException unused) {
258 >        } catch (NullPointerException unused) {
259              return false;
260          }
261      }
# Line 471 | Line 471 | public class ConcurrentSkipListSet<E>
471       * in {@link IllegalArgumentException}.  Instances of this class are
472       * constructed only using the <tt>subSet</tt>, <tt>headSet</tt>, and
473       * <tt>tailSet</tt> methods of their underlying sets.
474 –     *
474       */
475      static class ConcurrentSkipListSubSet<E>
476          extends AbstractSet<E>
# Line 487 | Line 486 | public class ConcurrentSkipListSet<E>
486           * @param fromElement inclusive least value, or <tt>null</tt> if from start
487           * @param toElement exclusive upper bound or <tt>null</tt> if to end
488           * @throws IllegalArgumentException if fromElement and toElement
489 <         * nonnull and fromElement greater than toElement
489 >         * non-null and fromElement greater than toElement
490           */
491          ConcurrentSkipListSubSet(ConcurrentSkipListMap<E,Object> map,
492                                   E fromElement, E toElement) {
# Line 541 | Line 540 | public class ConcurrentSkipListSet<E>
540          }
541          public E pollFirst() {
542              Map.Entry<E,?> e = s.pollFirstEntry();
543 <            return (e == null)? null : e.getKey();
543 >            return (e == null) ? null : e.getKey();
544          }
545          public E pollLast() {
546              Map.Entry<E,?> e = s.pollLastEntry();
547 <            return (e == null)? null : e.getKey();
547 >            return (e == null) ? null : e.getKey();
548          }
549  
550      }

Diff Legend

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