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 project.xml
Date Sat, 16 Oct 2004 21:26:14 GMT
scolebourne    2004/10/16 14:26:14

  Modified:    collections/src/java/org/apache/commons/collections/map
                        SingletonMap.java MultiKeyMap.java
                        ReferenceIdentityMap.java ReferenceMap.java
                        LRUMap.java
               collections/src/java/org/apache/commons/collections/comparators
                        BooleanComparator.java
               collections project.xml
  Log:
  Removing javadoc errors
  bug 31519, from Olaf Krische
  
  Revision  Changes    Path
  1.2       +5 -5      jakarta-commons/collections/src/java/org/apache/commons/collections/map/SingletonMap.java
  
  Index: SingletonMap.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/collections/src/java/org/apache/commons/collections/map/SingletonMap.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- SingletonMap.java	9 Apr 2004 14:46:35 -0000	1.1
  +++ SingletonMap.java	16 Oct 2004 21:26:14 -0000	1.2
  @@ -103,12 +103,12 @@
       /**
        * Constructor specifying the key and value as a <code>MapEntry</code>.
        *
  -     * @param keyValue  the key value pair to use
  +     * @param mapEntry  the mapEntry to use
        */
  -    public SingletonMap(Map.Entry entry) {
  +    public SingletonMap(Map.Entry mapEntry) {
           super();
  -        this.key = entry.getKey();
  -        this.value = entry.getValue();
  +        this.key = mapEntry.getKey();
  +        this.value = mapEntry.getValue();
       }
   
       /**
  
  
  
  1.4       +4 -6      jakarta-commons/collections/src/java/org/apache/commons/collections/map/MultiKeyMap.java
  
  Index: MultiKeyMap.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/collections/src/java/org/apache/commons/collections/map/MultiKeyMap.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- MultiKeyMap.java	7 Jun 2004 21:00:58 -0000	1.3
  +++ MultiKeyMap.java	16 Oct 2004 21:26:14 -0000	1.4
  @@ -829,14 +829,12 @@
       }
   
       /**
  -     * Puts all the keys and values into this map.
  +     * Copies all of the keys and values from the specified map to this map.
        * Each key must be non-null and a MultiKey object.
        * 
  -     * @param key  the non-null MultiKey object
  -     * @param value  the value to store
  -     * @return the previous value for the key
  +     * @param mapToCopy  to this map
        * @throws NullPointerException if the mapToCopy or any key within is null
  -     * @throws ClassCastException if any key is not a MultiKey
  +     * @throws ClassCastException if any key in mapToCopy is not a MultiKey
        */
       public void putAll(Map mapToCopy) {
           for (Iterator it = mapToCopy.keySet().iterator(); it.hasNext();) {
  
  
  
  1.2       +2 -2      jakarta-commons/collections/src/java/org/apache/commons/collections/map/ReferenceIdentityMap.java
  
  Index: ReferenceIdentityMap.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/collections/src/java/org/apache/commons/collections/map/ReferenceIdentityMap.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ReferenceIdentityMap.java	27 Apr 2004 21:37:32 -0000	1.1
  +++ ReferenceIdentityMap.java	16 Oct 2004 21:26:14 -0000	1.2
  @@ -45,7 +45,7 @@
    * This map will violate the detail of various Map and map view contracts.
    * As a general rule, don't compare this map to other maps.
    * <p>
  - * This {@link Map} implementation does <i>not</i> allow null elements.
  + * This {@link java.util.Map Map} implementation does <i>not</i> allow null
elements.
    * Attempting to add a null key or value to the map will raise a <code>NullPointerException</code>.
    * <p>
    * This implementation is not synchronized.
  
  
  
  1.14      +3 -3      jakarta-commons/collections/src/java/org/apache/commons/collections/map/ReferenceMap.java
  
  Index: ReferenceMap.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/collections/src/java/org/apache/commons/collections/map/ReferenceMap.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- ReferenceMap.java	27 Apr 2004 21:35:23 -0000	1.13
  +++ ReferenceMap.java	16 Oct 2004 21:26:14 -0000	1.14
  @@ -29,7 +29,7 @@
    * If non-hard references are used, then the garbage collector can remove
    * mappings if a key or value becomes unreachable, or if the JVM's memory is
    * running low. For information on how the different reference types behave,
  - * see {@link Reference}.
  + * see {@link java.lang.ref.Reference Reference}.
    * <p>
    * Different types of references can be specified for keys and values.
    * The keys can be configured to be weak but the values hard,
  @@ -43,7 +43,7 @@
    * {@link org.apache.commons.collections.map.ReferenceIdentityMap ReferenceIdentityMap}.
    * It differs in that keys and values in this class are compared using <code>equals()</code>.
    * <p>
  - * This {@link Map} implementation does <i>not</i> allow null elements.
  + * This {@link java.util.Map Map} implementation does <i>not</i> allow null
elements.
    * Attempting to add a null key or value to the map will raise a <code>NullPointerException</code>.
    * <p>
    * This implementation is not synchronized.
  
  
  
  1.15      +3 -3      jakarta-commons/collections/src/java/org/apache/commons/collections/map/LRUMap.java
  
  Index: LRUMap.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/collections/src/java/org/apache/commons/collections/map/LRUMap.java,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- LRUMap.java	7 Jun 2004 22:13:53 -0000	1.14
  +++ LRUMap.java	16 Oct 2004 21:26:14 -0000	1.15
  @@ -198,7 +198,7 @@
        * Updates an existing key-value mapping.
        * <p>
        * This implementation moves the updated entry to the top of the list
  -     * using {@link #moveToMRU(LinkEntry)}.
  +     * using {@link #moveToMRU(AbstractLinkedMap.LinkEntry)}.
        * 
        * @param entry  the entry to update
        * @param newValue  the new value to store
  @@ -212,7 +212,7 @@
        * Adds a new key-value mapping into this map.
        * <p>
        * This implementation checks the LRU size and determines whether to
  -     * discard an entry or not using {@link #removeLRU(LinkEntry)}.
  +     * discard an entry or not using {@link #removeLRU(AbstractLinkedMap.LinkEntry)}.
        * <p>
        * From Commons Collections 3.1 this method uses {@link #isFull()} rather
        * than accessing <code>size</code> and <code>maxSize</code>
directly.
  
  
  
  1.15      +3 -3      jakarta-commons/collections/src/java/org/apache/commons/collections/comparators/BooleanComparator.java
  
  Index: BooleanComparator.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/collections/src/java/org/apache/commons/collections/comparators/BooleanComparator.java,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- BooleanComparator.java	16 May 2004 11:56:47 -0000	1.14
  +++ BooleanComparator.java	16 Oct 2004 21:26:14 -0000	1.15
  @@ -143,7 +143,7 @@
       
       /**
        * Compares two non-<code>null</code> <code>Boolean</code>
objects
  -     * according to the value of {@link #trueFirst}.
  +     * according to the value of {@link #sortsTrueFirst()}.
        * 
        * @param b1  the first boolean to compare
        * @param b2  the second boolean to compare
  @@ -176,7 +176,7 @@
        * <p>
        * This implementation returns <code>true</code>
        * iff <code><i>that</i></code> is a {@link BooleanComparator}

  -     * whose {@link #trueFirst} value is equal to mine.
  +     * whose value of {@link #sortsTrueFirst()} is equal to mine.
        * 
        * @param object  the object to compare to
        * @return true if equal
  
  
  
  1.46      +3 -0      jakarta-commons/collections/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/collections/project.xml,v
  retrieving revision 1.45
  retrieving revision 1.46
  diff -u -r1.45 -r1.46
  --- project.xml	17 Jul 2004 21:40:48 -0000	1.45
  +++ project.xml	16 Oct 2004 21:26:14 -0000	1.46
  @@ -210,6 +210,9 @@
         <name>Peter KoBek</name>
       </contributor>
       <contributor>
  +      <name>Olaf Krische</name>
  +    </contributor>
  +    <contributor>
         <name>David Leppik</name>
       </contributor>
       <contributor>
  
  
  

---------------------------------------------------------------------
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