/[classpath]/classpath/java/util/Collections.java
ViewVC logotype

Diff of /classpath/java/util/Collections.java

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.28.2.4 by tromey, Sun Aug 15 07:59:51 2004 UTC revision 1.28.2.5 by tromey, Mon Nov 1 15:57:08 2004 UTC
# Line 405  public class Collections Line 405  public class Collections
405      /**      /**
406       * There are no entries.       * There are no entries.
407       */       */
408      public Set<Entry<K, V>> entrySet()      public Set<Map.Entry<K, V>> entrySet()
409      {      {
410        return EMPTY_SET;        return EMPTY_SET;
411      }      }
# Line 1563  public class Collections Line 1563  public class Collections
1563      /**      /**
1564       * Cache the entry set.       * Cache the entry set.
1565       */       */
1566      private transient Set<BasicMapEntry<K, V>> entries;      private transient Set<AbstractMap.BasicMapEntry<K, V>> entries;
1567    
1568      /**      /**
1569       * Construct a singleton.       * Construct a singleton.
# Line 1579  public class Collections Line 1579  public class Collections
1579      /**      /**
1580       * There is a single immutable entry.       * There is a single immutable entry.
1581       */       */
1582      public Set<BasicMapEntry<K, V>> entrySet()      public Set<AbstractMap.BasicMapEntry<K, V>> entrySet()
1583      {      {
1584        if (entries == null)        if (entries == null)
1585          entries = singleton(new AbstractMap.BasicMapEntry<K, V>(k, v)          entries = singleton(new AbstractMap.BasicMapEntry<K, V>(k, v)
# Line 2467  public class Collections Line 2467  public class Collections
2467        if (entries == null)        if (entries == null)
2468          synchronized (mutex)          synchronized (mutex)
2469            {            {
2470              entries = new SynchronizedSet<K, V>(mutex, m.entrySet())              entries = new SynchronizedSet<Map.Entry<K, V>>(mutex, m.entrySet())
2471              {              {
2472                public Iterator<Map.Entry<K, V>> iterator()                public Iterator<Map.Entry<K, V>> iterator()
2473                {                {
2474                  synchronized (super.mutex)                  synchronized (super.mutex)
2475                    {                    {
2476                      return new SynchronizedIterator<K, V>(super.mutex,                      return new SynchronizedIterator<Map.Entry<K, V>>(super.mutex,
2477                                                            c.iterator())                                                                       c.iterator())
2478                      {                      {
2479                        public Map.Entry<K, V> next()                        public Map.Entry<K, V> next()
2480                        {                        {
# Line 3471  public class Collections Line 3471  public class Collections
3471        throw new UnsupportedOperationException();        throw new UnsupportedOperationException();
3472      }      }
3473    
3474      public Map.Entry<K, V> remove(Object o)      public V remove(Object o)
3475      {      {
3476        throw new UnsupportedOperationException();        throw new UnsupportedOperationException();
3477      }      }

Legend:
Removed from v.1.28.2.4  
changed lines
  Added in v.1.28.2.5

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26