[Macattrick-commit] macattrick LineUpController.m,1.20,1.21

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/macattrick/macattrick
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv708

Modified Files:
	LineUpController.m 
Log Message:
spec position dispatch system improved

Index: LineUpController.m
===================================================================
RCS file: /cvsroot/macattrick/macattrick/LineUpController.m,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** LineUpController.m	25 Apr 2005 20:22:37 -0000	1.20
--- LineUpController.m	16 May 2005 14:26:58 -0000	1.21
***************
*** 45,48 ****
--- 45,49 ----
  - (void) loadCentralDefender;
  - (void) displayStrenght: (LineUpTree*) tree;
+ - (void) dispatchAndInsert: (int) selectedIndex forIndex: (int) insertIndex list: (NSArray*) list;
  @end

***************
*** 165,342 ****

  - (void) loadForward {
! 	if([[specForward1 titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Normal",@"Normal")]) {
! 		[positions insertObject:[[PositionHeap uniqueInstance] positionWithIdentifier:@"Forward"] atIndex:9];
! 	}
! 	if([[specForward1 titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Defensive",@"Defensive")]) {
! 		[positions insertObject:[[PositionHeap uniqueInstance] positionWithIdentifier:@"Forward Defensive"] atIndex:9];
! 	}	
! 	if([[specForward1 titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Extra Inner Midfield",@"Extra Inner Midfield")]) {
! 		[positions insertObject:[[PositionHeap uniqueInstance] positionWithIdentifier:@"Inner Midfield"] atIndex:9];
! 	}	
! 	if([[specForward1 titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Extra Central Defender",@"Extra Central Defender")]) {
! 		[positions insertObject:[[PositionHeap uniqueInstance] positionWithIdentifier:@"Central Defender"] atIndex:9];
! 	}	
! 	if([[specForward2 titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Normal",@"Normal")]) {
! 		[positions insertObject:[[PositionHeap uniqueInstance] positionWithIdentifier:@"Forward"] atIndex:10];
! 	}
! 	if([[specForward2 titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Defensive",@"Defensive")]) {
! 		[positions insertObject:[[PositionHeap uniqueInstance] positionWithIdentifier:@"Forward Defensive"] atIndex:10];
! 	}	
! 	if([[specForward2 titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Extra Inner Midfield",@"Extra Inner Midfield")]) {
! 		[positions insertObject:[[PositionHeap uniqueInstance] positionWithIdentifier:@"Inner Midfield"] atIndex:10];
! 	}	
! 	if([[specForward2 titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Extra Central Defender",@"Extra Central Defender")]) {
! 		[positions insertObject:[[PositionHeap uniqueInstance] positionWithIdentifier:@"Central Defender"] atIndex:10];
! 	}	
  }

  - (void) loadWinger {
! 	if([[specRightWinger titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Normal",@"Normal")]) {
! 		[positions insertObject:[[PositionHeap uniqueInstance] positionWithIdentifier:@"Winger"] atIndex:7];
! 	}
! 	if([[specRightWinger titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Offensive",@"Offensive")]) {
! 		[positions insertObject:[[PositionHeap uniqueInstance] positionWithIdentifier:@"Winger Offensive"] atIndex:7];
! 	}
! 	if([[specRightWinger titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Defensive",@"Defensive")]) {
! 		[positions insertObject:[[PositionHeap uniqueInstance] positionWithIdentifier:@"Winger Defensive"] atIndex:7];
! 	}
! 	if([[specRightWinger titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Towards Middle",@"Towards Middle")]) {
! 		[positions insertObject:[[PositionHeap uniqueInstance] positionWithIdentifier:@"Winger Towards Middle"] atIndex:7];
! 	}
! 	if([[specRightWinger titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Extra Forward",@"Extra Forward")]) {
! 		[positions insertObject:[[PositionHeap uniqueInstance] positionWithIdentifier:@"Forward"] atIndex:7];
! 	}
! 	if([[specRightWinger titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Extra Central Defender",@"Extra Central Defender")]) {
! 		[positions insertObject:[[PositionHeap uniqueInstance] positionWithIdentifier:@"Central Defender"] atIndex:7];
! 	}
! 	if([[specLeftWinger titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Normal",@"Normal")]) {
! 		[positions insertObject:[[PositionHeap uniqueInstance] positionWithIdentifier:@"Winger"] atIndex:8];
! 	}
! 	if([[specLeftWinger titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Offensive",@"Offensive")]) {
! 		[positions insertObject:[[PositionHeap uniqueInstance] positionWithIdentifier:@"Winger Offensive"] atIndex:8];
! 	}
! 	if([[specLeftWinger titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Defensive",@"Defensive")]) {
! 		[positions insertObject:[[PositionHeap uniqueInstance] positionWithIdentifier:@"Winger Defensive"] atIndex:8];
! 	}
! 	if([[specLeftWinger titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Towards Middle",@"Towards Middle")]) {
! 		[positions insertObject:[[PositionHeap uniqueInstance] positionWithIdentifier:@"Winger Towards Middle"] atIndex:8];
! 	}
! 	if([[specLeftWinger titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Extra Forward",@"Extra Forward")]) {
! 		[positions insertObject:[[PositionHeap uniqueInstance] positionWithIdentifier:@"Forward"] atIndex:8];
! 	}
! 	if([[specLeftWinger titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Extra Central Defender",@"Extra Central Defender")]) {
! 		[positions insertObject:[[PositionHeap uniqueInstance] positionWithIdentifier:@"Central Defender"] atIndex:8];
! 	}	
! }
! - (void) loadInnerMidfield {		
! 	if([[specInnerMidfield1 titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Normal",@"Normal")]) {
! 		[positions insertObject:[[PositionHeap uniqueInstance] positionWithIdentifier:@"Inner Midfield"] atIndex:5];
! 	}
! 	if([[specInnerMidfield1 titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Offensive",@"Offensive")]) {
! 		[positions insertObject:[[PositionHeap uniqueInstance] positionWithIdentifier:@"Inner Midfield Offensive"] atIndex:5];
! 	}
! 	if([[specInnerMidfield1 titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Defensive",@"Defensive")]) {
! 		[positions insertObject:[[PositionHeap uniqueInstance] positionWithIdentifier:@"Inner Midfield Defensive"] atIndex:5];
! 	}
! 	if([[specInnerMidfield1 titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Towards Wing",@"Towards Wing")]) {
! 		[positions insertObject:[[PositionHeap uniqueInstance] positionWithIdentifier:@"Inner Midfield Towards Wing"] atIndex:5];
! 	}
! 	if([[specInnerMidfield1 titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Extra Forward",@"Extra Forward")]) {
! 		[positions insertObject:[[PositionHeap uniqueInstance] positionWithIdentifier:@"Forward"] atIndex:5];
! 	}
! 	if([[specInnerMidfield1 titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Extra Central Defender",@"Extra Central Defender")]) {
! 		[positions insertObject:[[PositionHeap uniqueInstance] positionWithIdentifier:@"Central Defender"] atIndex:5];
! 	}
! 	if([[specInnerMidfield2 titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Normal",@"Normal")]) {
! 		[positions insertObject:[[PositionHeap uniqueInstance] positionWithIdentifier:@"Inner Midfield"] atIndex:6];
! 	}
! 	if([[specInnerMidfield2 titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Offensive",@"Offensive")]) {
! 		[positions insertObject:[[PositionHeap uniqueInstance] positionWithIdentifier:@"Inner Midfield Offensive"] atIndex:6];
! 	}
! 	if([[specInnerMidfield2 titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Defensive",@"Defensive")]) {
! 		[positions insertObject:[[PositionHeap uniqueInstance] positionWithIdentifier:@"Inner Midfield Defensive"] atIndex:6];
! 	}
! 	if([[specInnerMidfield2 titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Towards Wing",@"Towards Wing")]) {
! 		[positions insertObject:[[PositionHeap uniqueInstance] positionWithIdentifier:@"Inner Midfield Towards Wing"] atIndex:6];
! 	}
! 	if([[specInnerMidfield2 titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Extra Forward",@"Extra Forward")]) {
! 		[positions insertObject:[[PositionHeap uniqueInstance] positionWithIdentifier:@"Forward"] atIndex:6];
! 	}
! 	if([[specInnerMidfield2 titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Extra Central Defender",@"Extra Central Defender")]) {
! 		[positions insertObject:[[PositionHeap uniqueInstance] positionWithIdentifier:@"Central Defender"] atIndex:6];
! 	}
  }

! - (void) loadBackWings {		
! 	if([[specRightBack titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Normal",@"Normal")]) {
! 		[positions insertObject:[[PositionHeap uniqueInstance] positionWithIdentifier:@"Wingback"] atIndex:3];
! 	}
! 	if([[specRightBack titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Offensive",@"Offensive")]) {
! 		[positions insertObject:[[PositionHeap uniqueInstance] positionWithIdentifier:@"Wingback Offensive"] atIndex:3];
! 	}
! 	if([[specRightBack titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Defensive",@"Defensive")]) {
! 		[positions insertObject:[[PositionHeap uniqueInstance] positionWithIdentifier:@"Wingback Defensive"] atIndex:3];
! 	}
! 	if([[specRightBack titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Towards Middle",@"Towards Middle")]) {
! 		[positions insertObject:[[PositionHeap uniqueInstance] positionWithIdentifier:@"Wingback Towards Middle"] atIndex:3];
! 	}
! 	if([[specRightBack titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Extra Forward",@"Extra Forward")]) {
! 		[positions insertObject:[[PositionHeap uniqueInstance] positionWithIdentifier:@"Forward"] atIndex:3];
! 	}
! 	if([[specRightBack titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Extra Inner Midfield",@"Extra Inner Midfield")]) {
! 		[positions insertObject:[[PositionHeap uniqueInstance] positionWithIdentifier:@"Inner Midfield"] atIndex:3];
! 	}
! 	if([[specLeftBack titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Normal",@"Normal")]) {
! 		[positions insertObject:[[PositionHeap uniqueInstance] positionWithIdentifier:@"Wingback"] atIndex:4];
! 	}
! 	if([[specLeftBack titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Offensive",@"Offensive")]) {
! 		[positions insertObject:[[PositionHeap uniqueInstance] positionWithIdentifier:@"Wingback Offensive"] atIndex:4];
! 	}
! 	if([[specLeftBack titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Defensive",@"Defensive")]) {
! 		[positions insertObject:[[PositionHeap uniqueInstance] positionWithIdentifier:@"Wingback Defensive"] atIndex:4];
! 	}
! 	if([[specLeftBack titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Towards Middle",@"Towards Middle")]) {
! 		[positions insertObject:[[PositionHeap uniqueInstance] positionWithIdentifier:@"Wingback Towards Middle"] atIndex:4];
! 	}
! 	if([[specLeftBack titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Extra Forward",@"Extra Forward")]) {
! 		[positions insertObject:[[PositionHeap uniqueInstance] positionWithIdentifier:@"Forward"] atIndex:4];
! 	}
! 	if([[specLeftBack titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Extra Inner Midfield",@"Extra Inner Midfield")]) {
! 		[positions insertObject:[[PositionHeap uniqueInstance] positionWithIdentifier:@"Inner Midfield"] atIndex:4];
! 	}
  }

  - (void) loadCentralDefender {
! 	if([[specCentralDefender1 titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Normal",@"Normal")]) {
! 		[positions insertObject:[[PositionHeap uniqueInstance] positionWithIdentifier:@"Central Defender"] atIndex:1];
! 	}
! 	if([[specCentralDefender1 titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Offensive",@"Offensive")]) {
! 		[positions insertObject:[[PositionHeap uniqueInstance] positionWithIdentifier:@"Central Defender Offensive"] atIndex:1];
! 	}
! 	if([[specCentralDefender1 titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Towards Wing",@"Towards Wing")]) {
! 		[positions insertObject:[[PositionHeap uniqueInstance] positionWithIdentifier:@"Central Defender Towards Wing"] atIndex:1];
! 	}
! 	if([[specCentralDefender1 titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Extra Forward",@"Extra Forward")]) {
! 		[positions insertObject:[[PositionHeap uniqueInstance] positionWithIdentifier:@"Forward"] atIndex:1];
! 	}
! 	if([[specCentralDefender1 titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Extra Inner Midfield",@"Extra Inner Midfield")]) {
! 		[positions insertObject:[[PositionHeap uniqueInstance] positionWithIdentifier:@"Inner Midfield"] atIndex:1];
! 	}
! 	if([[specCentralDefender2 titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Normal",@"Normal")]) {
! 		[positions insertObject:[[PositionHeap uniqueInstance] positionWithIdentifier:@"Central Defender"] atIndex:2];
! 	}
! 	if([[specCentralDefender2 titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Offensive",@"Offensive")]) {
! 		[positions insertObject:[[PositionHeap uniqueInstance] positionWithIdentifier:@"Central Defender Offensive"] atIndex:2];
! 	}
! 	if([[specCentralDefender2 titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Towards Wing",@"Towards Wing")]) {
! 		[positions insertObject:[[PositionHeap uniqueInstance] positionWithIdentifier:@"Central Defender Towards Wing"] atIndex:2];
! 	}
! 	if([[specCentralDefender2 titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Extra Forward",@"Extra Forward")]) {
! 		[positions insertObject:[[PositionHeap uniqueInstance] positionWithIdentifier:@"Forward"] atIndex:2];
! 	}
! 	if([[specCentralDefender2 titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Extra Inner Midfield",@"Extra Inner Midfield")]) {
! 		[positions insertObject:[[PositionHeap uniqueInstance] positionWithIdentifier:@"Inner Midfield"] atIndex:2];
! 	}	
  }

--- 166,201 ----

  - (void) loadForward {
! 	NSArray *list = [[NSArray alloc] initWithObjects: @"Forward", @"Forward Defensive", @"Inner Midfield", @"Central Defender", nil];
! 	[self dispatchAndInsert:[specForward1 indexOfSelectedItem] forIndex: 9 list: list];
! 	[self dispatchAndInsert:[specForward2 indexOfSelectedItem] forIndex: 10 list: list];
  }

  - (void) loadWinger {
! 	NSArray *list = [[NSArray alloc] initWithObjects: @"Winger", @"Winger Offensive", @"Winger Defensive",@"Winger Towards Middle",  @"Forward", @"Central Defender", nil];
! 	[self dispatchAndInsert:[specRightWinger indexOfSelectedItem] forIndex: 7 list: list];
! 	[self dispatchAndInsert:[specLeftWinger indexOfSelectedItem] forIndex: 8 list: list];
  }

+ - (void) loadInnerMidfield {
+ 	NSArray *list = [[NSArray alloc] initWithObjects: @"Inner Midfield", @"Inner Midfield Offensive", @"Inner Midfield Defensive" ,@"Inner Midfield Towards Wing",  @"Forward", @"Central Defender", nil];
+ 	[self dispatchAndInsert:[specInnerMidfield1 indexOfSelectedItem] forIndex: 5 list: list];
+ 	[self dispatchAndInsert:[specInnerMidfield2 indexOfSelectedItem] forIndex: 6 list: list];
+ }

! - (void) loadBackWings {
! 	NSArray *list = [[NSArray alloc] initWithObjects: @"Wingback", @"Wingback Offensive", @"Wingback Defensive",@"Wingback Towards Middle",  @"Forward", @"Inner Midfield", nil];
! 	[self dispatchAndInsert:[specRightBack indexOfSelectedItem] forIndex: 3 list: list];
! 	[self dispatchAndInsert:[specLeftBack indexOfSelectedItem] forIndex: 4 list: list];
  }

  - (void) loadCentralDefender {
! 	NSArray *list = [[NSArray alloc] initWithObjects: @"Central Defender", @"Central Defender Offensive", @"Central Defender Towards Wing",  @"Forward", @"Inner Midfield", nil];
! 	[self dispatchAndInsert:[specCentralDefender1 indexOfSelectedItem] forIndex: 1 list: list];
! 	[self dispatchAndInsert:[specCentralDefender2 indexOfSelectedItem] forIndex: 2 list: list];
! }
! 
! 
! - (void) dispatchAndInsert: (int) selectedIndex forIndex: (int) insertIndex list: (NSArray*) list {
! 	[positions insertObject:[[PositionHeap uniqueInstance] positionWithIdentifier:[list objectAtIndex:selectedIndex]] atIndex:insertIndex];		
  }