From e2860efaf6d6ab41789bbd209f4f24bccdb44eb4 Mon Sep 17 00:00:00 2001 From: "Suresh, Kamlesh" Date: Mon, 17 Feb 2020 22:28:09 -0500 Subject: [PATCH] fixes --- MVMCoreUI/BaseControllers/MFViewController.h | 2 +- MVMCoreUI/BaseControllers/MFViewController.m | 6 +++--- MVMCoreUI/Templates/MoleculeListTemplate.swift | 2 +- MVMCoreUI/Templates/MoleculeStackTemplate.swift | 2 +- MVMCoreUI/Templates/ThreeLayerTemplate.swift | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/MVMCoreUI/BaseControllers/MFViewController.h b/MVMCoreUI/BaseControllers/MFViewController.h index ee38cf2b..11afe915 100644 --- a/MVMCoreUI/BaseControllers/MFViewController.h +++ b/MVMCoreUI/BaseControllers/MFViewController.h @@ -277,7 +277,7 @@ // subclass to set up intro animations - (void)setupIntroAnimations; -- (void)parsePageJSONAndReturnError:(NSError * _Nullable * _Nullable)error; +- (void)parsePageJSON:(NSError * _Nullable * _Nullable)error; @end diff --git a/MVMCoreUI/BaseControllers/MFViewController.m b/MVMCoreUI/BaseControllers/MFViewController.m index af2db33c..f663193f 100644 --- a/MVMCoreUI/BaseControllers/MFViewController.m +++ b/MVMCoreUI/BaseControllers/MFViewController.m @@ -98,7 +98,7 @@ self.loadObject = loadObject; NSError *parseError = nil; - [self parsePageJSONAndReturnError:&parseError]; + [self parsePageJSON:&parseError]; if (parseError) { if (error) { MVMCoreErrorObject *errorObject = [MVMCoreErrorObject createErrorObjectForNSError:parseError location:[[MVMCoreLoadHandler sharedGlobal] errorLocationForRequest:loadObject]]; @@ -112,7 +112,7 @@ return [MFViewController verifyRequiredModulesLoadedForLoadObject:loadObject error:error]; } -- (void)parsePageJSONAndReturnError:(NSError * _Nullable * _Nullable)error { +- (void)parsePageJSON:(NSError * _Nullable * _Nullable)error { } @@ -265,7 +265,7 @@ - (BOOL)newPageLoaded:(nonnull NSDictionary *)page { self.loadObject.pageJSON = page; NSError *parseError = nil; - [self parsePageJSONAndReturnError:&parseError]; + [self parsePageJSON:&parseError]; return YES; } diff --git a/MVMCoreUI/Templates/MoleculeListTemplate.swift b/MVMCoreUI/Templates/MoleculeListTemplate.swift index 291a6a27..cbe0458c 100644 --- a/MVMCoreUI/Templates/MoleculeListTemplate.swift +++ b/MVMCoreUI/Templates/MoleculeListTemplate.swift @@ -23,7 +23,7 @@ open class MoleculeListTemplate: ThreeLayerTableViewController, TemplateProtocol // MARK: - Computed Properties //-------------------------------------------------- - open override func parsePageJSONAndReturnError(_ error: NSErrorPointer) { + open override func parsePageJSON(_ error: NSErrorPointer) { try? parseTemplateJSON() } diff --git a/MVMCoreUI/Templates/MoleculeStackTemplate.swift b/MVMCoreUI/Templates/MoleculeStackTemplate.swift index b3fb4c3a..8bf0b4cd 100644 --- a/MVMCoreUI/Templates/MoleculeStackTemplate.swift +++ b/MVMCoreUI/Templates/MoleculeStackTemplate.swift @@ -12,7 +12,7 @@ open class MoleculeStackTemplate: ThreeLayerViewController, TemplateProtocol { var observer: NSKeyValueObservation? public var templateModel: StackPageTemplateModel? - open override func parsePageJSONAndReturnError(_ error: NSErrorPointer) { + open override func parsePageJSON(_ error: NSErrorPointer) { try? parseTemplateJSON() } diff --git a/MVMCoreUI/Templates/ThreeLayerTemplate.swift b/MVMCoreUI/Templates/ThreeLayerTemplate.swift index 8d4f7169..72498289 100644 --- a/MVMCoreUI/Templates/ThreeLayerTemplate.swift +++ b/MVMCoreUI/Templates/ThreeLayerTemplate.swift @@ -12,7 +12,7 @@ import UIKit public var templateModel: ThreeLayerPageTemplateModel? - open override func parsePageJSONAndReturnError(_ error: NSErrorPointer) { + open override func parsePageJSON(_ error: NSErrorPointer) { try? parseTemplateJSON() }