Better constructor for Config.

diff --git a/Config.h b/Config.h
index 2572669cb3b86d029a210874f7c33fcc579b71a2..cc96f2a53cd21ca535cccebfb82391809ef62ca9 100644 (file)
--- a/Config.h
+++ b/Config.h
@@ -14,6 +14,7 @@
 @property (copy) NSString *name;
 @property (readonly) NSMutableDictionary *entries;
 
+- (id)initWithName:(NSString *)name;
 - (Target *)objectForKeyedSubscript:(JSAction *)action;
 - (void)setObject:(Target *)target forKeyedSubscript:(JSAction *)action;
 

diff --git a/Config.m b/Config.m
index 84e6c324a782a09f22fba76fc41f4e6ef38c2c83..5a83ed30461deed4a4bfd44d4b6a993140571fa5 100644 (file)
--- a/Config.m
+++ b/Config.m
@@ -9,30 +9,26 @@
 
 #import "JSAction.h"
 
-@implementation Config {
-    NSMutableDictionary *entries;
-}
-
-@synthesize name;
-@synthesize entries;
+@implementation Config
 
-- (id)init {
+- (id)initWithName:(NSString *)name {
     if ((self = [super init])) {
-        entries = [[NSMutableDictionary alloc] init];
+        self.name = name;
+        _entries = [[NSMutableDictionary alloc] init];
     }
     return self;
 }
 
 - (Target *)objectForKeyedSubscript:(JSAction *)action {
-    return action ? entries[action.uid] : nil;
+    return action ? _entries[action.uid] : nil;
 }
 
 - (void)setObject:(Target *)target forKeyedSubscript:(JSAction *)action {
     if (action) {
         if (target)
-            entries[action.uid] = target;
+            _entries[action.uid] = target;
         else
-            [entries removeObjectForKey:action.uid];
+            [_entries removeObjectForKey:action.uid];
     }
 }
 

diff --git a/ConfigsController.m b/ConfigsController.m
index dbb2c6f063c4b9e1df5a6fcd5db0b63016a1f89d..4227d436a616bcbe43eb0229eba1b6a22486ecd6 100644 (file)
--- a/ConfigsController.m
+++ b/ConfigsController.m
@@ -24,8 +24,7 @@
 - (id)init {
     if ((self = [super init])) {
         configs = [[NSMutableArray alloc] init];
-        currentConfig = [[Config alloc] init];
-        currentConfig.name = @"(default)";
+        currentConfig = [[Config alloc] initWithName:@"(default)"];
         manualConfig = currentConfig;
         [configs addObject:currentConfig];
     }
@@ -60,8 +59,7 @@
 }
 
 - (IBAction)addPressed:(id)sender {
-    Config *newConfig = [[Config alloc] init];
-    newConfig.name = @"untitled";
+    Config *newConfig = [[Config alloc] initWithName:@"Untitled"];
     [configs addObject:newConfig];
     [(ApplicationController *)[[NSApplication sharedApplication] delegate] configsChanged];
     [tableView reloadData];
@@ -139,8 +137,7 @@
 
     // have to do two passes in case config1 refers to config2 via a TargetConfig
     for (NSDictionary *storedConfig in storedConfigs) {
-        Config *cfg = [[Config alloc] init];
-        cfg.name = storedConfig[@"name"];
+        Config *cfg = [[Config alloc] initWithName:storedConfig[@"name"]];
         [newConfigs addObject:cfg];
     }