Index: src/main/java/org/exolab/javasource/JAnnotatedElementHelper.java
===================================================================
--- src/main/java/org/exolab/javasource/JAnnotatedElementHelper.java	(révision 8000)
+++ src/main/java/org/exolab/javasource/JAnnotatedElementHelper.java	(copie de travail)
@@ -46,7 +46,7 @@
 
 import java.util.Iterator;
 
-import org.exolab.castor.util.OrderedHashMap;
+import java.util.LinkedHashMap;
 
 /**
  * Implements JAnnotatedElement interface on behalf of other classes in this
@@ -59,7 +59,7 @@
     //--------------------------------------------------------------------------
 
     /** Stores annotations associated with the source element containing this helper. */
-    private OrderedHashMap<String, JAnnotation> _annotations;
+    private LinkedHashMap<String, JAnnotation> _annotations;
 
     //--------------------------------------------------------------------------
 
@@ -109,7 +109,7 @@
                     + "' already added.");
         }
         String annotationType = annotation.getAnnotationType().getName();
-        if (_annotations == null) { _annotations = new OrderedHashMap<String, JAnnotation>(); }
+        if (_annotations == null) { _annotations = new LinkedHashMap<String, JAnnotation>(); }
         _annotations.put(annotationType, annotation);
     }
 
Index: src/main/java/org/exolab/javasource/JAnnotation.java
===================================================================
--- src/main/java/org/exolab/javasource/JAnnotation.java	(révision 8000)
+++ src/main/java/org/exolab/javasource/JAnnotation.java	(copie de travail)
@@ -44,7 +44,7 @@
 
 import java.lang.reflect.Array;
 
-import org.exolab.castor.util.OrderedHashMap;
+import java.util.LinkedHashMap;
 
 /**
  * JAnnotation represents a single annotation against a code element. The
@@ -146,7 +146,7 @@
 
     /** Element values associated with this JAnnotation, contains String,
      *  String[], JAnnotation and JAnnotation[] objects. */
-    private OrderedHashMap<Object, Object> _elementValues = new OrderedHashMap<Object, Object>();
+    private LinkedHashMap<Object, Object> _elementValues = new LinkedHashMap<Object, Object>();
 
     //--------------------------------------------------------------------------