scolebourne 2004/01/05 14:04:20
Modified: collections/src/java/org/apache/commons/collections/map
LazySortedMap.java CompositeMap.java
FixedSizeSortedMap.java HashedMap.java LazyMap.java
FixedSizeMap.java AbstractHashedMap.java
ListOrderedMap.java LinkedMap.java IdentityMap.java
AbstractLinkedMap.java LRUMap.java Flat3Map.java
Log:
Update file layout for consistency
Revision Changes Path
1.2 +5 -4
jakarta-commons/collections/src/java/org/apache/commons/collections/map/LazySortedMap.java
Index: LazySortedMap.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/collections/src/java/org/apache/commons/collections/map/LazySortedMap.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- LazySortedMap.java 16 Nov 2003 00:05:45 -0000 1.1
+++ LazySortedMap.java 5 Jan 2004 22:04:19 -0000 1.2
@@ -4,7 +4,7 @@
*
* 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
@@ -91,7 +91,8 @@
* @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.
1.4 +11 -11
jakarta-commons/collections/src/java/org/apache/commons/collections/map/CompositeMap.java
Index: CompositeMap.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/collections/src/java/org/apache/commons/collections/map/CompositeMap.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- CompositeMap.java 29 Dec 2003 15:26:39 -0000 1.3
+++ CompositeMap.java 5 Jan 2004 22:04:19 -0000 1.4
@@ -4,7 +4,7 @@
*
* 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
@@ -79,20 +79,20 @@
* @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 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 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 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 @@
this.addComposited(composite[i]);
}
}
-
+
//-----------------------------------------------------------------------
/**
* Specify the MapMutator to be used by mutation operations.
1.3 +5 -5
jakarta-commons/collections/src/java/org/apache/commons/collections/map/FixedSizeSortedMap.java
Index: FixedSizeSortedMap.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/collections/src/java/org/apache/commons/collections/map/FixedSizeSortedMap.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- FixedSizeSortedMap.java 11 Dec 2003 22:55:25 -0000 1.2
+++ FixedSizeSortedMap.java 5 Jan 2004 22:04:19 -0000 1.3
@@ -4,7 +4,7 @@
*
* 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,8 +86,8 @@
* @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.
1.12 +6 -5
jakarta-commons/collections/src/java/org/apache/commons/collections/map/HashedMap.java
Index: HashedMap.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/collections/src/java/org/apache/commons/collections/map/HashedMap.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- HashedMap.java 28 Dec 2003 17:58:53 -0000 1.11
+++ HashedMap.java 5 Jan 2004 22:04:19 -0000 1.12
@@ -4,7 +4,7 @@
*
* 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
@@ -76,8 +76,9 @@
*
* @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;
1.2 +5 -4
jakarta-commons/collections/src/java/org/apache/commons/collections/map/LazyMap.java
Index: LazyMap.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/collections/src/java/org/apache/commons/collections/map/LazyMap.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- LazyMap.java 16 Nov 2003 00:05:45 -0000 1.1
+++ LazyMap.java 5 Jan 2004 22:04:19 -0000 1.2
@@ -4,7 +4,7 @@
*
* 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
@@ -91,7 +91,8 @@
* @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;
1.3 +5 -5
jakarta-commons/collections/src/java/org/apache/commons/collections/map/FixedSizeMap.java
Index: FixedSizeMap.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/collections/src/java/org/apache/commons/collections/map/FixedSizeMap.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- FixedSizeMap.java 11 Dec 2003 22:55:25 -0000 1.2
+++ FixedSizeMap.java 5 Jan 2004 22:04:19 -0000 1.3
@@ -4,7 +4,7 @@
*
* 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
@@ -85,8 +85,8 @@
* @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.
1.8 +4 -4
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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- AbstractHashedMap.java 5 Jan 2004 21:32:10 -0000 1.7
+++ AbstractHashedMap.java 5 Jan 2004 22:04:19 -0000 1.8
@@ -4,7 +4,7 @@
*
* 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
@@ -162,7 +162,7 @@
protected AbstractHashedMap(int initialCapacity) {
this(initialCapacity, DEFAULT_LOAD_FACTOR);
}
-
+
/**
* Constructs a new, empty map with the specified initial capacity and
* load factor.
1.10 +5 -4
jakarta-commons/collections/src/java/org/apache/commons/collections/map/ListOrderedMap.java
Index: ListOrderedMap.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/collections/src/java/org/apache/commons/collections/map/ListOrderedMap.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ListOrderedMap.java 28 Dec 2003 22:45:47 -0000 1.9
+++ ListOrderedMap.java 5 Jan 2004 22:04:19 -0000 1.10
@@ -4,7 +4,7 @@
*
* 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
@@ -94,7 +94,8 @@
* @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();
1.7 +6 -5
jakarta-commons/collections/src/java/org/apache/commons/collections/map/LinkedMap.java
Index: LinkedMap.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/collections/src/java/org/apache/commons/collections/map/LinkedMap.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- LinkedMap.java 28 Dec 2003 22:45:47 -0000 1.6
+++ LinkedMap.java 5 Jan 2004 22:04:19 -0000 1.7
@@ -4,7 +4,7 @@
*
* 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
@@ -97,8 +97,9 @@
*
* @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;
1.3 +6 -5
jakarta-commons/collections/src/java/org/apache/commons/collections/map/IdentityMap.java
Index: IdentityMap.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/collections/src/java/org/apache/commons/collections/map/IdentityMap.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- IdentityMap.java 7 Dec 2003 23:59:13 -0000 1.2
+++ IdentityMap.java 5 Jan 2004 22:04:19 -0000 1.3
@@ -4,7 +4,7 @@
*
* 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
@@ -76,8 +76,9 @@
* @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;
1.6 +4 -4
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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- AbstractLinkedMap.java 29 Dec 2003 00:38:08 -0000 1.5
+++ AbstractLinkedMap.java 5 Jan 2004 22:04:19 -0000 1.6
@@ -4,7 +4,7 @@
*
* 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
@@ -125,7 +125,7 @@
protected AbstractLinkedMap(int initialCapacity, float loadFactor, int
threshhold) {
super(initialCapacity, loadFactor, threshhold);
}
-
+
/**
* Constructs a new, empty map with the specified initial capacity.
*
1.7 +5 -5
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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- LRUMap.java 5 Jan 2004 21:32:47 -0000 1.6
+++ LRUMap.java 5 Jan 2004 22:04:19 -0000 1.7
@@ -82,15 +82,15 @@
* 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
+ * @since Commons Collections 3.0 (previously in main package v1.0)
* @version $Revision$ $Date$
*
* @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;
1.10 +4 -4
jakarta-commons/collections/src/java/org/apache/commons/collections/map/Flat3Map.java
Index: Flat3Map.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/collections/src/java/org/apache/commons/collections/map/Flat3Map.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Flat3Map.java 29 Dec 2003 00:38:32 -0000 1.9
+++ Flat3Map.java 5 Jan 2004 22:04:19 -0000 1.10
@@ -4,7 +4,7 @@
*
* 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
@@ -103,7 +103,7 @@
* @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 */
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
