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.37 by dl, Tue May 9 18:17:08 2006 UTC vs.
Revision 1.40 by dl, Mon Jun 12 14:00:38 2006 UTC

# Line 1121 | Line 1121 | public class TreeMap<K,V>
1121              if (lastReturned.left != null && lastReturned.right != null)
1122                  next = lastReturned;
1123              deleteEntry(lastReturned);
1124 <            expectedModCount++;
1124 >            expectedModCount = modCount;
1125              lastReturned = null;
1126          }
1127      }
# Line 1689 | Line 1689 | public class TreeMap<K,V>
1689          }
1690  
1691          public NavigableMap<K,V> headMap(K toKey, boolean inclusive) {
1692 <            if (!inClosedRange(toKey))
1692 >            if (!inRange(toKey, inclusive))
1693                  throw new IllegalArgumentException("toKey out of range");
1694              return new AscendingSubMap(m,
1695                                         fromStart, lo,    loInclusive,
# Line 2353 | Line 2353 | public class TreeMap<K,V>
2353  
2354          if (hi < lo) return null;
2355  
2356 <        int mid = (lo + hi) / 2;
2356 >        int mid = (lo + hi) >>> 1;
2357  
2358          Entry<K,V> left  = null;
2359          if (lo < mid)

Diff Legend

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