X-Git-Url: https://git.yukkurigames.com/?p=enjoyable.git;a=blobdiff_plain;f=Classes%2FNJInput.m;h=78376e6dfe18472d6a170929f5a6215c9aaddb01;hp=15b4687059b657343efcd22af02e0ab5d10d193c;hb=79b05c3cf1c75bc4f7078acde43aaf4215c6408a;hpb=8f3613a31e2012374e00a6973f221421e0b770f0

diff --git a/Classes/NJInput.m b/Classes/NJInput.m
index 15b4687..78376e6 100644
--- a/Classes/NJInput.m
+++ b/Classes/NJInput.m
@@ -9,10 +9,12 @@
 
 @implementation NJInput
 
-- (id)initWithName:(NSString *)newName base:(id <NJInputPathElement>)newBase {
-    if ((self = [super init])) {
-        self.name = newName;
-        self.base = newBase;
+- (id)initWithName:(NSString *)name
+               did:(NSString *)did
+            cookie:(IOHIDElementCookie)cookie
+              base:(NJInputPathElement *)base {
+    if ((self = [super initWithName:name did:did base:base])) {
+        self.cookie = cookie;
     }
     return self;
 }
@@ -21,34 +23,8 @@
     return nil;
 }
 
-- (NSString *)uid {
-    return [NSString stringWithFormat:@"%@~%@", _base.uid, _name];
-}
-
 - (void)notifyEvent:(IOHIDValueRef)value {
     [self doesNotRecognizeSelector:_cmd];
 }
 
-- (BOOL)isEqual:(id)object {
-    return [object isKindOfClass:NJInput.class]
-        && [[object uid] isEqualToString:self.uid];
-}
-
-- (NSUInteger)hash {
-    return self.uid.hash;
-}
-
-- (id <NJInputPathElement>)elementForUID:(NSString *)uid {
-    if ([uid isEqualToString:self.uid])
-        return self;
-    else {
-        for (id <NJInputPathElement> elem in self.children) {
-            id <NJInputPathElement> ret = [elem elementForUID:uid];
-            if (ret)
-                return ret;
-        }
-    }
-    return nil;
-}
-
 @end