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

Comparing jsr166/src/main/java/util/AbstractMap.java (file contents):
Revision 1.1 by dl, Fri Dec 31 13:00:33 2004 UTC vs.
Revision 1.4 by dl, Tue Mar 8 12:27:06 2005 UTC

# Line 629 | Line 629 | public abstract class AbstractMap<K,V> i
629      // Implementation Note: SimpleEntry and SimpleImmutableEntry
630      // are distinct unrelated classes, even though they share
631      // some code. Since you can't add or subtract final-ness
632 <    // of a field in a subclass, they can't share represenations,
632 >    // of a field in a subclass, they can't share representations,
633      // and the amount of duplicated code is too small to warrant
634      // exposing a common abstract class.
635  
# Line 643 | Line 643 | public abstract class AbstractMap<K,V> i
643       * <tt>Map.entrySet().toArray</tt>
644       */
645      public static class SimpleEntry<K,V> implements Entry<K,V> {
646 <        private K key;
646 >        private final K key;
647          private V value;
648  
649          /**
# Line 664 | Line 664 | public abstract class AbstractMap<K,V> i
664           *
665           * @param entry the entry to copy.
666           */
667 <        public SimpleEntry(Entry<K,V> entry) {
667 >        public SimpleEntry(Entry<? extends K, ? extends V> entry) {
668              this.key   = entry.getKey();
669              this.value = entry.getValue();
670          }
# Line 754 | Line 754 | public abstract class AbstractMap<K,V> i
754           *
755           * @param entry the entry to copy.
756           */
757 <        public SimpleImmutableEntry(Entry<K,V> entry) {
757 >        public SimpleImmutableEntry(Entry<? extends K, ? extends V> entry) {
758              this.key   = entry.getKey();
759              this.value = entry.getValue();
760          }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines