X-Git-Url: https://git.yukkurigames.com/?p=enjoyable.git;a=blobdiff_plain;f=ConfigsController.m;h=67033d3bc4a22470e267c55164279ba5cea4c2c7;hp=65732e24656f0070dc56a09dcb64b1d915b2aeb7;hb=3090f311c3406d9c157630bc9744b9b14aa42311;hpb=d9d15b3f8729758f19b21918fee758b856921673 diff --git a/ConfigsController.m b/ConfigsController.m index 65732e2..67033d3 100644 --- a/ConfigsController.m +++ b/ConfigsController.m @@ -5,6 +5,14 @@ // Created by Sam McCall on 4/05/09. // +#import "ConfigsController.h" + +#import "ApplicationController.h" +#import "Config.h" +#import "ConfigsController.h" +#import "Target.h" +#import "TargetController.h" + @implementation ConfigsController { NSMutableArray *configs; Config *manualConfig; @@ -86,10 +94,8 @@ return [configs[index] name]; } -- (void)tableView:(NSTableView *)view setObjectValue:obj forTableColumn:(NSTableColumn *)col row:(int)index { - /* ugly hack so stringification doesn't fail */ - NSString* newName = [(NSString*)obj stringByReplacingOccurrencesOfString: @"~" withString: @""]; - [(Config *)configs[index] setName:newName]; +- (void)tableView:(NSTableView *)view setObjectValue:(NSString *)obj forTableColumn:(NSTableColumn *)col row:(int)index { + [(Config *)configs[index] setName:obj]; [targetController refreshConfigsPreservingSelection:YES]; [tableView reloadData]; [(ApplicationController *)[[NSApplication sharedApplication] delegate] configsChanged]; @@ -119,7 +125,7 @@ cfgInfo[@"name"] = [config name]; NSMutableDictionary* cfgEntries = [[NSMutableDictionary alloc] init]; for(id key in [config entries]) { - cfgEntries[key] = [[config entries][key]stringify]; + cfgEntries[key] = [[config entries][key] serialize]; } cfgInfo[@"entries"] = cfgEntries; [ary addObject: cfgInfo]; @@ -143,7 +149,7 @@ for(int i=0; i<[ary count]; i++) { NSDictionary* dict = ary[i][@"entries"]; for(id key in dict) { - [newConfigs[i] entries][key] = [Target unstringify: dict[key] withConfigList: newConfigs]; + [newConfigs[i] entries][key] = [Target targetDeserialize:dict[key] withConfigs:newConfigs]; } }