Remove MGSFragariaPreferences. Fixes KosmicTask#30.

If you used it, now you have to instantiate the preference views yourself.
bitstadium · Mar 3, 2015 · 80f8e81 · 80f8e81
1 parent 8519872
commit 80f8e81
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 179 deletions.
diff --git a/Applications/Simple/MGSPreferencesController.m b/Applications/Simple/MGSPreferencesController.m
@@ -49,9 +49,8 @@ -(void)dealloc
 - (void)showWindow:(id)sender
 {
     // load view controllers
-    textEditingPrefsViewController = [MGSFragariaPreferences sharedInstance].textEditingPrefsViewController;
-
-    fontsAndColoursPrefsViewController = [MGSFragariaPreferences sharedInstance].fontsAndColoursPrefsViewController;
+    textEditingPrefsViewController = [[MGSFragariaTextEditingPrefsViewController alloc] init];
+    fontsAndColoursPrefsViewController = [[MGSFragariaFontsAndColoursPrefsViewController alloc] init];
 
     [super showWindow:sender];
 }

diff --git a/Fragaria.xcodeproj/project.pbxproj b/Fragaria.xcodeproj/project.pbxproj
@@ -350,10 +350,10 @@
 		01BB1BEA1A795EFD006C0056 /* Preferences */ = {
 			isa = PBXGroup;
 			children = (
-				D08359DD1AA0875E001B7B50 /* MGSPreferencesObserver.h */,
-				D08359DE1AA0875E001B7B50 /* MGSPreferencesObserver.m */,
 				ABD0FE581193543600E6AFE6 /* MGSFragariaPreferences.h */,
 				ABC578D2160350240040B3FB /* MGSFragariaPreferences.m */,
+				D08359DD1AA0875E001B7B50 /* MGSPreferencesObserver.h */,
+				D08359DE1AA0875E001B7B50 /* MGSPreferencesObserver.m */,
 				01BB1BEF1A7966E7006C0056 /* Standard UI */,
 			);
 			name = Preferences;

diff --git a/MGSFragariaPreferences.h b/MGSFragariaPreferences.h
@@ -91,68 +91,3 @@ extern NSString * const MGSFragariaPrefsSyntaxColouringPopUpString;
 #import "MGSFragariaTextEditingPrefsViewController.h"
 
 
-#pragma mark - MGSFragariaPreferences
-
-/**
- *  MGSFragariaPreferences is responsible for registering the userDefaults for instances
- *  of Fragaria, and also offers some ready-made viewControllers should you want to
- *  implement them in your application.
- **/
-@interface MGSFragariaPreferences : NSObject
-
-
-/// @name Class Methods
-
-
-/**
- *  Provides a singleton instance of MGSFragariaPreferences.
- *  @todo: this is *only* used in the demo application. And there, it's only
- *         use is to resolve to `revertToStandardSettings`, which uses a
- *         global NSUserDefaultsController to perform its action. Issue #30.
- **/
-+ (MGSFragariaPreferences *)sharedInstance DEPRECATED_MSG_ATTRIBUTE("Proposed elimination.");
-
-
-/// @name Instance Methods
-
-/**
- *  Used by the preference view controllers to propagate the changeFont message
- *  up the responder chain.
- *  @param sender is the sender of the message.
- **/
-- (void)changeFont:(id)sender DEPRECATED_MSG_ATTRIBUTE("Proposed elimination.");
-
-
-/**
- *  Used by the preference view controllers, sets the shared userDefaultsController
- *  back to initial values.
- *  @param sender is the sender of the message.
- **/
-- (void)revertToStandardSettings:(id)sender DEPRECATED_MSG_ATTRIBUTE("Proposed elimination.");
-
-
-/// @name Properties
-
-/**
- *  Provides a dictionary of Fragaria's default values suitable for adding to your registerUserDefaults call in your
- *  application.
- *  @discussion The Framework should not register user defaults for you; you should register them yourself. This
- *  dictionary is suitable for using with your own user defaults when your application starts up.
- **/
-@property (nonatomic, readonly) NSDictionary *fragariaDefaultsDictionary;
-
-
-/**
- *  Provides a ready-made instance of MGSFragariaFontsAndColoursPrefsViewController for applications.
- **/
-@property (readonly) MGSFragariaFontsAndColoursPrefsViewController *fontsAndColoursPrefsViewController DEPRECATED_MSG_ATTRIBUTE("Proposed elimination.");
-
-
-/**
- * Provides a ready-made instance of MGSFragariaTextEditingPrefsViewController for applications.
- **/
-@property (readonly) MGSFragariaTextEditingPrefsViewController *textEditingPrefsViewController DEPRECATED_MSG_ATTRIBUTE("Proposed elimination.");
-
-
-@end
-
diff --git a/MGSFragariaPreferences.m b/MGSFragariaPreferences.m
@@ -79,113 +79,4 @@
 NSString * const MGSFragariaPrefsSyntaxColouringPopUpString = @"FragariaSyntaxColouringPopUpString";
 
 
-#pragma mark - Statics used for this class
-
-
-static id sharedInstance = nil;
-
-
-#pragma mark - MGSFragariaPreferences Implementation
-
-@implementation MGSFragariaPreferences
-
-@synthesize fontsAndColoursPrefsViewController = _fontsAndColoursPrefsViewController;
-@synthesize textEditingPrefsViewController = _textEditingPrefsViewController;
-
-
-#pragma mark - Class Methods
-
-
-/*
- *  + sharedInstance
- */
-+ (MGSFragariaPreferences *)sharedInstance
-{
-    if (sharedInstance == nil) {
-        sharedInstance = [[super allocWithZone:NULL] init];
-    }
-    return sharedInstance;
-}
-
-
-/*
- *  + allocWithZone:
- *    alloc with zone for singleton
- */
-+ (id)allocWithZone:(NSZone *)zone
-{
-#pragma unused(zone)
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-	return [self sharedInstance];
-#pragma clang diagnostic pop
-}
-
-
-#pragma mark - Instance methods
-
-/*
- *  - init
- */
-- (id)init
-{
-    if (sharedInstance) return sharedInstance;
-    self = [super init];
-    sharedInstance = self;
-    return self;
-}
-
-
-/*
- *  - changeFont:
- */
-- (void)changeFont:(id)sender
-{
-    /* NSFontManager will send this method up the responder chain */
-    [_fontsAndColoursPrefsViewController changeFont:sender];
-}
-
-
-/*
- *  - revertToStandardSettings:
- */
-- (void)revertToStandardSettings:(id)sender
-{
-	[[NSUserDefaultsController sharedUserDefaultsController] revertToInitialValues:nil];
-}
-
-
-#pragma mark - Property Accessors
-
-
-/*
- *  @property MGSFragariaTextEditingPrefsViewController
- *    Don't allocate these resources unless someone actually needs them.
- */
--(MGSFragariaTextEditingPrefsViewController *)textEditingPrefsViewController
-{
-    if (!_textEditingPrefsViewController)
-    {
-        _textEditingPrefsViewController = [[MGSFragariaTextEditingPrefsViewController alloc] init];
-    }
-
-    return _textEditingPrefsViewController;
-}
-
-
-/*
- *  @property MGSFragariaFontsAndColoursPrefsViewController
- *    Don't allocate these resources unless someone actually needs them.
- */
--(MGSFragariaFontsAndColoursPrefsViewController *)fontsAndColoursPrefsViewController
-{
-    if (!_fontsAndColoursPrefsViewController)
-    {
-        _fontsAndColoursPrefsViewController = [[MGSFragariaFontsAndColoursPrefsViewController alloc] init];
-    }
-
-    return _fontsAndColoursPrefsViewController;
-}
-
-@end