CCPackageDownloadManager cleansed of installData.

Author: NickyWeber

UnitTests/CCPackageDownloadManagerTests.m

@@ -13,8 +13,6 @@
 #import "CCDirector.h"
 #import "AppDelegate.h"
 #import "CCUnitTestAssertions.h"
-#import "CCPackageInstallData.h"
-#import "CCPackage+InstallData.h"
 
 @interface CCPackageDownloadManagerTestURLProtocol : NSURLProtocol @end
 
@@ -142,7 +140,7 @@ - (void)testCancelDownload
     [[NSRunLoop currentRunLoop] runMode:NSDefaultRunLoopMode beforeDate:[NSDate dateWithTimeInterval:0.5 sinceDate:[NSDate date]]];
 
     NSFileManager *fileManager = [NSFileManager defaultManager];
-    XCTAssertFalse([fileManager fileExistsAtPath:[package1 installData].localDownloadURL.path]);
+    XCTAssertFalse([fileManager fileExistsAtPath:package1.localDownloadURL.path]);
 }
 
 - (void)testPauseAndResumeAllDownloads
@@ -193,8 +191,8 @@ - (void)assertPackagesDownloadedAndContentsAreAsExpected:(NSArray *)packages
     NSFileManager *fileManager = [NSFileManager defaultManager];
     for (CCPackage *aPackage in packages)
     {
-        XCTAssertTrue([fileManager fileExistsAtPath:[aPackage installData].localDownloadURL.path]);
-        CCAssertEqualStrings(aPackage.name, [NSString stringWithContentsOfFile:[aPackage installData].localDownloadURL.path encoding:NSUTF8StringEncoding error:nil]);
+        XCTAssertTrue([fileManager fileExistsAtPath:aPackage.localDownloadURL.path]);
+        CCAssertEqualStrings(aPackage.name, [NSString stringWithContentsOfFile:aPackage.localDownloadURL.path encoding:NSUTF8StringEncoding error:nil]);
     }
 }
 
@@ -204,9 +202,6 @@ - (void)assertPackagesDownloadedAndContentsAreAsExpected:(NSArray *)packages
 - (CCPackage *)completePackageWithName:(NSString *)name
 {
     CCPackage *package = [[CCPackage alloc] initWithName:name resolution:@"phonehd" os:@"iOS" remoteURL:[NSURL URLWithString:[NSString stringWithFormat:@"http://package.fake/%@", name]]];
-    CCPackageInstallData  *installData = [[CCPackageInstallData  alloc] init];
-    [package setInstallData:installData];
-
     return package;
 }
 

cocos2d/CCPackageDownloadManager.m

@@ -2,10 +2,9 @@
 #import "CCPackage.h"
 #import "CCPackageDownload.h"
 #import "CCPackageDownloadManagerDelegate.h"
-#import "CCPackageInstallData.h"
-#import "CCPackage+InstallData.h"
 #import "CCPackageConstants.h"
 #import "ccMacros.h"
+#import "CCPackage_private.h"
 
 
 @interface CCPackageDownloadManager()
@@ -87,10 +86,7 @@ - (void)enqueuePackageForDownload:(CCPackage *)package
     CCPackageDownload *packageDownload = [[CCPackageDownload alloc] initWithPackage:package
                                                                            localURL:[NSURL fileURLWithPath:[_downloadPath stringByAppendingPathComponent:fileName]]];
 
-    CCPackageInstallData *installData = [package installData];
-    NSAssert(installData != nil, @"installData must not be nil");
-    installData.localDownloadURL = [NSURL fileURLWithPath:[_downloadPath stringByAppendingPathComponent:fileName]];
-
+    package.localDownloadURL = [NSURL fileURLWithPath:[_downloadPath stringByAppendingPathComponent:fileName]];
     packageDownload.delegate = self;
 
     [_downloads addObject:packageDownload];