Rename 'stringify' to 'uid' where it pertains to unique action IDs.

diff --git a/Config.h b/Config.h
index d11826205fae75676396577b09dc1b7ad04effd5..d85ec939c2982f4cbcf587057205dcf0799c8eff 100644 (file)
--- a/Config.h
+++ b/Config.h
@@ -17,7 +17,7 @@
 @property (copy) NSString *name;
 @property (readonly) NSMutableDictionary *entries;
 
-- (void)setTarget:(Target *)target forAction:(JSAction *)jsa;
-- (Target *)getTargetForAction:(JSAction *)sa;
+- (Target *)objectForKeyedSubscript:(JSAction *)action;
+- (void)setObject:(Target *)target forKeyedSubscript:(JSAction *)action;
 
 @end

diff --git a/Config.m b/Config.m
index f62c40fdf49a1571442bd25becb1ffd9f7bd13ac..727b8b01a5c730824519b3deda548cb77a949918 100644 (file)
--- a/Config.m
+++ b/Config.m
@@ -7,7 +7,9 @@
 
 #import "Config.h"
 
-@implementation Config
+@implementation Config {
+    NSMutableDictionary *entries;
+}
 
 @synthesize protect, name, entries;
 
@@ -18,12 +20,17 @@
     return self;
 }
 
-- (void)setTarget:(Target *)target forAction:(JSAction *)jsa {
-    entries[[jsa stringify]] = target;
+- (Target *)objectForKeyedSubscript:(JSAction *)action {
+    return action ? entries[action.uid] : nil;
 }
 
-- (Target *)getTargetForAction:(JSAction *)jsa {
-    return entries[[jsa stringify]];
+- (void)setObject:(Target *)target forKeyedSubscript:(JSAction *)action {
+    if (action) {
+        if (target)
+            entries[action.uid] = target;
+        else
+            [entries removeObjectForKey:action.uid];
+    }
 }
 
 @end

diff --git a/ConfigsController.m b/ConfigsController.m
index 63211ae06830e261e0cc86021060b079bcbc42e8..58614b2f56610c37b43923c2dd343d6f6c40a6c4 100644 (file)
--- a/ConfigsController.m
+++ b/ConfigsController.m
@@ -68,11 +68,11 @@
        [configs removeObjectAtIndex: [tableView selectedRow]];
        
        // remove all "switch to configuration" actions
-       for(int i=0; i<[configs count]; i++) {
-               NSMutableDictionary* entries = [(Config*)configs[i] entries];
-               for(id key in entries) {
-                       Target* target = (Target*) entries[key];
-                       if([target isKindOfClass: [TargetConfig class]] && [(TargetConfig*)target config] == current_config)
+    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] == current_config)
                                [entries removeObjectForKey: key];
                }
        }

diff --git a/JSAction.h b/JSAction.h
index 4b35832a4b6c12cfd778c9bc59ff9b09c8383e41..94d56f012583e1451f39014b6db0b2857324d10c 100644 (file)
--- a/JSAction.h
+++ b/JSAction.h
@@ -18,11 +18,11 @@
 @property (copy) NSString *name;
 @property (assign) BOOL active;
 @property (readonly) float magnitude;
+@property (readonly) NSString *uid;
 
 - (id)initWithName:(NSString *)newName base:(JSAction *)newBase;
 
 - (void)notifyEvent:(IOHIDValueRef)value;
-- (NSString *)stringify;
 - (id)findSubActionForValue:(IOHIDValueRef)value;
 
 @end

diff --git a/JSAction.m b/JSAction.m
index f96c10d878adc5dd7a9c6c2ddb73c385d36da911..0cb98554bf020ba58c622924533e9da9ebadf23e 100644 (file)
--- a/JSAction.m
+++ b/JSAction.m
@@ -28,11 +28,8 @@
     return NULL;
 }
 
-- (NSString *)stringify {
-    if (cookie)
-        return [NSString stringWithFormat: @"%@~%p", [base stringify], cookie];
-    else
-        return [NSString stringWithFormat: @"%@~%@", [base stringify], name];
+- (NSString *)uid {
+    return [NSString stringWithFormat:@"%@~%@", [self.base uid], self.name];
 }
 
 - (void)notifyEvent:(IOHIDValueRef)value {

diff --git a/Joystick.h b/Joystick.h
index 04c5686f42d5ec955c934ddbf791a48d1504f636..831b10b6f3a3e15a93a38bde8bd9c665d32f9081 100644 (file)
--- a/Joystick.h
+++ b/Joystick.h
@@ -20,6 +20,7 @@
 @property (assign) IOHIDDeviceRef device;
 @property (copy) NSArray *children;
 @property (readonly) NSString *name;
+@property (readonly) NSString *uid;
 
 - (id)initWithDevice:(IOHIDDeviceRef)device;
 - (id)handlerForEvent:(IOHIDValueRef)value;

diff --git a/Joystick.m b/Joystick.m
index 861ab8d8bc1c44459d22f6515c077cb22aa21b51..3f218184fe8810fd8af83cd939f644d4ae97f4b1 100644 (file)
--- a/Joystick.m
+++ b/Joystick.m
@@ -78,12 +78,11 @@ static NSArray *ActionsForElement(IOHIDDeviceRef device, id base) {
 }
 
 - (id)base {
-    // FIXME(jfw): This is a hack because actions get joysticks as their base.
     return nil;
 }
 
-- (NSString *)stringify {
-    return [[NSString alloc] initWithFormat: @"%d~%d~%d", vendorId, productId, index];
+- (NSString *)uid {
+    return [NSString stringWithFormat: @"%d:%d:%d", vendorId, productId, index];
 }
 
 - (JSAction *)findActionByCookie:(void *)cookie {

diff --git a/JoystickController.m b/JoystickController.m
index 317e9a51c9b09ae0680c9cf42b9565ee9c8fd447..d87dca7d8fdb0fead42e07ae70aa0023eeb2e028 100644 (file)
--- a/JoystickController.m
+++ b/JoystickController.m
@@ -62,7 +62,7 @@ static void input_callback(void *ctx, IOReturn inResult, void *inSender, IOHIDVa
         [mainAction notifyEvent:value];
         NSArray *children = mainAction.children ? mainAction.children : mainAction ? @[mainAction] : @[];
         for (JSAction *subaction in children) {
-            Target *target = [controller.currentConfig getTargetForAction:subaction];
+            Target *target = controller.currentConfig[subaction];
             target.magnitude = mainAction.magnitude;
             target.running = subaction.active;
             if (target.running && target.isContinuous)

diff --git a/TargetController.m b/TargetController.m
index 82eec039b08b9ad1a4715a60266e8bb1ec98e4d3..074c4876ff8717ffac5ed1f3f8b7966314f7d850 100644 (file)
--- a/TargetController.m
+++ b/TargetController.m
@@ -93,10 +93,9 @@
 }
 
 -(void) commit {
-       id action = [joystickController selectedAction];
-       if(action) {
-               Target* target = [self state];
-               [[configsController currentConfig] setTarget: target forAction: action];
+       JSAction *action = [joystickController selectedAction];
+       if (action) {
+        configsController.currentConfig[action] = self.state;
        }
 }
 
@@ -131,7 +130,7 @@
        } else {
                [self setEnabled: YES];
        }
-       Target* target = [[configsController currentConfig] getTargetForAction: jsaction];
+       Target* target = configsController.currentConfig[jsaction];
        
        id act = jsaction;
        NSString* actFullName = [act name];