--- a/dwt/internal/cocoa/NSMutableIndexSet.d	Tue Oct 21 15:20:04 2008 +0200
+++ b/dwt/internal/cocoa/NSMutableIndexSet.d	Mon Dec 01 17:07:00 2008 +0100
@@ -1,75 +1,41 @@
 /*******************************************************************************
- * 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.NSMutableIndexSet;
 
+import dwt.dwthelper.utils;
+import cocoa = dwt.internal.cocoa.id;
 import dwt.internal.cocoa.NSIndexSet;
-import dwt.internal.cocoa.NSInteger;
-import dwt.internal.cocoa.NSRange;
 import dwt.internal.cocoa.OS;
+import dwt.internal.objc.cocoa.Cocoa;
 import objc = dwt.internal.objc.runtime;
 
-public class NSMutableIndexSet : NSIndexSet
-{
-
-    public this ()
-    {
-        super();
-    }
+public class NSMutableIndexSet : NSIndexSet {
 
-    public this (objc.id id)
-    {
-        super(id);
-    }
-
-    public void addIndex (NSUInteger value)
-    {
-        OS.objc_msgSend(this.id_, OS.sel_addIndex_1, value);
-    }
-
-    public void addIndexes (NSIndexSet indexSet)
-    {
-        OS.objc_msgSend(this.id_, OS.sel_addIndexes_1, indexSet !is null ? indexSet.id_ : null);
-    }
+public this() {
+    super();
+}
 
-    public void addIndexesInRange (NSRange range)
-    {
-        OS.objc_msgSend(this.id_, OS.sel_addIndexesInRange_1, range);
-    }
-
-    public void removeAllIndexes ()
-    {
-        OS.objc_msgSend(this.id_, OS.sel_removeAllIndexes);
-    }
-
-    public void removeIndex (NSUInteger value)
-    {
-        OS.objc_msgSend(this.id_, OS.sel_removeIndex_1, value);
-    }
+public this(objc.id id) {
+    super(id);
+}
 
-    public void removeIndexes (NSIndexSet indexSet)
-    {
-        OS.objc_msgSend(this.id_, OS.sel_removeIndexes_1, indexSet !is null ? indexSet.id_ : null);
-    }
+public this(cocoa.id id) {
+    super(id);
+}
 
-    public void removeIndexesInRange (NSRange range)
-    {
-        OS.objc_msgSend(this.id_, OS.sel_removeIndexesInRange_1, range);
-    }
-
-    public void shiftIndexesStartingAtIndex (NSUInteger index, NSInteger delta)
-    {
-        OS.objc_msgSend(this.id_, OS.sel_shiftIndexesStartingAtIndex_1by_1, index, delta);
-    }
+public void addIndex(NSUInteger value) {
+    OS.objc_msgSend(this.id, OS.sel_addIndex_, value);
+}
 
 }