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 CursorableLinkedList.java StaticBucketMap.java DefaultMapBag.java ExtendedProperties.java
Date Fri, 20 Jun 2003 08:00:00 GMT
scolebourne    2003/06/20 01:00:00

  Modified:    collections/src/java/org/apache/commons/collections
                        CursorableLinkedList.java StaticBucketMap.java
                        DefaultMapBag.java ExtendedProperties.java
  Log:
  Converted inner classes to static nested classes where possible
  From Janek Bogucki
  
  Revision  Changes    Path
  1.13      +5 -4      jakarta-commons/collections/src/java/org/apache/commons/collections/CursorableLinkedList.java
  
  Index: CursorableLinkedList.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/collections/src/java/org/apache/commons/collections/CursorableLinkedList.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- CursorableLinkedList.java	11 May 2003 14:15:23 -0000	1.12
  +++ CursorableLinkedList.java	20 Jun 2003 07:59:59 -0000	1.13
  @@ -87,6 +87,7 @@
    * @version $Revision$ $Date$
    * 
    * @author Rodney Waldhoff
  + * @author Janek Bogucki
    */
   public class CursorableLinkedList implements List, Serializable {
       //  TODO: use weak references to cursors in case they aren't closed directly
  @@ -942,7 +943,7 @@
   
       //--- inner classes ----------------------------------------------
   
  -    class Listable implements Serializable {
  +    static class Listable implements Serializable {
           private Listable _prev = null;
           private Listable _next = null;
           private Object _val = null;
  @@ -1092,7 +1093,7 @@
           }
       }
   
  -    public class Cursor extends ListIter implements ListIterator {
  +    class Cursor extends ListIter implements ListIterator {
           boolean _valid = false;
   
           Cursor(int index) {
  
  
  
  1.10      +4 -3      jakarta-commons/collections/src/java/org/apache/commons/collections/StaticBucketMap.java
  
  Index: StaticBucketMap.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/collections/src/java/org/apache/commons/collections/StaticBucketMap.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- StaticBucketMap.java	16 May 2003 14:58:42 -0000	1.9
  +++ StaticBucketMap.java	20 Jun 2003 07:59:59 -0000	1.10
  @@ -137,6 +137,7 @@
    * @author <a href="mailto:mas@apache.org">Michael A. Smith</a>
    * @author Paul Jack
    * @author Leo Sutic
  + * @author Janek Bogucki
    */
   public final class StaticBucketMap implements Map {
   
  @@ -489,7 +490,7 @@
       /**
        * The Map.Entry for the StaticBucketMap.
        */
  -    private final class Node implements Map.Entry
  +    private static final class Node implements Map.Entry
       {
           protected Object key;
           protected Object value;
  
  
  
  1.9       +4 -3      jakarta-commons/collections/src/java/org/apache/commons/collections/DefaultMapBag.java
  
  Index: DefaultMapBag.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/collections/src/java/org/apache/commons/collections/DefaultMapBag.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- DefaultMapBag.java	16 May 2003 14:24:55 -0000	1.8
  +++ DefaultMapBag.java	20 Jun 2003 07:59:59 -0000	1.9
  @@ -83,6 +83,7 @@
    * @author Chuck Burdick
    * @author <a href="mailto:mas@apache.org">Michael A. Smith</a>
    * @author Stephen Colebourne
  + * @author Janek Bogucki
    */
   public abstract class DefaultMapBag implements Bag {
       private Map _map = null;
  @@ -240,7 +241,7 @@
           return new BagIterator(this, extractList().iterator());
       }
   
  -    private class BagIterator implements Iterator {
  +    static class BagIterator implements Iterator {
           private DefaultMapBag _parent = null;
           private Iterator _support = null;
           private Object _current = null;
  
  
  
  1.12      +5 -4      jakarta-commons/collections/src/java/org/apache/commons/collections/ExtendedProperties.java
  
  Index: ExtendedProperties.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/collections/src/java/org/apache/commons/collections/ExtendedProperties.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- ExtendedProperties.java	16 May 2003 14:36:40 -0000	1.11
  +++ ExtendedProperties.java	20 Jun 2003 07:59:59 -0000	1.12
  @@ -169,6 +169,7 @@
    * @author <a href="mailto:kjohnson@transparent.com">Kent Johnson</a>
    * @author <a href="mailto:dlr@finemaltcoding.com">Daniel Rall</a>
    * @author <a href="mailto:ipriha@surfeu.fi">Ilkka Priha</a>
  + * @author Janek Bogucki
    */
   public class ExtendedProperties extends Hashtable {
       
  @@ -254,7 +255,7 @@
        * backslash sign a the end of the line.  This is used to
        * concatenate multiple lines for readability.
        */
  -    class PropertiesReader extends LineNumberReader
  +    static class PropertiesReader extends LineNumberReader
       {
           /**
            * Constructor.
  @@ -310,7 +311,7 @@
        * separator is "," but commas into the property value are escaped
        * using the backslash in front.
        */
  -    class PropertiesTokenizer extends StringTokenizer
  +    static class PropertiesTokenizer extends StringTokenizer
       {
           /**
            * The property delimiter used while parsing (a comma).
  
  
  

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