Rename methods uniquely between mapping/device controllers.

[enjoyable.git] / Classes / EnjoyableApplicationDelegate.m

diff --git a/Classes/EnjoyableApplicationDelegate.m b/Classes/EnjoyableApplicationDelegate.m
index 41d068a..7646363 100644 (file)
--- a/Classes/EnjoyableApplicationDelegate.m
+++ b/Classes/EnjoyableApplicationDelegate.m
@@ -148,14 +148,14 @@
     NSURL *URL = [NSURL fileURLWithPath:filename];
     NJMapping *mapping = [NJMapping mappingWithContentsOfURL:URL
                                                        error:&error];
-    if ([self.mappingsController[mapping.name] hasConflictWith:mapping]) {
-        [self promptForMapping:mapping atIndex:self.mappingsController.count];
-    } else if (self.mappingsController[mapping.name]) {
-        [self.mappingsController[mapping.name] mergeEntriesFrom:mapping];
+    if ([[self.mappingsController mappingForKey:mapping.name] hasConflictWith:mapping]) {
+        [self promptForMapping:mapping atIndex:self.mappingsController.mappings.count];
+    } else if ([self.mappingsController  mappingForKey:mapping.name]) {
+        [[self.mappingsController mappingForKey:mapping.name] mergeEntriesFrom:mapping];
     } else if (mapping) {
         [self.mvc beginUpdates];
         [self.mappingsController addMapping:mapping];
-        [self.mvc addedMappingAtIndex:self.mappingsController.count - 1 startEditing:NO];
+        [self.mvc addedMappingAtIndex:self.mappingsController.mappings.count - 1 startEditing:NO];
         [self.mvc endUpdates];
         [self.mappingsController activateMapping:mapping];
     } else {
@@ -229,10 +229,10 @@
                       NSError *error;
                       NJMapping *mapping = [NJMapping mappingWithContentsOfURL:panel.URL
                                                                          error:&error];
-                      if ([self.mappingsController[mapping.name] hasConflictWith:mapping]) {
-                          [self promptForMapping:mapping atIndex:self.mappingsController.count];
-                      } else if (self.mappingsController[mapping.name]) {
-                          [self.mappingsController[mapping.name] mergeEntriesFrom:mapping];
+                      if ([[self.mappingsController mappingForKey:mapping.name] hasConflictWith:mapping]) {
+                          [self promptForMapping:mapping atIndex:self.mappingsController.mappings.count];
+                      } else if ([self.mappingsController mappingForKey:mapping.name]) {
+                          [[self.mappingsController mappingForKey:mapping.name] mergeEntriesFrom:mapping];
                       } else if (mapping) {
                           [self.mappingsController addMapping:mapping];
                       } else {
@@ -293,7 +293,7 @@
 }
 
 - (void)promptForMapping:(NJMapping *)mapping atIndex:(NSInteger)idx {
-    NJMapping *mergeInto = self.mappingsController[mapping.name];
+    NJMapping *mergeInto = [self.mappingsController mappingForKey:mapping.name];
     NSAlert *conflictAlert = [[NSAlert alloc] init];
     conflictAlert.messageText = NSLocalizedString(@"import conflict prompt", @"Title of import conflict alert");
     conflictAlert.informativeText =
@@ -311,18 +311,18 @@
 }
 
 - (NSInteger)numberOfMappings:(NJMappingsViewController *)mvc {
-    return self.mappingsController.count;
+    return self.mappingsController.mappings.count;
 }
 
 - (NJMapping *)mappingsViewController:(NJMappingsViewController *)mvc
                       mappingForIndex:(NSUInteger)idx {
-    return self.mappingsController[idx];
+    return self.mappingsController.mappings[idx];
 }
 
 - (void)mappingsViewController:(NJMappingsViewController *)mvc
           renameMappingAtIndex:(NSInteger)index
                         toName:(NSString *)name {
-    [self.mappingsController renameMapping:self.mappingsController[index]
+    [self.mappingsController renameMapping:self.mappingsController.mappings[index]
                                         to:name];
 }
 
@@ -330,7 +330,7 @@
        canMoveMappingFromIndex:(NSInteger)fromIdx
                        toIndex:(NSInteger)toIdx {
     return fromIdx != toIdx && fromIdx != 0 && toIdx != 0
-            && toIdx < (NSInteger)self.mappingsController.count;
+            && toIdx < (NSInteger)self.mappingsController.mappings.count;
 }
 
 - (void)mappingsViewController:(NJMappingsViewController *)mvc
@@ -361,10 +361,10 @@
                          error:(NSError **)error {
     NJMapping *mapping = [NJMapping mappingWithContentsOfURL:url
                                                        error:error];
-    if ([self.mappingsController[mapping.name] hasConflictWith:mapping]) {
+    if ([[self.mappingsController mappingForKey:mapping.name] hasConflictWith:mapping]) {
         [self promptForMapping:mapping atIndex:index];
-    } else if (self.mappingsController[mapping.name]) {
-        [self.mappingsController[mapping.name] mergeEntriesFrom:mapping];
+    } else if ([self.mappingsController mappingForKey:mapping.name]) {
+        [[self.mappingsController mappingForKey:mapping.name] mergeEntriesFrom:mapping];
     } else if (mapping) {
         [self.mvc beginUpdates];
         [self.mvc addedMappingAtIndex:index startEditing:NO];
@@ -377,7 +377,7 @@
 - (void)mappingsViewController:(NJMappingsViewController *)mvc
                     addMapping:(NJMapping *)mapping {
     [mvc beginUpdates];
-    [mvc addedMappingAtIndex:self.mappingsController.count startEditing:YES];
+    [mvc addedMappingAtIndex:self.mappingsController.mappings.count startEditing:YES];
     [self.mappingsController addMapping:mapping];
     [mvc endUpdates];
     [self.mappingsController activateMapping:mapping];
@@ -385,12 +385,12 @@
 
 - (void)mappingsViewController:(NJMappingsViewController *)mvc
            choseMappingAtIndex:(NSInteger)idx {
-    [self.mappingsController activateMapping:self.mappingsController[idx]];
+    [self.mappingsController activateMapping:self.mappingsController.mappings[idx]];
 }
 
 - (id)deviceViewController:(NJDeviceViewController *)dvc
              elementForUID:(NSString *)uid {
-    return self.deviceController[uid];
+    return [self.deviceController elementForUID:uid];
 }
 
 - (void)deviceViewControllerDidSelectNothing:(NJDeviceViewController *)dvc {
@@ -414,7 +414,7 @@
 
 - (void)deviceController:(NJDeviceController *)dc
             didAddDevice:(NJDevice *)device {
-    [self.dvc addedDevice:device atIndex:dc.count - 1];
+    [self.dvc addedDevice:device atIndex:dc.devices.count - 1];
 }
 
 - (void)deviceController:(NJDeviceController *)dc
@@ -451,12 +451,12 @@
 }
 
 - (NSInteger)numberOfDevicesInDeviceList:(NJDeviceViewController *)dvc {
-    return self.deviceController.count;
+    return self.deviceController.devices.count;
 }
 
 - (NJDevice *)deviceViewController:(NJDeviceViewController *)dvc
                     deviceForIndex:(NSUInteger)idx {
-    return self.deviceController[idx];
+    return self.deviceController.devices[idx];
 }
 
 - (IBAction)simulatingEventsChanged:(NSButton *)sender {