--- a/dwtx/jface/text/source/AnnotationMap.d	Wed Aug 27 14:49:30 2008 +0200
+++ b/dwtx/jface/text/source/AnnotationMap.d	Mon Sep 08 00:51:37 2008 +0200
@@ -102,7 +102,7 @@
      * The internal lock object used if <code>fLockObject</code> is <code>null</code>.
      * @since 3.2
      */
-    private const Object fInternalLockObject= new Object();
+    private const Object fInternalLockObject;
 
     /** The map holding the annotations */
     private Map fInternalMap;
@@ -113,6 +113,7 @@
      * @param capacity the capacity
      */
     public this(int capacity) {
+        fInternalLockObject= new Object();
         fInternalMap= new HashMap(capacity);
     }
 
@@ -257,4 +258,34 @@
             return fInternalMap.values();
         }
     }
+
+    /// DWT extension of Collection interfaces
+
+    public bool containsKey(String key) {
+        return containsKey(stringcast(key));
+    }
+    public Object get(String key) {
+        return get(stringcast(key));
+    }
+    public Object put(String key, String value) {
+        return put(stringcast(key), stringcast(value));
+    }
+    public Object put(Object key, String value) {
+        return put(key, stringcast(value));
+    }
+    public Object put(String key, Object value) {
+        return put(stringcast(key), value);
+    }
+    public Object remove(String key) {
+        return remove(stringcast(key));
+    }
+    public int opApply (int delegate(ref Object value) dg){
+        implMissing(__FILE__,__LINE__);
+        return 0;
+    }
+    public int opApply (int delegate(ref Object key, ref Object value) dg){
+        implMissing(__FILE__,__LINE__);
+        return 0;
+    }
+
 }