--- a/org.eclipse.equinox.common/src/org/eclipse/core/runtime/ListenerList.d	Sat May 02 11:27:24 2009 +0200
+++ b/org.eclipse.equinox.common/src/org/eclipse/core/runtime/ListenerList.d	Sun Nov 08 12:42:30 2009 +0100
@@ -4,41 +4,42 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
- *
+ * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
- * Port to the D programming language:
- *     Frank Benoit <benoit@tionex.de>
  *******************************************************************************/
-module org.eclipse.core.runtime.ListenerList;
+// Port to the D programming language:
+//     Frank Benoit <benoit@tionex.de>
+module org.eclipse.core.runtimeListenerList;
 
 import java.lang.all;
 
+
 /**
  * This class is a thread safe list that is designed for storing lists of listeners.
- * The implementation is optimized for minimal memory footprint, frequent reads
+ * The implementation is optimized for minimal memory footprint, frequent reads 
  * and infrequent writes.  Modification of the list is synchronized and relatively
- * expensive, while accessing the listeners is very fast.  Readers are given access
- * to the underlying array data structure for reading, with the trust that they will
+ * expensive, while accessing the listeners is very fast.  Readers are given access 
+ * to the underlying array data structure for reading, with the trust that they will 
  * not modify the underlying array.
  * <p>
- * <a name="same">A listener list handles the <i>same</i> listener being added
+ * <a name="same">A listener list handles the <i>same</i> listener being added 
  * multiple times, and tolerates removal of listeners that are the same as other
- * listeners in the list.  For this purpose, listeners can be compared with each other
+ * listeners in the list.  For this purpose, listeners can be compared with each other 
  * using either equality or identity, as specified in the list constructor.
  * </p>
  * <p>
  * Use the <code>getListeners</code> method when notifying listeners. The recommended
  * code sequence for notifying all registered listeners of say,
  * <code>FooListener.eventHappened</code>, is:
- *
+ * 
  * <pre>
  * Object[] listeners = myListenerList.getListeners();
  * for (int i = 0; i &lt; listeners.length; ++i) {
- *  ((FooListener) listeners[i]).eventHappened(event);
+ * 	((FooListener) listeners[i]).eventHappened(event);
  * }
  * </pre>
- *
+ * 
  * </p><p>
  * This class can be used without OSGi running.
  * </p>
@@ -49,19 +50,19 @@
     /**
      * The empty array singleton instance.
      */
-    private static const Object[] EmptyArray;
+    private static final Object[] EmptyArray = new Object[0];
 
     /**
      * Mode constant (value 0) indicating that listeners should be considered
      * the <a href="#same">same</a> if they are equal.
      */
-    public static const int EQUALITY = 0;
+    public static final int EQUALITY = 0;
 
     /**
      * Mode constant (value 1) indicating that listeners should be considered
      * the <a href="#same">same</a> if they are identical.
      */
-    public static const int IDENTITY = 1;
+    public static final int IDENTITY = 1;
 
     /**
      * Indicates the comparison mode used to determine if two
@@ -72,40 +73,40 @@
     /**
      * The list of listeners.  Initially empty but initialized
      * to an array of size capacity the first time a listener is added.
-     * Maintains invariant: listeners !is null
+     * Maintains invariant: listeners != null
      */
-    private Object[] listeners;
+    private /+volatile+/ Object[] listeners = EmptyArray;
 
     /**
      * Creates a listener list in which listeners are compared using equality.
      */
     public this() {
-        this(EQUALITY);
+        thiscast(EQUALITY);
     }
 
     /**
      * Creates a listener list using the provided comparison mode.
-     *
+     * 
      * @param mode The mode used to determine if listeners are the <a href="#same">same</a>.
      */
     public this(int mode) {
         if (mode !is EQUALITY && mode !is IDENTITY)
-            throw new IllegalArgumentException( null );
+            throw new IllegalArgumentException();
         this.identity = mode is IDENTITY;
     }
 
     /**
      * Adds a listener to this list. This method has no effect if the <a href="#same">same</a>
      * listener is already registered.
-     *
+     * 
      * @param listener the non-<code>null</code> listener to add
      */
     public synchronized void add(Object listener) {
-        // This method is synchronized to protect against multiple threads adding
+        // This method is synchronized to protect against multiple threads adding 
         // or removing listeners concurrently. This does not block concurrent readers.
         if (listener is null)
-            throw new IllegalArgumentException( null );
-        // check for duplicates
+            throw new IllegalArgumentException();
+        // check for duplicates 
         final int oldSize = listeners.length;
         for (int i = 0; i < oldSize; ++i) {
             Object listener2 = listeners[i];
@@ -125,10 +126,10 @@
      * The resulting array is unaffected by subsequent adds or removes.
      * If there are no listeners registered, the result is an empty array.
      * Use this method when notifying listeners, so that any modifications
-     * to the listener list during the notification will have no effect on
+     * to the listener list during the notification will have no effect on 
      * the notification itself.
      * <p>
-     * Note: Callers of this method <b>must not</b> modify the returned array.
+     * Note: Callers of this method <b>must not</b> modify the returned array. 
      *
      * @return the list of registered listeners
      */
@@ -147,16 +148,16 @@
     }
 
     /**
-     * Removes a listener from this list. Has no effect if the <a href="#same">same</a>
+     * Removes a listener from this list. Has no effect if the <a href="#same">same</a> 
      * listener was not already registered.
      *
      * @param listener the non-<code>null</code> listener to remove
      */
     public synchronized void remove(Object listener) {
-        // This method is synchronized to protect against multiple threads adding
+        // This method is synchronized to protect against multiple threads adding 
         // or removing listeners concurrently. This does not block concurrent readers.
         if (listener is null)
-            throw new IllegalArgumentException( null );
+            throw new IllegalArgumentException();
         int oldSize = listeners.length;
         for (int i = 0; i < oldSize; ++i) {
             Object listener2 = listeners[i];
@@ -184,7 +185,7 @@
     public int size() {
         return listeners.length;
     }
-
+    
     /**
      * Removes all listeners from this list.
      */