--- a/dwtx/jface/text/source/CompositeRuler.d	Wed Aug 27 14:49:30 2008 +0200
+++ b/dwtx/jface/text/source/CompositeRuler.d	Mon Sep 08 00:51:37 2008 +0200
@@ -187,7 +187,7 @@
         }
 
         /** The list of listeners added to this canvas. */
-        private List fCachedListeners= new ArrayList();
+        private List fCachedListeners;
         /**
          * Internal listener for opening the context menu.
          * @since 3.0
@@ -201,6 +201,8 @@
          * @param style the DWT styles
          */
         public this(Composite parent, int style) {
+            fCachedListeners= new ArrayList();
+
             super(parent, style);
             fMenuDetectListener= new class()  Listener {
                 public void handleEvent(Event event) {
@@ -356,7 +358,7 @@
             int length= fCachedListeners.size();
             for (int i= 0; i < length; i++) {
                 ListenerInfo info= cast(ListenerInfo) fCachedListeners.get(i);
-                if (listener is info.fListener && clazz.equals(info.fClass)) {
+                if (listener is info.fListener && clazz.opEquals(info.fClass)) {
                     fCachedListeners.remove(i);
                     break;
                 }
@@ -569,9 +571,9 @@
     /** The ruler's annotation model */
     private IAnnotationModel fModel;
     /** The list of columns */
-    private List fDecorators= new ArrayList(2);
+    private List fDecorators;
     /** The cached location of the last mouse button activity */
-    private Point fLocation= new Point(-1, -1);
+    private Point fLocation;
     /** The cached line of the list mouse button activity */
     private int fLastMouseButtonActivityLine= -1;
     /** The gap between the individual columns of this composite ruler */
@@ -580,7 +582,7 @@
      * The set of annotation listeners.
      * @since 3.0
      */
-    private Set fAnnotationListeners= new HashSet();
+    private Set fAnnotationListeners;
 
 
     /**
@@ -596,6 +598,10 @@
      * @param gap
      */
     public this(int gap) {
+        fDecorators= new ArrayList(2);
+        fLocation= new Point(-1, -1);
+        fAnnotationListeners= new HashSet();
+
         fGap= gap;
     }
 
@@ -610,9 +616,9 @@
         rulerColumn.setModel(getModel());
 
         if (index > fDecorators.size())
-            fDecorators.add(rulerColumn);
+            fDecorators.add(cast(Object)rulerColumn);
         else
-            fDecorators.add(index, rulerColumn);
+            fDecorators.add(index, cast(Object)rulerColumn);
 
         if (fComposite !is null && !fComposite.isDisposed()) {
             rulerColumn.createControl(this, fComposite);
@@ -638,7 +644,7 @@
      * @since 3.0
      */
     public void removeDecorator(IVerticalRulerColumn rulerColumn) {
-        fDecorators.remove(rulerColumn);
+        fDecorators.remove(cast(Object)rulerColumn);
         if (rulerColumn !is null) {
             Control cc= rulerColumn.getControl();
             if (cc !is null && !cc.isDisposed()) {
@@ -848,7 +854,7 @@
      * @since 3.0
      */
     public Iterator getDecoratorIterator() {
-        Assert.isNotNull(fDecorators, "fDecorators must be initialized"); //$NON-NLS-1$
+        Assert.isNotNull(cast(Object)fDecorators, "fDecorators must be initialized"); //$NON-NLS-1$
         return fDecorators.iterator();
     }
 
@@ -865,7 +871,7 @@
      * @since 3.0
      */
     public void addVerticalRulerListener(IVerticalRulerListener listener) {
-        fAnnotationListeners.add(listener);
+        fAnnotationListeners.add(cast(Object)listener);
     }
 
     /*
@@ -873,7 +879,7 @@
      * @since 3.0
      */
     public void removeVerticalRulerListener(IVerticalRulerListener listener) {
-        fAnnotationListeners.remove(listener);
+        fAnnotationListeners.remove(cast(Object)listener);
     }
 
     /**