--- a/dwt/internal/cocoa/NSOpenPanel.d	Tue Oct 21 15:20:04 2008 +0200
+++ b/dwt/internal/cocoa/NSOpenPanel.d	Mon Dec 01 17:07:00 2008 +0100
@@ -1,122 +1,64 @@
 /*******************************************************************************
- * 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.NSOpenPanel;
 
-import dwt.internal.cocoa.id;
+import dwt.dwthelper.utils;
+import cocoa = dwt.internal.cocoa.id;
 import dwt.internal.cocoa.NSArray;
-import dwt.internal.cocoa.NSInteger;
 import dwt.internal.cocoa.NSSavePanel;
-import dwt.internal.cocoa.NSString;
-import dwt.internal.cocoa.NSWindow;
 import dwt.internal.cocoa.OS;
 import objc = dwt.internal.objc.runtime;
 
-public class NSOpenPanel : NSSavePanel
-{
-
-    public this ()
-    {
-        super();
-    }
+public class NSOpenPanel : NSSavePanel {
 
-    public this (objc.id id)
-    {
-        super(id);
-    }
-
-    public NSArray URLs ()
-    {
-        objc.id result = OS.objc_msgSend(this.id_, OS.sel_URLs);
-        return result !is null ? new NSArray(result) : null;
-    }
+public this() {
+    super();
+}
 
-    public bool allowsMultipleSelection ()
-    {
-        return OS.objc_msgSend(this.id_, OS.sel_allowsMultipleSelection) !is null;
-    }
-
-    public void beginForDirectory (NSString path, NSString name, NSArray fileTypes, id delegatee, objc.SEL didEndSelector, void* contextInfo)
-    {
-        OS.objc_msgSend(this.id_, OS.sel_beginForDirectory_1file_1types_1modelessDelegate_1didEndSelector_1contextInfo_1,
-                path !is null ? path.id_ : null, name !is null ? name.id_ : null, fileTypes !is null ? fileTypes.id_ : null,
-                delegatee !is null ? delegatee.id_ : null, didEndSelector, contextInfo);
-    }
+public this(objc.id id) {
+    super(id);
+}
 
-    public void beginSheetForDirectory (NSString path, NSString name, NSArray fileTypes, NSWindow docWindow, id delegatee, objc.SEL didEndSelector,
-            void* contextInfo)
-    {
-        OS.objc_msgSend(this.id_, OS.sel_beginSheetForDirectory_1file_1types_1modalForWindow_1modalDelegate_1didEndSelector_1contextInfo_1,
-                path !is null ? path.id_ : null, name !is null ? name.id_ : null, fileTypes !is null ? fileTypes.id_ : null,
-                docWindow !is null ? docWindow.id_ : null, delegatee !is null ? delegatee.id_ : null, didEndSelector, contextInfo);
-    }
+public this(cocoa.id id) {
+    super(id);
+}
 
-    public bool canChooseDirectories ()
-    {
-        return OS.objc_msgSend(this.id_, OS.sel_canChooseDirectories) !is null;
-    }
+public NSArray filenames() {
+    objc.id result = OS.objc_msgSend(this.id, OS.sel_filenames);
+    return result !is null ? new NSArray(result) : null;
+}
 
-    public bool canChooseFiles ()
-    {
-        return OS.objc_msgSend(this.id_, OS.sel_canChooseFiles) !is null;
-    }
-
-    public NSArray filenames ()
-    {
-        objc.id result = OS.objc_msgSend(this.id_, OS.sel_filenames);
-        return result !is null ? new NSArray(result) : null;
-    }
+public static NSOpenPanel openPanel() {
+    objc.id result = OS.objc_msgSend(OS.class_NSOpenPanel, OS.sel_openPanel);
+    return result !is null ? new NSOpenPanel(result) : null;
+}
 
-    public static NSOpenPanel openPanel ()
-    {
-        objc.id result = OS.objc_msgSend(OS.class_NSOpenPanel, OS.sel_openPanel);
-        return result !is null ? new NSOpenPanel(result) : null;
-    }
-
-    public bool resolvesAliases ()
-    {
-        return OS.objc_msgSend(this.id_, OS.sel_resolvesAliases) !is null;
-    }
+public void setAllowsMultipleSelection(bool flag) {
+    OS.objc_msgSend(this.id, OS.sel_setAllowsMultipleSelection_, flag);
+}
 
-    public NSInteger runModalForDirectory (NSString path, NSString name, NSArray fileTypes)
-    {
-        return cast(NSInteger) OS.objc_msgSend(this.id_, OS.sel_runModalForDirectory_1file_1types_1, path !is null ? path.id_ : null, name !is null ? name.id_ : null,
-                fileTypes !is null ? fileTypes.id_ : null);
-    }
-
-    public NSInteger runModalForTypes (NSArray fileTypes)
-    {
-        return cast(NSInteger) OS.objc_msgSend(this.id_, OS.sel_runModalForTypes_1, fileTypes !is null ? fileTypes.id_ : null);
-    }
+public void setCanChooseDirectories(bool flag) {
+    OS.objc_msgSend(this.id, OS.sel_setCanChooseDirectories_, flag);
+}
 
-    public void setAllowsMultipleSelection (bool flag)
-    {
-        OS.objc_msgSend(this.id_, OS.sel_setAllowsMultipleSelection_1, flag);
-    }
-
-    public void setCanChooseDirectories (bool flag)
-    {
-        OS.objc_msgSend(this.id_, OS.sel_setCanChooseDirectories_1, flag);
-    }
+public void setCanChooseFiles(bool flag) {
+    OS.objc_msgSend(this.id, OS.sel_setCanChooseFiles_, flag);
+}
 
-    public void setCanChooseFiles (bool flag)
-    {
-        OS.objc_msgSend(this.id_, OS.sel_setCanChooseFiles_1, flag);
-    }
-
-    public void setResolvesAliases (bool flag)
-    {
-        OS.objc_msgSend(this.id_, OS.sel_setResolvesAliases_1, flag);
-    }
+public static NSSavePanel savePanel() {
+    objc.id result = OS.objc_msgSend(OS.class_NSOpenPanel, OS.sel_savePanel);
+    return result !is null ? new NSSavePanel(result) : null;
+}
 
 }