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

Comparing jsr166/src/main/java/util/TreeMap.java (file contents):
Revision 1.49 by jsr166, Wed Sep 1 07:48:47 2010 UTC vs.
Revision 1.53 by jsr166, Fri Oct 22 05:18:30 2010 UTC

# Line 1 | Line 1
1   /*
2 < * Copyright 1997-2008 Sun Microsystems, Inc.  All Rights Reserved.
2 > * Copyright (c) 1997, 2008, 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 1055 | Line 1055 | public class TreeMap<K,V>
1055          public Comparator<? super E> comparator() { return m.comparator(); }
1056          public E pollFirst() {
1057              Map.Entry<E,Object> e = m.pollFirstEntry();
1058 <            return e == null? null : e.getKey();
1058 >            return (e == null) ? null : e.getKey();
1059          }
1060          public E pollLast() {
1061              Map.Entry<E,Object> e = m.pollLastEntry();
1062 <            return e == null? null : e.getKey();
1062 >            return (e == null) ? null : e.getKey();
1063          }
1064          public boolean remove(Object o) {
1065              int oldSize = size();
# Line 1195 | Line 1195 | public class TreeMap<K,V>
1195       * Test two values for equality.  Differs from o1.equals(o2) only in
1196       * that it copes with <tt>null</tt> o1 properly.
1197       */
1198 <    final static boolean valEquals(Object o1, Object o2) {
1198 >    static final boolean valEquals(Object o1, Object o2) {
1199          return (o1==null ? o2==null : o1.equals(o2));
1200      }
1201  
# Line 1203 | Line 1203 | public class TreeMap<K,V>
1203       * Return SimpleImmutableEntry for entry, or null if null
1204       */
1205      static <K,V> Map.Entry<K,V> exportEntry(TreeMap.Entry<K,V> e) {
1206 <        return e == null? null :
1206 >        return (e == null) ? null :
1207              new AbstractMap.SimpleImmutableEntry<K,V>(e);
1208      }
1209  
# Line 1211 | Line 1211 | public class TreeMap<K,V>
1211       * Return key for entry, or null if null
1212       */
1213      static <K,V> K keyOrNull(TreeMap.Entry<K,V> e) {
1214 <        return e == null? null : e.key;
1214 >        return (e == null) ? null : e.key;
1215      }
1216  
1217      /**
# Line 1236 | Line 1236 | public class TreeMap<K,V>
1236      /**
1237       * @serial include
1238       */
1239 <    static abstract class NavigableSubMap<K,V> extends AbstractMap<K,V>
1239 >    abstract static class NavigableSubMap<K,V> extends AbstractMap<K,V>
1240          implements NavigableMap<K,V>, java.io.Serializable {
1241          /**
1242           * The backing map.
# Line 1411 | Line 1411 | public class TreeMap<K,V>
1411          }
1412  
1413          public final V get(Object key) {
1414 <            return !inRange(key)? null :  m.get(key);
1414 >            return !inRange(key) ? null :  m.get(key);
1415          }
1416  
1417          public final V remove(Object key) {
1418 <            return !inRange(key)? null  : m.remove(key);
1418 >            return !inRange(key) ? null  : m.remove(key);
1419          }
1420  
1421          public final Map.Entry<K,V> ceilingEntry(K key) {
# Line 1558 | Line 1558 | public class TreeMap<K,V>
1558                  if (!inRange(key))
1559                      return false;
1560                  TreeMap.Entry<K,V> node = m.getEntry(key);
1561 <                if (node!=null && valEquals(node.getValue(),entry.getValue())){
1561 >                if (node!=null && valEquals(node.getValue(),
1562 >                                            entry.getValue())) {
1563                      m.deleteEntry(node);
1564                      return true;
1565                  }
# Line 1723 | Line 1724 | public class TreeMap<K,V>
1724                                         false,     toKey, inclusive);
1725          }
1726  
1727 <        public NavigableMap<K,V> tailMap(K fromKey, boolean inclusive){
1727 >        public NavigableMap<K,V> tailMap(K fromKey, boolean inclusive) {
1728              if (!inRange(fromKey, inclusive))
1729                  throw new IllegalArgumentException("fromKey out of range");
1730              return new AscendingSubMap(m,
# Line 1804 | Line 1805 | public class TreeMap<K,V>
1805                                          toEnd, hi,    hiInclusive);
1806          }
1807  
1808 <        public NavigableMap<K,V> tailMap(K fromKey, boolean inclusive){
1808 >        public NavigableMap<K,V> tailMap(K fromKey, boolean inclusive) {
1809              if (!inRange(fromKey, inclusive))
1810                  throw new IllegalArgumentException("fromKey out of range");
1811              return new DescendingSubMap(m,

Diff Legend

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