--- a/dwt/dnd/DNDListener.d	Tue Oct 21 15:20:04 2008 +0200
+++ b/dwt/dnd/DNDListener.d	Mon Dec 01 17:07:00 2008 +0100
@@ -8,111 +8,115 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-module dwt.dnd;
+module dwt.dnd.DNDListener;
+
+import dwt.dwthelper.utils;
 
-import dwt.internal.*;
-import dwt.widgets.*;
+import dwt.internal.DWTEventListener;
+import dwt.widgets.Event;
+import dwt.widgets.TypedListener;
+import dwt.widgets.Widget;
 
 
-class DNDListener : TypedListener {
+class DNDListener extends TypedListener {
     Widget dndWidget;
 /**
  * DNDListener constructor comment.
  * @param listener dwt.internal.DWTEventListener
  */
-this(DWTEventListener listener) {
+DNDListener(DWTEventListener listener) {
     super(listener);
 }
 public void handleEvent (Event e) {
     switch (e.type) {
         case DND.DragStart: {
-            DragSourceEvent event = new DragSourceEvent(cast(DNDEvent)e);
-            DragSourceEffect sourceEffect = (cast(DragSource) dndWidget).getDragSourceEffect();
+            DragSourceEvent event = new DragSourceEvent((DNDEvent)e);
+            DragSourceEffect sourceEffect = ((DragSource) dndWidget).getDragSourceEffect();
             if (sourceEffect !is null) {
                 sourceEffect.dragStart (event);
             }
-            (cast(DragSourceListener) eventListener).dragStart (event);
-            event.updateEvent(cast(DNDEvent)e);
+            ((DragSourceListener) eventListener).dragStart (event);
+            event.updateEvent((DNDEvent)e);
             break;
         }
         case DND.DragEnd: {
-            DragSourceEvent event = new DragSourceEvent(cast(DNDEvent)e);
-            DragSourceEffect sourceEffect = (cast(DragSource) dndWidget).getDragSourceEffect();
+            DragSourceEvent event = new DragSourceEvent((DNDEvent)e);
+            DragSourceEffect sourceEffect = ((DragSource) dndWidget).getDragSourceEffect();
             if (sourceEffect !is null) {
                 sourceEffect.dragFinished (event);
             }
-            (cast(DragSourceListener) eventListener).dragFinished (event);
-            event.updateEvent(cast(DNDEvent)e);
+            ((DragSourceListener) eventListener).dragFinished (event);
+            event.updateEvent((DNDEvent)e);
             break;
         }
         case DND.DragSetData: {
-            DragSourceEvent event = new DragSourceEvent(cast(DNDEvent)e);
-            DragSourceEffect sourceEffect = (cast(DragSource) dndWidget).getDragSourceEffect();
+            DragSourceEvent event = new DragSourceEvent((DNDEvent)e);
+            DragSourceEffect sourceEffect = ((DragSource) dndWidget).getDragSourceEffect();
             if (sourceEffect !is null) {
                 sourceEffect.dragSetData (event);
             }
-            (cast(DragSourceListener) eventListener).dragSetData (event);
-            event.updateEvent(cast(DNDEvent)e);
+            ((DragSourceListener) eventListener).dragSetData (event);
+            event.updateEvent((DNDEvent)e);
             break;
         }
         case DND.DragEnter: {
-            DropTargetEvent event = new DropTargetEvent(cast(DNDEvent)e);
-            (cast(DropTargetListener) eventListener).dragEnter (event);
-            DropTargetEffect dropEffect = (cast(DropTarget) dndWidget).getDropTargetEffect();
+            DropTargetEvent event = new DropTargetEvent((DNDEvent)e);
+            ((DropTargetListener) eventListener).dragEnter (event);
+            DropTargetEffect dropEffect = ((DropTarget) dndWidget).getDropTargetEffect();
             if (dropEffect !is null) {
                 dropEffect.dragEnter (event);
             }
-            event.updateEvent(cast(DNDEvent)e);
+            event.updateEvent((DNDEvent)e);
             break;
         }
         case DND.DragLeave: {
-            DropTargetEvent event = new DropTargetEvent(cast(DNDEvent)e);
-            (cast(DropTargetListener) eventListener).dragLeave (event);
-            DropTargetEffect dropEffect = (cast(DropTarget) dndWidget).getDropTargetEffect();
+            DropTargetEvent event = new DropTargetEvent((DNDEvent)e);
+            ((DropTargetListener) eventListener).dragLeave (event);
+            DropTargetEffect dropEffect = ((DropTarget) dndWidget).getDropTargetEffect();
             if (dropEffect !is null) {
                 dropEffect.dragLeave (event);
             }
-            event.updateEvent(cast(DNDEvent)e);
+            event.updateEvent((DNDEvent)e);
             break;
         }
         case DND.DragOver: {
-            DropTargetEvent event = new DropTargetEvent(cast(DNDEvent)e);
-            (cast(DropTargetListener) eventListener).dragOver (event);
-            DropTargetEffect dropEffect = (cast(DropTarget) dndWidget).getDropTargetEffect();
+            DropTargetEvent event = new DropTargetEvent((DNDEvent)e);
+            ((DropTargetListener) eventListener).dragOver (event);
+            DropTargetEffect dropEffect = ((DropTarget) dndWidget).getDropTargetEffect();
             if (dropEffect !is null) {
                 dropEffect.dragOver (event);
             }
-            event.updateEvent(cast(DNDEvent)e);
+            event.updateEvent((DNDEvent)e);
             break;
         }
         case DND.Drop: {
-            DropTargetEvent event = new DropTargetEvent(cast(DNDEvent)e);
-            (cast(DropTargetListener) eventListener).drop (event);
-            DropTargetEffect dropEffect = (cast(DropTarget) dndWidget).getDropTargetEffect();
+            DropTargetEvent event = new DropTargetEvent((DNDEvent)e);
+            ((DropTargetListener) eventListener).drop (event);
+            DropTargetEffect dropEffect = ((DropTarget) dndWidget).getDropTargetEffect();
             if (dropEffect !is null) {
                 dropEffect.drop (event);
             }
-            event.updateEvent(cast(DNDEvent)e);
+            event.updateEvent((DNDEvent)e);
             break;
         }
         case DND.DropAccept: {
-            DropTargetEvent event = new DropTargetEvent(cast(DNDEvent)e);
-            (cast(DropTargetListener) eventListener).dropAccept (event);
-            DropTargetEffect dropEffect = (cast(DropTarget) dndWidget).getDropTargetEffect();
+            DropTargetEvent event = new DropTargetEvent((DNDEvent)e);
+            ((DropTargetListener) eventListener).dropAccept (event);
+            DropTargetEffect dropEffect = ((DropTarget) dndWidget).getDropTargetEffect();
             if (dropEffect !is null) {
                 dropEffect.dropAccept (event);
             }
-            event.updateEvent(cast(DNDEvent)e);
+            event.updateEvent((DNDEvent)e);
             break;
         }
         case DND.DragOperationChanged: {
-            DropTargetEvent event = new DropTargetEvent(cast(DNDEvent)e);
-            (cast(DropTargetListener) eventListener).dragOperationChanged (event);
-            DropTargetEffect dropEffect = (cast(DropTarget) dndWidget).getDropTargetEffect();
+            DropTargetEvent event = new DropTargetEvent((DNDEvent)e);
+            ((DropTargetListener) eventListener).dragOperationChanged (event);
+            DropTargetEffect dropEffect = ((DropTarget) dndWidget).getDropTargetEffect();
             if (dropEffect !is null) {
                 dropEffect.dragOperationChanged (event);
             }
-            event.updateEvent(cast(DNDEvent)e);
+            event.updateEvent((DNDEvent)e);
             break;
         }