commons-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From scolebou...@apache.org
Subject cvs commit: jakarta-commons/collections/src/java/org/apache/commons/collections/map AbstractHashedMap.java AbstractLinkedMap.java
Date Thu, 25 Dec 2003 01:09:01 GMT
scolebourne    2003/12/24 17:09:01

  Modified:    collections/src/java/org/apache/commons/collections/map
                        AbstractHashedMap.java AbstractLinkedMap.java
  Log:
  Convert inner classes to protected scope to package scope where designed for extension
  
  Revision  Changes    Path
  1.2       +21 -17    jakarta-commons/collections/src/java/org/apache/commons/collections/map/AbstractHashedMap.java
  
  Index: AbstractHashedMap.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/collections/src/java/org/apache/commons/collections/map/AbstractHashedMap.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- AbstractHashedMap.java	7 Dec 2003 23:59:13 -0000	1.1
  +++ AbstractHashedMap.java	25 Dec 2003 01:09:01 -0000	1.2
  @@ -710,9 +710,9 @@
       }
   
       /**
  -     * MapIterator
  +     * MapIterator implementation.
        */
  -    static class HashMapIterator extends HashIterator implements MapIterator {
  +    protected static class HashMapIterator extends HashIterator implements MapIterator
{
           
           HashMapIterator(AbstractHashedMap map) {
               super(map);
  @@ -778,9 +778,9 @@
       }
   
       /**
  -     * EntrySet
  +     * EntrySet implementation.
        */
  -    static class EntrySet extends AbstractSet {
  +    protected static class EntrySet extends AbstractSet {
           private final AbstractHashedMap map;
           
           EntrySet(AbstractHashedMap map) {
  @@ -820,9 +820,9 @@
       }
   
       /**
  -     * EntrySetIterator and MapEntry
  +     * EntrySet iterator.
        */
  -    static class EntrySetIterator extends HashIterator {
  +    protected static class EntrySetIterator extends HashIterator {
           
           EntrySetIterator(AbstractHashedMap map) {
               super(map);
  @@ -862,9 +862,9 @@
       }
   
       /**
  -     * KeySet
  +     * KeySet implementation.
        */
  -    static class KeySet extends AbstractSet {
  +    protected static class KeySet extends AbstractSet {
           private final AbstractHashedMap map;
           
           KeySet(AbstractHashedMap map) {
  @@ -896,9 +896,9 @@
       }
   
       /**
  -     * KeySetIterator
  +     * KeySet iterator.
        */
  -    static class KeySetIterator extends EntrySetIterator {
  +    protected static class KeySetIterator extends EntrySetIterator {
           
           KeySetIterator(AbstractHashedMap map) {
               super(map);
  @@ -938,9 +938,9 @@
       }
   
       /**
  -     * Values
  +     * Values implementation.
        */
  -    static class Values extends AbstractCollection {
  +    protected static class Values extends AbstractCollection {
           private final AbstractHashedMap map;
           
           Values(AbstractHashedMap map) {
  @@ -966,9 +966,9 @@
       }
   
       /**
  -     * ValuesIterator
  +     * Values iterator.
        */
  -    static class ValuesIterator extends HashIterator {
  +    protected static class ValuesIterator extends HashIterator {
           
           ValuesIterator(AbstractHashedMap map) {
               super(map);
  @@ -981,12 +981,16 @@
       
       //-----------------------------------------------------------------------
       /**
  -     * HashEntry
  +     * HashEntry used to store the data
        */
       protected static class HashEntry implements Map.Entry, KeyValue {
  +        /** The next entry in the hash chain */
           protected HashEntry next;
  +        /** The hash code of the key */
           protected int hashCode;
  +        /** The key */
           protected Object key;
  +        /** The value */
           protected Object value;
           
           protected HashEntry(HashEntry next, int hashCode, Object key, Object value) {
  
  
  
  1.2       +10 -10    jakarta-commons/collections/src/java/org/apache/commons/collections/map/AbstractLinkedMap.java
  
  Index: AbstractLinkedMap.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/collections/src/java/org/apache/commons/collections/map/AbstractLinkedMap.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- AbstractLinkedMap.java	7 Dec 2003 23:59:13 -0000	1.1
  +++ AbstractLinkedMap.java	25 Dec 2003 01:09:01 -0000	1.2
  @@ -340,9 +340,9 @@
       }
   
       /**
  -     * MapIterator
  +     * MapIterator implementation.
        */
  -    static class LinkMapIterator extends LinkIterator implements OrderedMapIterator {
  +    protected static class LinkMapIterator extends LinkIterator implements OrderedMapIterator
{
           
           LinkMapIterator(AbstractLinkedMap map) {
               super(map);
  @@ -396,9 +396,9 @@
       }
   
       /**
  -     * EntrySetIterator and MapEntry
  +     * EntrySet iterator.
        */
  -    static class EntrySetIterator extends LinkIterator {
  +    protected static class EntrySetIterator extends LinkIterator {
           
           EntrySetIterator(AbstractLinkedMap map) {
               super(map);
  @@ -428,9 +428,9 @@
       }
   
       /**
  -     * KeySetIterator
  +     * KeySet iterator.
        */
  -    static class KeySetIterator extends EntrySetIterator {
  +    protected static class KeySetIterator extends EntrySetIterator {
           
           KeySetIterator(AbstractLinkedMap map) {
               super(map);
  @@ -460,9 +460,9 @@
       }
   
       /**
  -     * ValuesIterator
  +     * Values iterator.
        */
  -    static class ValuesIterator extends LinkIterator {
  +    protected static class ValuesIterator extends LinkIterator {
           
           ValuesIterator(AbstractLinkedMap map) {
               super(map);
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org


Mime
View raw message