diff --git a/src/java/org/apache/commons/collections/bidimap/AbstractBidiMapDecorator.java b/src/java/org/apache/commons/collections/bidimap/AbstractBidiMapDecorator.java
index 97c3a94b4..e02cac39d 100644
--- a/src/java/org/apache/commons/collections/bidimap/AbstractBidiMapDecorator.java
+++ b/src/java/org/apache/commons/collections/bidimap/AbstractBidiMapDecorator.java
@@ -1,10 +1,10 @@
 /*
- * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/bidimap/AbstractBidiMapDecorator.java,v 1.2 2003/12/03 14:03:35 scolebourne Exp $
+ * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/bidimap/AbstractBidiMapDecorator.java,v 1.3 2004/01/05 21:46:49 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
@@ -74,11 +74,12 @@ import org.apache.commons.collections.map.AbstractMapDecorator;
  * But, you might want that loophole, so this class is kept simple.
  *
  * @since Commons Collections 3.0
- * @version $Revision: 1.2 $ $Date: 2003/12/03 14:03:35 $
+ * @version $Revision: 1.3 $ $Date: 2004/01/05 21:46:49 $
  * 
  * @author Stephen Colebourne
  */
-public abstract class AbstractBidiMapDecorator extends AbstractMapDecorator implements BidiMap {
+public abstract class AbstractBidiMapDecorator
+        extends AbstractMapDecorator implements BidiMap {
     
     /**
      * Constructor that wraps (not copies).
diff --git a/src/java/org/apache/commons/collections/bidimap/AbstractDualBidiMap.java b/src/java/org/apache/commons/collections/bidimap/AbstractDualBidiMap.java
index 9337c8194..2eb548bb3 100644
--- a/src/java/org/apache/commons/collections/bidimap/AbstractDualBidiMap.java
+++ b/src/java/org/apache/commons/collections/bidimap/AbstractDualBidiMap.java
@@ -1,10 +1,10 @@
 /*
- * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/bidimap/AbstractDualBidiMap.java,v 1.7 2003/12/29 01:28:20 scolebourne Exp $
+ * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/bidimap/AbstractDualBidiMap.java,v 1.8 2004/01/05 21:46:49 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
@@ -75,8 +75,10 @@ import org.apache.commons.collections.keyvalue.AbstractMapEntryDecorator;
  * An implementation can be written simply by implementing the
  * <code>createMap</code> method.
  * 
+ * @see DualHashBidiMap
+ * @see DualTreeBidiMap
  * @since Commons Collections 3.0
- * @version $Id: AbstractDualBidiMap.java,v 1.7 2003/12/29 01:28:20 scolebourne Exp $
+ * @version $Id: AbstractDualBidiMap.java,v 1.8 2004/01/05 21:46:49 scolebourne Exp $
  * 
  * @author Matthew Hawthorne
  * @author Stephen Colebourne
diff --git a/src/java/org/apache/commons/collections/bidimap/AbstractOrderedBidiMapDecorator.java b/src/java/org/apache/commons/collections/bidimap/AbstractOrderedBidiMapDecorator.java
index 78dbc7b0e..292f2dcf1 100644
--- a/src/java/org/apache/commons/collections/bidimap/AbstractOrderedBidiMapDecorator.java
+++ b/src/java/org/apache/commons/collections/bidimap/AbstractOrderedBidiMapDecorator.java
@@ -1,10 +1,10 @@
 /*
- * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/bidimap/AbstractOrderedBidiMapDecorator.java,v 1.1 2003/12/03 14:03:35 scolebourne Exp $
+ * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/bidimap/AbstractOrderedBidiMapDecorator.java,v 1.2 2004/01/05 21:46:49 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
@@ -73,12 +73,12 @@ import org.apache.commons.collections.OrderedMapIterator;
  * But, you might want that loophole, so this class is kept simple.
  *
  * @since Commons Collections 3.0
- * @version $Revision: 1.1 $ $Date: 2003/12/03 14:03:35 $
+ * @version $Revision: 1.2 $ $Date: 2004/01/05 21:46:49 $
  * 
  * @author Stephen Colebourne
  */
-public abstract class AbstractOrderedBidiMapDecorator extends AbstractBidiMapDecorator
-        implements OrderedBidiMap {
+public abstract class AbstractOrderedBidiMapDecorator
+        extends AbstractBidiMapDecorator implements OrderedBidiMap {
     
     /**
      * Constructor that wraps (not copies).
diff --git a/src/java/org/apache/commons/collections/bidimap/AbstractSortedBidiMapDecorator.java b/src/java/org/apache/commons/collections/bidimap/AbstractSortedBidiMapDecorator.java
index f6a5db74b..b5baecdc1 100644
--- a/src/java/org/apache/commons/collections/bidimap/AbstractSortedBidiMapDecorator.java
+++ b/src/java/org/apache/commons/collections/bidimap/AbstractSortedBidiMapDecorator.java
@@ -1,10 +1,10 @@
 /*
- * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/bidimap/AbstractSortedBidiMapDecorator.java,v 1.1 2003/12/03 14:03:35 scolebourne Exp $
+ * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/bidimap/AbstractSortedBidiMapDecorator.java,v 1.2 2004/01/05 21:46:49 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
@@ -75,12 +75,12 @@ import org.apache.commons.collections.SortedBidiMap;
  * But, you might want that loophole, so this class is kept simple.
  *
  * @since Commons Collections 3.0
- * @version $Revision: 1.1 $ $Date: 2003/12/03 14:03:35 $
+ * @version $Revision: 1.2 $ $Date: 2004/01/05 21:46:49 $
  * 
  * @author Stephen Colebourne
  */
-public abstract class AbstractSortedBidiMapDecorator extends AbstractOrderedBidiMapDecorator
-        implements SortedBidiMap {
+public abstract class AbstractSortedBidiMapDecorator
+        extends AbstractOrderedBidiMapDecorator implements SortedBidiMap {
     
     /**
      * Constructor that wraps (not copies).
diff --git a/src/java/org/apache/commons/collections/bidimap/DualHashBidiMap.java b/src/java/org/apache/commons/collections/bidimap/DualHashBidiMap.java
index 3128b2b08..259a7b3d1 100644
--- a/src/java/org/apache/commons/collections/bidimap/DualHashBidiMap.java
+++ b/src/java/org/apache/commons/collections/bidimap/DualHashBidiMap.java
@@ -1,10 +1,10 @@
 /*
- * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/bidimap/DualHashBidiMap.java,v 1.2 2003/12/01 22:34:54 scolebourne Exp $
+ * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/bidimap/DualHashBidiMap.java,v 1.3 2004/01/05 21:46:49 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
@@ -70,12 +70,13 @@ import org.apache.commons.collections.BidiMap;
  * Implementation of <code>BidiMap</code> that uses two <code>HashMap</code> instances.
  * 
  * @since Commons Collections 3.0
- * @version $Id: DualHashBidiMap.java,v 1.2 2003/12/01 22:34:54 scolebourne Exp $
+ * @version $Id: DualHashBidiMap.java,v 1.3 2004/01/05 21:46:49 scolebourne Exp $
  * 
  * @author Matthew Hawthorne
  * @author Stephen Colebourne
  */
-public class DualHashBidiMap extends AbstractDualBidiMap implements Serializable {
+public class DualHashBidiMap
+        extends AbstractDualBidiMap implements Serializable {
 
     /** Ensure serialization compatability */
     private static final long serialVersionUID = 721969328361808L;
diff --git a/src/java/org/apache/commons/collections/bidimap/DualTreeBidiMap.java b/src/java/org/apache/commons/collections/bidimap/DualTreeBidiMap.java
index a6d92db0f..7a1acc765 100644
--- a/src/java/org/apache/commons/collections/bidimap/DualTreeBidiMap.java
+++ b/src/java/org/apache/commons/collections/bidimap/DualTreeBidiMap.java
@@ -1,10 +1,10 @@
 /*
- * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/bidimap/DualTreeBidiMap.java,v 1.8 2004/01/02 01:36:51 psteitz Exp $
+ * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/bidimap/DualTreeBidiMap.java,v 1.9 2004/01/05 21:46:49 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,12 +88,13 @@ import org.apache.commons.collections.map.AbstractSortedMapDecorator;
  * not store each object twice, which can save on memory use.
  * 
  * @since Commons Collections 3.0
- * @version $Id: DualTreeBidiMap.java,v 1.8 2004/01/02 01:36:51 psteitz Exp $
+ * @version $Id: DualTreeBidiMap.java,v 1.9 2004/01/05 21:46:49 scolebourne Exp $
  * 
  * @author Matthew Hawthorne
  * @author Stephen Colebourne
  */
-public class DualTreeBidiMap extends AbstractDualBidiMap implements SortedBidiMap, Serializable {
+public class DualTreeBidiMap
+        extends AbstractDualBidiMap implements SortedBidiMap, Serializable {
 
     /** Ensure serialization compatability */
     private static final long serialVersionUID = 721969328361809L;
diff --git a/src/java/org/apache/commons/collections/bidimap/UnmodifiableBidiMap.java b/src/java/org/apache/commons/collections/bidimap/UnmodifiableBidiMap.java
index 42aa4578c..e27469eb5 100644
--- a/src/java/org/apache/commons/collections/bidimap/UnmodifiableBidiMap.java
+++ b/src/java/org/apache/commons/collections/bidimap/UnmodifiableBidiMap.java
@@ -1,10 +1,10 @@
 /*
- * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/bidimap/UnmodifiableBidiMap.java,v 1.1 2003/12/03 12:59:37 scolebourne Exp $
+ * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/bidimap/UnmodifiableBidiMap.java,v 1.2 2004/01/05 21:46:49 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
@@ -73,11 +73,12 @@ import org.apache.commons.collections.set.UnmodifiableSet;
  * Decorates another <code>BidiMap</code> to ensure it can't be altered.
  *
  * @since Commons Collections 3.0
- * @version $Revision: 1.1 $ $Date: 2003/12/03 12:59:37 $
+ * @version $Revision: 1.2 $ $Date: 2004/01/05 21:46:49 $
  * 
  * @author Stephen Colebourne
  */
-public final class UnmodifiableBidiMap extends AbstractBidiMapDecorator implements Unmodifiable {
+public final class UnmodifiableBidiMap
+        extends AbstractBidiMapDecorator implements Unmodifiable {
     
     /** The inverse unmodifiable map */
     private UnmodifiableBidiMap inverse;
diff --git a/src/java/org/apache/commons/collections/bidimap/UnmodifiableOrderedBidiMap.java b/src/java/org/apache/commons/collections/bidimap/UnmodifiableOrderedBidiMap.java
index 503c59dfa..785625046 100644
--- a/src/java/org/apache/commons/collections/bidimap/UnmodifiableOrderedBidiMap.java
+++ b/src/java/org/apache/commons/collections/bidimap/UnmodifiableOrderedBidiMap.java
@@ -1,10 +1,10 @@
 /*
- * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/bidimap/UnmodifiableOrderedBidiMap.java,v 1.1 2003/12/03 14:03:35 scolebourne Exp $
+ * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/bidimap/UnmodifiableOrderedBidiMap.java,v 1.2 2004/01/05 21:46:49 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
@@ -75,12 +75,12 @@ import org.apache.commons.collections.set.UnmodifiableSet;
  * Decorates another <code>OrderedBidiMap</code> to ensure it can't be altered.
  *
  * @since Commons Collections 3.0
- * @version $Revision: 1.1 $ $Date: 2003/12/03 14:03:35 $
+ * @version $Revision: 1.2 $ $Date: 2004/01/05 21:46:49 $
  * 
  * @author Stephen Colebourne
  */
-public final class UnmodifiableOrderedBidiMap extends AbstractOrderedBidiMapDecorator
-        implements Unmodifiable {
+public final class UnmodifiableOrderedBidiMap
+        extends AbstractOrderedBidiMapDecorator implements Unmodifiable {
     
     /** The inverse unmodifiable map */
     private UnmodifiableOrderedBidiMap inverse;
diff --git a/src/java/org/apache/commons/collections/bidimap/UnmodifiableSortedBidiMap.java b/src/java/org/apache/commons/collections/bidimap/UnmodifiableSortedBidiMap.java
index 82ac117ac..98404d612 100644
--- a/src/java/org/apache/commons/collections/bidimap/UnmodifiableSortedBidiMap.java
+++ b/src/java/org/apache/commons/collections/bidimap/UnmodifiableSortedBidiMap.java
@@ -1,10 +1,10 @@
 /*
- * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/bidimap/UnmodifiableSortedBidiMap.java,v 1.1 2003/12/03 14:03:35 scolebourne Exp $
+ * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/bidimap/UnmodifiableSortedBidiMap.java,v 1.2 2004/01/05 21:46:49 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
@@ -78,12 +78,12 @@ import org.apache.commons.collections.set.UnmodifiableSet;
  * Decorates another <code>SortedBidiMap</code> to ensure it can't be altered.
  *
  * @since Commons Collections 3.0
- * @version $Revision: 1.1 $ $Date: 2003/12/03 14:03:35 $
+ * @version $Revision: 1.2 $ $Date: 2004/01/05 21:46:49 $
  * 
  * @author Stephen Colebourne
  */
-public final class UnmodifiableSortedBidiMap extends AbstractSortedBidiMapDecorator
-        implements Unmodifiable {
+public final class UnmodifiableSortedBidiMap
+        extends AbstractSortedBidiMapDecorator implements Unmodifiable {
     
     /** The inverse unmodifiable map */
     private UnmodifiableSortedBidiMap inverse;