--- a/dwtx/jface/text/source/CompositeRuler.d	Mon Aug 25 19:06:44 2008 +0200
+++ b/dwtx/jface/text/source/CompositeRuler.d	Tue Aug 26 02:46:34 2008 +0200
@@ -74,16 +74,8 @@
 import dwtx.jface.text.source.OverviewRuler; // packageimport
 import dwtx.jface.text.source.OverviewRulerHoverManager; // packageimport
 
-
 import dwt.dwthelper.utils;
-
-
 import dwtx.dwtxhelper.Collection;
-import java.util.EventListener;
-
-
-
-
 
 import dwt.DWT;
 import dwt.custom.StyledText;
@@ -190,7 +182,7 @@
          * Keeps the information for which event type a listener object has been added.
          */
         static class ListenerInfo {
-            Class fClass;
+            ClassInfo fClass;
             EventListener fListener;
         }
 
@@ -239,7 +231,7 @@
          * @param control the control to add the listener to
          * @param listener the listener to be added
          */
-        private void addListener(Class clazz, Control control, EventListener listener) {
+        private void addListener(ClassInfo clazz, Control control, EventListener listener) {
             if (ControlListener.classinfo.opEquals(clazz)) {
                 control. addControlListener(cast(ControlListener) listener);
                 return;
@@ -290,7 +282,7 @@
          * @param control the control to remove the listener from
          * @param listener the listener to be removed
          */
-        private void removeListener(Class clazz, Control control, EventListener listener) {
+        private void removeListener(ClassInfo clazz, Control control, EventListener listener) {
             if (ControlListener.classinfo.opEquals(clazz)) {
                 control. removeControlListener(cast(ControlListener) listener);
                 return;
@@ -340,7 +332,7 @@
          * @param clazz the listener type
          * @param listener the listener object
          */
-        private void addListener(Class clazz, EventListener listener) {
+        private void addListener(ClassInfo clazz, EventListener listener) {
             Control[] children= getChildren();
             for (int i= 0; i < children.length; i++) {
                 if (children[i] !is null && !children[i].isDisposed())
@@ -360,7 +352,7 @@
          * @param clazz the listener type
          * @param listener the listener object
          */
-        private void removeListener(Class clazz, EventListener listener) {
+        private void removeListener(ClassInfo clazz, EventListener listener) {
             int length= fCachedListeners.size();
             for (int i= 0; i < length; i++) {
                 ListenerInfo info= cast(ListenerInfo) fCachedListeners.get(i);