Added new methods to return numbers. Cleaned up code.

diff --git a/ITAppleEventCenter.h b/ITAppleEventCenter.h
index be94d4b..218c0d7 100755 (executable)
--- a/ITAppleEventCenter.h
+++ b/ITAppleEventCenter.h
@@ -22,7 +22,11 @@
 }
 + (id)sharedCenter;
 - (NSString*)sendAEWithRequestedKey:(NSString*)key eventClass:(NSString*)eventClass eventID:(NSString*)eventID appPSN:(ProcessSerialNumber)psn;
+- (long)sendAEWithRequestedKeyForNumber:(NSString*)key eventClass:(NSString*)eventClass eventID:(NSString*)eventID appPSN:(ProcessSerialNumber)psn;
+
 - (NSString*)sendTwoTierAEWithRequestedKey:(NSString*)key fromObjectByKey:(NSString*)object eventClass:(NSString*)eventClass eventID:(NSString*)eventID appPSN:(ProcessSerialNumber)psn;
+- (long)sendTwoTierAEWithRequestedKeyForNumber:(NSString*)key fromObjectByKey:(NSString*)object eventClass:(NSString*)eventClass eventID:(NSString*)eventID appPSN:(ProcessSerialNumber)psn;
+
 - (NSString *)sendAEWithRequestedArray:(NSArray *)array eventClass:(NSString*)eventClass eventID:(NSString*)eventID appPSN:(ProcessSerialNumber)psn;
 - (void)sendAEWithEventClass:(NSString*)eventClass eventID:(NSString*)eventID appPSN:(ProcessSerialNumber)psn;
 - (void)printCarbonDesc:(AEDesc*)desc;

diff --git a/ITAppleEventCenter.m b/ITAppleEventCenter.m
index abb1823..78eb8f8 100755 (executable)
--- a/ITAppleEventCenter.m
+++ b/ITAppleEventCenter.m
@@ -31,11 +31,9 @@ static ITAppleEventCenter *_sharedAECenter = nil;
 
 - (NSString*)sendAEWithRequestedKey:(NSString*)key eventClass:(NSString*)eventClass eventID:(NSString*)eventID appPSN:(ProcessSerialNumber)psn
 {
-    /*if ( (!key) || (!eventClass) || (!eventID) || (psn.highLongOfPSN == kNoProcess) ) {
-        return @"";
-    } else*/ {
+    //Add error checking...
     AEEventClass eClass = *((unsigned long*)[eventClass UTF8String]);
-    AEEventID    eID    = *((unsigned long*)[eventID UTF8String]);
+    AEEventID   eID    = *((unsigned long*)[eventID UTF8String]);
     
     const char *sendString = [[NSString stringWithFormat:@"'----':obj { form:'prop', want:type('prop'), seld:type('%s'), from:'null'() }", [key UTF8String]] UTF8String];
     NSString  *_finalString;
@@ -43,7 +41,6 @@ static ITAppleEventCenter *_sharedAECenter = nil;
     AppleEvent sendEvent, replyEvent;
     AEIdleUPP upp = NewAEIdleUPP(&MyAEIdleCallback);
     
-    char *charResult;
     DescType resultType;
     Size resultSize, charResultSize;
     int pid;
@@ -52,13 +49,8 @@ static ITAppleEventCenter *_sharedAECenter = nil;
     OSStatus err;
     OSErr err2, err3;
     
-    if (GetProcessPID(&psn, &pid) == noErr) {
-        if (pid ==0) {
-            NSLog(@"Process doesn't exist! Exiting.");
-            return nil;
-        }
-    } else {
-        NSLog(@"Error getting PID of application to send to! Exiting.");
+    if ((GetProcessPID(&psn, &pid) == noErr) && (pid == 0)) {
+        NSLog(@"Error getting PID of application! Exiting.");
         return nil;
     }
     
@@ -79,40 +71,97 @@ static ITAppleEventCenter *_sharedAECenter = nil;
     if (err) {
         NSLog(@"Send Error: %i",err);
     } else {
-
-        unichar* result=0;
+        unichar *result = 0;
         
         err2 = AESizeOfParam(&replyEvent, keyDirectObject, &resultType, &resultSize);
-        result=malloc(resultSize);
-        
-        if (resultType == typeUInt32) {
-            NSLog(@"waffles");
-        }
-        
-        if (err2) { NSLog(@"Error After AESizeOfParam: %i", err2); } else {
-        
-        err3 = AEGetParamPtr(&replyEvent, keyDirectObject, resultType, NULL, result, resultSize, &charResultSize);
-        
-        if (err3) { NSLog(@"Error After AEGetParamPtr: %i", err3); } else {
-        
-        _finalString = [[NSString stringWithCharacters:result length:charResultSize/sizeof(unichar)] copy];
+        result = malloc(resultSize);
         
+        if (err2) {
+            NSLog(@"Error After AESizeOfParam: %i", err2);
+        } else {
+            err3 = AEGetParamPtr(&replyEvent, keyDirectObject, resultType, NULL, result, resultSize, &charResultSize);
+            
+            if (err3) {
+                NSLog(@"Error After AEGetParamPtr: %i", err3);
+            } else {
+                _finalString = [[NSString stringWithCharacters:result length:charResultSize/sizeof(unichar)] copy];
+            }
         }
-        }
+        free(result);
     }
     
     AEDisposeDesc(&sendEvent);
     AEDisposeDesc(&replyEvent);
     
     return _finalString;
+}
+
+- (long)sendAEWithRequestedKeyForNumber:(NSString*)key eventClass:(NSString*)eventClass eventID:(NSString*)eventID appPSN:(ProcessSerialNumber)psn
+{
+    //Add error checking...
+    AEEventClass eClass = *((unsigned long*)[eventClass UTF8String]);
+    AEEventID    eID    = *((unsigned long*)[eventID UTF8String]);
+    
+    const char *sendString = [[NSString stringWithFormat:@"'----':obj { form:'prop', want:type('prop'), seld:type('%s'), from:'null'() }", [key UTF8String]] UTF8String];
+    long result = 0;
+    
+    AppleEvent sendEvent, replyEvent;
+    AEIdleUPP upp = NewAEIdleUPP(&MyAEIdleCallback);
+    
+    DescType resultType;
+    Size resultSize, charResultSize;
+    int pid;
+    
+    AEBuildError buildError;
+    OSStatus err;
+    OSErr err2, err3;
+    
+    if ((GetProcessPID(&psn, &pid) == noErr) && (pid == 0)) {
+        NSLog(@"Error getting PID of application! Exiting.");
+        return nil;
+    }
+    
+    NSLog(@"_sendString: %s", sendString);
+    
+    err = AEBuildAppleEvent(eClass, eID, typeProcessSerialNumber,(ProcessSerialNumber*)&psn, sizeof(ProcessSerialNumber), kAutoGenerateReturnID, 0, &sendEvent, &buildError, sendString);
+    
+    [self printCarbonDesc:&sendEvent];
+    
+    if (err) {
+        NSLog(@"%d:%d at \"%@\"",buildError.fError,buildError.fErrorPos,[sendString substringToIndex:buildError.fErrorPos]);
     }
+    
+    err = AESend(&sendEvent, &replyEvent, kAEWaitReply, kAENormalPriority, kNoTimeOut, upp, NULL);
+    
+    [self printCarbonDesc:&replyEvent];
+    
+    if (err) {
+        NSLog(@"Send Error: %i",err);
+    } else {
+        err2 = AESizeOfParam(&replyEvent, keyDirectObject, &resultType, &resultSize);
+        
+        if (err2) {
+            NSLog(@"Error After AESizeOfParam: %i", err2);
+        } else {
+            err3 = AEGetParamPtr(&replyEvent, keyDirectObject, resultType, NULL, &result, resultSize, &charResultSize);
+            
+            if (err3) {
+                NSLog(@"Error After AEGetParamPtr: %i", err3);
+            } else {
+                NSLog(@"%i", result);
+            }
+        }
+    }
+    
+    AEDisposeDesc(&sendEvent);
+    AEDisposeDesc(&replyEvent);
+    
+    return result;
 }
 
 - (NSString*)sendTwoTierAEWithRequestedKey:(NSString*)key fromObjectByKey:(NSString*)object eventClass:(NSString*)eventClass eventID:(NSString*)eventID appPSN:(ProcessSerialNumber)psn
 {
-    /*if ( (!key) || (!object) || (!eventClass) || (!eventID) || (psn.highLongOfPSN == kNoProcess) ) {
-        return @"";
-    } else*/ {
+    //Add error checking...
     AEEventClass eClass = *((unsigned long*)[eventClass UTF8String]);
     AEEventID    eID    = *((unsigned long*)[eventID UTF8String]);
     
@@ -122,7 +171,6 @@ static ITAppleEventCenter *_sharedAECenter = nil;
     AppleEvent sendEvent, replyEvent;
     AEIdleUPP upp = NewAEIdleUPP(&MyAEIdleCallback);
     
-    char *charResult;
     DescType resultType;
     Size resultSize, charResultSize;
     int pid;
@@ -131,13 +179,8 @@ static ITAppleEventCenter *_sharedAECenter = nil;
     OSStatus err;
     OSErr err2, err3;
     
-    if (GetProcessPID(&psn, &pid) == noErr) {
-        if (pid ==0) {
-            NSLog(@"Process doesn't exist! Exiting.");
-            return nil;
-        }
-    } else {
-        NSLog(@"Error getting PID of application to send to! Exiting.");
+    if ((GetProcessPID(&psn, &pid) == noErr) && (pid == 0)) {
+        NSLog(@"Error getting PID of application! Exiting.");
         return nil;
     }
     
@@ -158,61 +201,178 @@ static ITAppleEventCenter *_sharedAECenter = nil;
     if (err) {
         NSLog(@"Send Error: %i",err);
     } else {
-        unichar* result=0;
+        unichar *result = 0;
         
         err2 = AESizeOfParam(&replyEvent, keyDirectObject, &resultType, &resultSize);
-        result=malloc(resultSize);
-        
-        if (err2) { NSLog(@"Error After AESizeOfParam: %i", err2); } else {
-        
-        err3 = AEGetParamPtr(&replyEvent, keyDirectObject, resultType, NULL, result, resultSize, &charResultSize);
-        
-        if (err3) { NSLog(@"Error After AEGetParamPtr: %i", err3); } else {
-        
-        _finalString = [[NSString stringWithCharacters:result length:charResultSize/sizeof(unichar)] copy];
+        result = malloc(resultSize);
         
+        if (err2) {
+            NSLog(@"Error After AESizeOfParam: %i", err2);
+        } else {
+            err3 = AEGetParamPtr(&replyEvent, keyDirectObject, resultType, NULL, result, resultSize, &charResultSize);
+            
+            if (err3) {
+                NSLog(@"Error After AEGetParamPtr: %i", err3);
+            } else {
+                _finalString = [[NSString stringWithCharacters:result length:charResultSize/sizeof(unichar)] copy];
+            }
         }
-        }
+        free(result);
     }
     
     AEDisposeDesc(&sendEvent);
     AEDisposeDesc(&replyEvent);
     
     return _finalString;
+}
+
+- (long)sendTwoTierAEWithRequestedKeyForNumber:(NSString*)key fromObjectByKey:(NSString*)object eventClass:(NSString*)eventClass eventID:(NSString*)eventID appPSN:(ProcessSerialNumber)psn
+{
+    //Add error checking...
+    AEEventClass eClass = *((unsigned long*)[eventClass UTF8String]);
+    AEEventID    eID    = *((unsigned long*)[eventID UTF8String]);
+    
+    const char *sendString = [[NSString stringWithFormat:@"'----':obj { form:'prop', want:type('prop'), seld:type('%s'), from:obj { form:'prop', want:type('prop'), seld:type('%s'), from:'null'() } }", [key UTF8String], [object UTF8String]] UTF8String];
+    long result = 0;
+    
+    AppleEvent sendEvent, replyEvent;
+    AEIdleUPP upp = NewAEIdleUPP(&MyAEIdleCallback);
+    
+    DescType resultType;
+    Size resultSize, charResultSize;
+    int pid;
+    
+    AEBuildError buildError;
+    OSStatus err;
+    OSErr err2, err3;
+    
+    if ((GetProcessPID(&psn, &pid) == noErr) && (pid == 0)) {
+        NSLog(@"Error getting PID of application! Exiting.");
+        return nil;
     }
+    
+    NSLog(@"_sendString: %s", sendString);
+    
+    err = AEBuildAppleEvent(eClass, eID, typeProcessSerialNumber,(ProcessSerialNumber*)&psn, sizeof(ProcessSerialNumber), kAutoGenerateReturnID, 0, &sendEvent, &buildError, sendString);
+    
+    [self printCarbonDesc:&sendEvent];
+    
+    if (err) {
+        NSLog(@"%d:%d at \"%@\"",buildError.fError,buildError.fErrorPos,[sendString substringToIndex:buildError.fErrorPos]);
+    }
+    
+    err = AESend(&sendEvent, &replyEvent, kAEWaitReply, kAENormalPriority, kNoTimeOut, upp, NULL);
+    
+    [self printCarbonDesc:&replyEvent];
+    
+    if (err) {
+        NSLog(@"Send Error: %i",err);
+    } else {
+        err2 = AESizeOfParam(&replyEvent, keyDirectObject, &resultType, &resultSize);
+        
+        if (err2) {
+            NSLog(@"Error After AESizeOfParam: %i", err2);
+        } else {
+            err3 = AEGetParamPtr(&replyEvent, keyDirectObject, resultType, NULL, &result, resultSize, &charResultSize);
+            
+            if (err3) {
+                NSLog(@"Error After AEGetParamPtr: %i", err3);
+            } else {
+                NSLog(@"%i", result);
+            }
+        }
+    }
+    
+    AEDisposeDesc(&sendEvent);
+    AEDisposeDesc(&replyEvent);
+    
+    return result;
 }
 
 - (NSString *)sendAEWithRequestedArray:(NSArray *)array eventClass:(NSString*)eventClass eventID:(NSString*)eventID appPSN:(ProcessSerialNumber)psn
 {
-    //Build the send string
-    NSString *curString = [NSString stringWithFormat:@"{ form:'prop', want:type('prop'), seld:type('%s'), from:'null'() }", [[array objectAtIndex:0] UTF8String]];
+    NSString *buildString = [NSString stringWithFormat:@"{ form:'prop', want:type('prop'), seld:type('%s'), from:'null'() }", [[array objectAtIndex:0] UTF8String]];
+    const char *sendString;
     int i;
+    NSString  *_finalString;
+    
+    AEEventClass eClass = *((unsigned long*)[eventClass UTF8String]);
+    AEEventID    eID    = *((unsigned long*)[eventID UTF8String]);
+    
+    AppleEvent sendEvent, replyEvent;
+    AEIdleUPP upp = NewAEIdleUPP(&MyAEIdleCallback);
+    
+    DescType resultType;
+    Size resultSize, charResultSize;
+    int pid;
+    
+    AEBuildError buildError;
+    OSStatus err;
+    OSErr err2, err3;
+    
     for (i = 1; i < [array count]; i++) {
         NSString *from = [NSString stringWithFormat:@"{ form:'prop', want:type('prop'), seld:type('%s'), from:obj %@ }",
-                    [[array objectAtIndex:i] UTF8String], curString];
-        curString = from;
-        NSLog(@"%@", from);
+                    [[array objectAtIndex:i] UTF8String], buildString];
+        buildString = from;
+    }
+    buildString = [@"'----':obj " stringByAppendingString:buildString];
+    sendString = [buildString UTF8String];
+    
+    if ((GetProcessPID(&psn, &pid) == noErr) && (pid == 0)) {
+        NSLog(@"Error getting PID of application! Exiting.");
+        return nil;
+    }
+    
+    NSLog(@"_sendString: %s", sendString);
+    
+    err = AEBuildAppleEvent(eClass, eID, typeProcessSerialNumber,(ProcessSerialNumber*)&psn, sizeof(ProcessSerialNumber), kAutoGenerateReturnID, 0, &sendEvent, &buildError, sendString);
+    
+    [self printCarbonDesc:&sendEvent];
+    
+    if (err) {
+        NSLog(@"%d:%d at \"%@\"",buildError.fError,buildError.fErrorPos,[sendString substringToIndex:buildError.fErrorPos]);
+    }
+    
+    err = AESend(&sendEvent, &replyEvent, kAEWaitReply, kAENormalPriority, kNoTimeOut, upp, NULL);
+    
+    [self printCarbonDesc:&replyEvent];
+    
+    if (err) {
+        NSLog(@"Send Error: %i",err);
+    } else {
+        unichar *result = 0;
+        
+        err2 = AESizeOfParam(&replyEvent, keyDirectObject, &resultType, &resultSize);
+        result=malloc(resultSize);
+        
+        if (err2) {
+            NSLog(@"Error After AESizeOfParam: %i", err2);
+        } else {
+            err3 = AEGetParamPtr(&replyEvent, keyDirectObject, resultType, NULL, result, resultSize, &charResultSize);
+            if (err3) {
+                NSLog(@"Error After AEGetParamPtr: %i", err3);
+            } else {
+                _finalString = [[NSString stringWithCharacters:result length:charResultSize/sizeof(unichar)] copy];
+            }
+        }
+        free(result);
     }
-    curString = [@"'----':obj " stringByAppendingString:curString];
-    return curString;
+    return _finalString;
 }
 
 - (void)sendAEWithEventClass:(NSString*)eventClass eventID:(NSString*)eventID appPSN:(ProcessSerialNumber)psn
 {
-    /*if ( (!eventClass) || (!eventID) || (psn.highLongOfPSN == kNoProcess) ) {
-        return;
-    } else */{
-        AEEventClass eClass = *((unsigned long*)[eventClass UTF8String]);
-        AEEventID    eID    = *((unsigned long*)[eventID UTF8String]);
-        AppleEvent event, reply;
-    
-        AEBuildAppleEvent(eClass, eID, typeProcessSerialNumber,(ProcessSerialNumber*)&psn, sizeof(ProcessSerialNumber), kAutoGenerateReturnID, kAnyTransactionID, &event, nil, "");
-    
-        AESend(&event, &reply, kAENoReply, kAENormalPriority, kAEDefaultTimeout, nil, nil);
+    //Add error checking...
+    AEEventClass eClass = *((unsigned long*)[eventClass UTF8String]);
+    AEEventID    eID    = *((unsigned long*)[eventID UTF8String]);
+    AppleEvent event, reply;
+
+    AEBuildAppleEvent(eClass, eID, typeProcessSerialNumber,(ProcessSerialNumber*)&psn, sizeof(ProcessSerialNumber), kAutoGenerateReturnID, kAnyTransactionID, &event, nil, "");
+
+    AESend(&event, &reply, kAENoReply, kAENormalPriority, kAEDefaultTimeout, nil, nil);
     
-        AEDisposeDesc(&event);
-        AEDisposeDesc(&reply);
-    }
+    AEDisposeDesc(&event);
+    AEDisposeDesc(&reply);
 }
 
 - (void)printCarbonDesc:(AEDesc*)desc {