--- a/dstep/foundation/NSArchiver.d	Mon Aug 03 15:31:48 2009 +0200
+++ b/dstep/foundation/NSArchiver.d	Sun Jan 03 22:06:11 2010 +0100
@@ -6,27 +6,58 @@
  */
 module dstep.foundation.NSArchiver;
 
+import dstep.foundation.NSArray;
 import dstep.foundation.NSCoder;
 import dstep.foundation.NSData;
-import dstep.foundation.NSMutableArray;
-import dstep.foundation.NSMutableData;
-import dstep.foundation.NSMutableDictionary;
+import dstep.foundation.NSDictionary;
 import dstep.foundation.NSString;
+import dstep.foundation.NSZone;
 import dstep.objc.bridge.Bridge;
-import dstep.objc.objc : id;
+import dstep.objc.objc;
+
+
 
 import bindings = dstep.foundation.NSArchiver_bindings;
 
-const NSString NSInconsistentArchiveException;
+private NSString NSInconsistentArchiveException_;
+
+NSString NSInconsistentArchiveException ()
+{
+	if (NSInconsistentArchiveException_)
+		return NSInconsistentArchiveException_;
+	
+	return NSInconsistentArchiveException_ = new NSString(bindings.NSInconsistentArchiveException);
+}
+
+const TNSArchiverCallback = `
 
-static this ()
-{
-	NSInconsistentArchiveException = new NSString(bindings.NSInconsistentArchiveException);
-}
+	Class classForArchiver ()
+	{
+		return invokeObjcSelf!(Class, "classForArchiver");
+	}
+	
+	Object replacementObjectForArchiver (NSArchiver archiver)
+	{
+		return invokeObjcSelf!(Object, "replacementObjectForArchiver:", NSArchiver)(archiver);
+	}
+	
+	//mixin ObjcBindMethod!(classForArchiver, "classForArchiver");
+	//mixin ObjcBindMethod!(replacementObjectForArchiver, "replacementObjectForArchiver:");
+`;
 
 class NSArchiver : NSCoder
 {
-	mixin ObjcWrap;
+	mixin (ObjcWrap);
+	
+	this ()
+	{
+		super(typeof(this).alloc.init.objcObject);
+	}
+	
+	typeof(this) init ()
+	{
+		return invokeObjcSelf!(typeof(this), "init");
+	}
 
 	Object initForWritingWithMutableData (NSMutableData mdata)
 	{
@@ -35,13 +66,7 @@
 
 	this (NSMutableData mdata)
 	{
-		objcObject = Bridge.invokeObjcClassMethod!(id, "alloc")(objcClass);
-		id result = Bridge.invokeObjcMethod!(id, "initForWritingWithMutableData:", NSMutableData)(objcObject, mdata);
-
-		if (result)
-			objcObject = ret;
-
-		dObject = this;
+		typeof(this).alloc.initForWritingWithMutableData(mdata);
 	}
 
 	NSMutableData archiverData ()
@@ -61,12 +86,12 @@
 
 	static NSData archivedDataWithRootObject (Object rootObject)
 	{
-		return invokeObjcSelfClass!(NSData, "archivedDataWithRootObject:", Object)(rootObject);
+		return invokeObjcSuperClass!(NSData, "archivedDataWithRootObject:", Object)(rootObject);
 	}
 
 	static bool archiveRootObject (Object rootObject, NSString path)
 	{
-		return invokeObjcSelfClass!(bool, "archiveRootObject:toFile:", Object, NSString)(rootObject, path);
+		return invokeObjcSuperClass!(bool, "archiveRootObject:toFile:", Object, NSString)(rootObject, path);
 	}
 
 	void encodeClassName (NSString trueName, NSString inArchiveName)
@@ -87,7 +112,17 @@
 
 class NSUnarchiver : NSCoder
 {
-	mixin ObjcWrap;
+	mixin (ObjcWrap);	
+	
+	this ()
+	{
+		super(typeof(this).alloc.init.objcObject);
+	}
+	
+	typeof(this) init ()
+	{
+		return invokeObjcSelf!(typeof(this), "init");
+	}
 
 	Object initForReadingWithData (NSData data)
 	{
@@ -96,13 +131,7 @@
 
 	this (NSData data)
 	{
-		objcObject = Bridge.invokeObjcClassMethod!(id, "alloc")(objcClass);
-		id result = Bridge.invokeObjcMethod!(id, "initForReadingWithData:", NSData)(objcObject, data);
-
-		if (result)
-			objcObject = ret;
-
-		dObject = this;
+		typeof(this).alloc.initForReadingWithData(data);
 	}
 
 	void setObjectZone (NSZone* zone)
@@ -127,17 +156,17 @@
 
 	static Object unarchiveObjectWithData (NSData data)
 	{
-		return invokeObjcSelfClass!(Object, "unarchiveObjectWithData:", NSData)(data);
+		return invokeObjcSuperClass!(Object, "unarchiveObjectWithData:", NSData)(data);
 	}
 
 	static Object unarchiveObjectWithFile (NSString path)
 	{
-		return invokeObjcSelfClass!(Object, "unarchiveObjectWithFile:", NSString)(path);
+		return invokeObjcSuperClass!(Object, "unarchiveObjectWithFile:", NSString)(path);
 	}
 
 	static void decodeClassName (NSString inArchiveName, NSString trueName)
 	{
-		return invokeObjcSelfClass!(void, "decodeClassName:asClassName:", NSString, NSString)(inArchiveName, trueName);
+		return invokeObjcSuperClass!(void, "decodeClassName:asClassName:", NSString, NSString)(inArchiveName, trueName);
 	}
 
 	void decodeClassName (NSString inArchiveName, NSString trueName)
@@ -147,7 +176,7 @@
 
 	static NSString classNameDecodedForArchiveClassName (NSString inArchiveName)
 	{
-		return invokeObjcSelfClass!(NSString, "classNameDecodedForArchiveClassName:", NSString)(inArchiveName);
+		return invokeObjcSuperClass!(NSString, "classNameDecodedForArchiveClassName:", NSString)(inArchiveName);
 	}
 
 	NSString classNameDecodedForArchiveClassName (NSString inArchiveName)
@@ -159,11 +188,4 @@
 	{
 		return invokeObjcSelf!(void, "replaceObject:withObject:", Object, Object)(object, newObject);
 	}
-}
-
-template TNSArchiverCallback ()
-{
-	Class classForArchiver ();
-	Object replacementObjectForArchiver (NSArchiver archiver);
-}
-
+}
\ No newline at end of file