From 88c8531bbd97fc333a342e36f34a67d54b325906 Mon Sep 17 00:00:00 2001 From: "Pfeil, Scott Robert" Date: Thu, 17 Jan 2019 18:52:05 -0500 Subject: [PATCH] remove duplicate function Move back to delegate. Throw error when using exact class, don't throw error when using protocol. remove unused search path --- MVMCoreUI/Atoms/Buttons/MFCustomButton.h | 1 - MVMCoreUI/BaseControllers/MFViewController.m | 2 +- MVMCoreUI/OtherHandlers/MVMCoreUILoggingHandler.h | 3 --- MVMCoreUI/OtherHandlers/MVMCoreUILoggingHandler.m | 3 --- 4 files changed, 1 insertion(+), 8 deletions(-) diff --git a/MVMCoreUI/Atoms/Buttons/MFCustomButton.h b/MVMCoreUI/Atoms/Buttons/MFCustomButton.h index 93d94092..5237acb6 100644 --- a/MVMCoreUI/Atoms/Buttons/MFCustomButton.h +++ b/MVMCoreUI/Atoms/Buttons/MFCustomButton.h @@ -18,7 +18,6 @@ extern CGFloat const CloseButtonWidth; @interface MFCustomButton : UIButton -@property (nullable, nonatomic, strong) id dataPassed; @property (nullable, nonatomic, strong) NSDictionary *actionMap; @property (nullable, nonatomic, weak) id buttonDelegate; @property (nullable, nonatomic, strong) NSLayoutConstraint *heightConstraint; diff --git a/MVMCoreUI/BaseControllers/MFViewController.m b/MVMCoreUI/BaseControllers/MFViewController.m index 4ba60b7c..df068925 100644 --- a/MVMCoreUI/BaseControllers/MFViewController.m +++ b/MVMCoreUI/BaseControllers/MFViewController.m @@ -688,7 +688,7 @@ if (!error && (loadObject.requestParameters.openSupportPanel || [loadObject.systemParametersJSON boolForKey:KeyOpenSupport])) { [[MVMCoreUISession sharedGlobal].splitViewController showRightPanelAnimated:YES]; } - [[MVMCoreUILoggingHandler sharedLoggingHandler] defaultTrackLoadFinishedForController:self loadObject:loadObject]; + [MVMCoreUILoggingHandler logWithDelegateLoadFinished:loadObject loadedViewController:loadedViewController error:error]; } - (void)loadCancelled:(nullable MVMCoreLoadObject *)loadObject { diff --git a/MVMCoreUI/OtherHandlers/MVMCoreUILoggingHandler.h b/MVMCoreUI/OtherHandlers/MVMCoreUILoggingHandler.h index 57457992..56bb60a2 100644 --- a/MVMCoreUI/OtherHandlers/MVMCoreUILoggingHandler.h +++ b/MVMCoreUI/OtherHandlers/MVMCoreUILoggingHandler.h @@ -21,9 +21,6 @@ NS_ASSUME_NONNULL_BEGIN - (void)defaultLogActionForController:(nonnull MFViewController *)controller actionInformation:(nullable NSDictionary *)actionInformation additionalData:(nullable NSDictionary *)additionalData; - (nullable NSDictionary *)defaultGetActionTrackDataDictionaryForController:(nonnull MFViewController *)controller actionInformation:(nullable NSDictionary *)actionInformation additionalData:(nullable NSDictionary *)additionalData; -// Load Logging -- (void)defaultTrackLoadFinishedForController:(nonnull MFViewController *)controller loadObject:(nullable MVMCoreLoadObject *)loadObject; - @end NS_ASSUME_NONNULL_END diff --git a/MVMCoreUI/OtherHandlers/MVMCoreUILoggingHandler.m b/MVMCoreUI/OtherHandlers/MVMCoreUILoggingHandler.m index fa5ec6e9..6395fbcc 100644 --- a/MVMCoreUI/OtherHandlers/MVMCoreUILoggingHandler.m +++ b/MVMCoreUI/OtherHandlers/MVMCoreUILoggingHandler.m @@ -20,7 +20,4 @@ return nil; } -- (void)defaultTrackLoadFinishedForController:(nonnull MFViewController *)controller loadObject:(nullable MVMCoreLoadObject *)loadObject { -} - @end