Use a weak reference for TargetConfig configurations to avoid a circular reference...

diff --git a/ConfigsController.m b/ConfigsController.m
index 50861cf73f66f5b3cf37dd9ec01b44e62daee2af..65732e24656f0070dc56a09dcb64b1d915b2aeb7 100644 (file)
--- a/ConfigsController.m
+++ b/ConfigsController.m
@@ -73,16 +73,6 @@
     if (toRemove == manualConfig)
         manualConfig = configs[0];
        
-       // remove all "switch to configuration" actions
-    for (Config *config in configs) {
-               NSMutableDictionary *entries = config.entries;
-               for (id key in entries) {
-                       Target *target = entries[key];
-                       if ([target isKindOfClass:[TargetConfig class]]
-                && [(TargetConfig *)target config] == toRemove)
-                               [entries removeObjectForKey: key];
-               }
-       }
        [(ApplicationController *)[[NSApplication sharedApplication] delegate] configsChanged]; 
        [tableView reloadData];
 }

diff --git a/TargetConfig.h b/TargetConfig.h
index b08e31bb2f7972f6b55773f2882740ed6585910e..addf2ebb5965b4dbbcf5a91d703498f468b546c9 100644 (file)
--- a/TargetConfig.h
+++ b/TargetConfig.h
@@ -7,14 +7,14 @@
 //
 
 #import <Cocoa/Cocoa.h>
+
+#import "Target.h"
+
 @class Config;
-@class Target;
 
-@interface TargetConfig : Target {
-       Config *config;
-}
+@interface TargetConfig : Target
 
-@property(readwrite, strong) Config* config;
-+(TargetConfig*) unstringifyImpl: (NSArray*) comps withConfigList: (NSArray*) configs;
+@property (weak) Config *config;
++ (TargetConfig *)unstringifyImpl:(NSArray *)comps withConfigList:(NSArray *)configs;
 
 @end

diff --git a/TargetConfig.m b/TargetConfig.m
index 8e4fc409d33df8729d16fbbd53996bd52212eea3..469edabe0bb9898386c1705b9987b06361b34111 100644 (file)
--- a/TargetConfig.m
+++ b/TargetConfig.m
@@ -7,30 +7,27 @@
 
 #import "TargetConfig.h"
 
-
 @implementation TargetConfig
 
-@synthesize config;
-
--(NSString*) stringify {
-       return [[NSString alloc] initWithFormat: @"cfg~%@", [config name]];
+- (NSString *)stringify {
+    return [[NSString alloc] initWithFormat: @"cfg~%@", self.config.name];
 }
 
-+(TargetConfig*) unstringifyImpl: (NSArray*) comps withConfigList: (NSArray*) configs {
-       NSParameterAssert([comps count] == 2);
-       NSString* name = comps[1];
-       TargetConfig* target = [[TargetConfig alloc] init];
-       for(int i=0; i<[configs count]; i++)
-               if([[configs[i] name] isEqualToString:name]) {
-                       [target setConfig: configs[i]];
-                       return target;
-               }
-       NSLog(@"Warning: couldn't find matching config to restore from: %@",name);
-       return NULL;
++ (TargetConfig *)unstringifyImpl:(NSArray *)comps withConfigList:(NSArray *)configs {
+    NSString *name = comps[1];
+    TargetConfig *target = [[TargetConfig alloc] init];
+    for (Config *config in configs) {
+        if ([config.name isEqualToString:name]) {
+            target.config = config;
+            return target;
+        }
+    }
+    NSLog(@"Warning: couldn't find matching config to restore from: %@", name);
+    return nil;
 }
 
--(void) trigger {
-       [[(ApplicationController *)[[NSApplication sharedApplication] delegate] configsController] activateConfig:config];
+- (void)trigger {
+    [[(ApplicationController *)[[NSApplication sharedApplication] delegate] configsController] activateConfig:self.config];
 }
 
 @end