Changeset 4 for trunk

Timestamp:

11/16/07 16:50:01 (14 months ago)

Author:

mgorbach

Message:

Continuing work on the core classes for plugins and filesystems

Location:

trunk

Files:

• MFFilesystem.h (modified) (1 diff)
• MFFilesystem.m (modified) (7 diffs)
• MFPlugin.h (modified) (1 diff)
• MFPlugin.m (modified) (4 diffs)

trunk/MFFilesystem.h

@@ -8 +8 @@
 
 #import <Cocoa/Cocoa.h>
-
+@class MFPlugin;
 
 @interface MFFilesystem : NSObject {

trunk/MFFilesystem.m

@@ -8 +8 @@
 
 #import "MFFilesystem.h"
-
+#import "MFPluginController.h"
+#import "MFPlugin.h"
 
 @interface MFFilesystem(PrivateAPI)
-- (void)mergeParameters;
-- (NSArray*)taskArgumentList
+- (NSMutableDictionary*)fullParametersWithDictionary: (NSDictionary*)fsParams;
+- (NSArray*)taskArgumentList;
 @end
 
@@ -30 +31 @@
 }
 
+
 - (MFPlugin*)plugin
 {
@@ -39 +41 @@
 {
         // We want an immutable dictionary
-        return [parameterDictionary copy];
+        return [parameters copy];
 }
 
-- (void)mergeParameters:(NSDictionary*)params
+- (NSMutableDictionary*)fullParametersWithDictionary:(NSDictionary*)fsParams
 {
-        NSDictionary* defaults = [[self plugin] defaultParameterDict];
-        for(NSString* parameterKey in [defaults keyEnumerator])
+        MFPlugin* plugin = [self plugin];
+        NSDictionary* defaultParams = [plugin defaultParameterDictionary];
+        NSMutableDictionary* params = [NSMutableDictionary dictionary];
+        
+        for(NSString* parameterKey in [defaultParams keyEnumerator])
         {
-                if ([params objectForKey:parameterKey] != nil)
+                if ([fsParams objectForKey:parameterKey] != nil)
                 {
                         // The fs specifies a value for this parameter, take it.
                         // Validation per-value goes here
-                        [parameters setObject: [params objectForKey:parameterKey]
-                                                   forKey: parameterKey];
+                        [params setObject: [fsParams objectForKey:parameterKey]
+                                        forKey: parameterKey];
                 }
                 else 
@@ -58 +63 @@
                         // The fs doesn't specify a value for this parameter.
                         // Use the default
-                        [parameters setObject: [defaults objectForKey:parameterKey]
-                                                   forKey: parameterKey];
+                        [params setObject: [defaultParams objectForKey:parameterKey]
+                                        forKey: parameterKey];
                 }
                         
         }
+        
+        return params;
 }
 
@@ -80 +87 @@
                         // TODO: Value typing
                         NSString* searchString = [NSString stringWithFormat:@"[%@]", token];
-                        id* value = [parameters objectForKey:parameterKey];
+                        id value = [parameters objectForKey:parameterKey];
                         NSString* stringValue;
                         if ([value isKindOfClass: [NSString class]])
@@ -94 +101 @@
                                                                                   withString:value 
                                                                                          options:NSLiteralSearch
-                                                                                           range:NSMakeRange(0, [receiver length])];
+                                                                                           range:NSMakeRange(0, [formatString length])];
                 }
                 
@@ -103 +110 @@
         
         argParameters = [formatString componentsSeparatedByString:@" "];
+        return argParameters;
 }
 
 - (NSTask*)taskForLaunch
 {
-        
+        return nil;
 }
 

trunk/MFPlugin.h

@@ -19 +19 @@
 @property(readonly) NSString* inputFormatString;
 
-+(MFPlugin*)pluginFromBundleAtPath:(NSString*)path;
++ (MFPlugin*)pluginFromBundleAtPath:(NSString*)path;
+
+- (NSDictionary*)defaultParameterDictionary;
 
 @end

trunk/MFPlugin.m

@@ -34 +34 @@
 }
 
-- (void)defaultParameterDict
+- (NSDictionary*)defaultParameterDictionary
 {
         NSMutableDictionary* defaultsDictionary = [NSMutableDictionary dictionary];
@@ -45 +45 @@
                                                            forKey:parameterKey];
         }
+        
+        return defaultsDictionary;
 }
 
@@ -54 +56 @@
 - (NSString*)taskPath
 {
-        NSArray* locationsArray = [dictionary objectForKey:@"Binary Location"]
+        NSArray* locationsArray = [dictionary objectForKey:@"Binary Location"];
         NSFileManager* fm = [NSFileManager defaultManager];
         for(NSString* path in locationsArray)
@@ -74 +76 @@
                 }
         }
+        
+        // We can't find the executablr
+        return nil;
 }