Merge branch 'feature/deprecation_removal' into 'develop'
remove deprecated MVMCoreLoadObject code See merge request BPHV_MIPS/mvm_core!227
This commit is contained in:
commit
05f6ed1013
@ -46,7 +46,6 @@
|
||||
@property (nullable, strong, nonatomic) NSDictionary *dataForPage;
|
||||
|
||||
// The load delegate
|
||||
@property (nullable, weak, nonatomic) NSObject <MVMCoreLoadDelegateProtocol,MVMCorePresentationDelegateProtocol,MVMCoreActionDelegateProtocol> *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<MVMCoreLoadDelegateProtocol,MVMCorePresentationDelegateProtocol,MVMCoreActionDelegateProtocol>*)delegate __deprecated;
|
||||
|
||||
- (nullable instancetype)initWithRequestParameters:(nullable MVMCoreRequestParameters *)requestParameters dataForPage:(nullable NSDictionary *)dataForPage delegate:(nullable NSObject<MVMCoreLoadDelegateProtocol,MVMCorePresentationDelegateProtocol,MVMCoreActionDelegateProtocol>*)delegate __deprecated;
|
||||
|
||||
- (nullable instancetype)initWithDelegate:(nullable NSObject<MVMCoreLoadDelegateProtocol,MVMCorePresentationDelegateProtocol,MVMCoreActionDelegateProtocol>*)delegate __deprecated;
|
||||
|
||||
@end
|
||||
|
||||
@ -68,44 +68,4 @@
|
||||
return NO;
|
||||
}
|
||||
|
||||
#pragma mark - Deprecated
|
||||
|
||||
- (void)setDelegateObject:(DelegateObject *)delegateObject {
|
||||
_delegateObject = delegateObject;
|
||||
_delegate = delegateObject.loadDelegate;
|
||||
}
|
||||
|
||||
- (void)setDelegate:(NSObject<MVMCoreLoadDelegateProtocol,MVMCorePresentationDelegateProtocol,MVMCoreActionDelegateProtocol> *)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<MVMCoreLoadDelegateProtocol,MVMCorePresentationDelegateProtocol,MVMCoreActionDelegateProtocol>*)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<MVMCoreLoadDelegateProtocol,MVMCorePresentationDelegateProtocol,MVMCoreActionDelegateProtocol>*)delegate {
|
||||
if (self = [self initWithDelegate:delegate]) {
|
||||
self.requestParameters = requestParameters;
|
||||
self.dataForPage = dataForPage;
|
||||
}
|
||||
return self;
|
||||
}
|
||||
|
||||
- (nullable instancetype)initWithDelegate:(nullable NSObject<MVMCoreLoadDelegateProtocol,MVMCorePresentationDelegateProtocol,MVMCoreActionDelegateProtocol>*)delegate {
|
||||
if (self = [super init]) {
|
||||
self.delegate = delegate;
|
||||
}
|
||||
return self;
|
||||
}
|
||||
|
||||
@end
|
||||
|
||||
Loading…
Reference in New Issue
Block a user