From e7e829bb44daa0a1f6aaa295540ff63cb0a0b64d Mon Sep 17 00:00:00 2001 From: Scott Pfeil Date: Fri, 2 Sep 2022 15:49:06 -0400 Subject: [PATCH] remove deprecated MVMCoreLoadObject code --- .../MVMCore/LoadHandling/MVMCoreLoadObject.h | 9 ----- .../MVMCore/LoadHandling/MVMCoreLoadObject.m | 40 ------------------- 2 files changed, 49 deletions(-) diff --git a/MVMCore/MVMCore/LoadHandling/MVMCoreLoadObject.h b/MVMCore/MVMCore/LoadHandling/MVMCoreLoadObject.h index 92063b8..1ee321d 100644 --- a/MVMCore/MVMCore/LoadHandling/MVMCoreLoadObject.h +++ b/MVMCore/MVMCore/LoadHandling/MVMCoreLoadObject.h @@ -46,7 +46,6 @@ @property (nullable, strong, nonatomic) NSDictionary *dataForPage; // The load delegate -@property (nullable, weak, nonatomic) NSObject *delegate __deprecated; @property (nullable, strong, nonatomic) DelegateObject *delegateObject; // The operation that is loading. @@ -70,12 +69,4 @@ // Returns whether the load will extend the app session timer based on the response provided by the server. - (BOOL)extendsAppSession; -#pragma mark - Deprecated - -- (nullable instancetype)initWithPageJSON:(nullable NSDictionary *)pageJSON modulesJSON:(nullable NSDictionary *)modulesJSON requestParameters:(nullable MVMCoreRequestParameters *)requestParameters dataForPage:(nullable NSDictionary *)dataForPage delegate:(nullable NSObject*)delegate __deprecated; - -- (nullable instancetype)initWithRequestParameters:(nullable MVMCoreRequestParameters *)requestParameters dataForPage:(nullable NSDictionary *)dataForPage delegate:(nullable NSObject*)delegate __deprecated; - -- (nullable instancetype)initWithDelegate:(nullable NSObject*)delegate __deprecated; - @end diff --git a/MVMCore/MVMCore/LoadHandling/MVMCoreLoadObject.m b/MVMCore/MVMCore/LoadHandling/MVMCoreLoadObject.m index 9c56d99..25240c4 100644 --- a/MVMCore/MVMCore/LoadHandling/MVMCoreLoadObject.m +++ b/MVMCore/MVMCore/LoadHandling/MVMCoreLoadObject.m @@ -68,44 +68,4 @@ return NO; } -#pragma mark - Deprecated - -- (void)setDelegateObject:(DelegateObject *)delegateObject { - _delegateObject = delegateObject; - _delegate = delegateObject.loadDelegate; -} - -- (void)setDelegate:(NSObject *)delegate { - _delegate = delegate; - if ([delegate respondsToSelector:@selector(delegateObject)]) { - _delegateObject = [delegate performSelector:@selector(delegateObject)]; - } else { - _delegateObject = [DelegateObject createWithDelegateForAll:delegate]; - } -} - -- (nullable instancetype)initWithPageJSON:(nullable NSDictionary *)pageJSON modulesJSON:(nullable NSDictionary *)modulesJSON requestParameters:(nullable MVMCoreRequestParameters *)requestParameters dataForPage:(nullable NSDictionary *)dataForPage delegate:(nullable NSObject*)delegate { - - if (self = [self initWithRequestParameters:requestParameters dataForPage:dataForPage delegate:delegate]) { - self.pageJSON = pageJSON; - self.modulesJSON = modulesJSON; - } - return self; -} - -- (nullable instancetype)initWithRequestParameters:(nullable MVMCoreRequestParameters *)requestParameters dataForPage:(nullable NSDictionary *)dataForPage delegate:(nullable NSObject*)delegate { - if (self = [self initWithDelegate:delegate]) { - self.requestParameters = requestParameters; - self.dataForPage = dataForPage; - } - return self; -} - -- (nullable instancetype)initWithDelegate:(nullable NSObject*)delegate { - if (self = [super init]) { - self.delegate = delegate; - } - return self; -} - @end