projects
/
enjoyable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Big rename part 2: 'config' etc. to 'mapping.
[enjoyable.git]
/
TargetConfig.m
diff --git
a/TargetConfig.m
b/TargetConfig.m
index
055f782
..
0f892c6
100644
(file)
--- a/
TargetConfig.m
+++ b/
TargetConfig.m
@@
-8,28
+8,28
@@
#import "TargetConfig.h"
#import "ApplicationController.h"
#import "TargetConfig.h"
#import "ApplicationController.h"
-#import "
Confi
g.h"
-#import "
Confi
gsController.h"
+#import "
NJMappin
g.h"
+#import "
NJMappin
gsController.h"
@implementation TargetConfig
+ (NSString *)serializationCode {
@implementation TargetConfig
+ (NSString *)serializationCode {
- return @"
cf
g";
+ return @"
mappin
g";
}
- (NSDictionary *)serialize {
}
- (NSDictionary *)serialize {
- return _
confi
g
- ? @{ @"type": @"
cfg", @"name": _confi
g.name }
+ return _
mappin
g
+ ? @{ @"type": @"
mapping", @"name": _mappin
g.name }
: nil;
}
+ (TargetConfig *)targetDeserialize:(NSDictionary *)serialization
: nil;
}
+ (TargetConfig *)targetDeserialize:(NSDictionary *)serialization
- with
Configs:(NSArray *)confi
gs {
+ with
Mappings:(NSArray *)mappin
gs {
NSString *name = serialization[@"name"];
TargetConfig *target = [[TargetConfig alloc] init];
NSString *name = serialization[@"name"];
TargetConfig *target = [[TargetConfig alloc] init];
- for (
Config *config in confi
gs) {
- if ([
confi
g.name isEqualToString:name]) {
- target.
config = confi
g;
+ for (
NJMapping *mapping in mappin
gs) {
+ if ([
mappin
g.name isEqualToString:name]) {
+ target.
mapping = mappin
g;
return target;
}
}
return target;
}
}
@@
-38,7
+38,7
@@
- (void)trigger {
ApplicationController *ctrl = NSApplication.sharedApplication.delegate;
- (void)trigger {
ApplicationController *ctrl = NSApplication.sharedApplication.delegate;
- [ctrl.
configsController activateConfig:_confi
g];
+ [ctrl.
mappingsController activateMapping:_mappin
g];
}
@end
}
@end