Move logic into messages rather than directly in the callback functions.

[enjoyable.git] / TargetConfig.m

diff --git a/TargetConfig.m b/TargetConfig.m
index 763bbac..e9c374e 100644 (file)
--- a/TargetConfig.m
+++ b/TargetConfig.m
@@ -13,12 +13,19 @@
 
 @implementation TargetConfig
 
-- (NSString *)stringify {
-    return [[NSString alloc] initWithFormat: @"cfg~%@", self.config.name];
++ (NSString *)serializationCode {
+    return @"cfg";
 }
 
-+ (TargetConfig *)unstringifyImpl:(NSArray *)comps withConfigList:(NSArray *)configs {
-    NSString *name = comps[1];
+- (NSDictionary *)serialize {
+    return _config
+        ? @{ @"type": @"cfg", @"name": _config.name }
+        : @{};
+}
+
++ (TargetConfig *)targetDeserialize:(NSDictionary *)serialization
+                        withConfigs:(NSArray *)configs {
+    NSString *name = serialization[@"name"];
     TargetConfig *target = [[TargetConfig alloc] init];
     for (Config *config in configs) {
         if ([config.name isEqualToString:name]) {
@@ -26,12 +33,11 @@
             return target;
         }
     }
-    NSLog(@"Warning: couldn't find matching config to restore from: %@", name);
     return nil;
 }
 
 - (void)trigger {
-    [[(ApplicationController *)[[NSApplication sharedApplication] delegate] configsController] activateConfig:self.config];
+    [[(ApplicationController *)[[NSApplication sharedApplication] delegate] configsController] activateConfig:_config];
 }
 
 @end