|
From: Geisschaes <gei...@us...> - 2005-05-30 20:00:39
|
Update of /cvsroot/macattrick/macattrick In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31105 Modified Files: PlayerList.h PlayerList.m PlayerTableController.h PlayerTableController.m Team.m Log Message: combo box added to player table view Index: PlayerTableController.h =================================================================== RCS file: /cvsroot/macattrick/macattrick/PlayerTableController.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** PlayerTableController.h 16 Jan 2005 18:04:00 -0000 1.2 --- PlayerTableController.h 30 May 2005 19:59:59 -0000 1.3 *************** *** 32,35 **** --- 32,36 ---- @interface PlayerTableController : TeamController { + NSString* selectedDate; IBOutlet NSView *playerTableView; IBOutlet NSTableView *playerTable; *************** *** 40,42 **** --- 41,46 ---- -(Player*) selectedPlayer; + - (NSString *) selectedDate; + + @end Index: PlayerList.h =================================================================== RCS file: /cvsroot/macattrick/macattrick/PlayerList.h,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** PlayerList.h 29 May 2005 19:15:59 -0000 1.6 --- PlayerList.h 30 May 2005 19:59:59 -0000 1.7 *************** *** 39,42 **** --- 39,43 ---- NSMutableArray* playerList; + NSMutableArray* formerDates; // used only for XML Parsing *************** *** 66,69 **** --- 67,73 ---- - (NSArray *)playerList; + - (NSMutableArray *) formerDates; + + /*! @method playerWithInjured:disqualified Index: PlayerList.m =================================================================== RCS file: /cvsroot/macattrick/macattrick/PlayerList.m,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** PlayerList.m 29 May 2005 19:15:59 -0000 1.6 --- PlayerList.m 30 May 2005 19:59:59 -0000 1.7 *************** *** 31,34 **** --- 31,35 ---- @interface PlayerList (Private) - (void) loadStatesFromFormerPlayerList: (PlayerList*) playerList date: (NSString*) date; + - (void) setFormerDates: (NSMutableArray *) newFormerDates; @end *************** *** 43,46 **** --- 44,48 ---- self = [super init]; playerList = [[NSMutableArray alloc] init]; + formerDates = [[NSMutableArray alloc] init]; NSXMLParser *parser = [[NSXMLParser alloc] initWithContentsOfURL: url]; [parser setDelegate:self]; *************** *** 60,63 **** --- 62,66 ---- if([[NSFileManager defaultManager] fileExistsAtPath:filename]) { NSString *date = [currentPath lastPathComponent]; + [formerDates addObject:date]; PlayerList *formerPlayerList = [[PlayerList alloc] initFromXML:[NSURL URLWithString:filename]]; if(formerPlayerList) { *************** *** 109,112 **** --- 112,125 ---- // Accessors + + + - (NSMutableArray *) formerDates { return formerDates; } + - (void) setFormerDates: (NSMutableArray *) newFormerDates { + [newFormerDates retain]; + [formerDates release]; + formerDates = newFormerDates; + } + + - (NSArray *)playerList { return playerList; *************** *** 197,201 **** - (void)dealloc { [playerList release]; ! [super dealloc]; } --- 210,214 ---- - (void)dealloc { [playerList release]; ! [formerDates release]; [super dealloc]; } Index: PlayerTableController.m =================================================================== RCS file: /cvsroot/macattrick/macattrick/PlayerTableController.m,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** PlayerTableController.m 18 Jan 2005 19:37:26 -0000 1.3 --- PlayerTableController.m 30 May 2005 19:59:59 -0000 1.4 *************** *** 32,35 **** --- 32,36 ---- @interface PlayerTableController (Private) - (void) doubleClicked; + - (void) setSelectedDate: (NSString *) newSelectedDate; @end *************** *** 40,46 **** -(PlayerTableController*) init { self = [super init]; ! [NSBundle loadNibNamed:@"PlayerTableView" owner: self]; ! [playerTable setTarget:self]; ! [playerTable setDoubleAction:@selector(doubleClicked)]; return self; } --- 41,49 ---- -(PlayerTableController*) init { self = [super init]; ! if(self) { ! [NSBundle loadNibNamed:@"PlayerTableView" owner: self]; ! [playerTable setTarget:self]; ! [playerTable setDoubleAction:@selector(doubleClicked)]; ! } return self; } *************** *** 59,64 **** --- 62,80 ---- } + + - (NSString *) selectedDate { return selectedDate; } + - (void) setSelectedDate: (NSString *) newSelectedDate { + [newSelectedDate retain]; + [selectedDate release]; + selectedDate = newSelectedDate; + } + + + -(void) doubleClicked { [[MainController mainController] showPlayerDetailsWindowWithPlayer:[self selectedPlayer]]; + NSLog(selectedDate); } + + @end Index: Team.m =================================================================== RCS file: /cvsroot/macattrick/macattrick/Team.m,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** Team.m 27 Apr 2005 19:36:38 -0000 1.22 --- Team.m 30 May 2005 19:59:59 -0000 1.23 *************** *** 59,62 **** --- 59,63 ---- success = [parser parse]; playerList = [[PlayerList alloc] init]; + [playerList loadFormerPlayerStates]; arena = [[Arena alloc] init]; league = [[League alloc] init]; |