X-Git-Url: https://git.yukkurigames.com/?p=enjoyable.git;a=blobdiff_plain;f=JSAction.h;h=dc00a8d8749eca6f84c6c3f30ebc5a50b21936f1;hp=8e52e9c4594b6fc1849e652c8d786d0c3ed0e3df;hb=f563321aec9e13b8479ab3b890a9179f095a8b17;hpb=51d43664909060e85c943c4d63cc3cff307ceb1d

diff --git a/JSAction.h b/JSAction.h
index 8e52e9c..dc00a8d 100644
--- a/JSAction.h
+++ b/JSAction.h
@@ -6,24 +6,21 @@
 //  Copyright 2009 University of Otago. All rights reserved.
 //
 
-#import <Foundation/Foundation.h>
-#import <IOKit/hid/IOHIDBase.h>
+#import "NJActionPathElement.h"
 
-@interface JSAction : NSObject {
-	id base;
-	NSString *name;
-}
+@interface JSAction : NSObject <NJActionPathElement>
 
-@property (assign) void* cookie;
-@property (assign) int index;
-@property (copy) NSArray *children;
-@property (strong) id base;
-@property (copy) NSString *name;
-@property (assign) BOOL active;
-@property (readonly) float magnitude;
+@property (nonatomic, assign) IOHIDElementCookie cookie;
+@property (nonatomic, copy) NSArray *children;
+@property (nonatomic, weak) id base;
+@property (nonatomic, copy) NSString *name;
+@property (nonatomic, assign) BOOL active;
+@property (nonatomic, readonly) float magnitude;
+@property (readonly) NSString *uid;
+
+- (id)initWithName:(NSString *)newName base:(id <NJActionPathElement>)newBase;
 
 - (void)notifyEvent:(IOHIDValueRef)value;
-- (NSString *)stringify;
 - (id)findSubActionForValue:(IOHIDValueRef)value;
 
 @end