Clean up manual (previously 'neutral') vs. automatic (i.e. process-driven) configurat...

diff --git a/ApplicationController.m b/ApplicationController.m
index e87421c062b0e173d01965140ca5bf2a21b8e5d1..09be1c04d6811747fc928e7ab18fb42fd2e43ba6 100644 (file)
--- a/ApplicationController.m
+++ b/ApplicationController.m
@@ -15,14 +15,7 @@
 
 - (void)didSwitchApplication:(NSNotification *)notification {
     NSRunningApplication *currentApp = notification.userInfo[NSWorkspaceApplicationKey];
-    ProcessSerialNumber psn;
-    OSStatus err;
-    if ((err = GetProcessForPID(currentApp.processIdentifier, &psn)) == noErr) {
-        [self.configsController applicationSwitchedTo:currentApp.localizedName withPsn:psn];
-    } else {
-        NSError *error = [NSError errorWithDomain:NSOSStatusErrorDomain code:err userInfo:nil];
-        NSLog(@"Error getting PSN for %@: %@", currentApp.localizedName, error);
-    }
+    [self.configsController activateConfigForProcess:currentApp.localizedName];
 }
 
 - (void)applicationDidFinishLaunching:(NSNotification *)notification {
@@ -94,6 +87,6 @@
 - (void)chooseConfig:(id)sender {
     int idx = [dockMenuBase indexOfItem:sender] - [self firstConfigMenuIndex];
     Config *chosen = self.configsController.configs[idx];
-    [configsController activateConfig:chosen forApplication:NULL];
+    [configsController activateConfig:chosen];
 }
 @end

diff --git a/ConfigsController.h b/ConfigsController.h
index 5d2b4d108a0cfebe6c5d5433c0fe60b7cb3f08dc..32e0c6132a2a32b0b39c92a3fc0df079874cb78d 100644 (file)
--- a/ConfigsController.h
+++ b/ConfigsController.h
@@ -19,18 +19,16 @@
 
 - (IBAction)addPressed:(id)sender;
 - (IBAction)removePressed:(id)sender;
-- (void)activateConfig:(Config *)config forApplication:(ProcessSerialNumber *)psn;
+- (void)activateConfig:(Config *)config;
+- (void)activateConfigForProcess:(NSString *)processName;
 
 - (NSDictionary *)dumpAll;
 - (void)loadAllFrom:(NSDictionary*) dict;
 
 @property (readonly) Config *currentConfig;
-@property (readonly) Config *currentNeutralConfig;
 @property (readonly) NSArray *configs;
 
 - (void)save;
 - (void)load;
 
-- (void)applicationSwitchedTo:(NSString *)name withPsn:(ProcessSerialNumber)psn;
-
 @end

diff --git a/ConfigsController.m b/ConfigsController.m
index 10adcee4215190686ba70176ea791a76a9cff023..50861cf73f66f5b3cf37dd9ec01b44e62daee2af 100644 (file)
--- a/ConfigsController.m
+++ b/ConfigsController.m
@@ -7,7 +7,7 @@
 
 @implementation ConfigsController {
     NSMutableArray *configs;
-       Config *neutralConfig;
+       Config *manualConfig;
 }
 
 @synthesize currentConfig;
@@ -16,36 +16,35 @@
 - (id)init {
        if ((self = [super init])) {
                configs = [[NSMutableArray alloc] init];
-               currentConfig = [[Config alloc] init];
-               [currentConfig setName: @"(default)"];
+        currentConfig = [[Config alloc] init];
+        currentConfig.name = @"(default)";
+        manualConfig = currentConfig;
                [configs addObject:currentConfig];
        }
        return self;
 }
 
-// TODO: Neutral config stuff is a mess.
+- (Config *)objectForKeyedSubscript:(NSString *)name {
+    for (Config *config in configs)
+        if ([name isEqualToString:config.name])
+            return config;
+    return nil;
+}
 
--(void) restoreNeutralConfig {
-       if(!neutralConfig)
-               return;
-       [self activateConfig: neutralConfig forApplication: NULL];
+- (void)activateConfigForProcess:(NSString *)processName {
+    Config *oldConfig = manualConfig;
+    [self activateConfig:self[processName]];
+    manualConfig = oldConfig;
 }
 
--(void) activateConfig: (Config*)config forApplication: (ProcessSerialNumber*) psn {
-       if(currentConfig == config)
+- (void)activateConfig:(Config *)config {
+    if (!config)
+        config = manualConfig;
+       if (currentConfig == config)
                return;
-
-       if(psn) {
-               if(!neutralConfig)
-                       neutralConfig = currentConfig;
-       } else {
-               neutralConfig = NULL;
-       }
-       
-       if(currentConfig != NULL) {
-               [targetController reset];
-       }
+    manualConfig = config;
        currentConfig = config;
+    [targetController reset];
        [removeButton setEnabled:configs[0] != config];
        [targetController load];
        [(ApplicationController *)[[NSApplication sharedApplication] delegate] configChanged];
@@ -66,8 +65,13 @@
     if (tableView.selectedRow == 0)
         return;
 
-       Config *current_config = configs[tableView.selectedRow];
+       Config *toRemove = configs[tableView.selectedRow];
        [configs removeObjectAtIndex:tableView.selectedRow];
+    
+    if (toRemove == currentConfig)
+        currentConfig = configs[0];
+    if (toRemove == manualConfig)
+        manualConfig = configs[0];
        
        // remove all "switch to configuration" actions
     for (Config *config in configs) {
@@ -75,7 +79,7 @@
                for (id key in entries) {
                        Target *target = entries[key];
                        if ([target isKindOfClass:[TargetConfig class]]
-                && [(TargetConfig *)target config] == current_config)
+                && [(TargetConfig *)target config] == toRemove)
                                [entries removeObjectForKey: key];
                }
        }
@@ -85,7 +89,7 @@
 
 -(void)tableViewSelectionDidChange:(NSNotification *)notify {
     if (tableView.selectedRow >= 0)
-        [self activateConfig:configs[tableView.selectedRow] forApplication: NULL];
+        [self activateConfig:configs[tableView.selectedRow]];
 }
        
 - (id)tableView:(NSTableView *)view objectValueForTableColumn:(NSTableColumn *)column row:(int)index {
@@ -107,16 +111,6 @@
 
 - (BOOL)tableView:(NSTableView *)view shouldEditTableColumn:(NSTableColumn *)column row:(int)index {
        return index > 0;
-}      
-
-- (Config *)currentConfig {
-       return currentConfig;
-}
-
-- (Config *)currentNeutralConfig {
-       if (neutralConfig)
-               return neutralConfig;
-       return currentConfig;
 }
 
 -(void) save {
@@ -141,9 +135,9 @@
                [ary addObject: cfgInfo];
        }
        envelope[@"configurationList"] = ary;
-       envelope[@"selectedIndex"] = @([configs indexOfObject: [self currentNeutralConfig] ]);
        return envelope;
 }
+
 -(void) loadAllFrom: (NSDictionary*) envelope{
        if(envelope == NULL)
                return;
@@ -163,25 +157,13 @@
                }
        }
        
-       configs = newConfigs;
-       [tableView reloadData];
-       currentConfig = NULL;
-       [(ApplicationController *)[[NSApplication sharedApplication] delegate] configsChanged];
-       
-       int index = [envelope[@"selectedIndex"] intValue];
-    if (index < configs.count)
-        [self activateConfig: configs[index] forApplication: NULL];
-}
-
--(void) applicationSwitchedTo: (NSString*) name withPsn: (ProcessSerialNumber) psn {
-       for(int i=0; i<[configs count]; i++) {
-               Config* cfg = configs[i];
-               if([[cfg name] isEqualToString: name]) {
-                       [self activateConfig: cfg forApplication: &psn];
-                       return;
-               }
-       }
-       [self restoreNeutralConfig];
+    if (newConfigs.count) {
+        configs = newConfigs;
+        [tableView reloadData];
+        currentConfig = configs[0];
+        manualConfig = configs[0];
+        [(ApplicationController *)[[NSApplication sharedApplication] delegate] configsChanged];
+    }
 }
 
 @end

diff --git a/TargetConfig.m b/TargetConfig.m
index f62755d1da5912ea499183bb7df8f17e2653d7b9..8e4fc409d33df8729d16fbbd53996bd52212eea3 100644 (file)
--- a/TargetConfig.m
+++ b/TargetConfig.m
@@ -30,7 +30,7 @@
 }
 
 -(void) trigger {
-       [[(ApplicationController *)[[NSApplication sharedApplication] delegate] configsController] activateConfig:config forApplication: NULL];
+       [[(ApplicationController *)[[NSApplication sharedApplication] delegate] configsController] activateConfig:config];
 }
 
 @end