Changeset 14 for trunk/Cocoa/F-Script Anywhere/Source/FSAController.m

Timestamp:

10/20/02 04:41:17 (22 years ago)

Author:

Nicholas Riley

Message:

F-Script Anywhere 1.1.2

File:

• trunk/Cocoa/F-Script Anywhere/Source/FSAController.m (modified) (7 diffs)

trunk/Cocoa/F-Script Anywhere/Source/FSAController.m

@@ -28 +28 @@
 #import "FSAViewAssociationController.h"
 #import "FSAnywhere.h"
+#import <FScript/FSInterpreter.h>
 
 @class ShellView;
@@ -36 +37 @@
 @end
 
-@interface FSInterpreterView (Private)
+@interface FSInterpreterView (FSAWorkaround)
 - (CLIView *)cliView;
 @end
@@ -93 +94 @@
         }
         if (insertIntoMenu) {
-            NSMenu *fsaMenu = [[NSMenu allocWithZone:[NSMenu menuZone]] initWithTitle:NSLocalizedStringFromTableInBundle(@"FSA", @"FSA", bundle, @"Title of F-Script Anywhere menu")];
-
-            item = [insertIntoMenu insertItemWithTitle:NSLocalizedStringFromTableInBundle(@"FSA", @"FSA", bundle, @"Title of F-Script Anywhere menu") action:NULL keyEquivalent:@"" atIndex:insertLoc];
+            NSMenu *fsaMenu = [[NSMenu allocWithZone: [NSMenu menuZone]] initWithTitle:NSLocalizedStringFromTableInBundle(@"FSA", @"FSA", bundle, @"Title of F-Script Anywhere menu")];
+
+            item = [insertIntoMenu insertItemWithTitle: NSLocalizedStringFromTableInBundle(@"FSA", @"FSA", bundle, @"Title of F-Script Anywhere menu") action:NULL keyEquivalent:@"" atIndex:insertLoc];
             [insertIntoMenu setSubmenu:fsaMenu forItem:item];
             [fsaMenu release];
 
             // Add the items for the commands.
-            item = [fsaMenu addItemWithTitle:NSLocalizedStringFromTableInBundle(@"New F-Script Workspace", @"FSA", bundle, @"Title of F-Script Workspace menu item") action:@selector(createInterpreterWindow:) keyEquivalent:@""];
+            item = [fsaMenu addItemWithTitle: NSLocalizedStringFromTableInBundle(@"New F-Script Workspace", @"FSA", bundle, @"Title of F-Script Workspace menu item") action:@selector(createInterpreterWindow:) keyEquivalent: @""];
             [item setTarget: self];
+            [fsaMenu addItemWithTitle: NSLocalizedStringFromTableInBundle(@"Associate With Interface", @"FSA", bundle, @"Title of Associate with Interface menu item") action: @selector(FSA_associateWithInterface:) keyEquivalent: @""];
             [fsaMenu addItem: [NSMenuItem separatorItem]];
-            item = [fsaMenu addItemWithTitle:NSLocalizedStringFromTableInBundle(@"About F-Script AnywhereÉ", @"FSA", bundle, @"Title of Info Panel menu item") action:@selector(showInfo:) keyEquivalent:@""];
+            item = [fsaMenu addItemWithTitle: NSLocalizedStringFromTableInBundle(@"About F-Script AnywhereÉ", @"FSA", bundle, @"Title of Info Panel menu item") action:@selector(showInfo:) keyEquivalent: @""];
             [item setTarget: self];
         }
@@ -160 +162 @@
 #warning this should go away when F-Script properly accepts firstResponder on the InterpreterView
         [window makeFirstResponder: (NSView *)[[[self interpreterView] cliView] shellView]];
+        system = [[[self interpreterView] interpreter] objectForIdentifier: @"sys" found: NULL];
+        [system retain];
+        NSAssert1([system isKindOfClass: [System class]], @"Initial value bound to identifier 'sys' is not a System object, but %@", system);
     }
     
@@ -165 +170 @@
 }
 
+- (void)dealloc;
+{
+    [system release];
+    [super dealloc];
+}
+
 - (FSInterpreterView *)interpreterView;
 {
@@ -170 +181 @@
 }
 
+- (System *)system;
+{
+    return system;
+}
+
 - (IBAction)setFloating:(id)sender;
 {
@@ -175 +191 @@
 }
 
-- (IBAction)associateInterface:(id)sender;
-{
-    FSALog(@"associating interface");
+- (IBAction)FSA_associateWithInterface:(id)sender;
+{
     NS_DURING
-        FSALog(@"controller?");
         if (viewAssociationController == nil) {
-            NSLog(@"creating controller");
-            viewAssociationController = [[FSAViewAssociationController alloc] initWithInterpreter: [interpreterView interpreter]];
-        }
-        FSALog(@"got controller %@", viewAssociationController);
+            viewAssociationController = [[FSAViewAssociationController alloc] initWithFSAController: self];
+        }
         [viewAssociationController showWindow: self];
     NS_HANDLER