--- a/dwt/internal/cocoa/NSNotification.d	Tue Oct 21 15:20:04 2008 +0200
+++ b/dwt/internal/cocoa/NSNotification.d	Mon Dec 01 17:07:00 2008 +0100
@@ -1,68 +1,47 @@
 /*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2008 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * 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
+ *    IBM Corporation - initial API and implementation
  *     
  * Port to the D programming language:
- *     Jacob Carlborg <jacob.carlborg@gmail.com>
+ *    Jacob Carlborg <doob@me.com>
  *******************************************************************************/
 module dwt.internal.cocoa.NSNotification;
 
-import dwt.internal.cocoa.id;
+import dwt.dwthelper.utils;
+import cocoa = dwt.internal.cocoa.id;
 import dwt.internal.cocoa.NSDictionary;
 import dwt.internal.cocoa.NSObject;
-import dwt.internal.cocoa.NSString;
 import dwt.internal.cocoa.OS;
 import objc = dwt.internal.objc.runtime;
 
-public class NSNotification : NSObject
-{
-
-    public this ()
-    {
-        super();
-    }
+public class NSNotification : NSObject {
 
-    public this (objc.id id)
-    {
-        super(id);
-    }
+public this() {
+    super();
+}
 
-    public NSString name ()
-    {
-        objc.id result = OS.objc_msgSend(this.id_, OS.sel_name);
-        return result !is null ? new NSString(result) : null;
-    }
+public this(objc.id id) {
+    super(id);
+}
 
-    public static id static_notificationWithName_object_ (NSString aName, id anObject)
-    {
-        objc.id result = OS.objc_msgSend(OS.class_NSNotification, OS.sel_notificationWithName_1object_1, aName !is null ? aName.id_ : null,
-                anObject !is null ? anObject.id_ : null);
-        return result !is null ? new id(result) : null;
-    }
+public this(cocoa.id id) {
+    super(id);
+}
 
-    public static id static_notificationWithName_object_userInfo_ (NSString aName, id anObject, NSDictionary aUserInfo)
-    {
-        objc.id result = OS.objc_msgSend(OS.class_NSNotification, OS.sel_notificationWithName_1object_1userInfo_1, aName !is null ? aName.id_ : null,
-                anObject !is null ? anObject.id_ : null, aUserInfo !is null ? aUserInfo.id_ : null);
-        return result !is null ? new id(result) : null;
-    }
+public cocoa.id object() {
+    objc.id result = OS.objc_msgSend(this.id, OS.sel_object);
+    return result !is null ? new cocoa.id(result) : null;
+}
 
-    public id object ()
-    {
-        objc.id result = OS.objc_msgSend(this.id_, OS.sel_object);
-        return result !is null ? new id(result) : null;
-    }
-
-    public NSDictionary userInfo ()
-    {
-        objc.id result = OS.objc_msgSend(this.id_, OS.sel_userInfo);
-        return result !is null ? new NSDictionary(result) : null;
-    }
+public NSDictionary userInfo() {
+    objc.id result = OS.objc_msgSend(this.id, OS.sel_userInfo);
+    return result !is null ? new NSDictionary(result) : null;
+}
 
 }