deleteObject:をHMCoreDataManagerで行うように変更

diff --git a/KCD/HMAirBaseCommand.m b/KCD/HMAirBaseCommand.m
index 188fc16..e309221 100644 (file)
--- a/KCD/HMAirBaseCommand.m
+++ b/KCD/HMAirBaseCommand.m
@@ -29,14 +29,13 @@
 - (void)execute
 {
     HMServerDataStore *serverDataStore = [HMServerDataStore oneTimeEditor];
-    NSManagedObjectContext *managedObjectContext = [serverDataStore managedObjectContext];
     
     NSError *error = nil;
     NSArray *objects = [serverDataStore objectsWithEntityName:@"AirBase"
                                                     predicate:nil
                                                         error:&error];
     for(NSManagedObject *obj in objects) {
-        [managedObjectContext deleteObject:obj];
+        [serverDataStore deleteObject:obj];
     }
     serverDataStore = nil;
     

diff --git a/KCD/HMBroserWindowController.m b/KCD/HMBroserWindowController.m
index 00267a1..18e5d9a 100644 (file)
--- a/KCD/HMBroserWindowController.m
+++ b/KCD/HMBroserWindowController.m
@@ -212,9 +212,8 @@ typedef NS_ENUM(NSUInteger, FleetViewPosition) {
        NSArray *objects = [store objectsWithEntityName:@"Quest"
                                                                                  predicate:nil
                                                                                          error:NULL];
-       NSManagedObjectContext *moc = store.managedObjectContext;
        for(id object in objects) {
-               [moc deleteObject:object];
+               [store deleteObject:object];
        }
 }
 

diff --git a/KCD/HMCalculateDamageCommand.m b/KCD/HMCalculateDamageCommand.m
index 2956d5d..00e013e 100644 (file)
--- a/KCD/HMCalculateDamageCommand.m
+++ b/KCD/HMCalculateDamageCommand.m
@@ -55,10 +55,9 @@ typedef NS_ENUM(NSUInteger, HMDamageControlMasterSlotItemID) {
 
 - (void)resetBattle
 {
-       NSManagedObjectContext *moc = self.store.managedObjectContext;
        NSArray<HMKCBattle *> *array = self.store.battles;
        for(HMKCBattle *object in array) {
-               [moc deleteObject:object];
+               [self.store deleteObject:object];
        }
                
        [self.store saveAction:nil];
@@ -66,10 +65,9 @@ typedef NS_ENUM(NSUInteger, HMDamageControlMasterSlotItemID) {
 
 - (void)resetDamage
 {
-       NSManagedObjectContext *moc = self.store.managedObjectContext;
        NSArray<HMKCDamage *> *array = [self.store damagesWithSortDescriptors:nil];
        for(HMKCDamage *object in array) {
-               [moc deleteObject:object];
+               [self.store deleteObject:object];
        }
        
        [self.store saveAction:nil];

diff --git a/KCD/HMCoreDataManager.h b/KCD/HMCoreDataManager.h
index e687ec1..842ba3f 100644 (file)
--- a/KCD/HMCoreDataManager.h
+++ b/KCD/HMCoreDataManager.h
@@ -31,6 +31,13 @@
 - (__kindof NSManagedObject *)insertNewObjectForEntityForName:(NSString *)name;
 
 /**
+ *  CoreDataオブジェクトを削除する
+ *
+ *  @param object   削除するオブジェクト
+ **/
+- (void)deleteObject:(NSManagedObject *)object;
+
+/**
  *  CoreDataからデータを読み出す
  *
  *  @param entityName      対象エンティティ

diff --git a/KCD/HMCoreDataManager.m b/KCD/HMCoreDataManager.m
index f5b10cb..b00df07 100644 (file)
--- a/KCD/HMCoreDataManager.m
+++ b/KCD/HMCoreDataManager.m
@@ -62,6 +62,10 @@ typedef NS_ENUM(NSUInteger, HMCoreDataManagerType) {
     return [NSEntityDescription insertNewObjectForEntityForName:name
                                          inManagedObjectContext:self.managedObjectContext];
 }
+- (void)deleteObject:(NSManagedObject *)object
+{
+    [self.managedObjectContext deleteObject:object];
+}
 
 - (NSArray *)objectsWithEntityName:(NSString *)entityName sortDescriptors:(NSArray *)sortDescriptors predicate:(NSPredicate *)predicate error:(NSError **)error
 {

diff --git a/KCD/HMDestroyItem2Command.m b/KCD/HMDestroyItem2Command.m
index 9e83a25..0ceafc8 100644 (file)
--- a/KCD/HMDestroyItem2Command.m
+++ b/KCD/HMDestroyItem2Command.m
@@ -31,7 +31,6 @@
 - (void)execute
 {
        HMServerDataStore *store = [HMServerDataStore oneTimeEditor];
-       NSManagedObjectContext *moc = store.managedObjectContext;
        
        NSString *itemsString = self.arguments[@"api_slotitem_ids"];
        NSArray *itemsStrings = [itemsString componentsSeparatedByString:@","];
@@ -50,7 +49,7 @@
        }
        
        for(id obj in slotItems) {
-               [moc deleteObject:obj];
+               [store deleteObject:obj];
        }
        
        //

diff --git a/KCD/HMDropShipHistoryCommand.m b/KCD/HMDropShipHistoryCommand.m
index 8f9a505..7c61f2c 100644 (file)
--- a/KCD/HMDropShipHistoryCommand.m
+++ b/KCD/HMDropShipHistoryCommand.m
@@ -102,7 +102,6 @@
        if(error) {
                NSLog(@"%s error: %@", __PRETTY_FUNCTION__, error);
        }
-       NSManagedObjectContext *context = lds.managedObjectContext;
        for(HMDropShipHistory *history in dropShipHistories) {
                HMDropShipHistory *newObejct = [lds insertNewObjectForEntityForName:@"DropShipHistory"];
                
@@ -115,7 +114,7 @@
                newObejct.winRank = history.winRank;
                newObejct.date = history.date;
                
-               [context deleteObject:history];
+               [lds deleteObject:history];
        }
        
        [lds saveAction:nil];

diff --git a/KCD/HMDummyShipCommand.m b/KCD/HMDummyShipCommand.m
index f621962..3b876f7 100644 (file)
--- a/KCD/HMDummyShipCommand.m
+++ b/KCD/HMDummyShipCommand.m
@@ -41,12 +41,11 @@ static BOOL getShipFlag = 0;
        
        NSError *error = nil;
        HMServerDataStore *serverDataStore = [HMServerDataStore oneTimeEditor];
-       NSManagedObjectContext *managedObjectContext = [serverDataStore managedObjectContext];
        NSArray<HMKCShipObject *> *dummys = [serverDataStore objectsWithEntityName:@"Ship"
                                                                                                                                                 error:&error
                                                                                                                           predicateFormat:@"id = %@", @(-2)];
        for(HMKCShipObject *dummy in dummys) {
-               [managedObjectContext deleteObject:dummy];
+               [serverDataStore deleteObject:dummy];
        }
 }
 

diff --git a/KCD/HMGuardShelterCommand.m b/KCD/HMGuardShelterCommand.m
index f1969ac..5de3a40 100644 (file)
--- a/KCD/HMGuardShelterCommand.m
+++ b/KCD/HMGuardShelterCommand.m
@@ -133,7 +133,7 @@ NSString *HMGuardShelterCommandDidUpdateGuardExcapeNotification = @"HMGuardShelt
                return;
        }
        for(NSManagedObject *object in escapeds) {
-               [store.managedObjectContext deleteObject:object];
+               [store deleteObject:object];
        }
        [store saveAction:nil];
        [NSThread sleepForTimeInterval:0.1];
@@ -156,7 +156,7 @@ NSString *HMGuardShelterCommandDidUpdateGuardExcapeNotification = @"HMGuardShelt
                return;
        }
        for(NSManagedObject *object in escapeds) {
-               [store.managedObjectContext deleteObject:object];
+               [store deleteObject:object];
        }
        [store saveAction:nil];
        [NSThread sleepForTimeInterval:0.1];

diff --git a/KCD/HMHistoryItemCleaner.m b/KCD/HMHistoryItemCleaner.m
index 792ce2c..479d5a5 100644 (file)
--- a/KCD/HMHistoryItemCleaner.m
+++ b/KCD/HMHistoryItemCleaner.m
@@ -32,7 +32,7 @@
                                                                                                                                          error:&error];
        if(!error) {
                for(NSManagedObject *obj in array) {
-                       [store.managedObjectContext deleteObject:obj];
+                       [store deleteObject:obj];
                }
        } else {
                NSLog(@"%s ERROR: KaihatuHistory, %@", __PRETTY_FUNCTION__, error);
@@ -44,7 +44,7 @@
                                                                   error:&error];
        if(!error) {
                for(NSManagedObject *obj in array) {
-                       [store.managedObjectContext deleteObject:obj];
+                       [store deleteObject:obj];
                }
        } else {
                NSLog(@"%s ERROR: KenzoHistory, %@", __PRETTY_FUNCTION__, error);
@@ -60,7 +60,7 @@
                                                                   error:&error];
        if(!error) {
                for(NSManagedObject *obj in array) {
-                       [store.managedObjectContext deleteObject:obj];
+                       [store deleteObject:obj];
                }
        } else {
                NSLog(@"%s ERROR: DropShipHistory, %@", __PRETTY_FUNCTION__, error);

diff --git a/KCD/HMHistoryWindowController.m b/KCD/HMHistoryWindowController.m
index ba46827..2f6a027 100644 (file)
--- a/KCD/HMHistoryWindowController.m
+++ b/KCD/HMHistoryWindowController.m
@@ -117,7 +117,7 @@ typedef NS_ENUM(NSUInteger, HMHistoryWindowTabIndex) {
        
        for(NSManagedObjectID *objectID in objectIds) {
                NSManagedObject *object = [moc objectWithID:objectID];
-               [moc deleteObject:object];
+               [store deleteObject:object];
        }
 }
 

diff --git a/KCD/HMRealDestroyShipCommand.m b/KCD/HMRealDestroyShipCommand.m
index c910f23..60d6a1c 100644 (file)
--- a/KCD/HMRealDestroyShipCommand.m
+++ b/KCD/HMRealDestroyShipCommand.m
@@ -14,7 +14,6 @@
 - (void)execute
 {
        HMServerDataStore *store = [HMServerDataStore oneTimeEditor];
-       NSManagedObjectContext *moc = store.managedObjectContext;
        
        NSString *destroyedShipId = [self.arguments objectForKey:@"api_ship_id"];
        
@@ -25,6 +24,6 @@
        if(ships.count == 0) {
                return;
        }
-       [moc deleteObject:ships[0]];
+       [store deleteObject:ships[0]];
 }
 @end

diff --git a/KCD/HMRealPowerUpCommand.m b/KCD/HMRealPowerUpCommand.m
index c71c431..2480873 100644 (file)
--- a/KCD/HMRealPowerUpCommand.m
+++ b/KCD/HMRealPowerUpCommand.m
@@ -16,7 +16,6 @@
 - (void)execute
 {
        HMServerDataStore *store = [HMServerDataStore oneTimeEditor];
-       NSManagedObjectContext *moc = store.managedObjectContext;
        
        NSString *usedShipsStrings = [self.arguments objectForKey:@"api_id_items"];
        NSArray *usedShipStringArray = [usedShipsStrings componentsSeparatedByString:@","];
@@ -29,7 +28,7 @@
                if(ships.count == 0) {
                        continue;
                }
-               [moc deleteObject:ships[0]];
+               [store deleteObject:ships[0]];
        }
 }
 @end

diff --git a/KCD/HMRemodelSlotItemCommand.m b/KCD/HMRemodelSlotItemCommand.m
index 4f41292..7844947 100644 (file)
--- a/KCD/HMRemodelSlotItemCommand.m
+++ b/KCD/HMRemodelSlotItemCommand.m
@@ -31,8 +31,7 @@
                                                                                                                                                                           error:&error
                                                                                                                                                         predicateFormat:@"id IN %@", useSlotItemIDs];
                [useSlotItems enumerateObjectsUsingBlock:^(HMKCSlotItemObject * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) {
-                       NSManagedObjectContext *con = serverDataStore.managedObjectContext;
-                       [con deleteObject:obj];
+                       [serverDataStore deleteObject:obj];
                }];
        }
        

diff --git a/KCD/HMResetSortieCommand.m b/KCD/HMResetSortieCommand.m
index 08e1d69..d8851c4 100644 (file)
--- a/KCD/HMResetSortieCommand.m
+++ b/KCD/HMResetSortieCommand.m
@@ -17,7 +17,6 @@
 - (void)execute
 {
        HMTemporaryDataStore *store = [HMTemporaryDataStore oneTimeEditor];
-       NSManagedObjectContext *moc = store.managedObjectContext;
        
        NSError *error = nil;
        NSArray<HMKCBattle *> *battles = [store objectsWithEntityName:@"Battle"
@@ -28,7 +27,7 @@
                return;
        }
        for(HMKCBattle *object in battles) {
-               [moc deleteObject:object];
+               [store deleteObject:object];
        }
 }
 

diff --git a/KCD/HMResourceHistoryManager.m b/KCD/HMResourceHistoryManager.m
index cda2aad..fc05161 100644 (file)
--- a/KCD/HMResourceHistoryManager.m
+++ b/KCD/HMResourceHistoryManager.m
@@ -138,13 +138,12 @@ static HMResourceHistoryManager *sInstance;
 void reduceResourceByConditions(HMResourceHistoryDataStore *resourceStore, NSArray *target, NSDate *oneMonthAgo)
 {
        NSError *error = nil;
-       NSManagedObjectContext *moc = resourceStore.managedObjectContext;
        NSArray *array = [resourceStore objectsWithEntityName:@"Resource"
                                                                                                        error:&error
                                                                                  predicateFormat:@"minute IN %@ AND date < %@",
                                          target, oneMonthAgo];
        for( NSManagedObject *object in array) {
-               [moc deleteObject:object];
+               [resourceStore deleteObject:object];
        }
 }