From c35bd787df48f393513553444c47679c31a79fef Mon Sep 17 00:00:00 2001 From: Gregory John Casamento Date: Mon, 22 Dec 2008 00:09:23 +0000 Subject: [PATCH] Changes for gorm file and debugger class. git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/apps/projectcenter/trunk@27382 72102866-910b-0410-8b05-ffd578937521 --- Modules/Debuggers/ProjectCenter/PCDebugger.h | 9 ++- Modules/Debuggers/ProjectCenter/PCDebugger.m | 54 ++++++++++++++++-- .../Debuggers/ProjectCenter/PCDebuggerView.m | 1 - .../Resources/PCDebugger.gorm/data.classes | 3 +- .../Resources/PCDebugger.gorm/data.info | Bin 184 -> 184 bytes .../Resources/PCDebugger.gorm/objects.gorm | Bin 2720 -> 2170 bytes Modules/Editors/ProjectCenter/PCEditor.m | 2 - Modules/GNUmakefile | 3 +- 8 files changed, 59 insertions(+), 13 deletions(-) diff --git a/Modules/Debuggers/ProjectCenter/PCDebugger.h b/Modules/Debuggers/ProjectCenter/PCDebugger.h index bf50d6e..36ced58 100644 --- a/Modules/Debuggers/ProjectCenter/PCDebugger.h +++ b/Modules/Debuggers/ProjectCenter/PCDebugger.h @@ -3,10 +3,13 @@ #include #include -@interface PCDebugger : NSObject +#include + +@interface PCDebugger : NSObject { - id consoleView; - id consoleWindow; + id debuggerView; + id debuggerWindow; + NSString *path; NSTask *debuggerTask; id standardInput; id standardOutput; diff --git a/Modules/Debuggers/ProjectCenter/PCDebugger.m b/Modules/Debuggers/ProjectCenter/PCDebugger.m index 68dfdca..6010fe1 100644 --- a/Modules/Debuggers/ProjectCenter/PCDebugger.m +++ b/Modules/Debuggers/ProjectCenter/PCDebugger.m @@ -4,26 +4,70 @@ #include "PCDebugger.h" @implementation PCDebugger -- (id) init +- (id) initWithPath: (NSString *)filePath { - if((self == [super init]) != nil) + if((self = [super init]) != nil) { // initialization here... + if([NSBundle loadNibNamed: @"PCDebugger" owner: self] == NO) + { + return nil; + } } return self; } ++(id) debugExecutableAtPath: (NSString *)filePath +{ + return [[self alloc] initWithPath: filePath]; +} + +- (void) show +{ + [debuggerWindow makeKeyAndOrderFront: self]; + [self startDebugger]; +} + - (void) startDebugger { debuggerTask = [NSTask launchedTaskWithLaunchPath: @"/usr/bin/gdb" - arguments: @""]; + arguments: NULL]; standardInput = [debuggerTask standardInput]; standardOutput = [debuggerTask standardOutput]; } - (void) awakeFromNib { - [consoleView setFont: [NSFont userFixedPitchFontOfSize: 0]]; - [self startDebugger]; + [debuggerView setFont: [NSFont userFixedPitchFontOfSize: 0]]; +} + +- (NSWindow *)debuggerWindow +{ + return debuggerWindow; +} + +- (void)setDebuggerWindow: (NSWindow *)window +{ + ASSIGN(debuggerWindow,window); +} + +- (NSView *)debuggerView +{ + return debuggerView; +} + +- (void)setDebuggerView: (id)view +{ + ASSIGN(debuggerView,view); +} + +- (NSString *)path +{ + return path; +} + +- (void)setPath:(NSString *)p +{ + ASSIGN(path,p); } @end diff --git a/Modules/Debuggers/ProjectCenter/PCDebuggerView.m b/Modules/Debuggers/ProjectCenter/PCDebuggerView.m index 4c1c3bf..9c9d94e 100644 --- a/Modules/Debuggers/ProjectCenter/PCDebuggerView.m +++ b/Modules/Debuggers/ProjectCenter/PCDebuggerView.m @@ -4,5 +4,4 @@ #include "PCDebuggerView.h" @implementation PCDebuggerView - @end diff --git a/Modules/Debuggers/ProjectCenter/Resources/PCDebugger.gorm/data.classes b/Modules/Debuggers/ProjectCenter/Resources/PCDebugger.gorm/data.classes index 10fbef2..4bf6774 100644 --- a/Modules/Debuggers/ProjectCenter/Resources/PCDebugger.gorm/data.classes +++ b/Modules/Debuggers/ProjectCenter/Resources/PCDebugger.gorm/data.classes @@ -4,7 +4,8 @@ Actions = ( ); Outlets = ( - consoleView + debuggerView, + debuggerWindow ); Super = NSObject; }; diff --git a/Modules/Debuggers/ProjectCenter/Resources/PCDebugger.gorm/data.info b/Modules/Debuggers/ProjectCenter/Resources/PCDebugger.gorm/data.info index cc6bdcab11cbd66d237600526d5c50b4a5b4d8e5..3bc8f05d4a6be2a0a9d14ad67d0720f682795b0a 100644 GIT binary patch delta 11 ScmdnNxPx&*8YBC}^gsX?!~?nj delta 11 ScmdnNxPx&*8YAn(^gsX?yaTuZ diff --git a/Modules/Debuggers/ProjectCenter/Resources/PCDebugger.gorm/objects.gorm b/Modules/Debuggers/ProjectCenter/Resources/PCDebugger.gorm/objects.gorm index 9d261cad182755a3d700416f24d015acdfb7406f..c7aa81d397aca30a34f793a1c5553b63a4f8c7c7 100644 GIT binary patch delta 438 zcmZ1=`b%JfJXeyH0T>vYPSnh2WSls2C5H>c0S0atIfu<&jGBy03=Eq~nKm(-ZRAm7 zU|?Vr1rZyV4dftv1_OCRaRy<(VBgY`#H5^5m(1jn%>2B>qDr7T21AL-=h?+=SPc|5 za)5NRs{#pDkP+-me!>3bd8tJPiV!I-xD*#tfU`?#QfYcRP*!Pj5{Ht4GDHn0Tn#6a zZ>2(bW?o8uInXUClb3NQ=&54b5tf-+u3@0Lfz?0_;#^LU-JAyMhLV#7IK`BeHz-Un z(AX%sL3M-j1OrVVLurHR1OqJ~LuG@~1OshDsmTvGW!P0VC>ZD%N>4t^CN(*TOO#u8 zqtphVUIV?2(v$tTB)Rp$d=&!&Ais!9Ey@tcSJfgc5M6JY#3V$jib6lr1WMZk2puOWAEiJcp)^GepddIQ3sPq($ z9Jl0z#DOcfHT?tpE-o;e6(+P&eXz&#-pssxWB(femgMQ!yEPbIrN&Xt(df~a?|S(Y zA@Rz}&*N<^r_qg%$36NZ)Hfzcq*mWyc8?IE5t#S&C5+B3;w_w%5#2E@J0ls8_RmX@ z$~=XPF-2mkw(7Ai=EewIQuSj&{TSV{b{Sk&c`e9mw7o>emkE&_f6FwXgu{X{O`^4W zwQIH*rZhq|xMIuYc!KW0qV%?|Pou=&*{_^eo3V-9zLNV{Y&!GTGN5uZBm1lSFB){_MbJF5FO1EP!J4 zdAY(Gy;cj+6@|tFG*0FIVWa2!TNs9$XjMY)QF@nvTSjWI5xv+4k>_yR zPl;6l9PVIHl9@FO3Zlf}t}#!NwR+8JlpWi1oen;1*7O`#T1!L$)=y8Z)i*77--CM! z3I}4tw2dF{8r;YBE5r5={CSMlVM9?z7vM3sYuToU{D;Ul#43kJ7!-xUp=_iFhtauy zUKF9CYDd@8bnJbn!{qVdv7g48JZ!2DSr63cbeDBl3n#!6bq1$8

3Bagwsn OAf%`Cr~a(`L&zWYUf3@H diff --git a/Modules/Editors/ProjectCenter/PCEditor.m b/Modules/Editors/ProjectCenter/PCEditor.m index b8945f2..5de5840 100644 --- a/Modules/Editors/ProjectCenter/PCEditor.m +++ b/Modules/Editors/ProjectCenter/PCEditor.m @@ -25,8 +25,6 @@ #import "PCEditor.h" #import "PCEditorView.h" -//#import "CommandQueryPanel.h" -//#import "LineQueryPanel.h" @implementation PCEditor (UInterface) diff --git a/Modules/GNUmakefile b/Modules/GNUmakefile index 594f28b..00659ea 100644 --- a/Modules/GNUmakefile +++ b/Modules/GNUmakefile @@ -32,7 +32,8 @@ SUBPROJECTS = \ Projects/ResourceSet \ Projects/Tool \ Editors/ProjectCenter \ - Parsers/ProjectCenter + Parsers/ProjectCenter \ + Debuggers/ProjectCenter include $(GNUSTEP_MAKEFILES)/aggregate.make