|
From: Geisschaes <gei...@us...> - 2005-09-26 19:34:09
|
Update of /cvsroot/macattrick/macattrick In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv833 Modified Files: PlayerList.m PlayerListsViewController.m PlayerTableController.m PlayerTableView.m Log Message: some bugs removed Index: PlayerTableView.m =================================================================== RCS file: /cvsroot/macattrick/macattrick/PlayerTableView.m,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** PlayerTableView.m 26 Sep 2005 17:47:38 -0000 1.4 --- PlayerTableView.m 26 Sep 2005 19:33:58 -0000 1.5 *************** *** 39,42 **** --- 39,47 ---- [controller removeSelectedPlayers]; } + [self reloadData]; + [self setNeedsDisplay:YES]; + } + else { + [super keyDown:event]; } } Index: PlayerListsViewController.m =================================================================== RCS file: /cvsroot/macattrick/macattrick/PlayerListsViewController.m,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** PlayerListsViewController.m 24 Sep 2005 11:50:30 -0000 1.5 --- PlayerListsViewController.m 26 Sep 2005 19:33:58 -0000 1.6 *************** *** 56,59 **** --- 56,60 ---- [playerLists release]; playerLists = newPlayerLists; + [[Team currentTeam] setUserDefinedPlayerLists:playerLists]; } Index: PlayerList.m =================================================================== RCS file: /cvsroot/macattrick/macattrick/PlayerList.m,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** PlayerList.m 17 Sep 2005 16:22:27 -0000 1.16 --- PlayerList.m 26 Sep 2005 19:33:58 -0000 1.17 *************** *** 288,292 **** ! - (NSMutableArray *) formerDates { return formerDates; } - (void) setFormerDates: (NSMutableArray *) newFormerDates { [newFormerDates retain]; --- 288,299 ---- ! - (NSMutableArray *) formerDates { ! if( self == [[Team currentTeam] allPlayersList]) { ! return formerDates; ! } ! else { ! return [[[Team currentTeam] allPlayersList] formerDates]; ! } ! } - (void) setFormerDates: (NSMutableArray *) newFormerDates { [newFormerDates retain]; Index: PlayerTableController.m =================================================================== RCS file: /cvsroot/macattrick/macattrick/PlayerTableController.m,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** PlayerTableController.m 17 Sep 2005 16:22:27 -0000 1.12 --- PlayerTableController.m 26 Sep 2005 19:33:58 -0000 1.13 *************** *** 54,57 **** --- 54,72 ---- } + - (void) setTeam: (Team*) newTeam { + if(team) { + [team removeObserver:self forKeyPath:@"playerList"]; + } + [newTeam addObserver: self forKeyPath: @"playerList" options: NSKeyValueObservingOptionNew context:nil]; + [super setTeam: newTeam]; + } + + + // observing + - (void) observeValueForKeyPath: (NSString*) keyPath ofObject: (id) object change: (NSDictionary*) change context: (void *) context { + if([keyPath isEqualToString: @"playerList"] ) { + [self setSelectedDate: [self selectedDate]]; // force update + } + } - (void) addSelectedPlayersToPlayerList: (PlayerList*) aPlayerList { NSArray *selectedPlayers = [playerListController selectedObjects]; *************** *** 62,65 **** --- 77,81 ---- NSArray *selected = [playerListController selectedObjects]; [[team playerList] removePlayers:selected]; + [team setPlayerList: [team playerList]]; // force update of binding [playerTable setNeedsDisplay:YES]; } |