Apache
/
commons-collections
mirror of https://github.com/apache/commons-collections.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update file layout for consistency 

git-svn-id: https://svn.apache.org/repos/asf/jakarta/commons/proper/collections/trunk@131524 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Stephen Colebourne 2004-01-05 22:04:19 +00:00
parent a1eb25eeac
commit d25ba06165
13 changed files with 71 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/java/org/apache/commons/collections/map/AbstractHashedMap.java
View File

@ -1,10 +1,10 @@
/*
* $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/map/AbstractHashedMap.java,v 1.7 2004/01/05 21:32:10 scolebourne Exp $
* $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/map/AbstractHashedMap.java,v 1.8 2004/01/05 22:04:19 scolebourne Exp $
* ====================================================================
*
* The Apache Software License, Version 1.1
*
* Copyright (c) 2001-2004 The Apache Software Foundation. All rights
* Copyright (c) 2003-2004 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@ -88,7 +88,7 @@ import org.apache.commons.collections.MapIterator;
* need for unusual subclasses is here.
*
* @since Commons Collections 3.0
* @version $Revision: 1.7 $ $Date: 2004/01/05 21:32:10 $
* @version $Revision: 1.8 $ $Date: 2004/01/05 22:04:19 $
*
* @author java util HashMap
* @author Stephen Colebourne
@ -162,7 +162,7 @@ public class AbstractHashedMap implements IterableMap {
protected AbstractHashedMap(int initialCapacity) {
this(initialCapacity, DEFAULT_LOAD_FACTOR);
}
/**
* Constructs a new, empty map with the specified initial capacity and
* load factor.

8
src/java/org/apache/commons/collections/map/AbstractLinkedMap.java
View File

@ -1,10 +1,10 @@
/*
* $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/map/AbstractLinkedMap.java,v 1.5 2003/12/29 00:38:08 scolebourne Exp $
* $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/map/AbstractLinkedMap.java,v 1.6 2004/01/05 22:04:19 scolebourne Exp $
* ====================================================================
*
* The Apache Software License, Version 1.1
*
* Copyright (c) 2001-2003 The Apache Software Foundation. All rights
* Copyright (c) 2003-2004 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@ -98,7 +98,7 @@ import org.apache.commons.collections.ResettableIterator;
* methods exposed.
*
* @since Commons Collections 3.0
* @version $Revision: 1.5 $ $Date: 2003/12/29 00:38:08 $
* @version $Revision: 1.6 $ $Date: 2004/01/05 22:04:19 $
*
* @author java util LinkedHashMap
* @author Stephen Colebourne
@ -125,7 +125,7 @@ public class AbstractLinkedMap extends AbstractHashedMap implements OrderedMap {
protected AbstractLinkedMap(int initialCapacity, float loadFactor, int threshhold) {
super(initialCapacity, loadFactor, threshhold);
}
/**
* Constructs a new, empty map with the specified initial capacity.
*

22
src/java/org/apache/commons/collections/map/CompositeMap.java
View File

@ -1,10 +1,10 @@
/*
* $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/map/CompositeMap.java,v 1.3 2003/12/29 15:26:39 scolebourne Exp $
* $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/map/CompositeMap.java,v 1.4 2004/01/05 22:04:19 scolebourne Exp $
* ====================================================================
*
* The Apache Software License, Version 1.1
*
* Copyright (c) 2001-2003 The Apache Software Foundation. All rights
* Copyright (c) 2003-2004 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@ -74,25 +74,25 @@ import org.apache.commons.collections.set.CompositeSet;
* strategy is provided then add and remove are unsupported.
*
* @since Commons Collections 3.0
* @version $Revision: 1.3 $ $Date: 2003/12/29 15:26:39 $
* @version $Revision: 1.4 $ $Date: 2004/01/05 22:04:19 $
*
* @author Brian McCallister
*/
public class CompositeMap implements Map {
/** Array of all maps in the composite */
private Map[] composite;
/** Handle mutation operations */
private MapMutator mutator;
/**
* Create a new, empty, CompositeMap.
*/
public CompositeMap() {
this(new Map[]{}, null);
}
/**
* Create a new CompositeMap with two composited Map instances.
*
@ -103,7 +103,7 @@ public class CompositeMap implements Map {
public CompositeMap(Map one, Map two) {
this(new Map[]{one, two}, null);
}
/**
* Create a new CompositeMap with two composited Map instances.
*
@ -114,7 +114,7 @@ public class CompositeMap implements Map {
public CompositeMap(Map one, Map two, MapMutator mutator) {
this(new Map[]{one, two}, mutator);
}
/**
* Create a new CompositeMap which composites all of the Map instances in the
* argument. It copies the argument array, it does not use it directly.
@ -125,7 +125,7 @@ public class CompositeMap implements Map {
public CompositeMap(Map[] composite) {
this(composite, null);
}
/**
* Create a new CompositeMap which composites all of the Map instances in the
* argument. It copies the argument array, it does not use it directly.
@ -140,7 +140,7 @@ public class CompositeMap implements Map {
this.addComposited(composite[i]);
}
}
//-----------------------------------------------------------------------
/**
* Specify the MapMutator to be used by mutation operations.

10
src/java/org/apache/commons/collections/map/FixedSizeMap.java
View File

@ -1,10 +1,10 @@
/*
* $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/map/FixedSizeMap.java,v 1.2 2003/12/11 22:55:25 scolebourne Exp $
* $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/map/FixedSizeMap.java,v 1.3 2004/01/05 22:04:19 scolebourne Exp $
* ====================================================================
*
* The Apache Software License, Version 1.1
*
* Copyright (c) 2003 The Apache Software Foundation. All rights
* Copyright (c) 2003-2004 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@ -80,13 +80,13 @@ import org.apache.commons.collections.set.UnmodifiableSet;
* is not always unsupported.
*
* @since Commons Collections 3.0
* @version $Revision: 1.2 $ $Date: 2003/12/11 22:55:25 $
* @version $Revision: 1.3 $ $Date: 2004/01/05 22:04:19 $
*
* @author Stephen Colebourne
* @author Paul Jack
*/
public class FixedSizeMap extends AbstractMapDecorator
implements Map, BoundedMap {
public class FixedSizeMap
extends AbstractMapDecorator implements Map, BoundedMap {
/**
* Factory method to create a fixed size map.

10
src/java/org/apache/commons/collections/map/FixedSizeSortedMap.java
View File

@ -1,10 +1,10 @@
/*
* $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/map/FixedSizeSortedMap.java,v 1.2 2003/12/11 22:55:25 scolebourne Exp $
* $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/map/FixedSizeSortedMap.java,v 1.3 2004/01/05 22:04:19 scolebourne Exp $
* ====================================================================
*
* The Apache Software License, Version 1.1
*
* Copyright (c) 2003 The Apache Software Foundation. All rights
* Copyright (c) 2003-2004 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@ -81,13 +81,13 @@ import org.apache.commons.collections.set.UnmodifiableSet;
* is not always unsupported.
*
* @since Commons Collections 3.0
* @version $Revision: 1.2 $ $Date: 2003/12/11 22:55:25 $
* @version $Revision: 1.3 $ $Date: 2004/01/05 22:04:19 $
*
* @author Stephen Colebourne
* @author Paul Jack
*/
public class FixedSizeSortedMap extends AbstractSortedMapDecorator
implements SortedMap, BoundedMap {
public class FixedSizeSortedMap
extends AbstractSortedMapDecorator implements SortedMap, BoundedMap {
/**
* Factory method to create a fixed size sorted map.

8
src/java/org/apache/commons/collections/map/Flat3Map.java
View File

@ -1,10 +1,10 @@
/*
* $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/map/Flat3Map.java,v 1.9 2003/12/29 00:38:32 scolebourne Exp $
* $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/map/Flat3Map.java,v 1.10 2004/01/05 22:04:19 scolebourne Exp $
* ====================================================================
*
* The Apache Software License, Version 1.1
*
* Copyright (c) 2001-2003 The Apache Software Foundation. All rights
* Copyright (c) 2003-2004 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@ -98,12 +98,12 @@ import org.apache.commons.collections.ResettableIterator;
* Do not use <code>Flat3Map</code> if the size is likely to grow beyond 3.
*
* @since Commons Collections 3.0
* @version $Revision: 1.9 $ $Date: 2003/12/29 00:38:32 $
* @version $Revision: 1.10 $ $Date: 2004/01/05 22:04:19 $
*
* @author Stephen Colebourne
*/
public class Flat3Map implements IterableMap {
/** The size of the map, used while in flat mode */
private int size;
/** Hash, used while in flat mode */

11
src/java/org/apache/commons/collections/map/HashedMap.java
View File

@ -1,10 +1,10 @@
/*
* $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/map/HashedMap.java,v 1.11 2003/12/28 17:58:53 scolebourne Exp $
* $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/map/HashedMap.java,v 1.12 2004/01/05 22:04:19 scolebourne Exp $
* ====================================================================
*
* The Apache Software License, Version 1.1
*
* Copyright (c) 2001-2003 The Apache Software Foundation. All rights
* Copyright (c) 2003-2004 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@ -72,12 +72,13 @@ import java.util.Map;
* functionality and many methods for subclassing.
* <p>
* @since Commons Collections 3.0
* @version $Revision: 1.11 $ $Date: 2003/12/28 17:58:53 $
* @version $Revision: 1.12 $ $Date: 2004/01/05 22:04:19 $
*
* @author Stephen Colebourne
*/
public class HashedMap extends AbstractHashedMap implements Serializable, Cloneable {
public class HashedMap
extends AbstractHashedMap implements Serializable, Cloneable {
/** Serialisation version */
private static final long serialVersionUID = -1788199231038721040L;

11
src/java/org/apache/commons/collections/map/IdentityMap.java
View File

@ -1,10 +1,10 @@
/*
* $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/map/IdentityMap.java,v 1.2 2003/12/07 23:59:13 scolebourne Exp $
* $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/map/IdentityMap.java,v 1.3 2004/01/05 22:04:19 scolebourne Exp $
* ====================================================================
*
* The Apache Software License, Version 1.1
*
* Copyright (c) 2001-2003 The Apache Software Foundation. All rights
* Copyright (c) 2003-2004 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@ -71,13 +71,14 @@ import java.util.Map;
* As a general rule, don't compare this map to other maps.
*
* @since Commons Collections 3.0
* @version $Revision: 1.2 $ $Date: 2003/12/07 23:59:13 $
* @version $Revision: 1.3 $ $Date: 2004/01/05 22:04:19 $
*
* @author java util HashMap
* @author Stephen Colebourne
*/
public class IdentityMap extends AbstractHashedMap implements Serializable, Cloneable {
public class IdentityMap
extends AbstractHashedMap implements Serializable, Cloneable {
/** Serialisation version */
private static final long serialVersionUID = 2028493495224302329L;

10
src/java/org/apache/commons/collections/map/LRUMap.java
View File

@ -1,5 +1,5 @@
/*
* $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/map/LRUMap.java,v 1.6 2004/01/05 21:32:47 scolebourne Exp $
* $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/map/LRUMap.java,v 1.7 2004/01/05 22:04:19 scolebourne Exp $
* ====================================================================
*
* The Apache Software License, Version 1.1
@ -82,15 +82,15 @@ import org.apache.commons.collections.BoundedMap;
* All the available iterators can be reset back to the start by casting to
* <code>ResettableIterator</code> and calling <code>reset()</code>.
*
* @since Commons Collections 3.0
* @version $Revision: 1.6 $ $Date: 2004/01/05 21:32:47 $
* @since Commons Collections 3.0 (previously in main package v1.0)
* @version $Revision: 1.7 $ $Date: 2004/01/05 22:04:19 $
*
* @author James Strachan
* @author Morgan Delagrange
* @author Stephen Colebourne
*/
public class LRUMap extends AbstractLinkedMap
implements BoundedMap, Serializable, Cloneable {
public class LRUMap
extends AbstractLinkedMap implements BoundedMap, Serializable, Cloneable {
/** Serialisation version */
static final long serialVersionUID = -612114643488955218L;

9
src/java/org/apache/commons/collections/map/LazyMap.java
View File

@ -1,10 +1,10 @@
/*
* $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/map/LazyMap.java,v 1.1 2003/11/16 00:05:45 scolebourne Exp $
* $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/map/LazyMap.java,v 1.2 2004/01/05 22:04:19 scolebourne Exp $
* ====================================================================
*
* The Apache Software License, Version 1.1
*
* Copyright (c) 2003 The Apache Software Foundation. All rights
* Copyright (c) 2003-2004 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@ -86,12 +86,13 @@ import org.apache.commons.collections.TransformerUtils;
* instance is mapped to the "NOW" key in the map.
*
* @since Commons Collections 3.0
* @version $Revision: 1.1 $ $Date: 2003/11/16 00:05:45 $
* @version $Revision: 1.2 $ $Date: 2004/01/05 22:04:19 $
*
* @author Stephen Colebourne
* @author Paul Jack
*/
public class LazyMap extends AbstractMapDecorator implements Map {
public class LazyMap
extends AbstractMapDecorator implements Map {
/** The factory to use to construct elements */
protected final Transformer factory;

9
src/java/org/apache/commons/collections/map/LazySortedMap.java
View File

@ -1,10 +1,10 @@
/*
* $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/map/LazySortedMap.java,v 1.1 2003/11/16 00:05:45 scolebourne Exp $
* $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/map/LazySortedMap.java,v 1.2 2004/01/05 22:04:19 scolebourne Exp $
* ====================================================================
*
* The Apache Software License, Version 1.1
*
* Copyright (c) 2003 The Apache Software Foundation. All rights
* Copyright (c) 2003-2004 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@ -86,12 +86,13 @@ import org.apache.commons.collections.Transformer;
* instance is mapped to the "NOW" key in the map.
*
* @since Commons Collections 3.0
* @version $Revision: 1.1 $ $Date: 2003/11/16 00:05:45 $
* @version $Revision: 1.2 $ $Date: 2004/01/05 22:04:19 $
*
* @author Stephen Colebourne
* @author Paul Jack
*/
public class LazySortedMap extends LazyMap implements SortedMap {
public class LazySortedMap
extends LazyMap implements SortedMap {
/**
* Factory method to create a lazily instantiated sorted map.

11
src/java/org/apache/commons/collections/map/LinkedMap.java
View File

@ -1,10 +1,10 @@
/*
* $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/map/LinkedMap.java,v 1.6 2003/12/28 22:45:47 scolebourne Exp $
* $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/map/LinkedMap.java,v 1.7 2004/01/05 22:04:19 scolebourne Exp $
* ====================================================================
*
* The Apache Software License, Version 1.1
*
* Copyright (c) 2001-2003 The Apache Software Foundation. All rights
* Copyright (c) 2003-2004 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@ -93,12 +93,13 @@ import org.apache.commons.collections.list.UnmodifiableList;
* methods exposed.
*
* @since Commons Collections 3.0
* @version $Revision: 1.6 $ $Date: 2003/12/28 22:45:47 $
* @version $Revision: 1.7 $ $Date: 2004/01/05 22:04:19 $
*
* @author Stephen Colebourne
*/
public class LinkedMap extends AbstractLinkedMap implements Serializable, Cloneable {
public class LinkedMap
extends AbstractLinkedMap implements Serializable, Cloneable {
/** Serialisation version */
private static final long serialVersionUID = 9077234323521161066L;

9
src/java/org/apache/commons/collections/map/ListOrderedMap.java
View File

@ -1,10 +1,10 @@
/*
* $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/map/ListOrderedMap.java,v 1.9 2003/12/28 22:45:47 scolebourne Exp $
* $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/map/ListOrderedMap.java,v 1.10 2004/01/05 22:04:19 scolebourne Exp $
* ====================================================================
*
* The Apache Software License, Version 1.1
*
* Copyright (c) 2003 The Apache Software Foundation. All rights
* Copyright (c) 2003-2004 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@ -89,12 +89,13 @@ import org.apache.commons.collections.list.UnmodifiableList;
* original position in the iteration.
*
* @since Commons Collections 3.0
* @version $Revision: 1.9 $ $Date: 2003/12/28 22:45:47 $
* @version $Revision: 1.10 $ $Date: 2004/01/05 22:04:19 $
*
* @author Henri Yandell
* @author Stephen Colebourne
*/
public class ListOrderedMap extends AbstractMapDecorator implements OrderedMap {
public class ListOrderedMap
extends AbstractMapDecorator implements OrderedMap {
/** Internal list to hold the sequence of objects */
protected final List insertOrder = new ArrayList();