--- a/dstep/foundation/NSURLProtocol.d	Mon Aug 03 15:31:48 2009 +0200
+++ b/dstep/foundation/NSURLProtocol.d	Sun Jan 03 22:06:11 2010 +0100
@@ -6,23 +6,31 @@
  */
 module dstep.foundation.NSURLProtocol;
 
-import dstep.AvailabilityMacros;
-import dstep.foundation.NSCachedURLResponse;
+import dstep.foundation.NSData;
 import dstep.foundation.NSError;
-import dstep.foundation.NSMutableURLRequest;
 import dstep.foundation.NSObject;
+import dstep.foundation.NSString;
 import dstep.foundation.NSURLAuthenticationChallenge;
 import dstep.foundation.NSURLCache;
 import dstep.foundation.NSURLConnection;
-import dstep.foundation.NSURLProtocolInternal;
 import dstep.foundation.NSURLRequest;
 import dstep.foundation.NSURLResponse;
 import dstep.objc.bridge.Bridge;
-import dstep.objc.objc : id;
+import dstep.objc.objc;
 
 class NSURLProtocol : NSObject
 {
-	mixin ObjcWrap;
+	mixin (ObjcWrap);
+	
+	this ()
+	{
+		super(typeof(this).alloc.init.objcObject);
+	}
+	
+	typeof(this) init ()
+	{
+		return invokeObjcSelf!(typeof(this), "init");
+	}
 
 	Object initWithRequest (NSURLRequest request, NSCachedURLResponse cachedResponse, INSURLProtocolClient client)
 	{
@@ -31,13 +39,7 @@
 
 	this (NSURLRequest request, NSCachedURLResponse cachedResponse, INSURLProtocolClient client)
 	{
-		objcObject = Bridge.invokeObjcClassMethod!(id, "alloc")(objcClass);
-		id result = Bridge.invokeObjcMethod!(id, "initWithRequest:cachedResponse:client:", NSURLRequest, NSCachedURLResponse, INSURLProtocolClient)(objcObject, request, cachedResponse, client);
-
-		if (result)
-			objcObject = ret;
-
-		dObject = this;
+		typeof(this).alloc.initWithRequest(request, cachedResponse, client);
 	}
 
 	INSURLProtocolClient client ()
@@ -57,17 +59,17 @@
 
 	static bool canInitWithRequest (NSURLRequest request)
 	{
-		return invokeObjcSelfClass!(bool, "canInitWithRequest:", NSURLRequest)(request);
+		return invokeObjcSuperClass!(bool, "canInitWithRequest:", NSURLRequest)(request);
 	}
 
 	static NSURLRequest canonicalRequestForRequest (NSURLRequest request)
 	{
-		return invokeObjcSelfClass!(NSURLRequest, "canonicalRequestForRequest:", NSURLRequest)(request);
+		return invokeObjcSuperClass!(NSURLRequest, "canonicalRequestForRequest:", NSURLRequest)(request);
 	}
 
 	static bool requestIsCacheEquivalent (NSURLRequest a, NSURLRequest b)
 	{
-		return invokeObjcSelfClass!(bool, "requestIsCacheEquivalent:toRequest:", NSURLRequest, NSURLRequest)(a, b);
+		return invokeObjcSuperClass!(bool, "requestIsCacheEquivalent:toRequest:", NSURLRequest, NSURLRequest)(a, b);
 	}
 
 	void startLoading ()
@@ -82,27 +84,27 @@
 
 	static Object propertyForKey (NSString key, NSURLRequest request)
 	{
-		return invokeObjcSelfClass!(Object, "propertyForKey:inRequest:", NSString, NSURLRequest)(key, request);
+		return invokeObjcSuperClass!(Object, "propertyForKey:inRequest:", NSString, NSURLRequest)(key, request);
 	}
 
 	static void setProperty (Object value, NSString key, NSMutableURLRequest request)
 	{
-		return invokeObjcSelfClass!(void, "setProperty:forKey:inRequest:", Object, NSString, NSMutableURLRequest)(value, key, request);
+		return invokeObjcSuperClass!(void, "setProperty:forKey:inRequest:", Object, NSString, NSMutableURLRequest)(value, key, request);
 	}
 
 	static void removePropertyForKey (NSString key, NSMutableURLRequest request)
 	{
-		return invokeObjcSelfClass!(void, "removePropertyForKey:inRequest:", NSString, NSMutableURLRequest)(key, request);
+		return invokeObjcSuperClass!(void, "removePropertyForKey:inRequest:", NSString, NSMutableURLRequest)(key, request);
 	}
 
 	static bool registerClass (Class protocolClass)
 	{
-		return invokeObjcSelfClass!(bool, "registerClass:", Class)(protocolClass);
+		return invokeObjcSuperClass!(bool, "registerClass:", Class)(protocolClass);
 	}
 
 	static void unregisterClass (Class protocolClass)
 	{
-		return invokeObjcSelfClass!(void, "unregisterClass:", Class)(protocolClass);
+		return invokeObjcSuperClass!(void, "unregisterClass:", Class)(protocolClass);
 	}
 }