From 17421dacc25ebceb76e38366d37355f9aaeb5905 Mon Sep 17 00:00:00 2001 From: masakih Date: Fri, 17 Feb 2017 22:07:02 +0900 Subject: [PATCH] =?utf8?q?=E9=87=8D=E8=A4=87=E3=81=97=E3=81=9F=E9=96=A2?= =?utf8?q?=E6=95=B0=E3=82=92=E5=89=8A=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- KCD/CoreDataCore.swift | 27 ++------------------------- 1 file changed, 2 insertions(+), 25 deletions(-) diff --git a/KCD/CoreDataCore.swift b/KCD/CoreDataCore.swift index 0643bb8b..88faa883 100644 --- a/KCD/CoreDataCore.swift +++ b/KCD/CoreDataCore.swift @@ -219,33 +219,10 @@ extension CoreDataAccessor { func object(with objectId: NSManagedObjectID) -> NSManagedObject { return managedObjectContext.object(with: objectId) } - func objects(withEntityName entityName: String, sortDescriptors: [NSSortDescriptor]?, predicate: NSPredicate?) throws -> [NSManagedObject] { + func objects(withEntityName entityName: String, sortDescriptors: [NSSortDescriptor]? = nil, predicate: NSPredicate? = nil) throws -> [NSManagedObject] { let req = NSFetchRequest(entityName: entityName) req.sortDescriptors = sortDescriptors req.predicate = predicate - do { - return try managedObjectContext.fetch(req) - } - catch { - throw error - } - } - - func objects(withEntityName entityName: String, predicate: NSPredicate?) throws -> [NSManagedObject] { - do { - return try objects(withEntityName: entityName, sortDescriptors: nil, predicate: predicate) - } - catch { - throw error - } - } - - func objects(withEntityName entityName: String, sortDescriptors: [NSSortDescriptor]? = nil) throws -> [NSManagedObject] { - do { - return try objects(withEntityName: entityName, sortDescriptors: sortDescriptors, predicate: nil) - } - catch { - throw error - } + return try managedObjectContext.fetch(req) } } -- 2.11.0