macattrick-commit — Every CVS commit will be sent to macattrick-commit.

[Macattrick-commit] macattrick LineUpController.h,1.6,1.7 LineUpController.m,1.21,1.22

[Geisschaes <gei...@us...>]

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

Modified Files:
	LineUpController.h LineUpController.m 
Log Message:
point are now diplayed in pop up buttons. implementational improvement of the lineup controller

Index: LineUpController.m
===================================================================
RCS file: /cvsroot/macattrick/macattrick/LineUpController.m,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** LineUpController.m	16 May 2005 14:26:58 -0000	1.21
--- LineUpController.m	16 May 2005 15:43:36 -0000	1.22
***************
*** 45,49 ****
--- 45,57 ----
  - (void) loadCentralDefender;
  - (void) displayStrenght: (LineUpTree*) tree;
+ - (void) displayPointsInSpecs: (NSArray*) lineUp;
+ - (void) display: (Player*) player inSpec: (NSPopUpButton*) spec list: (NSArray*) specList contentList: (NSArray*)specContentList;
  - (void) dispatchAndInsert: (int) selectedIndex forIndex: (int) insertIndex list: (NSArray*) list;
+ - (NSArray *) specForwardList;
+ - (NSArray *) specWingerList;
+ - (NSArray *) specInnerMidfieldList;
+ - (NSArray *) specWingbackList;
+ - (NSArray *) specCentralDefenderList;
+ 
  @end
  
***************
*** 53,57 ****
  -(LineUpController*) init {
  	self = [super init];
! 	[NSBundle loadNibNamed:@"LineUpView" owner: self];
  	return self;
  }
--- 61,77 ----
  -(LineUpController*) init {
  	self = [super init];
! 	if(self) {
! 		[NSBundle loadNibNamed:@"LineUpView" owner: self];
! 		specForwardList =  [[NSArray alloc] initWithObjects: @"Forward", @"Forward Defensive", @"Inner Midfield", @"Central Defender", nil];
! 		specForwardContentList =  [[NSArray alloc] initWithObjects: NSLocalizedString(@"Normal", @"Normal"), NSLocalizedString(@"Defensive", @"Defensive"), NSLocalizedString(@"Extra Inner Midfield", @"Extra Inner Midfield"), NSLocalizedString(@"Extra Central Defender", @"Extra Central Defender"), nil];
! 		specWingerList = [[NSArray alloc] initWithObjects: @"Winger", @"Winger Offensive", @"Winger Defensive",@"Winger Towards Middle",  @"Forward", @"Central Defender", nil];
! 		specWingerContentList =  [[NSArray alloc] initWithObjects: NSLocalizedString(@"Normal", @"Normal"), NSLocalizedString(@"Offensive", @"Offensive"), NSLocalizedString(@"Defensive", @"Defensive"),NSLocalizedString(@"Towards Middle", @"Towards Middle"), NSLocalizedString(@"Extra Forward", @"Extra Forward"), NSLocalizedString(@"Extra Central Defender", @"Extra Central Defender"), nil];
! 		specInnerMidfieldList = [[NSArray alloc] initWithObjects: @"Inner Midfield", @"Inner Midfield Offensive", @"Inner Midfield Defensive" ,@"Inner Midfield Towards Wing",  @"Forward", @"Central Defender", nil];
! 		specInnerMidfieldContentList =  [[NSArray alloc] initWithObjects: NSLocalizedString(@"Normal", @"Normal"), NSLocalizedString(@"Offensive", @"Offensive"), NSLocalizedString(@"Defensive", @"Defensive"),NSLocalizedString(@"Towards Wing", @"Towards Wing"), NSLocalizedString(@"Extra Forward", @"Extra Forward"), NSLocalizedString(@"Extra Central Defender", @"Extra Central Defender"), nil];
! 		specWingbackList = [[NSArray alloc] initWithObjects: @"Wingback", @"Wingback Offensive", @"Wingback Defensive",@"Wingback Towards Middle",  @"Forward", @"Inner Midfield", nil];
! 		specWingbackContentList =  [[NSArray alloc] initWithObjects: NSLocalizedString(@"Normal", @"Normal"), NSLocalizedString(@"Offensive", @"Offensive"), NSLocalizedString(@"Defensive", @"Defensive"),NSLocalizedString(@"Towards Middle", @"Towards Middle"), NSLocalizedString(@"Extra Forward", @"Extra Forward"), NSLocalizedString(@"Extra Inner Midfield", @"Extra Inner Midfield"), nil];		
! 		specCentralDefenderList =  [[NSArray alloc] initWithObjects: @"Central Defender", @"Central Defender Offensive", @"Central Defender Towards Wing",  @"Forward", @"Inner Midfield", nil];
! 		specCentralDefenderContentList =  [[NSArray alloc] initWithObjects: NSLocalizedString(@"Normal", @"Normal"), NSLocalizedString(@"Offensive", @"Offensive"),NSLocalizedString(@"Towards Wing", @"Towards Wing"), NSLocalizedString(@"Extra Forward", @"Extra Forward"), NSLocalizedString(@"Extra Inner Midfield", @"Extra Inner Midfield"), nil];
! 	}
  	return self;
  }
***************
*** 69,72 ****
--- 89,93 ----
  	NSArray *lineUp = [lineUpTree bestLineUp];
  	[self displayLineUp: lineUp];
+ 	[self displayPointsInSpecs: lineUp];
  	[self setPiecesPlayer:[self teamFromLineUp: lineUp]];	
  	[self teamCaptainPlayer:[self teamFromLineUp: lineUp]];		
***************
*** 118,121 ****
--- 139,170 ----
  }
  
+ - (void) displayPointsInSpecs: (NSArray*) lineUp {
+ 	[self display:[[lineUp objectAtIndex:0] player] inSpec: specForward2 list: (NSArray*) specForwardList contentList: specForwardContentList];
+ 	[self display:[[lineUp objectAtIndex:1] player] inSpec: specForward1 list: (NSArray*) specForwardList contentList: specForwardContentList];
+ 	[self display:[[lineUp objectAtIndex:2] player] inSpec: specLeftWinger list: (NSArray*) specWingerList contentList: specWingerContentList];
+ 	[self display:[[lineUp objectAtIndex:3] player] inSpec: specRightWinger list: (NSArray*) specWingerList contentList: specWingerContentList];
+ 	[self display:[[lineUp objectAtIndex:4] player] inSpec: specInnerMidfield2 list: (NSArray*) specInnerMidfieldList contentList: specInnerMidfieldContentList];
+ 	[self display:[[lineUp objectAtIndex:5] player] inSpec: specInnerMidfield1 list: (NSArray*) specInnerMidfieldList contentList: specInnerMidfieldContentList];
+ 	[self display:[[lineUp objectAtIndex:6] player] inSpec: specLeftBack list: (NSArray*) specWingbackList contentList: specWingbackContentList];
+ 	[self display:[[lineUp objectAtIndex:7] player] inSpec: specRightBack list: (NSArray*) specWingbackList contentList: specWingbackContentList];
+ 	[self display:[[lineUp objectAtIndex:8] player] inSpec: specCentralDefender2 list: (NSArray*) specCentralDefenderList contentList: specCentralDefenderContentList];
+ 	[self display:[[lineUp objectAtIndex:9] player] inSpec: specCentralDefender1 list: (NSArray*) specCentralDefenderList contentList: specCentralDefenderContentList];
+ }
+ 
+ - (void) display: (Player*) player inSpec: (NSPopUpButton*) spec list: (NSArray*) specList contentList: (NSArray*)specContentList{
+ 	int size = [specList count];
+ 	int selected = [spec indexOfSelectedItem];
+ 	[spec removeAllItems];
+ 	int i = 0;
+ 	for (i=0; i<size; i++) {
+ 		Position *pos = [[PositionHeap uniqueInstance] positionWithIdentifier: [specList objectAtIndex:i]];
+ 		NSString *str = [[NSString alloc] initWithFormat:@"%@ (%.2f)", [specContentList objectAtIndex:i], [player calculatePositionValue:pos]];
+ 		[spec insertItemWithTitle:str atIndex:i];
+ 		[str release];
+ 	}
+ 	[spec selectItemAtIndex:selected];
+ }
+ 
+ 
  -(void) displaySubstitutes: (NSArray*) substitutes {
  	[subKeeper setStringValue: [[substitutes objectAtIndex:4] playerNameWithPointsForPosition]];
***************
*** 141,156 ****
  - (void) loadPositions {
  	positions = [NSMutableArray arrayWithCapacity:11];
- 	// keeper at index 0
  	[positions insertObject:[[PositionHeap uniqueInstance] positionWithIdentifier:@"Keeper"] atIndex:0];
! 	// central defenders at index 1 and 2
! 	[self loadCentralDefender];
! 	// backwing at index 3 and 4
! 	[self loadBackWings];
! 	// inner midfield at index 5 and 6
! 	[self loadInnerMidfield];
! 	// winger at index 7 and 8
! 	[self loadWinger];
! 	// finally forwards at index 9 and 10
! 	[self loadForward];
  }
  
--- 190,205 ----
  - (void) loadPositions {
  	positions = [NSMutableArray arrayWithCapacity:11];
  	[positions insertObject:[[PositionHeap uniqueInstance] positionWithIdentifier:@"Keeper"] atIndex:0];
! 	[self dispatchAndInsert:[specCentralDefender1 indexOfSelectedItem] forIndex: 1 list: specCentralDefenderList];
! 	[self dispatchAndInsert:[specCentralDefender2 indexOfSelectedItem] forIndex: 2 list: specCentralDefenderList];
! 	[self dispatchAndInsert:[specRightBack indexOfSelectedItem] forIndex: 3 list: specWingbackList];
! 	[self dispatchAndInsert:[specLeftBack indexOfSelectedItem] forIndex: 4 list: specWingbackList];
! 	[self dispatchAndInsert:[specInnerMidfield1 indexOfSelectedItem] forIndex: 5 list: specInnerMidfieldList];
! 	[self dispatchAndInsert:[specInnerMidfield2 indexOfSelectedItem] forIndex: 6 list: specInnerMidfieldList];
! 	[self dispatchAndInsert:[specRightWinger indexOfSelectedItem] forIndex: 7 list: specWingerList];
! 	[self dispatchAndInsert:[specLeftWinger indexOfSelectedItem] forIndex: 8 list: specWingerList];
! 	[self dispatchAndInsert:[specForward1 indexOfSelectedItem] forIndex: 9 list: specForwardList];
! 	[self dispatchAndInsert:[specForward2 indexOfSelectedItem] forIndex: 10 list: specForwardList];
! 
  }
  
***************
*** 165,197 ****
  }
  
! - (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];
! }
  
  
--- 214,226 ----
  }
  
! - (NSArray *) specForwardList { return specForwardList; }
  
! - (NSArray *) specWingerList { return specWingerList; }
  
! - (NSArray *) specInnerMidfieldList { return specInnerMidfieldList; }
  
! - (NSArray *) specWingbackList { return specWingbackList; }
  
! - (NSArray *) specCentralDefenderList { return specCentralDefenderList; }
  
  
***************
*** 200,202 ****
--- 229,251 ----
  }
  
+ 
+ 
+ - (void) dealloc {
+     [positions release];
+     [specForwardList release];
+     [specWingerList release];
+     [specInnerMidfieldList release];
+     [specWingbackList release];
+     [specCentralDefenderList release];
+     [specForwardContentList release];
+     [specWingerContentList release];
+     [specInnerMidfieldContentList release];
+     [specWingbackContentList release];
+     [specCentralDefenderContentList release];
+     [super dealloc];
+ }
+ 
+ 
+ 
+ 
  @end

Index: LineUpController.h
===================================================================
RCS file: /cvsroot/macattrick/macattrick/LineUpController.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** LineUpController.h	25 Apr 2005 20:22:37 -0000	1.6
--- LineUpController.h	16 May 2005 15:43:36 -0000	1.7
***************
*** 43,47 ****
  {
  	IBOutlet NSView *lineUpView;
! 	NSMutableArray *positions;
      IBOutlet NSTextField *centralDefender1;
      IBOutlet NSTextField *centralDefender2;
--- 43,47 ----
  {
  	IBOutlet NSView *lineUpView;
! 
      IBOutlet NSTextField *centralDefender1;
      IBOutlet NSTextField *centralDefender2;
***************
*** 77,81 ****
      IBOutlet NSPopUpButton *specRightWinger;
  
! 
  }
  
--- 77,92 ----
      IBOutlet NSPopUpButton *specRightWinger;
  
! 	NSMutableArray *positions;
! 	NSArray *specForwardList;
! 	NSArray *specWingerList;
! 	NSArray *specInnerMidfieldList;
! 	NSArray *specWingbackList;
! 	NSArray *specCentralDefenderList;
! 	NSArray *specForwardContentList;
! 	NSArray *specWingerContentList;
! 	NSArray *specInnerMidfieldContentList;
! 	NSArray *specWingbackContentList;
! 	NSArray *specCentralDefenderContentList;
! 		
  }
  

[Macattrick-commit] macattrick/Macattrick.xcode roman.mode1,1.32,1.33 roman.pbxuser,1.97,1.98

[Geisschaes <gei...@us...>]

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

Modified Files:
	roman.mode1 roman.pbxuser 
Log Message:
spec position dispatch system improved

Index: roman.mode1
===================================================================
RCS file: /cvsroot/macattrick/macattrick/Macattrick.xcode/roman.mode1,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** roman.mode1	16 May 2005 13:31:58 -0000	1.32
--- roman.mode1	16 May 2005 14:26:58 -0000	1.33
***************
*** 191,197 ****
  			<dict>
  				<key>PBXProjectModuleGUID</key>
! 				<string>30BE483F082FF0F400826659</string>
  				<key>PBXProjectModuleLabel</key>
! 				<string>PositionHeapTest.m</string>
  				<key>PBXSplitModuleInNavigatorKey</key>
  				<dict>
--- 191,197 ----
  			<dict>
  				<key>PBXProjectModuleGUID</key>
! 				<string>3067B0360838D8EF0063180D</string>
  				<key>PBXProjectModuleLabel</key>
! 				<string>LineUpController.m</string>
  				<key>PBXSplitModuleInNavigatorKey</key>
  				<dict>
***************
*** 199,233 ****
  					<dict>
  						<key>PBXProjectModuleGUID</key>
! 						<string>30BE4845082FF1B600826659</string>
  						<key>PBXProjectModuleLabel</key>
! 						<string>PositionHeapTest.m</string>
  						<key>_historyCapacity</key>
  						<integer>0</integer>
  						<key>bookmark</key>
! 						<string>3067B02F0838D79D0063180D</string>
  						<key>history</key>
  						<array>
! 							<string>30BE4867082FF5B200826659</string>
! 							<string>3067AFF50838D3E00063180D</string>
! 							<string>3067AFF60838D3E00063180D</string>
! 							<string>3067B0180838D6FF0063180D</string>
! 							<string>3067B0190838D6FF0063180D</string>
! 							<string>3067B02D0838D79D0063180D</string>
! 							<string>3067B0030838D4C70063180D</string>
  						</array>
  						<key>prevStack</key>
  						<array>
! 							<string>30BE486A082FF5B200826659</string>
! 							<string>30BE486B082FF5B200826659</string>
! 							<string>3042558D0837E2BB00DDF612</string>
! 							<string>3067AFF80838D3E00063180D</string>
! 							<string>3067B0040838D4C70063180D</string>
! 							<string>3067B01B0838D6FF0063180D</string>
! 							<string>3067B01C0838D6FF0063180D</string>
! 							<string>3067B01D0838D6FF0063180D</string>
! 							<string>3067B01E0838D6FF0063180D</string>
! 							<string>3067B01F0838D6FF0063180D</string>
! 							<string>3067B0200838D6FF0063180D</string>
! 							<string>3067B02E0838D79D0063180D</string>
  						</array>
  					</dict>
--- 199,220 ----
  					<dict>
  						<key>PBXProjectModuleGUID</key>
! 						<string>3067B0450838E12D0063180D</string>
  						<key>PBXProjectModuleLabel</key>
! 						<string>LineUpController.m</string>
  						<key>_historyCapacity</key>
  						<integer>0</integer>
  						<key>bookmark</key>
! 						<string>3067B04B0838E12D0063180D</string>
  						<key>history</key>
  						<array>
! 							<string>3067B0460838E12D0063180D</string>
! 							<string>3067B03D0838E0600063180D</string>
  						</array>
  						<key>prevStack</key>
  						<array>
! 							<string>3067B0470838E12D0063180D</string>
! 							<string>3067B0480838E12D0063180D</string>
! 							<string>3067B0490838E12D0063180D</string>
! 							<string>3067B04A0838E12D0063180D</string>
  						</array>
  					</dict>
***************
*** 241,249 ****
  			<dict>
  				<key>Frame</key>
! 				<string>{{0, 20}, {1087, 519}}</string>
  				<key>PBXModuleWindowStatusBarHidden2</key>
  				<false/>
  				<key>RubberWindowFrame</key>
! 				<string>158 253 1087 560 0 0 1280 832 </string>
  			</dict>
  		</dict>
--- 228,236 ----
  			<dict>
  				<key>Frame</key>
! 				<string>{{0, 20}, {1043, 583}}</string>
  				<key>PBXModuleWindowStatusBarHidden2</key>
  				<false/>
  				<key>RubberWindowFrame</key>
! 				<string>84 140 1043 624 0 0 1280 832 </string>
  			</dict>
  		</dict>
***************
*** 325,329 ****
  							<array>
  								<array>
! 									<integer>3</integer>
  									<integer>0</integer>
  								</array>
--- 312,316 ----
  							<array>
  								<array>
! 									<integer>4</integer>
  									<integer>0</integer>
  								</array>
***************
*** 377,381 ****
  										<integer>0</integer>
  										<key>bookmark</key>
! 										<string>3067B02C0838D79D0063180D</string>
  										<key>history</key>
  										<array>
--- 364,368 ----
  										<integer>0</integer>
  										<key>bookmark</key>
! 										<string>3067B0440838E12D0063180D</string>
  										<key>history</key>
  										<array>
***************
*** 573,577 ****
  	<false/>
  	<key>PinnedNavigatorIdentifier</key>
! 	<string>30BE483F082FF0F400826659</string>
  	<key>ShelfIsVisible</key>
  	<false/>
--- 560,564 ----
  	<false/>
  	<key>PinnedNavigatorIdentifier</key>
! 	<string>3067B0360838D8EF0063180D</string>
  	<key>ShelfIsVisible</key>
  	<false/>
***************
*** 598,605 ****
  		<string>1C530D57069F1CE1000CFCEE</string>
  		<string>3067AFAB0838C99F0063180D</string>
- 		<string>1C0AD2B3069F1EA900FABCE6</string>
  		<string>1CD10A99069EF8BA00B06720</string>
  		<string>/Users/roman/Documents/dev/macattrick/Macattrick.xcode</string>
! 		<string>30BE483F082FF0F400826659</string>
  	</array>
  	<key>WindowString</key>
--- 585,593 ----
  		<string>1C530D57069F1CE1000CFCEE</string>
  		<string>3067AFAB0838C99F0063180D</string>
  		<string>1CD10A99069EF8BA00B06720</string>
  		<string>/Users/roman/Documents/dev/macattrick/Macattrick.xcode</string>
! 		<string>30A82A48082E9E83003C97DB</string>
! 		<string>1C0AD2B3069F1EA900FABCE6</string>
! 		<string>3067B0360838D8EF0063180D</string>
  	</array>
  	<key>WindowString</key>
***************
*** 625,629 ****
  								<string>1CD0528F0623707200166675</string>
  								<key>PBXProjectModuleLabel</key>
! 								<string>PositionHeap.m</string>
  								<key>StatusBarVisibility</key>
  								<true/>
--- 613,617 ----
  								<string>1CD0528F0623707200166675</string>
  								<key>PBXProjectModuleLabel</key>
! 								<string>LineUpController.m</string>
  								<key>StatusBarVisibility</key>
  								<true/>
***************
*** 634,638 ****
  								<string>{{0, 0}, {787, 290}}</string>
  								<key>RubberWindowFrame</key>
! 								<string>458 116 787 699 0 0 1280 832 </string>
  							</dict>
  							<key>Module</key>
--- 622,626 ----
  								<string>{{0, 0}, {787, 290}}</string>
  								<key>RubberWindowFrame</key>
! 								<string>458 117 787 699 0 0 1280 832 </string>
  							</dict>
  							<key>Module</key>
***************
*** 662,666 ****
  								<string>{{0, 295}, {787, 363}}</string>
  								<key>RubberWindowFrame</key>
! 								<string>458 116 787 699 0 0 1280 832 </string>
  							</dict>
  							<key>Module</key>
--- 650,654 ----
  								<string>{{0, 295}, {787, 363}}</string>
  								<key>RubberWindowFrame</key>
! 								<string>458 117 787 699 0 0 1280 832 </string>
  							</dict>
  							<key>Module</key>
***************
*** 692,696 ****
  			<string>xcode.toolbar.config.build</string>
  			<key>WindowString</key>
! 			<string>458 116 787 699 0 0 1280 832 </string>
  			<key>WindowToolGUID</key>
  			<string>30A82A48082E9E83003C97DB</string>
--- 680,684 ----
  			<string>xcode.toolbar.config.build</string>
  			<key>WindowString</key>
! 			<string>458 117 787 699 0 0 1280 832 </string>
  			<key>WindowToolGUID</key>
  			<string>30A82A48082E9E83003C97DB</string>
***************
*** 1024,1039 ****
  							<dict>
  								<key>Frame</key>
! 								<string>{{0, 0}, {459, 159}}</string>
  								<key>RubberWindowFrame</key>
! 								<string>181 606 459 200 0 0 1280 832 </string>
  							</dict>
  							<key>Module</key>
  							<string>PBXRunSessionModule</string>
  							<key>Proportion</key>
! 							<string>159pt</string>
  						</dict>
  					</array>
  					<key>Proportion</key>
! 					<string>159pt</string>
  				</dict>
  			</array>
--- 1012,1027 ----
  							<dict>
  								<key>Frame</key>
! 								<string>{{0, 0}, {1095, 323}}</string>
  								<key>RubberWindowFrame</key>
! 								<string>181 442 1095 364 0 0 1280 832 </string>
  							</dict>
  							<key>Module</key>
  							<string>PBXRunSessionModule</string>
  							<key>Proportion</key>
! 							<string>323pt</string>
  						</dict>
  					</array>
  					<key>Proportion</key>
! 					<string>323pt</string>
  				</dict>
  			</array>
***************
*** 1056,1064 ****
  			<string>xcode.toolbar.config.run</string>
  			<key>WindowString</key>
! 			<string>181 606 459 200 0 0 1280 832 </string>
  			<key>WindowToolGUID</key>
  			<string>1C0AD2B3069F1EA900FABCE6</string>
  			<key>WindowToolIsVisible</key>
! 			<false/>
  		</dict>
  		<dict>
--- 1044,1052 ----
  			<string>xcode.toolbar.config.run</string>
  			<key>WindowString</key>
! 			<string>181 442 1095 364 0 0 1280 832 </string>
  			<key>WindowToolGUID</key>
  			<string>1C0AD2B3069F1EA900FABCE6</string>
  			<key>WindowToolIsVisible</key>
! 			<true/>
  		</dict>
  		<dict>

Index: roman.pbxuser
===================================================================
RCS file: /cvsroot/macattrick/macattrick/Macattrick.xcode/roman.pbxuser,v
retrieving revision 1.97
retrieving revision 1.98
diff -C2 -d -r1.97 -r1.98
*** roman.pbxuser	16 May 2005 13:31:58 -0000	1.97
--- roman.pbxuser	16 May 2005 14:26:59 -0000	1.98
***************
*** 40,44 ****
  		activeBuildStyle = 4A9504CCFFE6A4B311CA0CBA;
  		activeExecutable = 30744BA6069560A70039B82A;
! 		activeTarget = 30DFA496082018F2000CE74D;
  		addToTargets = (
  			30DFA496082018F2000CE74D,
--- 40,44 ----
  		activeBuildStyle = 4A9504CCFFE6A4B311CA0CBA;
  		activeExecutable = 30744BA6069560A70039B82A;
! 		activeTarget = 30744BA4069560A70039B82A;
  		addToTargets = (
  			30DFA496082018F2000CE74D,
***************
*** 1096,1099 ****
--- 1096,1108 ----
  			3067B02E0838D79D0063180D = 3067B02E0838D79D0063180D;
  			3067B02F0838D79D0063180D = 3067B02F0838D79D0063180D;
+ 			3067B0340838D8C40063180D = 3067B0340838D8C40063180D;
+ 			3067B03D0838E0600063180D = 3067B03D0838E0600063180D;
+ 			3067B0440838E12D0063180D = 3067B0440838E12D0063180D;
+ 			3067B0460838E12D0063180D = 3067B0460838E12D0063180D;
+ 			3067B0470838E12D0063180D = 3067B0470838E12D0063180D;
+ 			3067B0480838E12D0063180D = 3067B0480838E12D0063180D;
+ 			3067B0490838E12D0063180D = 3067B0490838E12D0063180D;
+ 			3067B04A0838E12D0063180D = 3067B04A0838E12D0063180D;
+ 			3067B04B0838E12D0063180D = 3067B04B0838E12D0063180D;
  			30A82A69082EA48F003C97DB = 30A82A69082EA48F003C97DB;
  			30A82A6B082EA48F003C97DB = 30A82A6B082EA48F003C97DB;
***************
*** 1168,1174 ****
  	301E3B2E064A7C1A00C88C10 = {
  		uiCtxt = {
! 			sepNavIntBoundsRect = "{{0, 0}, {705, 1259}}";
  			sepNavSelRange = "{3138, 1}";
! 			sepNavVisRect = "{{0, 704}, {705, 428}}";
  			sepNavWindowFrame = "{{107, 221}, {750, 522}}";
  		};
--- 1177,1183 ----
  	301E3B2E064A7C1A00C88C10 = {
  		uiCtxt = {
! 			sepNavIntBoundsRect = "{{0, 0}, {998, 1260}}";
  			sepNavSelRange = "{3138, 1}";
! 			sepNavVisRect = "{{0, 663}, {998, 551}}";
  			sepNavWindowFrame = "{{107, 221}, {750, 522}}";
  		};
***************
*** 1176,1182 ****
  	301E3B2F064A7C1A00C88C10 = {
  		uiCtxt = {
! 			sepNavIntBoundsRect = "{{0, 0}, {1406, 4815}}";
! 			sepNavSelRange = "{4392, 24}";
! 			sepNavVisRect = "{{0, 1848}, {606, 326}}";
  			sepNavWindowFrame = "{{84, 230}, {750, 534}}";
  		};
--- 1185,1191 ----
  	301E3B2F064A7C1A00C88C10 = {
  		uiCtxt = {
! 			sepNavIntBoundsRect = "{{0, 0}, {1406, 5012}}";
! 			sepNavSelRange = "{21505, 0}";
! 			sepNavVisRect = "{{0, 4461}, {998, 551}}";
  			sepNavWindowFrame = "{{84, 230}, {750, 534}}";
  		};
***************
*** 1240,1245 ****
  		uiCtxt = {
  			sepNavIntBoundsRect = "{{0, 0}, {2036, 2912}}";
! 			sepNavSelRange = "{3054, 0}";
! 			sepNavVisRect = "{{0, 883}, {435, 171}}";
  			sepNavWindowFrame = "{{208, 49}, {1064, 783}}";
  		};
--- 1249,1254 ----
  		uiCtxt = {
  			sepNavIntBoundsRect = "{{0, 0}, {2036, 2912}}";
! 			sepNavSelRange = "{2634, 24}";
! 			sepNavVisRect = "{{0, 812}, {740, 258}}";
  			sepNavWindowFrame = "{{208, 49}, {1064, 783}}";
  		};
***************
*** 2028,2031 ****
--- 2037,2128 ----
  		vrLoc = 2973;
  	};
+ 	3067B0340838D8C40063180D = {
+ 		fRef = 30D77BEC0645778B0095BAC8;
+ 		isa = PBXTextBookmark;
+ 		name = "UKFloatsEqual([pos total], 1.0, 0.001);";
+ 		rLen = 41;
+ 		rLoc = 10326;
+ 		rType = 0;
+ 		vrLen = 678;
+ 		vrLoc = 9513;
+ 	};
+ 	3067B03D0838E0600063180D = {
+ 		comments = "error: parse error before ';' token";
+ 		fRef = 301E3B2F064A7C1A00C88C10;
+ 		isa = PBXTextBookmark;
+ 		rLen = 1;
+ 		rLoc = 198;
+ 		rType = 1;
+ 	};
+ 	3067B0440838E12D0063180D = {
+ 		fRef = 30D77BEC0645778B0095BAC8;
+ 		isa = PBXTextBookmark;
+ 		name = "UKFloatsEqual([pos total], 1.0, 0.001);";
+ 		rLen = 41;
+ 		rLoc = 10326;
+ 		rType = 0;
+ 		vrLen = 678;
+ 		vrLoc = 9513;
+ 	};
+ 	3067B0460838E12D0063180D = {
+ 		fRef = 301E3B2E064A7C1A00C88C10;
+ 		isa = PBXTextBookmark;
+ 		name = "";
+ 		rLen = 1;
+ 		rLoc = 3138;
+ 		rType = 0;
+ 		vrLen = 1354;
+ 		vrLoc = 2646;
+ 	};
+ 	3067B0470838E12D0063180D = {
+ 		fRef = 301E3B2F064A7C1A00C88C10;
+ 		isa = PBXTextBookmark;
+ 		name = "= NSSelectorFromString(";
+ 		rLen = 24;
+ 		rLoc = 4491;
+ 		rType = 0;
+ 		vrLen = 2118;
+ 		vrLoc = 4272;
+ 	};
+ 	3067B0480838E12D0063180D = {
+ 		fRef = 301E3B2E064A7C1A00C88C10;
+ 		isa = PBXTextBookmark;
+ 		name = "";
+ 		rLen = 1;
+ 		rLoc = 3138;
+ 		rType = 0;
+ 		vrLen = 1397;
+ 		vrLoc = 2500;
+ 	};
+ 	3067B0490838E12D0063180D = {
+ 		fRef = 301E3B2F064A7C1A00C88C10;
+ 		isa = PBXTextBookmark;
+ 		name = "= NSSelectorFromString(";
+ 		rLen = 24;
+ 		rLoc = 4491;
+ 		rType = 0;
+ 		vrLen = 2930;
+ 		vrLoc = 10726;
+ 	};
+ 	3067B04A0838E12D0063180D = {
+ 		fRef = 301E3B2E064A7C1A00C88C10;
+ 		isa = PBXTextBookmark;
+ 		name = "";
+ 		rLen = 1;
+ 		rLoc = 3138;
+ 		rType = 0;
+ 		vrLen = 1354;
+ 		vrLoc = 2646;
+ 	};
+ 	3067B04B0838E12D0063180D = {
+ 		fRef = 301E3B2F064A7C1A00C88C10;
+ 		isa = PBXTextBookmark;
+ 		name = "LineUpController.m: 354";
+ 		rLen = 0;
+ 		rLoc = 10366;
+ 		rType = 0;
+ 		vrLen = 2667;
+ 		vrLoc = 18871;
+ 	};
  	306BE2A807B803D6009942ED = {
  		uiCtxt = {
***************
*** 2037,2043 ****
  	306BE2A907B803D6009942ED = {
  		uiCtxt = {
! 			sepNavIntBoundsRect = "{{0, 0}, {1042, 1204}}";
! 			sepNavSelRange = "{4322, 0}";
  			sepNavVisRect = "{{0, 717}, {1042, 487}}";
  		};
  	};
--- 2134,2141 ----
  	306BE2A907B803D6009942ED = {
  		uiCtxt = {
! 			sepNavIntBoundsRect = "{{0, 0}, {1042, 1218}}";
! 			sepNavSelRange = "{4299, 0}";
  			sepNavVisRect = "{{0, 717}, {1042, 487}}";
+ 			sepNavWindowFrame = "{{158, 221}, {1087, 592}}";
  		};
  	};

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

[Geisschaes <gei...@us...>]

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];		
  }
  

[Macattrick-commit] macattrick/Macattrick.xcode roman.mode1,1.31,1.32 roman.pbxuser,1.96,1.97

[Geisschaes <gei...@us...>]

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

Modified Files:
	roman.mode1 roman.pbxuser 
Log Message:
import bug fixed

Index: roman.mode1
===================================================================
RCS file: /cvsroot/macattrick/macattrick/Macattrick.xcode/roman.mode1,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** roman.mode1	9 May 2005 19:48:53 -0000	1.31
--- roman.mode1	16 May 2005 13:31:58 -0000	1.32
***************
*** 193,197 ****
  				<string>30BE483F082FF0F400826659</string>
  				<key>PBXProjectModuleLabel</key>
! 				<string>Position.m</string>
  				<key>PBXSplitModuleInNavigatorKey</key>
  				<dict>
--- 193,197 ----
  				<string>30BE483F082FF0F400826659</string>
  				<key>PBXProjectModuleLabel</key>
! 				<string>PositionHeapTest.m</string>
  				<key>PBXSplitModuleInNavigatorKey</key>
  				<dict>
***************
*** 201,215 ****
  						<string>30BE4845082FF1B600826659</string>
  						<key>PBXProjectModuleLabel</key>
! 						<string>Position.m</string>
  						<key>_historyCapacity</key>
  						<integer>0</integer>
  						<key>bookmark</key>
! 						<string>30BE486E082FF5B200826659</string>
  						<key>history</key>
  						<array>
  							<string>30BE4867082FF5B200826659</string>
! 							<string>30BE4868082FF5B200826659</string>
! 							<string>30BE4869082FF5B200826659</string>
! 							<string>30BE485F082FF3D200826659</string>
  						</array>
  						<key>prevStack</key>
--- 201,218 ----
  						<string>30BE4845082FF1B600826659</string>
  						<key>PBXProjectModuleLabel</key>
! 						<string>PositionHeapTest.m</string>
  						<key>_historyCapacity</key>
  						<integer>0</integer>
  						<key>bookmark</key>
! 						<string>3067B02F0838D79D0063180D</string>
  						<key>history</key>
  						<array>
  							<string>30BE4867082FF5B200826659</string>
! 							<string>3067AFF50838D3E00063180D</string>
! 							<string>3067AFF60838D3E00063180D</string>
! 							<string>3067B0180838D6FF0063180D</string>
! 							<string>3067B0190838D6FF0063180D</string>
! 							<string>3067B02D0838D79D0063180D</string>
! 							<string>3067B0030838D4C70063180D</string>
  						</array>
  						<key>prevStack</key>
***************
*** 217,222 ****
  							<string>30BE486A082FF5B200826659</string>
  							<string>30BE486B082FF5B200826659</string>
! 							<string>30BE486C082FF5B200826659</string>
! 							<string>30BE486D082FF5B200826659</string>
  						</array>
  					</dict>
--- 220,233 ----
  							<string>30BE486A082FF5B200826659</string>
  							<string>30BE486B082FF5B200826659</string>
! 							<string>3042558D0837E2BB00DDF612</string>
! 							<string>3067AFF80838D3E00063180D</string>
! 							<string>3067B0040838D4C70063180D</string>
! 							<string>3067B01B0838D6FF0063180D</string>
! 							<string>3067B01C0838D6FF0063180D</string>
! 							<string>3067B01D0838D6FF0063180D</string>
! 							<string>3067B01E0838D6FF0063180D</string>
! 							<string>3067B01F0838D6FF0063180D</string>
! 							<string>3067B0200838D6FF0063180D</string>
! 							<string>3067B02E0838D79D0063180D</string>
  						</array>
  					</dict>
***************
*** 234,238 ****
  				<false/>
  				<key>RubberWindowFrame</key>
! 				<string>77 96 1087 560 0 0 1280 832 </string>
  			</dict>
  		</dict>
--- 245,249 ----
  				<false/>
  				<key>RubberWindowFrame</key>
! 				<string>158 253 1087 560 0 0 1280 832 </string>
  			</dict>
  		</dict>
***************
*** 314,318 ****
  							<array>
  								<array>
! 									<integer>4</integer>
  									<integer>0</integer>
  								</array>
--- 325,329 ----
  							<array>
  								<array>
! 									<integer>3</integer>
  									<integer>0</integer>
  								</array>
***************
*** 338,342 ****
  						</array>
  						<key>RubberWindowFrame</key>
! 						<string>529 435 690 397 0 0 1280 832 </string>
  					</dict>
  					<key>Module</key>
--- 349,353 ----
  						</array>
  						<key>RubberWindowFrame</key>
! 						<string>406 411 690 397 0 0 1280 832 </string>
  					</dict>
  					<key>Module</key>
***************
*** 354,358 ****
  								<string>1CE0B20306471E060097A5F4</string>
  								<key>PBXProjectModuleLabel</key>
! 								<string>FormulasViewController.m</string>
  								<key>PBXSplitModuleInNavigatorKey</key>
  								<dict>
--- 365,369 ----
  								<string>1CE0B20306471E060097A5F4</string>
  								<key>PBXProjectModuleLabel</key>
! 								<string>PositionTest.m</string>
  								<key>PBXSplitModuleInNavigatorKey</key>
  								<dict>
***************
*** 362,379 ****
  										<string>1CE0B20406471E060097A5F4</string>
  										<key>PBXProjectModuleLabel</key>
! 										<string>FormulasViewController.m</string>
  										<key>_historyCapacity</key>
  										<integer>0</integer>
  										<key>bookmark</key>
! 										<string>30BE4866082FF5B200826659</string>
  										<key>history</key>
  										<array>
  											<string>30A82A69082EA48F003C97DB</string>
- 											<string>30A82A97082EAADC003C97DB</string>
- 											<string>30A82A98082EAADC003C97DB</string>
- 											<string>30A82A99082EAADC003C97DB</string>
  											<string>30BE47FB082FED0200826659</string>
  											<string>30BE4841082FF1B600826659</string>
! 											<string>30BE4842082FF1B600826659</string>
  										</array>
  										<key>prevStack</key>
--- 373,390 ----
  										<string>1CE0B20406471E060097A5F4</string>
  										<key>PBXProjectModuleLabel</key>
! 										<string>PositionTest.m</string>
  										<key>_historyCapacity</key>
  										<integer>0</integer>
  										<key>bookmark</key>
! 										<string>3067B02C0838D79D0063180D</string>
  										<key>history</key>
  										<array>
  											<string>30A82A69082EA48F003C97DB</string>
  											<string>30BE47FB082FED0200826659</string>
  											<string>30BE4841082FF1B600826659</string>
! 											<string>304255850837E2BB00DDF612</string>
! 											<string>3067AFF10838D3E00063180D</string>
! 											<string>3067B0140838D6FF0063180D</string>
! 											<string>3067B0150838D6FF0063180D</string>
  										</array>
  										<key>prevStack</key>
***************
*** 384,389 ****
  											<string>30A82A9C082EAADC003C97DB</string>
  											<string>30A82A9F082EAADC003C97DB</string>
- 											<string>30BE47FD082FED0200826659</string>
  											<string>30BE4843082FF1B600826659</string>
  										</array>
  									</dict>
--- 395,402 ----
  											<string>30A82A9C082EAADC003C97DB</string>
  											<string>30A82A9F082EAADC003C97DB</string>
  											<string>30BE4843082FF1B600826659</string>
+ 											<string>304255860837E2BB00DDF612</string>
+ 											<string>3067AFF30838D3E00063180D</string>
+ 											<string>3067B0160838D6FF0063180D</string>
  										</array>
  									</dict>
***************
*** 399,403 ****
  								<string>{{0, 0}, {482, 203}}</string>
  								<key>RubberWindowFrame</key>
! 								<string>529 435 690 397 0 0 1280 832 </string>
  							</dict>
  							<key>Module</key>
--- 412,416 ----
  								<string>{{0, 0}, {482, 203}}</string>
  								<key>RubberWindowFrame</key>
! 								<string>406 411 690 397 0 0 1280 832 </string>
  							</dict>
  							<key>Module</key>
***************
*** 421,425 ****
  								<string>{{0, 208}, {482, 148}}</string>
  								<key>RubberWindowFrame</key>
! 								<string>529 435 690 397 0 0 1280 832 </string>
  							</dict>
  							<key>Module</key>
--- 434,438 ----
  								<string>{{0, 208}, {482, 148}}</string>
  								<key>RubberWindowFrame</key>
! 								<string>406 411 690 397 0 0 1280 832 </string>
  							</dict>
  							<key>Module</key>
***************
*** 445,451 ****
  			<key>TableOfContents</key>
  			<array>
! 				<string>30BE47FF082FED0200826659</string>
  				<string>1CE0B1FE06471DED0097A5F4</string>
! 				<string>30BE4800082FED0200826659</string>
  				<string>1CE0B20306471E060097A5F4</string>
  				<string>1CE0B20506471E060097A5F4</string>
--- 458,464 ----
  			<key>TableOfContents</key>
  			<array>
! 				<string>3067AFA20838C99F0063180D</string>
  				<string>1CE0B1FE06471DED0097A5F4</string>
! 				<string>3067AFA30838C99F0063180D</string>
  				<string>1CE0B20306471E060097A5F4</string>
  				<string>1CE0B20506471E060097A5F4</string>
***************
*** 583,598 ****
  	<key>WindowOrderList</key>
  	<array>
! 		<string>30BE4847082FF1B600826659</string>
! 		<string>30BE4848082FF1B600826659</string>
! 		<string>30BE4823082FED6F00826659</string>
! 		<string>30BE4822082FED6F00826659</string>
  		<string>1C0AD2B3069F1EA900FABCE6</string>
  		<string>/Users/roman/Documents/dev/macattrick/Macattrick.xcode</string>
  		<string>30BE483F082FF0F400826659</string>
- 		<string>1CD10A99069EF8BA00B06720</string>
- 		<string>30A82A48082E9E83003C97DB</string>
  	</array>
  	<key>WindowString</key>
! 	<string>529 435 690 397 0 0 1280 832 </string>
  	<key>WindowTools</key>
  	<array>
--- 596,608 ----
  	<key>WindowOrderList</key>
  	<array>
! 		<string>1C530D57069F1CE1000CFCEE</string>
! 		<string>3067AFAB0838C99F0063180D</string>
  		<string>1C0AD2B3069F1EA900FABCE6</string>
+ 		<string>1CD10A99069EF8BA00B06720</string>
  		<string>/Users/roman/Documents/dev/macattrick/Macattrick.xcode</string>
  		<string>30BE483F082FF0F400826659</string>
  	</array>
  	<key>WindowString</key>
! 	<string>406 411 690 397 0 0 1280 832 </string>
  	<key>WindowTools</key>
  	<array>
***************
*** 615,619 ****
  								<string>1CD0528F0623707200166675</string>
  								<key>PBXProjectModuleLabel</key>
! 								<string>Position.m</string>
  								<key>StatusBarVisibility</key>
  								<true/>
--- 625,629 ----
  								<string>1CD0528F0623707200166675</string>
  								<key>PBXProjectModuleLabel</key>
! 								<string>PositionHeap.m</string>
  								<key>StatusBarVisibility</key>
  								<true/>
***************
*** 624,628 ****
  								<string>{{0, 0}, {787, 290}}</string>
  								<key>RubberWindowFrame</key>
! 								<string>-2 133 787 699 0 0 1280 832 </string>
  							</dict>
  							<key>Module</key>
--- 634,638 ----
  								<string>{{0, 0}, {787, 290}}</string>
  								<key>RubberWindowFrame</key>
! 								<string>458 116 787 699 0 0 1280 832 </string>
  							</dict>
  							<key>Module</key>
***************
*** 637,641 ****
  							<dict>
  								<key>PBXBuildLogShowsTranscriptDefaultKey</key>
! 								<string>{{0, 263}, {787, 100}}</string>
  								<key>PBXProjectModuleGUID</key>
  								<string>XCMainBuildResultsModuleGUID</string>
--- 647,651 ----
  							<dict>
  								<key>PBXBuildLogShowsTranscriptDefaultKey</key>
! 								<string>{{0, 86}, {787, 277}}</string>
  								<key>PBXProjectModuleGUID</key>
  								<string>XCMainBuildResultsModuleGUID</string>
***************
*** 652,656 ****
  								<string>{{0, 295}, {787, 363}}</string>
  								<key>RubberWindowFrame</key>
! 								<string>-2 133 787 699 0 0 1280 832 </string>
  							</dict>
  							<key>Module</key>
--- 662,666 ----
  								<string>{{0, 295}, {787, 363}}</string>
  								<key>RubberWindowFrame</key>
! 								<string>458 116 787 699 0 0 1280 832 </string>
  							</dict>
  							<key>Module</key>
***************
*** 675,679 ****
  			<array>
  				<string>30A82A48082E9E83003C97DB</string>
! 				<string>30BE480C082FED0200826659</string>
  				<string>1CD0528F0623707200166675</string>
  				<string>XCMainBuildResultsModuleGUID</string>
--- 685,689 ----
  			<array>
  				<string>30A82A48082E9E83003C97DB</string>
! 				<string>3067AFFA0838D3E00063180D</string>
  				<string>1CD0528F0623707200166675</string>
  				<string>XCMainBuildResultsModuleGUID</string>
***************
*** 682,686 ****
  			<string>xcode.toolbar.config.build</string>
  			<key>WindowString</key>
! 			<string>-2 133 787 699 0 0 1280 832 </string>
  			<key>WindowToolGUID</key>
  			<string>30A82A48082E9E83003C97DB</string>
--- 692,696 ----
  			<string>xcode.toolbar.config.build</string>
  			<key>WindowString</key>
! 			<string>458 116 787 699 0 0 1280 832 </string>
  			<key>WindowToolGUID</key>
  			<string>30A82A48082E9E83003C97DB</string>
***************
*** 717,722 ****
  										<key>sizes</key>
  										<array>
! 											<string>{{0, 0}, {305, 162}}</string>
! 											<string>{{305, 0}, {389, 162}}</string>
  										</array>
  									</dict>
--- 727,732 ----
  										<key>sizes</key>
  										<array>
! 											<string>{{0, 0}, {277, 157}}</string>
! 											<string>{{277, 0}, {417, 157}}</string>
  										</array>
  									</dict>
***************
*** 733,738 ****
  										<key>sizes</key>
  										<array>
! 											<string>{{0, 0}, {694, 162}}</string>
! 											<string>{{0, 162}, {694, 219}}</string>
  										</array>
  									</dict>
--- 743,748 ----
  										<key>sizes</key>
  										<array>
! 											<string>{{0, 0}, {694, 157}}</string>
! 											<string>{{0, 157}, {694, 224}}</string>
  										</array>
  									</dict>
***************
*** 781,792 ****
  			<array>
  				<string>1CD10A99069EF8BA00B06720</string>
! 				<string>30BE481C082FED6F00826659</string>
  				<string>1C162984064C10D400B95A72</string>
! 				<string>30BE481D082FED6F00826659</string>
! 				<string>30BE481E082FED6F00826659</string>
! 				<string>30BE481F082FED6F00826659</string>
! 				<string>30BE4820082FED6F00826659</string>
! 				<string>30BE4821082FED6F00826659</string>
! 				<string>30BE4822082FED6F00826659</string>
  			</array>
  			<key>ToolbarConfiguration</key>
--- 791,802 ----
  			<array>
  				<string>1CD10A99069EF8BA00B06720</string>
! 				<string>3067AFA50838C99F0063180D</string>
  				<string>1C162984064C10D400B95A72</string>
! 				<string>3067AFA60838C99F0063180D</string>
! 				<string>3067AFA70838C99F0063180D</string>
! 				<string>3067AFA80838C99F0063180D</string>
! 				<string>3067AFA90838C99F0063180D</string>
! 				<string>3067AFAA0838C99F0063180D</string>
! 				<string>3067AFAB0838C99F0063180D</string>
  			</array>
  			<key>ToolbarConfiguration</key>
***************
*** 800,805 ****
--- 810,819 ----
  		</dict>
  		<dict>
+ 			<key>FirstTimeWindowDisplayed</key>
+ 			<false/>
  			<key>Identifier</key>
  			<string>windowTool.find</string>
+ 			<key>IsVertical</key>
+ 			<true/>
  			<key>Layout</key>
  			<array>
***************
*** 811,814 ****
--- 825,830 ----
  							<array>
  								<dict>
+ 									<key>BecomeActive</key>
+ 									<true/>
  									<key>ContentConfiguration</key>
  									<dict>
***************
*** 816,839 ****
  										<string>1CDD528C0622207200134675</string>
  										<key>PBXProjectModuleLabel</key>
! 										<string>&lt;No Editor&gt;</string>
! 										<key>PBXSplitModuleInNavigatorKey</key>
! 										<dict>
! 											<key>Split0</key>
! 											<dict>
! 												<key>PBXProjectModuleGUID</key>
! 												<string>1CD0528D0623707200166675</string>
! 											</dict>
! 											<key>SplitCount</key>
! 											<string>1</string>
! 										</dict>
  										<key>StatusBarVisibility</key>
! 										<integer>1</integer>
  									</dict>
  									<key>GeometryConfiguration</key>
  									<dict>
  										<key>Frame</key>
! 										<string>{{0, 0}, {781, 167}}</string>
  										<key>RubberWindowFrame</key>
! 										<string>62 385 781 470 0 0 1440 878 </string>
  									</dict>
  									<key>Module</key>
--- 832,845 ----
  										<string>1CDD528C0622207200134675</string>
  										<key>PBXProjectModuleLabel</key>
! 										<string>PositionHeapTest.m</string>
  										<key>StatusBarVisibility</key>
! 										<true/>
  									</dict>
  									<key>GeometryConfiguration</key>
  									<dict>
  										<key>Frame</key>
! 										<string>{{0, 0}, {781, 212}}</string>
  										<key>RubberWindowFrame</key>
! 										<string>307 319 781 470 0 0 1280 832 </string>
  									</dict>
  									<key>Module</key>
***************
*** 844,852 ****
  							</array>
  							<key>Proportion</key>
! 							<string>50%</string>
  						</dict>
  						<dict>
- 							<key>BecomeActive</key>
- 							<integer>1</integer>
  							<key>ContentConfiguration</key>
  							<dict>
--- 850,856 ----
  							</array>
  							<key>Proportion</key>
! 							<string>212pt</string>
  						</dict>
  						<dict>
  							<key>ContentConfiguration</key>
  							<dict>
***************
*** 859,874 ****
  							<dict>
  								<key>Frame</key>
! 								<string>{{8, 0}, {773, 254}}</string>
  								<key>RubberWindowFrame</key>
! 								<string>62 385 781 470 0 0 1440 878 </string>
  							</dict>
  							<key>Module</key>
  							<string>PBXProjectFindModule</string>
  							<key>Proportion</key>
! 							<string>50%</string>
  						</dict>
  					</array>
  					<key>Proportion</key>
! 					<string>428pt</string>
  				</dict>
  			</array>
--- 863,878 ----
  							<dict>
  								<key>Frame</key>
! 								<string>{{0, 217}, {781, 212}}</string>
  								<key>RubberWindowFrame</key>
! 								<string>307 319 781 470 0 0 1280 832 </string>
  							</dict>
  							<key>Module</key>
  							<string>PBXProjectFindModule</string>
  							<key>Proportion</key>
! 							<string>212pt</string>
  						</dict>
  					</array>
  					<key>Proportion</key>
! 					<string>429pt</string>
  				</dict>
  			</array>
***************
*** 880,900 ****
  			</array>
  			<key>StatusbarIsVisible</key>
! 			<integer>1</integer>
  			<key>TableOfContents</key>
  			<array>
  				<string>1C530D57069F1CE1000CFCEE</string>
! 				<string>1C530D58069F1CE1000CFCEE</string>
! 				<string>1C530D59069F1CE1000CFCEE</string>
  				<string>1CDD528C0622207200134675</string>
- 				<string>1C530D5A069F1CE1000CFCEE</string>
- 				<string>1CE0B1FE06471DED0097A5F4</string>
  				<string>1CD0528E0623707200166675</string>
  			</array>
  			<key>WindowString</key>
! 			<string>62 385 781 470 0 0 1440 878 </string>
  			<key>WindowToolGUID</key>
  			<string>1C530D57069F1CE1000CFCEE</string>
  			<key>WindowToolIsVisible</key>
! 			<integer>0</integer>
  		</dict>
  		<dict>
--- 884,902 ----
  			</array>
  			<key>StatusbarIsVisible</key>
! 			<true/>
  			<key>TableOfContents</key>
  			<array>
  				<string>1C530D57069F1CE1000CFCEE</string>
! 				<string>3067AFFB0838D3E00063180D</string>
! 				<string>3067AFFC0838D3E00063180D</string>
  				<string>1CDD528C0622207200134675</string>
  				<string>1CD0528E0623707200166675</string>
  			</array>
  			<key>WindowString</key>
! 			<string>307 319 781 470 0 0 1280 832 </string>
  			<key>WindowToolGUID</key>
  			<string>1C530D57069F1CE1000CFCEE</string>
  			<key>WindowToolIsVisible</key>
! 			<false/>
  		</dict>
  		<dict>
***************
*** 997,1002 ****
  										<key>sizes</key>
  										<array>
! 											<string>{{0, 0}, {367, 168}}</string>
! 											<string>{{0, 173}, {367, 270}}</string>
  										</array>
  									</dict>
--- 999,1004 ----
  										<key>sizes</key>
  										<array>
! 											<string>{{0, 0}, {366, 168}}</string>
! 											<string>{{0, 173}, {366, 270}}</string>
  										</array>
  									</dict>
***************
*** 1024,1028 ****
  								<string>{{0, 0}, {459, 159}}</string>
  								<key>RubberWindowFrame</key>
! 								<string>21 609 459 200 0 0 1280 832 </string>
  							</dict>
  							<key>Module</key>
--- 1026,1030 ----
  								<string>{{0, 0}, {459, 159}}</string>
  								<key>RubberWindowFrame</key>
! 								<string>181 606 459 200 0 0 1280 832 </string>
  							</dict>
  							<key>Module</key>
***************
*** 1047,1058 ****
  			<array>
  				<string>1C0AD2B3069F1EA900FABCE6</string>
! 				<string>30BE4815082FED4800826659</string>
  				<string>1CD0528B0623707200166675</string>
! 				<string>30BE4816082FED4800826659</string>
  			</array>
  			<key>ToolbarConfiguration</key>
  			<string>xcode.toolbar.config.run</string>
  			<key>WindowString</key>
! 			<string>21 609 459 200 0 0 1280 832 </string>
  			<key>WindowToolGUID</key>
  			<string>1C0AD2B3069F1EA900FABCE6</string>
--- 1049,1060 ----
  			<array>
  				<string>1C0AD2B3069F1EA900FABCE6</string>
! 				<string>3067AFAC0838C99F0063180D</string>
  				<string>1CD0528B0623707200166675</string>
! 				<string>3067AFAD0838C99F0063180D</string>
  			</array>
  			<key>ToolbarConfiguration</key>
  			<string>xcode.toolbar.config.run</string>
  			<key>WindowString</key>
! 			<string>181 606 459 200 0 0 1280 832 </string>
  			<key>WindowToolGUID</key>
  			<string>1C0AD2B3069F1EA900FABCE6</string>

Index: roman.pbxuser
===================================================================
RCS file: /cvsroot/macattrick/macattrick/Macattrick.xcode/roman.pbxuser,v
retrieving revision 1.96
retrieving revision 1.97
diff -C2 -d -r1.96 -r1.97
*** roman.pbxuser	9 May 2005 19:48:53 -0000	1.96
--- roman.pbxuser	16 May 2005 13:31:58 -0000	1.97
***************
*** 40,44 ****
  		activeBuildStyle = 4A9504CCFFE6A4B311CA0CBA;
  		activeExecutable = 30744BA6069560A70039B82A;
! 		activeTarget = 309914160820019C00FBF240;
  		addToTargets = (
  			30DFA496082018F2000CE74D,
--- 40,44 ----
  		activeBuildStyle = 4A9504CCFFE6A4B311CA0CBA;
  		activeExecutable = 30744BA6069560A70039B82A;
! 		activeTarget = 30DFA496082018F2000CE74D;
  		addToTargets = (
[...1015 lines suppressed...]
! 			sepNavVisRect = "{{0, 1754}, {1042, 487}}";
  			sepNavWindowFrame = "{{212, 47}, {1064, 783}}";
  		};
***************
*** 2903,2909 ****
  	30D77BEC0645778B0095BAC8 = {
  		uiCtxt = {
! 			sepNavIntBoundsRect = "{{0, 0}, {1088, 2478}}";
! 			sepNavSelRange = "{10276, 0}";
! 			sepNavVisRect = "{{0, 0}, {1019, 678}}";
  			sepNavWindowFrame = "{{195, 115}, {970, 675}}";
  		};
--- 3393,3399 ----
  	30D77BEC0645778B0095BAC8 = {
  		uiCtxt = {
! 			sepNavIntBoundsRect = "{{0, 0}, {1088, 2492}}";
! 			sepNavSelRange = "{10326, 41}";
! 			sepNavVisRect = "{{0, 2041}, {435, 171}}";
  			sepNavWindowFrame = "{{195, 115}, {970, 675}}";
  		};

[Macattrick-commit] macattrick/Test PositionHeapTest.m,1.4,1.5 PositionTest.m,1.12,1.13

[Geisschaes <gei...@us...>]

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

Modified Files:
	PositionHeapTest.m PositionTest.m 
Log Message:
import bug fixed

Index: PositionTest.m
===================================================================
RCS file: /cvsroot/macattrick/macattrick/Test/PositionTest.m,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** PositionTest.m	8 May 2005 20:17:50 -0000	1.12
--- PositionTest.m	16 May 2005 13:32:00 -0000	1.13
***************
*** 157,160 ****
--- 157,161 ----
  	Position *pos = [[Position alloc] initFromSaveString: @"Winger|0.000000|0.000000|0.000000|0.100000|0.000000|0.050000|0.700000|0.000000|0.100000|0.050000"];
  	UKNotNil(pos);
+ 	UKEqual([pos identifier], @"Winger");
  	UKFloatsEqual([pos wingerRate], 0.7, 0.001);
  	UKFloatsEqual([pos setPiecesRate], 0.05, 0.001);

Index: PositionHeapTest.m
===================================================================
RCS file: /cvsroot/macattrick/macattrick/Test/PositionHeapTest.m,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** PositionHeapTest.m	9 May 2005 19:49:03 -0000	1.4
--- PositionHeapTest.m	16 May 2005 13:32:00 -0000	1.5
***************
*** 56,59 ****
--- 56,61 ----
  	UKStringsEqual([[[PositionHeap uniqueInstance]positionWithIdentifier:@"Forward"] identifier], @"Forward");
  	UKTrue([[[PositionHeap uniqueInstance]positionWithIdentifier:@"Forward"] scorerRate] > 0);
+ 	
+ 	
  }
  
***************
*** 70,81 ****
  }
  
  - (void) testLoadFromFile{
  	NSString *filename = [AllTests getProperty:@"positionsfile1"];
  	PositionHeap *heap = [PositionHeap uniqueInstance];
  	[heap loadPositionHeapFromFile:filename];
! //	Position *newDefender = [heap positionWithIdentifier:@"Central Defender"];
! //	UKNotNil(newDefender);
! //	UKFloatsEqual([newDefender defenderRate], 0.95, 0.001);
! //	UKFloatsEqual([newDefender playerFormRate], 0.8, 0.001);
  }
  
--- 72,85 ----
  }
  
+ 
  - (void) testLoadFromFile{
  	NSString *filename = [AllTests getProperty:@"positionsfile1"];
  	PositionHeap *heap = [PositionHeap uniqueInstance];
  	[heap loadPositionHeapFromFile:filename];
! 	Position *newDefender = [heap positionWithIdentifier:@"Central Defender"];
! 	UKNotNil(newDefender);
! 	UKEqual([newDefender  identifier],@"Central Defender");
! 	UKFloatsEqual([newDefender defenderRate], 0.95, 0.001);
! 	UKFloatsEqual([newDefender playerFormRate], 0.8, 0.001);
  }
  

[Macattrick-commit] macattrick/Macattrick.xcode project.pbxproj,1.71,1.72

[Gfive <gf...@us...>]

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

Modified Files:
	project.pbxproj 
Log Message:
Interface changes, Preferences and LineUp

Index: project.pbxproj
===================================================================
RCS file: /cvsroot/macattrick/macattrick/Macattrick.xcode/project.pbxproj,v
retrieving revision 1.71
retrieving revision 1.72
diff -C2 -d -r1.71 -r1.72
*** project.pbxproj	29 Apr 2005 20:33:58 -0000	1.71
--- project.pbxproj	14 May 2005 10:23:11 -0000	1.72
***************
*** 3929,3933 ****
  			lastKnownFileType = text.xml;
  			name = "RunAllTests-Info.plist";
! 			path = "/Users/roman/Documents/dev/macattrick/RunAllTests-Info.plist";
  			refType = 0;
  			sourceTree = "<absolute>";
--- 3929,3933 ----
  			lastKnownFileType = text.xml;
  			name = "RunAllTests-Info.plist";
! 			path = "/Users/martijn/macattrick/RunAllTests-Info.plist";
  			refType = 0;
  			sourceTree = "<absolute>";
***************
*** 5669,5673 ****
  			lastKnownFileType = text.xml;
  			name = "FastTests-Info.plist";
! 			path = "/Users/roman/Documents/dev/macattrick/FastTests-Info.plist";
  			refType = 0;
  			sourceTree = "<absolute>";
--- 5669,5673 ----
  			lastKnownFileType = text.xml;
  			name = "FastTests-Info.plist";
! 			path = "/Users/martijn/macattrick/FastTests-Info.plist";
  			refType = 0;
  			sourceTree = "<absolute>";

[Macattrick-commit] macattrick/English.lproj/LineUpView.nib info.nib,1.4,1.5 keyedobjects.nib,1.4,1.5

[Gfive <gf...@us...>]

Update of /cvsroot/macattrick/macattrick/English.lproj/LineUpView.nib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30100/English.lproj/LineUpView.nib

Modified Files:
	info.nib keyedobjects.nib 
Log Message:
Interface changes, Preferences and LineUp

Index: info.nib
===================================================================
RCS file: /cvsroot/macattrick/macattrick/English.lproj/LineUpView.nib/info.nib,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** info.nib	25 Apr 2005 20:22:37 -0000	1.4
--- info.nib	14 May 2005 10:23:09 -0000	1.5
***************
*** 4,15 ****
  <dict>
  	<key>IBDocumentLocation</key>
! 	<string>24 34 356 240 0 0 1280 832 </string>
  	<key>IBEditorPositions</key>
  	<dict>
  		<key>5</key>
! 		<string>167 302 827 517 0 0 1280 832 </string>
  	</dict>
  	<key>IBFramework Version</key>
! 	<string>364.0</string>
  	<key>IBOpenObjects</key>
  	<array>
--- 4,15 ----
  <dict>
  	<key>IBDocumentLocation</key>
! 	<string>32 93 356 240 0 0 1600 1002 </string>
  	<key>IBEditorPositions</key>
  	<dict>
  		<key>5</key>
! 		<string>194 376 827 517 0 0 1600 1002 </string>
  	</dict>
  	<key>IBFramework Version</key>
! 	<string>437.0</string>
  	<key>IBOpenObjects</key>
  	<array>
***************
*** 17,21 ****
  	</array>
  	<key>IBSystem Version</key>
! 	<string>7W98</string>
  </dict>
  </plist>
--- 17,21 ----
  	</array>
  	<key>IBSystem Version</key>
! 	<string>8A428</string>
  </dict>
  </plist>

Index: keyedobjects.nib
===================================================================
RCS file: /cvsroot/macattrick/macattrick/English.lproj/LineUpView.nib/keyedobjects.nib,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
Binary files /tmp/cvs4CleI1 and /tmp/cvs3QIli9 differ

[Macattrick-commit] macattrick/English.lproj/PreferencesPanel.nib info.nib,1.11,1.12 keyedobjects.nib,1.16,1.17

[Gfive <gf...@us...>]

Update of /cvsroot/macattrick/macattrick/English.lproj/PreferencesPanel.nib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30100/English.lproj/PreferencesPanel.nib

Modified Files:
	info.nib keyedobjects.nib 
Log Message:
Interface changes, Preferences and LineUp

Index: info.nib
===================================================================
RCS file: /cvsroot/macattrick/macattrick/English.lproj/PreferencesPanel.nib/info.nib,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** info.nib	18 Feb 2005 15:40:52 -0000	1.11
--- info.nib	14 May 2005 10:23:10 -0000	1.12
***************
*** 6,16 ****
  	<string>93 129 356 240 0 0 1600 1002 </string>
  	<key>IBFramework Version</key>
! 	<string>364.0</string>
! 	<key>IBOpenObjects</key>
! 	<array>
! 		<integer>6</integer>
! 	</array>
  	<key>IBSystem Version</key>
! 	<string>7U16</string>
  </dict>
  </plist>
--- 6,12 ----
  	<string>93 129 356 240 0 0 1600 1002 </string>
  	<key>IBFramework Version</key>
! 	<string>437.0</string>
  	<key>IBSystem Version</key>
! 	<string>8A428</string>
  </dict>
  </plist>

Index: keyedobjects.nib
===================================================================
RCS file: /cvsroot/macattrick/macattrick/English.lproj/PreferencesPanel.nib/keyedobjects.nib,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
Binary files /tmp/cvsyvQDdl and /tmp/cvs7cUa8s differ

[Macattrick-commit] macattrick/English.lproj/FormulasView.nib info.nib,1.8,1.9 keyedobjects.nib,1.8,1.9

[Gfive <gf...@us...>]

Update of /cvsroot/macattrick/macattrick/English.lproj/FormulasView.nib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30100/English.lproj/FormulasView.nib

Modified Files:
	info.nib keyedobjects.nib 
Log Message:
Interface changes, Preferences and LineUp

Index: info.nib
===================================================================
RCS file: /cvsroot/macattrick/macattrick/English.lproj/FormulasView.nib/info.nib,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** info.nib	9 May 2005 19:48:51 -0000	1.8
--- info.nib	14 May 2005 10:22:57 -0000	1.9
***************
*** 4,12 ****
  <dict>
  	<key>IBDocumentLocation</key>
! 	<string>56 141 356 240 0 0 1280 832 </string>
  	<key>IBEditorPositions</key>
  	<dict>
  		<key>1848</key>
! 		<string>143 369 540 351 0 0 1280 832 </string>
  	</dict>
  	<key>IBFramework Version</key>
--- 4,12 ----
  <dict>
  	<key>IBDocumentLocation</key>
! 	<string>75 181 356 240 0 0 1600 1002 </string>
  	<key>IBEditorPositions</key>
  	<dict>
  		<key>1848</key>
! 		<string>373 466 540 351 0 0 1600 1002 </string>
  	</dict>
  	<key>IBFramework Version</key>

Index: keyedobjects.nib
===================================================================
RCS file: /cvsroot/macattrick/macattrick/English.lproj/FormulasView.nib/keyedobjects.nib,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
Binary files /tmp/cvsOtbngi and /tmp/cvs6etGqp differ

[Macattrick-commit] macattrick/English.lproj/FormulasView.nib classes.nib,1.3,1.4 info.nib,1.7,1.8 keyedobjects.nib,1.7,1.8

[Geisschaes <gei...@us...>]

Update of /cvsroot/macattrick/macattrick/English.lproj/FormulasView.nib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3842/English.lproj/FormulasView.nib

Modified Files:
	classes.nib info.nib keyedobjects.nib 
Log Message:
import and export buttons added. but import has some memory problem

Index: info.nib
===================================================================
RCS file: /cvsroot/macattrick/macattrick/English.lproj/FormulasView.nib/info.nib,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** info.nib	18 Feb 2005 15:40:43 -0000	1.7
--- info.nib	9 May 2005 19:48:51 -0000	1.8
***************
*** 4,15 ****
  <dict>
  	<key>IBDocumentLocation</key>
! 	<string>89 229 356 240 0 0 1600 1002 </string>
  	<key>IBEditorPositions</key>
  	<dict>
  		<key>1848</key>
! 		<string>34 637 540 351 0 0 1600 1002 </string>
  	</dict>
  	<key>IBFramework Version</key>
! 	<string>364.0</string>
  	<key>IBOpenObjects</key>
  	<array>
--- 4,15 ----
  <dict>
  	<key>IBDocumentLocation</key>
! 	<string>56 141 356 240 0 0 1280 832 </string>
  	<key>IBEditorPositions</key>
  	<dict>
  		<key>1848</key>
! 		<string>143 369 540 351 0 0 1280 832 </string>
  	</dict>
  	<key>IBFramework Version</key>
! 	<string>437.0</string>
  	<key>IBOpenObjects</key>
  	<array>
***************
*** 17,21 ****
  	</array>
  	<key>IBSystem Version</key>
! 	<string>7U16</string>
  </dict>
  </plist>
--- 17,21 ----
  	</array>
  	<key>IBSystem Version</key>
! 	<string>8A428</string>
  </dict>
  </plist>

Index: classes.nib
===================================================================
RCS file: /cvsroot/macattrick/macattrick/English.lproj/FormulasView.nib/classes.nib,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** classes.nib	7 Feb 2005 21:15:40 -0000	1.3
--- classes.nib	9 May 2005 19:48:50 -0000	1.4
***************
*** 3,10 ****
          {CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, 
          {
!             ACTIONS = {export = id; }; 
              CLASS = FormulasViewController; 
              LANGUAGE = ObjC; 
!             OUTLETS = {formulasView = NSView; keeperTotal = NSTextField; }; 
              SUPERCLASS = NSObject; 
          }
--- 3,10 ----
          {CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, 
          {
!             ACTIONS = {export = id; import = id; }; 
              CLASS = FormulasViewController; 
              LANGUAGE = ObjC; 
!             OUTLETS = {formulasView = NSView; }; 
              SUPERCLASS = NSObject; 
          }

Index: keyedobjects.nib
===================================================================
RCS file: /cvsroot/macattrick/macattrick/English.lproj/FormulasView.nib/keyedobjects.nib,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
Binary files /tmp/cvs2arEIb and /tmp/cvsAzr1yB differ

[Macattrick-commit] macattrick FormulasViewController.h,1.5,1.6 FormulasViewController.m,1.5,1.6 Position.m,1.10,1.11 PositionHeap.h,1.2,1.3 PositionHeap.m,1.2,1.3

[Geisschaes <gei...@us...>]

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

Modified Files:
	FormulasViewController.h FormulasViewController.m Position.m 
	PositionHeap.h PositionHeap.m 
Log Message:
import and export buttons added. but import has some memory problem

Index: Position.m
===================================================================
RCS file: /cvsroot/macattrick/macattrick/Position.m,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** Position.m	8 May 2005 20:17:47 -0000	1.10
--- Position.m	9 May 2005 19:48:49 -0000	1.11
***************
*** 419,423 ****
  
  
! + savePositionsToUserDefaults {
  	NSEnumerator *en = [positionsDictionary objectEnumerator];
  	Position *current;
--- 419,423 ----
  
  
! + (void) savePositionsToUserDefaults {
  	NSEnumerator *en = [positionsDictionary objectEnumerator];
  	Position *current;
***************
*** 426,431 ****
  	}
  }
  - (void)dealloc {
!     [identifier release];	
      [super dealloc];
  }
--- 426,432 ----
  	}
  }
+ 
  - (void)dealloc {
! //    [identifier release];	
      [super dealloc];
  }

Index: FormulasViewController.h
===================================================================
RCS file: /cvsroot/macattrick/macattrick/FormulasViewController.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** FormulasViewController.h	27 Feb 2005 15:14:44 -0000	1.5
--- FormulasViewController.h	9 May 2005 19:48:49 -0000	1.6
***************
*** 58,62 ****
  
  
! 
  - (IBAction) export:(id)sender;
  
--- 58,62 ----
  
  
! - (IBAction) import:(id)sender;
  - (IBAction) export:(id)sender;
  

Index: PositionHeap.m
===================================================================
RCS file: /cvsroot/macattrick/macattrick/PositionHeap.m,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** PositionHeap.m	8 May 2005 20:17:48 -0000	1.2
--- PositionHeap.m	9 May 2005 19:48:49 -0000	1.3
***************
*** 55,64 ****
  }
  
! - (void) loadPositionHeapFromFileName: (NSString*) filename {
  	NSDictionary *dic = [[NSDictionary alloc] initWithContentsOfFile:filename];
  	NSEnumerator *en = [dic keyEnumerator];
  	NSString *currentKey = nil;
  	while(currentKey = [en nextObject]) {
! 		Position *newPosition = [[Position alloc] initFromSaveString:[dic valueForKey:currentKey]];
  		[positionsDictionary setValue: newPosition forKey: currentKey];
  		[newPosition release];
--- 55,65 ----
  }
  
! - (void) loadPositionHeapFromFile: (NSString*) filename {
  	NSDictionary *dic = [[NSDictionary alloc] initWithContentsOfFile:filename];
  	NSEnumerator *en = [dic keyEnumerator];
  	NSString *currentKey = nil;
  	while(currentKey = [en nextObject]) {
! 		NSString *value = [dic valueForKey:currentKey];
! 		Position *newPosition = [[Position alloc] initFromSaveString:value];
  		[positionsDictionary setValue: newPosition forKey: currentKey];
  		[newPosition release];

Index: FormulasViewController.m
===================================================================
RCS file: /cvsroot/macattrick/macattrick/FormulasViewController.m,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** FormulasViewController.m	27 Feb 2005 15:14:44 -0000	1.5
--- FormulasViewController.m	9 May 2005 19:48:49 -0000	1.6
***************
*** 68,71 ****
--- 68,74 ----
  }
  
+ 
+ 
+ 
  -(void) cancel {
  	[self loadPositions];
***************
*** 104,107 ****
--- 107,118 ----
  
  
+ - (IBAction) import:(id)sender {
+ 	NSOpenPanel *sp = [NSOpenPanel openPanel];
+ 	int runResult;
+ 	runResult = [sp runModal];
+ 	if(runResult == NSOKButton) {
+ 		[[PositionHeap uniqueInstance] loadPositionHeapFromFile:[sp filename]];
+ 	}
+ }
  
  

Index: PositionHeap.h
===================================================================
RCS file: /cvsroot/macattrick/macattrick/PositionHeap.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** PositionHeap.h	8 May 2005 20:17:47 -0000	1.2
--- PositionHeap.h	9 May 2005 19:48:49 -0000	1.3
***************
*** 39,43 ****
  + (PositionHeap*) uniqueInstance;
  
! - (void) loadPositionHeapFromFileName: (NSString*) filename;
  
  - (Position*) positionWithIdentifier: (NSString*) positionsIdentifier;
--- 39,43 ----
  + (PositionHeap*) uniqueInstance;
  
! - (void) loadPositionHeapFromFile: (NSString*) filename;
  
  - (Position*) positionWithIdentifier: (NSString*) positionsIdentifier;
***************
*** 49,53 ****
  - (NSArray*) positionsIdentifiers;
  
- - (void) initialize;
  
  - (void) loadPositions;
--- 49,52 ----

[Macattrick-commit] macattrick/Macattrick.xcode roman.mode1,1.30,1.31 roman.pbxuser,1.95,1.96

[Geisschaes <gei...@us...>]

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

Modified Files:
	roman.mode1 roman.pbxuser 
Log Message:
import and export buttons added. but import has some memory problem

Index: roman.mode1
===================================================================
RCS file: /cvsroot/macattrick/macattrick/Macattrick.xcode/roman.mode1,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** roman.mode1	8 May 2005 20:17:48 -0000	1.30
--- roman.mode1	9 May 2005 19:48:53 -0000	1.31
***************
*** 191,197 ****
  			<dict>
  				<key>PBXProjectModuleGUID</key>
! 				<string>30A82A3A082E9B37003C97DB</string>
  				<key>PBXProjectModuleLabel</key>
! 				<string>PositionHeap.m</string>
  				<key>PBXSplitModuleInNavigatorKey</key>
  				<dict>
--- 191,197 ----
  			<dict>
  				<key>PBXProjectModuleGUID</key>
! 				<string>30BE483F082FF0F400826659</string>
  				<key>PBXProjectModuleLabel</key>
! 				<string>Position.m</string>
  				<key>PBXSplitModuleInNavigatorKey</key>
  				<dict>
***************
*** 199,232 ****
  					<dict>
  						<key>PBXProjectModuleGUID</key>
! 						<string>30A82A4E082E9E85003C97DB</string>
  						<key>PBXProjectModuleLabel</key>
! 						<string>PositionHeap.m</string>
  						<key>_historyCapacity</key>
  						<integer>0</integer>
  						<key>bookmark</key>
! 						<string>30A82AB5082EAADD003C97DB</string>
  						<key>history</key>
  						<array>
! 							<string>30A82AA2082EAADC003C97DB</string>
! 							<string>30A82AA3082EAADC003C97DB</string>
! 							<string>30A82AA4082EAADC003C97DB</string>
! 							<string>30A82AA5082EAADC003C97DB</string>
! 							<string>30A82AA6082EAADC003C97DB</string>
! 							<string>30A82AA7082EAADC003C97DB</string>
! 							<string>30A82AA8082EAADC003C97DB</string>
  						</array>
  						<key>prevStack</key>
  						<array>
! 							<string>30A82A71082EA48F003C97DB</string>
! 							<string>30A82AA9082EAADC003C97DB</string>
! 							<string>30A82AAA082EAADC003C97DB</string>
! 							<string>30A82AAB082EAADC003C97DB</string>
! 							<string>30A82AAC082EAADC003C97DB</string>
! 							<string>30A82AAD082EAADC003C97DB</string>
! 							<string>30A82AAE082EAADC003C97DB</string>
! 							<string>30A82AAF082EAADC003C97DB</string>
! 							<string>30A82AB0082EAADC003C97DB</string>
! 							<string>30A82AB1082EAADC003C97DB</string>
! 							<string>30A82AB2082EAADC003C97DB</string>
  						</array>
  					</dict>
--- 199,222 ----
  					<dict>
  						<key>PBXProjectModuleGUID</key>
! 						<string>30BE4845082FF1B600826659</string>
  						<key>PBXProjectModuleLabel</key>
! 						<string>Position.m</string>
  						<key>_historyCapacity</key>
  						<integer>0</integer>
  						<key>bookmark</key>
! 						<string>30BE486E082FF5B200826659</string>
  						<key>history</key>
  						<array>
! 							<string>30BE4867082FF5B200826659</string>
! 							<string>30BE4868082FF5B200826659</string>
! 							<string>30BE4869082FF5B200826659</string>
! 							<string>30BE485F082FF3D200826659</string>
  						</array>
  						<key>prevStack</key>
  						<array>
! 							<string>30BE486A082FF5B200826659</string>
! 							<string>30BE486B082FF5B200826659</string>
! 							<string>30BE486C082FF5B200826659</string>
! 							<string>30BE486D082FF5B200826659</string>
  						</array>
  					</dict>
***************
*** 240,248 ****
  			<dict>
  				<key>Frame</key>
! 				<string>{{0, 20}, {1064, 710}}</string>
  				<key>PBXModuleWindowStatusBarHidden2</key>
  				<false/>
  				<key>RubberWindowFrame</key>
! 				<string>61 81 1064 751 0 0 1280 832 </string>
  			</dict>
  		</dict>
--- 230,238 ----
  			<dict>
  				<key>Frame</key>
! 				<string>{{0, 20}, {1087, 519}}</string>
  				<key>PBXModuleWindowStatusBarHidden2</key>
  				<false/>
  				<key>RubberWindowFrame</key>
! 				<string>77 96 1087 560 0 0 1280 832 </string>
  			</dict>
  		</dict>
***************
*** 317,320 ****
--- 307,312 ----
  							<array>
  								<string>29B97314FDCFA39411CA2CEA</string>
+ 								<string>1C37FBAC04509CD000000102</string>
+ 								<string>1C37FAAC04509CD000000102</string>
  								<string>1C37FABC05509CD000000102</string>
  							</array>
***************
*** 322,326 ****
  							<array>
  								<array>
! 									<integer>3</integer>
  									<integer>0</integer>
  								</array>
--- 314,318 ----
  							<array>
  								<array>
! 									<integer>4</integer>
  									<integer>0</integer>
  								</array>
***************
*** 362,366 ****
  								<string>1CE0B20306471E060097A5F4</string>
  								<key>PBXProjectModuleLabel</key>
! 								<string>Position.h</string>
  								<key>PBXSplitModuleInNavigatorKey</key>
  								<dict>
--- 354,358 ----
  								<string>1CE0B20306471E060097A5F4</string>
  								<key>PBXProjectModuleLabel</key>
! 								<string>FormulasViewController.m</string>
  								<key>PBXSplitModuleInNavigatorKey</key>
  								<dict>
***************
*** 370,378 ****
  										<string>1CE0B20406471E060097A5F4</string>
  										<key>PBXProjectModuleLabel</key>
! 										<string>Position.h</string>
  										<key>_historyCapacity</key>
  										<integer>0</integer>
  										<key>bookmark</key>
! 										<string>30A82AB4082EAADD003C97DB</string>
  										<key>history</key>
  										<array>
--- 362,370 ----
  										<string>1CE0B20406471E060097A5F4</string>
  										<key>PBXProjectModuleLabel</key>
! 										<string>FormulasViewController.m</string>
  										<key>_historyCapacity</key>
  										<integer>0</integer>
  										<key>bookmark</key>
! 										<string>30BE4866082FF5B200826659</string>
  										<key>history</key>
  										<array>
***************
*** 381,385 ****
  											<string>30A82A98082EAADC003C97DB</string>
  											<string>30A82A99082EAADC003C97DB</string>
! 											<string>30A82A9A082EAADC003C97DB</string>
  										</array>
  										<key>prevStack</key>
--- 373,379 ----
  											<string>30A82A98082EAADC003C97DB</string>
  											<string>30A82A99082EAADC003C97DB</string>
! 											<string>30BE47FB082FED0200826659</string>
! 											<string>30BE4841082FF1B600826659</string>
! 											<string>30BE4842082FF1B600826659</string>
  										</array>
  										<key>prevStack</key>
***************
*** 389,396 ****
  											<string>30A82A9B082EAADC003C97DB</string>
  											<string>30A82A9C082EAADC003C97DB</string>
- 											<string>30A82A9D082EAADC003C97DB</string>
- 											<string>30A82A9E082EAADC003C97DB</string>
  											<string>30A82A9F082EAADC003C97DB</string>
! 											<string>30A82AA0082EAADC003C97DB</string>
  										</array>
  									</dict>
--- 383,389 ----
  											<string>30A82A9B082EAADC003C97DB</string>
  											<string>30A82A9C082EAADC003C97DB</string>
  											<string>30A82A9F082EAADC003C97DB</string>
! 											<string>30BE47FD082FED0200826659</string>
! 											<string>30BE4843082FF1B600826659</string>
  										</array>
  									</dict>
***************
*** 452,458 ****
  			<key>TableOfContents</key>
  			<array>
! 				<string>30A82A2B082E9911003C97DB</string>
  				<string>1CE0B1FE06471DED0097A5F4</string>
! 				<string>30A82A2C082E9911003C97DB</string>
  				<string>1CE0B20306471E060097A5F4</string>
  				<string>1CE0B20506471E060097A5F4</string>
--- 445,451 ----
  			<key>TableOfContents</key>
  			<array>
! 				<string>30BE47FF082FED0200826659</string>
  				<string>1CE0B1FE06471DED0097A5F4</string>
! 				<string>30BE4800082FED0200826659</string>
  				<string>1CE0B20306471E060097A5F4</string>
  				<string>1CE0B20506471E060097A5F4</string>
***************
*** 567,571 ****
  	<false/>
  	<key>PinnedNavigatorIdentifier</key>
! 	<string>30A82A3A082E9B37003C97DB</string>
  	<key>ShelfIsVisible</key>
  	<false/>
--- 560,564 ----
  	<false/>
  	<key>PinnedNavigatorIdentifier</key>
! 	<string>30BE483F082FF0F400826659</string>
  	<key>ShelfIsVisible</key>
  	<false/>
***************
*** 590,596 ****
  	<key>WindowOrderList</key>
  	<array>
! 		<string>30A82A48082E9E83003C97DB</string>
  		<string>/Users/roman/Documents/dev/macattrick/Macattrick.xcode</string>
! 		<string>30A82A3A082E9B37003C97DB</string>
  	</array>
  	<key>WindowString</key>
--- 583,595 ----
  	<key>WindowOrderList</key>
  	<array>
! 		<string>30BE4847082FF1B600826659</string>
! 		<string>30BE4848082FF1B600826659</string>
! 		<string>30BE4823082FED6F00826659</string>
! 		<string>30BE4822082FED6F00826659</string>
! 		<string>1C0AD2B3069F1EA900FABCE6</string>
  		<string>/Users/roman/Documents/dev/macattrick/Macattrick.xcode</string>
! 		<string>30BE483F082FF0F400826659</string>
! 		<string>1CD10A99069EF8BA00B06720</string>
! 		<string>30A82A48082E9E83003C97DB</string>
  	</array>
  	<key>WindowString</key>
***************
*** 616,620 ****
  								<string>1CD0528F0623707200166675</string>
  								<key>PBXProjectModuleLabel</key>
! 								<string>PositionTest.m</string>
  								<key>StatusBarVisibility</key>
  								<true/>
--- 615,619 ----
  								<string>1CD0528F0623707200166675</string>
  								<key>PBXProjectModuleLabel</key>
! 								<string>Position.m</string>
  								<key>StatusBarVisibility</key>
  								<true/>
***************
*** 623,634 ****
  							<dict>
  								<key>Frame</key>
! 								<string>{{0, 0}, {787, 417}}</string>
  								<key>RubberWindowFrame</key>
! 								<string>0 133 787 699 0 0 1280 832 </string>
  							</dict>
  							<key>Module</key>
  							<string>PBXNavigatorGroup</string>
  							<key>Proportion</key>
! 							<string>417pt</string>
  						</dict>
  						<dict>
--- 622,633 ----
  							<dict>
  								<key>Frame</key>
! 								<string>{{0, 0}, {787, 290}}</string>
  								<key>RubberWindowFrame</key>
! 								<string>-2 133 787 699 0 0 1280 832 </string>
  							</dict>
  							<key>Module</key>
  							<string>PBXNavigatorGroup</string>
  							<key>Proportion</key>
! 							<string>290pt</string>
  						</dict>
  						<dict>
***************
*** 637,640 ****
--- 636,641 ----
  							<key>ContentConfiguration</key>
  							<dict>
+ 								<key>PBXBuildLogShowsTranscriptDefaultKey</key>
+ 								<string>{{0, 263}, {787, 100}}</string>
  								<key>PBXProjectModuleGUID</key>
  								<string>XCMainBuildResultsModuleGUID</string>
***************
*** 649,660 ****
  							<dict>
  								<key>Frame</key>
! 								<string>{{0, 422}, {787, 236}}</string>
  								<key>RubberWindowFrame</key>
! 								<string>0 133 787 699 0 0 1280 832 </string>
  							</dict>
  							<key>Module</key>
  							<string>PBXBuildResultsModule</string>
  							<key>Proportion</key>
! 							<string>236pt</string>
  						</dict>
  					</array>
--- 650,661 ----
  							<dict>
  								<key>Frame</key>
! 								<string>{{0, 295}, {787, 363}}</string>
  								<key>RubberWindowFrame</key>
! 								<string>-2 133 787 699 0 0 1280 832 </string>
  							</dict>
  							<key>Module</key>
  							<string>PBXBuildResultsModule</string>
  							<key>Proportion</key>
! 							<string>363pt</string>
  						</dict>
  					</array>
***************
*** 674,678 ****
  			<array>
  				<string>30A82A48082E9E83003C97DB</string>
! 				<string>30A82A49082E9E83003C97DB</string>
  				<string>1CD0528F0623707200166675</string>
  				<string>XCMainBuildResultsModuleGUID</string>
--- 675,679 ----
  			<array>
  				<string>30A82A48082E9E83003C97DB</string>
! 				<string>30BE480C082FED0200826659</string>
  				<string>1CD0528F0623707200166675</string>
  				<string>XCMainBuildResultsModuleGUID</string>
***************
*** 681,693 ****
  			<string>xcode.toolbar.config.build</string>
  			<key>WindowString</key>
! 			<string>0 133 787 699 0 0 1280 832 </string>
  			<key>WindowToolGUID</key>
  			<string>30A82A48082E9E83003C97DB</string>
  			<key>WindowToolIsVisible</key>
! 			<false/>
  		</dict>
  		<dict>
  			<key>Identifier</key>
  			<string>windowTool.debugger</string>
  			<key>Layout</key>
  			<array>
--- 682,698 ----
  			<string>xcode.toolbar.config.build</string>
  			<key>WindowString</key>
! 			<string>-2 133 787 699 0 0 1280 832 </string>
  			<key>WindowToolGUID</key>
  			<string>30A82A48082E9E83003C97DB</string>
  			<key>WindowToolIsVisible</key>
! 			<true/>
  		</dict>
  		<dict>
+ 			<key>FirstTimeWindowDisplayed</key>
+ 			<false/>
  			<key>Identifier</key>
  			<string>windowTool.debugger</string>
+ 			<key>IsVertical</key>
+ 			<true/>
  			<key>Layout</key>
  			<array>
***************
*** 712,717 ****
  										<key>sizes</key>
  										<array>
! 											<string>{{0, 0}, {317, 164}}</string>
! 											<string>{{317, 0}, {377, 164}}</string>
  										</array>
  									</dict>
--- 717,722 ----
  										<key>sizes</key>
  										<array>
! 											<string>{{0, 0}, {305, 162}}</string>
! 											<string>{{305, 0}, {389, 162}}</string>
  										</array>
  									</dict>
***************
*** 728,733 ****
  										<key>sizes</key>
  										<array>
! 											<string>{{0, 0}, {694, 164}}</string>
! 											<string>{{0, 164}, {694, 216}}</string>
  										</array>
  									</dict>
--- 733,738 ----
  										<key>sizes</key>
  										<array>
! 											<string>{{0, 0}, {694, 162}}</string>
! 											<string>{{0, 162}, {694, 219}}</string>
  										</array>
  									</dict>
***************
*** 751,766 ****
  								<string>{{200, 200}, {500, 300}}</string>
  								<key>Frame</key>
! 								<string>{{0, 0}, {694, 380}}</string>
  								<key>RubberWindowFrame</key>
! 								<string>321 238 694 422 0 0 1440 878 </string>
  							</dict>
  							<key>Module</key>
  							<string>PBXDebugSessionModule</string>
  							<key>Proportion</key>
! 							<string>100%</string>
  						</dict>
  					</array>
  					<key>Proportion</key>
! 					<string>100%</string>
  				</dict>
  			</array>
--- 756,771 ----
  								<string>{{200, 200}, {500, 300}}</string>
  								<key>Frame</key>
! 								<string>{{0, 0}, {694, 381}}</string>
  								<key>RubberWindowFrame</key>
! 								<string>339 354 694 422 0 0 1280 832 </string>
  							</dict>
  							<key>Module</key>
  							<string>PBXDebugSessionModule</string>
  							<key>Proportion</key>
! 							<string>381pt</string>
  						</dict>
  					</array>
  					<key>Proportion</key>
! 					<string>381pt</string>
  				</dict>
  			</array>
***************
*** 772,791 ****
  			</array>
  			<key>StatusbarIsVisible</key>
! 			<integer>1</integer>
  			<key>TableOfContents</key>
  			<array>
  				<string>1CD10A99069EF8BA00B06720</string>
! 				<string>1C0AD2AB069F1E9B00FABCE6</string>
  				<string>1C162984064C10D400B95A72</string>
! 				<string>1C0AD2AC069F1E9B00FABCE6</string>
  			</array>
  			<key>ToolbarConfiguration</key>
  			<string>xcode.toolbar.config.debug</string>
  			<key>WindowString</key>
! 			<string>321 238 694 422 0 0 1440 878 </string>
  			<key>WindowToolGUID</key>
  			<string>1CD10A99069EF8BA00B06720</string>
  			<key>WindowToolIsVisible</key>
! 			<integer>0</integer>
  		</dict>
  		<dict>
--- 777,801 ----
  			</array>
  			<key>StatusbarIsVisible</key>
! 			<true/>
  			<key>TableOfContents</key>
  			<array>
  				<string>1CD10A99069EF8BA00B06720</string>
! 				<string>30BE481C082FED6F00826659</string>
  				<string>1C162984064C10D400B95A72</string>
! 				<string>30BE481D082FED6F00826659</string>
! 				<string>30BE481E082FED6F00826659</string>
! 				<string>30BE481F082FED6F00826659</string>
! 				<string>30BE4820082FED6F00826659</string>
! 				<string>30BE4821082FED6F00826659</string>
! 				<string>30BE4822082FED6F00826659</string>
  			</array>
  			<key>ToolbarConfiguration</key>
  			<string>xcode.toolbar.config.debug</string>
  			<key>WindowString</key>
! 			<string>339 354 694 422 0 0 1280 832 </string>
  			<key>WindowToolGUID</key>
  			<string>1CD10A99069EF8BA00B06720</string>
  			<key>WindowToolIsVisible</key>
! 			<true/>
  		</dict>
  		<dict>
***************
*** 893,898 ****
--- 903,912 ----
  		</dict>
  		<dict>
+ 			<key>FirstTimeWindowDisplayed</key>
+ 			<false/>
  			<key>Identifier</key>
  			<string>windowTool.debuggerConsole</string>
+ 			<key>IsVertical</key>
+ 			<true/>
  			<key>Layout</key>
  			<array>
***************
*** 902,906 ****
  						<dict>
  							<key>BecomeActive</key>
! 							<integer>1</integer>
  							<key>ContentConfiguration</key>
  							<dict>
--- 916,920 ----
  						<dict>
  							<key>BecomeActive</key>
! 							<true/>
  							<key>ContentConfiguration</key>
  							<dict>
***************
*** 915,919 ****
  								<string>{{0, 0}, {440, 358}}</string>
  								<key>RubberWindowFrame</key>
! 								<string>650 41 440 400 0 0 1280 1002 </string>
  							</dict>
  							<key>Module</key>
--- 929,933 ----
  								<string>{{0, 0}, {440, 358}}</string>
  								<key>RubberWindowFrame</key>
! 								<string>203 336 440 400 0 0 1280 832 </string>
  							</dict>
  							<key>Module</key>
***************
*** 924,928 ****
  					</array>
  					<key>Proportion</key>
! 					<string>358pt</string>
  				</dict>
  			</array>
--- 938,942 ----
  					</array>
  					<key>Proportion</key>
! 					<string>359pt</string>
  				</dict>
  			</array>
***************
*** 934,950 ****
  			</array>
  			<key>StatusbarIsVisible</key>
! 			<integer>1</integer>
  			<key>TableOfContents</key>
  			<array>
! 				<string>1C78EAAD065D492600B07095</string>
! 				<string>1C78EAAE065D492600B07095</string>
  				<string>1C78EAAC065D492600B07095</string>
  			</array>
  			<key>WindowString</key>
! 			<string>650 41 440 400 0 0 1280 1002 </string>
  		</dict>
  		<dict>
  			<key>Identifier</key>
  			<string>windowTool.run</string>
  			<key>Layout</key>
  			<array>
--- 948,972 ----
  			</array>
  			<key>StatusbarIsVisible</key>
! 			<true/>
  			<key>TableOfContents</key>
  			<array>
! 				<string>30BE4823082FED6F00826659</string>
! 				<string>30BE4824082FED6F00826659</string>
  				<string>1C78EAAC065D492600B07095</string>
  			</array>
  			<key>WindowString</key>
! 			<string>203 336 440 400 0 0 1280 832 </string>
! 			<key>WindowToolGUID</key>
! 			<string>30BE4823082FED6F00826659</string>
! 			<key>WindowToolIsVisible</key>
! 			<false/>
  		</dict>
  		<dict>
+ 			<key>FirstTimeWindowDisplayed</key>
+ 			<false/>
  			<key>Identifier</key>
  			<string>windowTool.run</string>
+ 			<key>IsVertical</key>
+ 			<true/>
  			<key>Layout</key>
  			<array>
***************
*** 975,980 ****
  										<key>sizes</key>
  										<array>
! 											<string>{{0, 0}, {493, 167}}</string>
! 											<string>{{0, 176}, {493, 267}}</string>
  										</array>
  									</dict>
--- 997,1002 ----
  										<key>sizes</key>
  										<array>
! 											<string>{{0, 0}, {367, 168}}</string>
! 											<string>{{0, 173}, {367, 270}}</string>
  										</array>
  									</dict>
***************
*** 991,996 ****
  										<key>sizes</key>
  										<array>
! 											<string>{{0, 0}, {405, 443}}</string>
! 											<string>{{414, 0}, {514, 443}}</string>
  										</array>
  									</dict>
--- 1013,1018 ----
  										<key>sizes</key>
  										<array>
! 											<string>{{0, 0}, {406, 443}}</string>
! 											<string>{{411, 0}, {517, 443}}</string>
  										</array>
  									</dict>
***************
*** 1000,1006 ****
  							<dict>
  								<key>Frame</key>
! 								<string>{{0, 0}, {460, 159}}</string>
  								<key>RubberWindowFrame</key>
! 								<string>316 696 459 200 0 0 1280 1002 </string>
  							</dict>
  							<key>Module</key>
--- 1022,1028 ----
  							<dict>
  								<key>Frame</key>
! 								<string>{{0, 0}, {459, 159}}</string>
  								<key>RubberWindowFrame</key>
! 								<string>21 609 459 200 0 0 1280 832 </string>
  							</dict>
  							<key>Module</key>
***************
*** 1021,1040 ****
  			</array>
  			<key>StatusbarIsVisible</key>
! 			<integer>1</integer>
  			<key>TableOfContents</key>
  			<array>
  				<string>1C0AD2B3069F1EA900FABCE6</string>
! 				<string>1C0AD2B4069F1EA900FABCE6</string>
  				<string>1CD0528B0623707200166675</string>
! 				<string>1C0AD2B5069F1EA900FABCE6</string>
  			</array>
  			<key>ToolbarConfiguration</key>
  			<string>xcode.toolbar.config.run</string>
  			<key>WindowString</key>
! 			<string>316 696 459 200 0 0 1280 1002 </string>
  			<key>WindowToolGUID</key>
  			<string>1C0AD2B3069F1EA900FABCE6</string>
  			<key>WindowToolIsVisible</key>
! 			<integer>0</integer>
  		</dict>
  		<dict>
--- 1043,1062 ----
  			</array>
  			<key>StatusbarIsVisible</key>
! 			<true/>
  			<key>TableOfContents</key>
  			<array>
  				<string>1C0AD2B3069F1EA900FABCE6</string>
! 				<string>30BE4815082FED4800826659</string>
  				<string>1CD0528B0623707200166675</string>
! 				<string>30BE4816082FED4800826659</string>
  			</array>
  			<key>ToolbarConfiguration</key>
  			<string>xcode.toolbar.config.run</string>
  			<key>WindowString</key>
! 			<string>21 609 459 200 0 0 1280 832 </string>
  			<key>WindowToolGUID</key>
  			<string>1C0AD2B3069F1EA900FABCE6</string>
  			<key>WindowToolIsVisible</key>
! 			<false/>
  		</dict>
  		<dict>

Index: roman.pbxuser
===================================================================
RCS file: /cvsroot/macattrick/macattrick/Macattrick.xcode/roman.pbxuser,v
retrieving revision 1.95
retrieving revision 1.96
diff -C2 -d -r1.95 -r1.96
*** roman.pbxuser	8 May 2005 20:17:48 -0000	1.95
--- roman.pbxuser	9 May 2005 19:48:53 -0000	1.96
***************
*** 40,44 ****
  		activeBuildStyle = 4A9504CCFFE6A4B311CA0CBA;
  		activeExecutable = 30744BA6069560A70039B82A;
! 		activeTarget = 30DFA496082018F2000CE74D;
  		addToTargets = (
  			30DFA496082018F2000CE74D,
--- 40,44 ----
  		activeBuildStyle = 4A9504CCFFE6A4B311CA0CBA;
  		activeExecutable = 30744BA6069560A70039B82A;
! 		activeTarget = 309914160820019C00FBF240;
  		addToTargets = (
[...1344 lines suppressed...]
! 			sepNavVisRect = "{{0, 5931}, {647, 187}}";
  			sepNavWindowFrame = "{{212, 47}, {1064, 783}}";
  		};
***************
*** 2457,2463 ****
  	30D9FB420644FA8300390F49 = {
  		uiCtxt = {
! 			sepNavIntBoundsRect = "{{0, 0}, {765, 1119}}";
! 			sepNavSelRange = "{4601, 0}";
! 			sepNavVisRect = "{{0, 409}, {765, 387}}";
  			sepNavWindowFrame = "{{84, 242}, {750, 522}}";
  		};
--- 2911,2917 ----
  	30D9FB420644FA8300390F49 = {
  		uiCtxt = {
! 			sepNavIntBoundsRect = "{{0, 0}, {740, 1120}}";
! 			sepNavSelRange = "{3060, 78}";
! 			sepNavVisRect = "{{0, 144}, {740, 385}}";
  			sepNavWindowFrame = "{{84, 242}, {750, 522}}";
  		};

[Macattrick-commit] macattrick/Test AllTests.m,1.21,1.22 PositionHeapTest.m,1.3,1.4

[Geisschaes <gei...@us...>]

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

Modified Files:
	AllTests.m PositionHeapTest.m 
Log Message:
import and export buttons added. but import has some memory problem

Index: AllTests.m
===================================================================
RCS file: /cvsroot/macattrick/macattrick/Test/AllTests.m,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** AllTests.m	8 May 2005 20:17:50 -0000	1.21
--- AllTests.m	9 May 2005 19:49:02 -0000	1.22
***************
*** 95,98 ****
--- 95,99 ----
  	[properties setObject:[NSString stringWithFormat:@"%@/Test/players.xml", [Properties libraryPath]] forKey:@"playersfile"];
      [properties setObject:[NSString stringWithFormat:@"%@/Test/positionsFile.xml", [Properties libraryPath]] forKey:@"positionsfile"];
+     [properties setObject:[NSString stringWithFormat:@"%@/Test/positionsFile1.xml", [Properties libraryPath]] forKey:@"positionsfile1"];
      [pool release];
  }

Index: PositionHeapTest.m
===================================================================
RCS file: /cvsroot/macattrick/macattrick/Test/PositionHeapTest.m,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** PositionHeapTest.m	8 May 2005 20:17:50 -0000	1.3
--- PositionHeapTest.m	9 May 2005 19:49:03 -0000	1.4
***************
*** 29,33 ****
  #import "PositionHeapTest.h"
  #import "AllTests.h"
! 
  
  @implementation PositionHeapTest
--- 29,33 ----
  #import "PositionHeapTest.h"
  #import "AllTests.h"
! #import "Position.h"
  
  @implementation PositionHeapTest
***************
*** 64,67 ****
--- 64,81 ----
  	NSString *filename = [AllTests getProperty:@"positionsfile"];
  	[heap saveToFile:filename];
+ 	NSString *fileContents = [[NSString alloc] initWithContentsOfFile:filename];
+ 	UKNotNil(fileContents);
+ 	UKTrue([fileContents length] > 2000);
+ 	[fileContents release];
+ }
+ 
+ - (void) testLoadFromFile{
+ 	NSString *filename = [AllTests getProperty:@"positionsfile1"];
+ 	PositionHeap *heap = [PositionHeap uniqueInstance];
+ 	[heap loadPositionHeapFromFile:filename];
+ //	Position *newDefender = [heap positionWithIdentifier:@"Central Defender"];
+ //	UKNotNil(newDefender);
+ //	UKFloatsEqual([newDefender defenderRate], 0.95, 0.001);
+ //	UKFloatsEqual([newDefender playerFormRate], 0.8, 0.001);
  }
  

[Macattrick-commit] macattrick Position.h,1.8,1.9 Position.m,1.9,1.10 PositionHeap.h,1.1,1.2 PositionHeap.m,1.1,1.2

[Geisschaes <gei...@us...>]

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

Modified Files:
	Position.h Position.m PositionHeap.h PositionHeap.m 
Log Message:
export and import positionsheap added. import is not yet tested approprietly

Index: Position.m
===================================================================
RCS file: /cvsroot/macattrick/macattrick/Position.m,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** Position.m	25 Apr 2005 20:22:37 -0000	1.9
--- Position.m	8 May 2005 20:17:47 -0000	1.10
***************
*** 80,83 ****
--- 80,106 ----
  }
  
+ 
+ -(Position*) initFromSaveString: (NSString*) saveString {
+ 	self = [super init];
+ 	if (self) {
+ 		NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+ 		NSArray* array = [saveString componentsSeparatedByString:@"|"];
+ 		identifier = [array objectAtIndex:0];
+ 		[self setPlayerFormRate:[[array objectAtIndex:1]doubleValue]];
+ 		[self setExperienceRate:[[array objectAtIndex:2]doubleValue]];
+ 		[self setStaminaRate:[[array objectAtIndex:3]doubleValue]];
+ 		[self setKeeperRate:[[array objectAtIndex:4]doubleValue]];
+ 		[self setPlaymakingRate:[[array objectAtIndex:5]doubleValue]];
+ 		[self setPassingRate:[[array objectAtIndex:6]doubleValue]];
+ 		[self setWingerRate:[[array objectAtIndex:7]doubleValue]];
+ 		[self setDefenderRate:[[array objectAtIndex:8]doubleValue]];
+ 		[self setScorerRate:[[array objectAtIndex:9]doubleValue]];
+ 		[self setSetPiecesRate:[[array objectAtIndex:10]doubleValue]];
+ 		[self updateTotal];
+ 		[pool release];
+ 	}
+ 	return self;
+ }
+ 
  - (Position*) initWithIdentifier: (NSString*) newIdentifier 
  				  playerFormRate: (double) newPlayerFormRate experienceRate: (double) newExperienceRate
***************
*** 219,222 ****
--- 242,252 ----
  }
  
+ 
+ -(NSString*) saveString {
+ 	return [NSString stringWithFormat: 
+ 	@"%@|%f|%f|%f|%f|%f|%f|%f|%f|%f|%f", 
+ 	identifier, playerFormRate, experienceRate, staminaRate, keeperRate, playmakingRate, passingRate, wingerRate, defenderRate, scorerRate, setPiecesRate];
+ }
+ 
  -(void) saveToUserDefaults {
  	NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];

Index: PositionHeap.m
===================================================================
RCS file: /cvsroot/macattrick/macattrick/PositionHeap.m,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** PositionHeap.m	7 Feb 2005 21:15:40 -0000	1.1
--- PositionHeap.m	8 May 2005 20:17:48 -0000	1.2
***************
*** 55,58 ****
--- 55,71 ----
  }
  
+ - (void) loadPositionHeapFromFileName: (NSString*) filename {
+ 	NSDictionary *dic = [[NSDictionary alloc] initWithContentsOfFile:filename];
+ 	NSEnumerator *en = [dic keyEnumerator];
+ 	NSString *currentKey = nil;
+ 	while(currentKey = [en nextObject]) {
+ 		Position *newPosition = [[Position alloc] initFromSaveString:[dic valueForKey:currentKey]];
+ 		[positionsDictionary setValue: newPosition forKey: currentKey];
+ 		[newPosition release];
+ 	}
+ 	[dic release];
+ }
+ 
+ 
  -(Position*) positionWithIdentifier: (NSString*) positionsIdentifier {
  	Position *pos = [positionsDictionary objectForKey:positionsIdentifier];
***************
*** 117,120 ****
--- 130,134 ----
  		[pos release];
  	}
+ 	[self savePositionsToUserDefaults];
  }
  
***************
*** 169,173 ****
  
  - (void) saveToFile: (NSString *) filename {
! 	[positionsDictionary writeToFile:filename atomically:NO];
  }
  
--- 183,196 ----
  
  - (void) saveToFile: (NSString *) filename {
! 	[self loadPositions];
! 	NSMutableDictionary *saveDic = [[NSMutableDictionary alloc] initWithCapacity:[positionsDictionary count]];
! 	NSEnumerator *en = [positionsDictionary objectEnumerator];
! 	Position *current = nil;
! 	while(current = [en nextObject]) {
! 		[saveDic setValue:[current saveString] forKey:[current identifier]];
! 	}
! 	[saveDic writeToFile:filename atomically:NO];
! 	[saveDic release];
! 	
  }
  

Index: Position.h
===================================================================
RCS file: /cvsroot/macattrick/macattrick/Position.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** Position.h	25 Apr 2005 20:22:37 -0000	1.8
--- Position.h	8 May 2005 20:17:47 -0000	1.9
***************
*** 51,54 ****
--- 51,56 ----
  -(Position*) initFromUserDefaults: (NSString*) newIdentifier;
  
+ -(Position*) initFromSaveString: (NSString*) saveString;
+ 
  - (Position*) initWithIdentifier: (NSString*) newIdentifier 
  		staminaRate: (double) newStaminaRate keeperRate: (double) newKeeperRate 
***************
*** 88,91 ****
--- 90,95 ----
  -(void) saveToUserDefaults;
  
+ -(NSString*) saveString;
+ 
  // class methods
  

Index: PositionHeap.h
===================================================================
RCS file: /cvsroot/macattrick/macattrick/PositionHeap.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** PositionHeap.h	7 Feb 2005 21:15:40 -0000	1.1
--- PositionHeap.h	8 May 2005 20:17:47 -0000	1.2
***************
*** 39,42 ****
--- 39,44 ----
  + (PositionHeap*) uniqueInstance;
  
+ - (void) loadPositionHeapFromFileName: (NSString*) filename;
+ 
  - (Position*) positionWithIdentifier: (NSString*) positionsIdentifier;
  

[Macattrick-commit] macattrick/Test AllTests.m,1.20,1.21 PositionHeapTest.m,1.2,1.3 PositionTest.m,1.11,1.12

[Geisschaes <gei...@us...>]

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

Modified Files:
	AllTests.m PositionHeapTest.m PositionTest.m 
Log Message:
export and import positionsheap added. import is not yet tested approprietly

Index: PositionTest.m
===================================================================
RCS file: /cvsroot/macattrick/macattrick/Test/PositionTest.m,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** PositionTest.m	27 Apr 2005 19:36:45 -0000	1.11
--- PositionTest.m	8 May 2005 20:17:50 -0000	1.12
***************
*** 146,149 ****
--- 146,165 ----
  	UKObjectsEqual(positionKeeper ,newKeeper);
  }
+ 
+ - (void) testSaveString {
+ 	Position *pos = [[Position alloc] initWithIdentifier:@"Inner Midfield" playerFormRate: 0.6 experienceRate: 0.35 staminaRate:0.25 keeperRate:0 playmakingRate:0.5 scorerRate:0 
+ 									passingRate:0.15 wingerRate:0 defenderRate:0.1 setPiecesRate:0];
+ 
+ 	UKStringsEqual([pos saveString], @"Inner Midfield|0.600000|0.350000|0.250000|0.000000|0.500000|0.150000|0.000000|0.100000|0.000000|0.000000");
+ }
+ 
+ - (void) testInitFromSaveString {
+ 	Position *pos = [[Position alloc] initFromSaveString: @"Winger|0.000000|0.000000|0.000000|0.100000|0.000000|0.050000|0.700000|0.000000|0.100000|0.050000"];
+ 	UKNotNil(pos);
+ 	UKFloatsEqual([pos wingerRate], 0.7, 0.001);
+ 	UKFloatsEqual([pos setPiecesRate], 0.05, 0.001);
+ 	UKFloatsEqual([pos total], 1.0, 0.001);
+ }
+ 
  -(void) testIsEqual {
  	UKTrue([positionKeeper isEqual: [[PositionHeap uniqueInstance] positionWithIdentifier:@"Keeper"]]);

Index: AllTests.m
===================================================================
RCS file: /cvsroot/macattrick/macattrick/Test/AllTests.m,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** AllTests.m	27 Apr 2005 19:36:44 -0000	1.20
--- AllTests.m	8 May 2005 20:17:50 -0000	1.21
***************
*** 94,97 ****
--- 94,98 ----
  	[[HattrickOrg uniqueInstance] setLoginName: [AllTests getProperty:@"login"] password:[AllTests getProperty:@"password"]];
  	[properties setObject:[NSString stringWithFormat:@"%@/Test/players.xml", [Properties libraryPath]] forKey:@"playersfile"];
+     [properties setObject:[NSString stringWithFormat:@"%@/Test/positionsFile.xml", [Properties libraryPath]] forKey:@"positionsfile"];
      [pool release];
  }

Index: PositionHeapTest.m
===================================================================
RCS file: /cvsroot/macattrick/macattrick/Test/PositionHeapTest.m,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** PositionHeapTest.m	27 Apr 2005 19:36:45 -0000	1.2
--- PositionHeapTest.m	8 May 2005 20:17:50 -0000	1.3
***************
*** 28,35 ****
--- 28,43 ----
  
  #import "PositionHeapTest.h"
+ #import "AllTests.h"
  
  
  @implementation PositionHeapTest
  
+ - (void) testUniqueInstance {
+ 	PositionHeap *first = [PositionHeap uniqueInstance];
+ 	UKNotNil(first);
+ 	PositionHeap *second = [PositionHeap uniqueInstance];
+ 	UKObjectsSame(first, second);
+ }
+ 
  
  -(void) testPossiblePositions {
***************
*** 39,41 ****
--- 47,68 ----
  }
  
+ - (void) testPositionWithIdentifier {
+ 	UKStringsEqual([[[PositionHeap uniqueInstance]positionWithIdentifier:@"Keeper"] identifier], @"Keeper");
+ 	UKTrue([[[PositionHeap uniqueInstance]positionWithIdentifier:@"Keeper"] keeperRate] > 0);
+ 	UKStringsEqual([[[PositionHeap uniqueInstance]positionWithIdentifier:@"Central Defender"] identifier], @"Central Defender");
+ 	UKTrue([[[PositionHeap uniqueInstance]positionWithIdentifier:@"Central Defender"] defenderRate] > 0);
+ 	UKStringsEqual([[[PositionHeap uniqueInstance]positionWithIdentifier:@"Inner Midfield"] identifier], @"Inner Midfield");
+ 	UKTrue([[[PositionHeap uniqueInstance]positionWithIdentifier:@"Inner Midfield"] playmakingRate] > 0);
+ 	UKStringsEqual([[[PositionHeap uniqueInstance]positionWithIdentifier:@"Forward"] identifier], @"Forward");
+ 	UKTrue([[[PositionHeap uniqueInstance]positionWithIdentifier:@"Forward"] scorerRate] > 0);
+ }
+ 
+ 
+ 
+ - (void) testSaveToFile {
+ 	PositionHeap *heap = [PositionHeap uniqueInstance];
+ 	NSString *filename = [AllTests getProperty:@"positionsfile"];
+ 	[heap saveToFile:filename];
+ }
+ 
  @end

[Macattrick-commit] macattrick/Macattrick.xcode roman.mode1,1.29,1.30 roman.pbxuser,1.94,1.95

[Geisschaes <gei...@us...>]

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

Modified Files:
	roman.mode1 roman.pbxuser 
Log Message:
export and import positionsheap added. import is not yet tested approprietly

Index: roman.mode1
===================================================================
RCS file: /cvsroot/macattrick/macattrick/Macattrick.xcode/roman.mode1,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** roman.mode1	29 Apr 2005 20:33:58 -0000	1.29
--- roman.mode1	8 May 2005 20:17:48 -0000	1.30
***************
*** 159,167 ****
  	</array>
  	<key>Description</key>
! 	<string>This workspace mimics that found in Xcode 1.2, with various minor improvements such as including attached editors to the build results window and the project find window.</string>
  	<key>DockingSystemVisible</key>
  	<false/>
  	<key>Extension</key>
  	<string>mode1</string>
  	<key>FirstTimeWindowDisplayed</key>
  	<false/>
--- 159,176 ----
[...1672 lines suppressed...]
*** 1411,1419 ****
  			<string>xcode.toolbar.config.classbrowser</string>
  			<key>WindowString</key>
! 			<string>103 273 1011 485 0 0 1280 832 </string>
  			<key>WindowToolGUID</key>
  			<string>1C0AD2AF069F1E9B00FABCE6</string>
  			<key>WindowToolIsVisible</key>
! 			<true/>
  		</dict>
  	</array>
--- 1309,1317 ----
  			<string>xcode.toolbar.config.classbrowser</string>
  			<key>WindowString</key>
! 			<string>385 179 630 352 0 0 1440 878 </string>
  			<key>WindowToolGUID</key>
  			<string>1C0AD2AF069F1E9B00FABCE6</string>
  			<key>WindowToolIsVisible</key>
! 			<integer>0</integer>
  		</dict>
  	</array>

Index: roman.pbxuser
===================================================================
RCS file: /cvsroot/macattrick/macattrick/Macattrick.xcode/roman.pbxuser,v
retrieving revision 1.94
retrieving revision 1.95
diff -C2 -d -r1.94 -r1.95
*** roman.pbxuser	29 Apr 2005 20:33:58 -0000	1.94
--- roman.pbxuser	8 May 2005 20:17:48 -0000	1.95
***************
*** 40,45 ****
  		activeBuildStyle = 4A9504CCFFE6A4B311CA0CBA;
  		activeExecutable = 30744BA6069560A70039B82A;
! 		activeTarget = 30744BA4069560A70039B82A;
  		addToTargets = (
  		);
  		breakpoints = (
--- 40,46 ----
  		activeBuildStyle = 4A9504CCFFE6A4B311CA0CBA;
  		activeExecutable = 30744BA6069560A70039B82A;
! 		activeTarget = 30DFA496082018F2000CE74D;
[...4147 lines suppressed...]
- 	};
- 	30E8345E078DAC7600274608 = {
- 		fRef = 10A233D307327EA7007529F7;
- 		isa = PBXBookmark;
- 	};
- 	30E8345F078DAC7600274608 = {
- 		fRef = 304145120711D07F00B323F1;
- 		isa = PBXBookmark;
- 	};
- 	30E83717078DC6E100274608 = {
- 		fRef = 30D6DF2D0761FEE9001A24BD;
- 		isa = PBXBookmark;
- 	};
- 	30E83719078DC6E100274608 = {
- 		fRef = 30D6DF2D0761FEE9001A24BD;
- 		isa = PBXBookmark;
- 	};
  	30EC0BDE06425043008B3F6B = {
  		uiCtxt = {
--- 2554,2557 ----

[Macattrick-commit] macattrick/doc/divers - New directory

[Geisschaes <gei...@us...>]

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

Log Message:
Directory /cvsroot/macattrick/macattrick/doc/divers added to the repository

[Macattrick-commit] macattrick/doc/divers formula.tex,NONE,1.1

[Geisschaes <gei...@us...>]

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

Added Files:
	formula.tex 
Log Message:
formulas added

--- NEW FILE: formula.tex ---
\documentclass[12pt]{article}
\usepackage{graphicx}
\usepackage{amssymb}
\usepackage{epstopdf}
\DeclareGraphicsRule{.tif}{png}{.png}{`convert #1 `dirname #1`/`basename #1 .tif`.png}

\textwidth = 6.5 in
\textheight = 9 in
\oddsidemargin = 0.0 in
\evensidemargin = 0.0 in
\topmargin = 0.0 in
\headheight = 0.0 in
\headsep = 0.0 in
\parskip = 0in
\parindent = 0.0in

\newtheorem{theorem}{Theorem}
\newtheorem{corollary}[theorem]{Corollary}
\newtheorem{definition}{Definition}

\title{Brief Article}
\author{The Author}
\begin{document}
$\alpha = (f \!\cdot\! fr/8) \!+\!0.4 $

$\beta =  st \!\cdot\! str \!+\! k \!\cdot\! kr \!+\! pm \!\cdot\! pmr \!+\!  ps \!\cdot\! psr \!+\! w \!\cdot\! wr \!+\! d \!\cdot\! dr \!+\! sp \!\cdot\! spr$

$\gamma = 2\!\cdot\! \log(e) \!\cdot\! er $

score = $\alpha \!\cdot\! \beta \!\cdot\! \gamma$




 \end{document} 

[Macattrick-commit] macattrick/Test LineUpTreeTest.m,1.12,1.13

[Geisschaes <gei...@us...>]

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

Modified Files:
	LineUpTreeTest.m 
Log Message:
test cases adjusted

Index: LineUpTreeTest.m
===================================================================
RCS file: /cvsroot/macattrick/macattrick/Test/LineUpTreeTest.m,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** LineUpTreeTest.m	27 Apr 2005 19:36:45 -0000	1.12
--- LineUpTreeTest.m	1 May 2005 09:58:43 -0000	1.13
***************
*** 84,91 ****
  	NSSet *playerSet = [NSSet setWithArray:[playerList playerList]];
  	[lineUpTree buildTree: 0.99 playerList:  playerSet];
! 	UKFloatsEqual( [lineUpTree strength:@"Total"] ,40.0 ,1.5);
! 	UKFloatsEqual( [lineUpTree strength:@"Defense"] ,16.0 ,1.5);
! 	UKFloatsEqual( [lineUpTree strength:@"Midfield"] ,18.0 ,1.5);
! 	UKFloatsEqual( [lineUpTree strength:@"Attack"] ,6 ,1.5);
  	
  }
--- 84,91 ----
  	NSSet *playerSet = [NSSet setWithArray:[playerList playerList]];
  	[lineUpTree buildTree: 0.99 playerList:  playerSet];
! 	UKFloatsEqual( [lineUpTree strength:@"Total"] ,59.0 ,1.5);
! 	UKFloatsEqual( [lineUpTree strength:@"Defense"] ,26.0 ,1.5);
! 	UKFloatsEqual( [lineUpTree strength:@"Midfield"] ,24.0 ,1.5);
! 	UKFloatsEqual( [lineUpTree strength:@"Attack"] ,11 ,1.5);
  	
  }

[Macattrick-commit] macattrick/Macattrick.xcode project.pbxproj,1.70,1.71 roman.mode1,1.28,1.29 roman.pbxuser,1.93,1.94

[Geisschaes <gei...@us...>]

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

Modified Files:
	project.pbxproj roman.mode1 roman.pbxuser 
Log Message:
line up statistic bug fixed

Index: project.pbxproj
===================================================================
RCS file: /cvsroot/macattrick/macattrick/Macattrick.xcode/project.pbxproj,v
retrieving revision 1.70
retrieving revision 1.71
diff -C2 -d -r1.70 -r1.71
*** project.pbxproj	29 Apr 2005 19:18:37 -0000	1.70
--- project.pbxproj	29 Apr 2005 20:33:58 -0000	1.71
***************
*** 369,373 ****
  				30744BA7069560A70039B82A,
  				309914180820019C00FBF240,
- 				30DFA46C082016C9000CE74D,
  				30DFA498082018F2000CE74D,
  			);
--- 369,372 ----
***************
*** 5482,5493 ****
  			};
  		};
- 		30DFA46C082016C9000CE74D = {
- 			isa = PBXFileReference;
- 			lastKnownFileType = text.xml;
- 			name = "DebugBundle-Info.plist";
- 			path = "/Users/roman/Documents/dev/macattrick/DebugBundle-Info.plist";
- 			refType = 0;
- 			sourceTree = "<absolute>";
- 		};
  		30DFA491082018F2000CE74D = {
  			buildActionMask = 2147483647;
--- 5481,5484 ----

Index: roman.mode1
===================================================================
RCS file: /cvsroot/macattrick/macattrick/Macattrick.xcode/roman.mode1,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** roman.mode1	29 Apr 2005 19:18:38 -0000	1.28
--- roman.mode1	29 Apr 2005 20:33:58 -0000	1.29
***************
*** 206,211 ****
  			<array>
  				<dict>
- 					<key>BecomeActive</key>
- 					<true/>
  					<key>ContentConfiguration</key>
  					<dict>
--- 206,209 ----
***************
*** 250,259 ****
  							<array>
  								<array>
! 									<integer>28</integer>
! 									<integer>25</integer>
  								</array>
  							</array>
  							<key>PBXSmartGroupTreeModuleOutlineStateVisibleRectKey</key>
! 							<string>{{0, 7}, {322, 605}}</string>
  						</dict>
  						<key>PBXTopSmartGroupGIDs</key>
--- 248,257 ----
  							<array>
  								<array>
! 									<integer>3</integer>
! 									<integer>0</integer>
  								</array>
  							</array>
  							<key>PBXSmartGroupTreeModuleOutlineStateVisibleRectKey</key>
! 							<string>{{0, 0}, {322, 605}}</string>
  						</dict>
  						<key>PBXTopSmartGroupGIDs</key>
***************
*** 270,274 ****
  						</array>
  						<key>RubberWindowFrame</key>
! 						<string>240 129 998 665 0 0 1280 832 </string>
  					</dict>
  					<key>Module</key>
--- 268,272 ----
  						</array>
  						<key>RubberWindowFrame</key>
! 						<string>105 146 998 665 0 0 1280 832 </string>
  					</dict>
  					<key>Module</key>
***************
*** 286,290 ****
  								<string>1CE0B20306471E060097A5F4</string>
  								<key>PBXProjectModuleLabel</key>
! 								<string>DebugBundle-Info.plist</string>
  								<key>PBXSplitModuleInNavigatorKey</key>
  								<dict>
--- 284,288 ----
  								<string>1CE0B20306471E060097A5F4</string>
  								<key>PBXProjectModuleLabel</key>
! 								<string>Position.m</string>
  								<key>PBXSplitModuleInNavigatorKey</key>
  								<dict>
***************
*** 294,300 ****
  										<string>1CE0B20406471E060097A5F4</string>
  										<key>PBXProjectModuleLabel</key>
! 										<string>DebugBundle-Info.plist</string>
  										<key>bookmark</key>
! 										<string>3028100F0822BF8900E09F89</string>
  										<key>history</key>
  										<array>
--- 292,298 ----
  										<string>1CE0B20406471E060097A5F4</string>
  										<key>PBXProjectModuleLabel</key>
! 										<string>Position.m</string>
  										<key>bookmark</key>
! 										<string>3086ECCF0822D155006A3707</string>
  										<key>history</key>
  										<array>
***************
*** 357,361 ****
  											<string>309913D6081FFED700FBF240</string>
  											<string>309914240820020A00FBF240</string>
- 											<string>309915710820073A00FBF240</string>
  											<string>30DFA4E8082019A1000CE74D</string>
  											<string>30DFA4E9082019A1000CE74D</string>
--- 355,358 ----
***************
*** 402,406 ****
  											<string>30DFA517082019A1000CE74D</string>
  											<string>30DFA518082019A1000CE74D</string>
- 											<string>30DFA519082019A1000CE74D</string>
  											<string>30DFA51A082019A1000CE74D</string>
  											<string>30DFA51B082019A1000CE74D</string>
--- 399,402 ----
***************
*** 431,438 ****
  											<string>30DFA5E308201A96000CE74D</string>
  											<string>30DFA5F008201AFB000CE74D</string>
- 											<string>30DFA61A08201FA5000CE74D</string>
  											<string>30DFA61B08201FA5000CE74D</string>
  											<string>300230B50822BBC600C8AB0C</string>
! 											<string>300230D80822BD7000C8AB0C</string>
  										</array>
  										<key>prevStack</key>
--- 427,436 ----
  											<string>30DFA5E308201A96000CE74D</string>
  											<string>30DFA5F008201AFB000CE74D</string>
  											<string>30DFA61B08201FA5000CE74D</string>
  											<string>300230B50822BBC600C8AB0C</string>
! 											<string>3028101F0822C57A00E09F89</string>
! 											<string>302810200822C57A00E09F89</string>
! 											<string>3086ECB40822CE71006A3707</string>
! 											<string>3086ECB50822CE71006A3707</string>
  										</array>
  										<key>prevStack</key>
***************
*** 572,576 ****
  											<string>30991510082002CE00FBF240</string>
  											<string>3099156E082006C500FBF240</string>
! 											<string>309915730820073A00FBF240</string>
  										</array>
  									</dict>
--- 570,576 ----
  											<string>30991510082002CE00FBF240</string>
  											<string>3099156E082006C500FBF240</string>
! 											<string>302810220822C57A00E09F89</string>
! 											<string>302810230822C57A00E09F89</string>
! 											<string>3086ECB60822CE71006A3707</string>
  										</array>
  									</dict>
***************
*** 586,590 ****
  								<string>{{0, 0}, {653, 391}}</string>
  								<key>RubberWindowFrame</key>
! 								<string>240 129 998 665 0 0 1280 832 </string>
  							</dict>
  							<key>Module</key>
--- 586,590 ----
  								<string>{{0, 0}, {653, 391}}</string>
  								<key>RubberWindowFrame</key>
! 								<string>105 146 998 665 0 0 1280 832 </string>
  							</dict>
  							<key>Module</key>
***************
*** 594,597 ****
--- 594,599 ----
  						</dict>
  						<dict>
+ 							<key>BecomeActive</key>
+ 							<true/>
  							<key>ContentConfiguration</key>
  							<dict>
***************
*** 606,610 ****
  								<string>{{0, 398}, {653, 225}}</string>
  								<key>RubberWindowFrame</key>
! 								<string>240 129 998 665 0 0 1280 832 </string>
  							</dict>
  							<key>Module</key>
--- 608,612 ----
  								<string>{{0, 398}, {653, 225}}</string>
  								<key>RubberWindowFrame</key>
! 								<string>105 146 998 665 0 0 1280 832 </string>
  							</dict>
  							<key>Module</key>
***************
*** 630,636 ****
  			<key>TableOfContents</key>
  			<array>
! 				<string>302810010822BDE200E09F89</string>
  				<string>1CE0B1FE06471DED0097A5F4</string>
! 				<string>302810020822BDE200E09F89</string>
  				<string>1CE0B20306471E060097A5F4</string>
  				<string>1CE0B20506471E060097A5F4</string>
--- 632,638 ----
  			<key>TableOfContents</key>
  			<array>
! 				<string>3086ECA80822CD03006A3707</string>
  				<string>1CE0B1FE06471DED0097A5F4</string>
! 				<string>3086ECA90822CD03006A3707</string>
  				<string>1CE0B20306471E060097A5F4</string>
  				<string>1CE0B20506471E060097A5F4</string>
***************
*** 660,668 ****
  	<key>WindowOrderList</key>
  	<array>
! 		<string>1C0AD2B3069F1EA900FABCE6</string>
  		<string>/Users/roman/Documents/dev/macattrick/Macattrick.xcode</string>
  	</array>
  	<key>WindowString</key>
! 	<string>240 129 998 665 0 0 1280 832 </string>
  	<key>WindowTools</key>
  	<array>
--- 662,673 ----
  	<key>WindowOrderList</key>
  	<array>
! 		<string>1C0AD2AF069F1E9B00FABCE6</string>
  		<string>/Users/roman/Documents/dev/macattrick/Macattrick.xcode</string>
+ 		<string>303B68B1075A0D24009951CC</string>
+ 		<string>1C0AD2B3069F1EA900FABCE6</string>
+ 		<string>3086ECAD0822CD7A006A3707</string>
  	</array>
  	<key>WindowString</key>
! 	<string>105 146 998 665 0 0 1280 832 </string>
  	<key>WindowTools</key>
  	<array>
***************
*** 683,687 ****
  								<string>1CD0528F0623707200166675</string>
  								<key>PBXProjectModuleLabel</key>
! 								<string>LeagueTest.m</string>
  								<key>PBXSplitModuleInNavigatorKey</key>
  								<dict>
--- 688,692 ----
  								<string>1CD0528F0623707200166675</string>
  								<key>PBXProjectModuleLabel</key>
! 								<string>LineUpTree.m</string>
  								<key>PBXSplitModuleInNavigatorKey</key>
  								<dict>
***************
*** 691,718 ****
  										<string>1CD052900623707200166675</string>
  										<key>PBXProjectModuleLabel</key>
! 										<string>LeagueTest.m</string>
  										<key>bookmark</key>
! 										<string>300230D90822BD7000C8AB0C</string>
  										<key>history</key>
  										<array>
! 											<string>302E1B51081D7557004659AF</string>
! 											<string>302E1B6A081D79E6004659AF</string>
! 											<string>3099154C082003B900FBF240</string>
! 											<string>309915600820063500FBF240</string>
! 											<string>30DFA1170820095F000CE74D</string>
! 											<string>30DFA60D08201D84000CE74D</string>
! 											<string>30DFA60E08201D84000CE74D</string>
! 											<string>30DFA633082020D7000CE74D</string>
! 										</array>
! 										<key>prevStack</key>
! 										<array>
! 											<string>302E1B53081D7557004659AF</string>
! 											<string>302E1B6C081D79E6004659AF</string>
! 											<string>3099154E082003B900FBF240</string>
! 											<string>309915620820063500FBF240</string>
! 											<string>30DFA11A0820095F000CE74D</string>
! 											<string>30DFA11B0820095F000CE74D</string>
! 											<string>30DFA11C0820095F000CE74D</string>
! 											<string>30DFA61008201D84000CE74D</string>
  										</array>
  									</dict>
--- 696,705 ----
  										<string>1CD052900623707200166675</string>
  										<key>PBXProjectModuleLabel</key>
! 										<string>LineUpTree.m</string>
  										<key>bookmark</key>
! 										<string>3086ECD00822D155006A3707</string>
  										<key>history</key>
  										<array>
! 											<string>3086ECC00822D08C006A3707</string>
  										</array>
  									</dict>
***************
*** 777,781 ****
  			<array>
  				<string>303B68B1075A0D24009951CC</string>
! 				<string>300230BA0822BBC600C8AB0C</string>
  				<string>1CD0528F0623707200166675</string>
  				<string>XCMainBuildResultsModuleGUID</string>
--- 764,768 ----
  			<array>
  				<string>303B68B1075A0D24009951CC</string>
! 				<string>3086ECC20822D08C006A3707</string>
  				<string>1CD0528F0623707200166675</string>
  				<string>XCMainBuildResultsModuleGUID</string>
***************
*** 1090,1095 ****
  										<key>sizes</key>
  										<array>
! 											<string>{{0, 0}, {491, 167}}</string>
! 											<string>{{0, 176}, {491, 267}}</string>
  										</array>
  									</dict>
--- 1077,1082 ----
  										<key>sizes</key>
  										<array>
! 											<string>{{0, 0}, {366, 167}}</string>
! 											<string>{{0, 176}, {366, 267}}</string>
  										</array>
  									</dict>
***************
*** 1115,1121 ****
  							<dict>
  								<key>Frame</key>
! 								<string>{{0, 0}, {707, 467}}</string>
  								<key>RubberWindowFrame</key>
! 								<string>567 107 707 509 0 0 1280 832 </string>
  							</dict>
  							<key>Module</key>
--- 1102,1108 ----
  							<dict>
  								<key>Frame</key>
! 								<string>{{0, 0}, {931, 467}}</string>
  								<key>RubberWindowFrame</key>
! 								<string>227 274 931 509 0 0 1280 832 </string>
  							</dict>
  							<key>Module</key>
***************
*** 1140,1151 ****
  			<array>
  				<string>1C0AD2B3069F1EA900FABCE6</string>
! 				<string>302810030822BDE200E09F89</string>
  				<string>1CD0528B0623707200166675</string>
! 				<string>302810040822BDE200E09F89</string>
  			</array>
  			<key>ToolbarConfiguration</key>
  			<string>xcode.toolbar.config.run</string>
  			<key>WindowString</key>
! 			<string>567 107 707 509 0 0 1280 832 </string>
  			<key>WindowToolGUID</key>
  			<string>1C0AD2B3069F1EA900FABCE6</string>
--- 1127,1138 ----
  			<array>
  				<string>1C0AD2B3069F1EA900FABCE6</string>
! 				<string>3086ECAA0822CD03006A3707</string>
  				<string>1CD0528B0623707200166675</string>
! 				<string>3086ECAB0822CD03006A3707</string>
  			</array>
  			<key>ToolbarConfiguration</key>
  			<string>xcode.toolbar.config.run</string>
  			<key>WindowString</key>
! 			<string>227 274 931 509 0 0 1280 832 </string>
  			<key>WindowToolGUID</key>
  			<string>1C0AD2B3069F1EA900FABCE6</string>
***************
*** 1364,1373 ****
  								<string>1CA6456E063B45B4001379D8</string>
  								<key>PBXProjectModuleLabel</key>
! 								<string>Class Browser - TeamTableController</string>
  							</dict>
  							<key>GeometryConfiguration</key>
  							<dict>
  								<key>ClassesFrame</key>
! 								<string>{{0, 0}, {374, 96}}</string>
  								<key>ClassesTreeTableConfiguration</key>
  								<array>
--- 1351,1360 ----
  								<string>1CA6456E063B45B4001379D8</string>
  								<key>PBXProjectModuleLabel</key>
! 								<string>Class Browser - Position</string>
  							</dict>
  							<key>GeometryConfiguration</key>
  							<dict>
  								<key>ClassesFrame</key>
! 								<string>{{0, 0}, {755, 96}}</string>
  								<key>ClassesTreeTableConfiguration</key>
  								<array>
***************
*** 1378,1384 ****
  								</array>
  								<key>Frame</key>
! 								<string>{{0, 0}, {630, 331}}</string>
  								<key>MembersFrame</key>
! 								<string>{{0, 105}, {374, 226}}</string>
  								<key>MembersTreeTableConfiguration</key>
  								<array>
--- 1365,1371 ----
  								</array>
  								<key>Frame</key>
! 								<string>{{0, 0}, {1011, 464}}</string>
  								<key>MembersFrame</key>
! 								<string>{{0, 105}, {755, 359}}</string>
  								<key>MembersTreeTableConfiguration</key>
  								<array>
***************
*** 1388,1392 ****
  									<real>216</real>
  									<string>PBXMemberTypeColumnIdentifier</string>
! 									<real>97</real>
  									<string>PBXMemberBookColumnIdentifier</string>
  									<real>22</real>
--- 1375,1379 ----
  									<real>216</real>
  									<string>PBXMemberTypeColumnIdentifier</string>
! 									<real>478</real>
  									<string>PBXMemberBookColumnIdentifier</string>
  									<real>22</real>
***************
*** 1395,1408 ****
  								<true/>
  								<key>RubberWindowFrame</key>
! 								<string>103 406 630 352 0 0 1280 832 </string>
  							</dict>
  							<key>Module</key>
  							<string>PBXClassBrowserModule</string>
  							<key>Proportion</key>
! 							<string>331pt</string>
  						</dict>
  					</array>
  					<key>Proportion</key>
! 					<string>331pt</string>
  				</dict>
  			</array>
--- 1382,1395 ----
  								<true/>
  								<key>RubberWindowFrame</key>
! 								<string>103 273 1011 485 0 0 1280 832 </string>
  							</dict>
  							<key>Module</key>
  							<string>PBXClassBrowserModule</string>
  							<key>Proportion</key>
! 							<string>464pt</string>
  						</dict>
  					</array>
  					<key>Proportion</key>
! 					<string>464pt</string>
  				</dict>
  			</array>
***************
*** 1418,1422 ****
  			<array>
  				<string>1C0AD2AF069F1E9B00FABCE6</string>
! 				<string>3084F823076388FD00DCF936</string>
  				<string>1CA6456E063B45B4001379D8</string>
  			</array>
--- 1405,1409 ----
  			<array>
  				<string>1C0AD2AF069F1E9B00FABCE6</string>
! 				<string>3086ECB10822CDBD006A3707</string>
  				<string>1CA6456E063B45B4001379D8</string>
  			</array>
***************
*** 1424,1432 ****
  			<string>xcode.toolbar.config.classbrowser</string>
  			<key>WindowString</key>
! 			<string>103 406 630 352 0 0 1280 832 </string>
  			<key>WindowToolGUID</key>
  			<string>1C0AD2AF069F1E9B00FABCE6</string>
  			<key>WindowToolIsVisible</key>
! 			<false/>
  		</dict>
  	</array>
--- 1411,1419 ----
  			<string>xcode.toolbar.config.classbrowser</string>
  			<key>WindowString</key>
! 			<string>103 273 1011 485 0 0 1280 832 </string>
  			<key>WindowToolGUID</key>
  			<string>1C0AD2AF069F1E9B00FABCE6</string>
  			<key>WindowToolIsVisible</key>
! 			<true/>
  		</dict>
  	</array>

Index: roman.pbxuser
===================================================================
RCS file: /cvsroot/macattrick/macattrick/Macattrick.xcode/roman.pbxuser,v
retrieving revision 1.93
retrieving revision 1.94
diff -C2 -d -r1.93 -r1.94
*** roman.pbxuser	29 Apr 2005 19:18:38 -0000	1.93
--- roman.pbxuser	29 Apr 2005 20:33:58 -0000	1.94
***************
*** 195,199 ****
  				);
  			};
! 			PBXPerProjectTemplateStateSaveDate = 136494545;
  			PBXPrepackagedSmartGroups_v2 = (
  				{
--- 195,199 ----
  				);
  			};
! 			PBXPerProjectTemplateStateSaveDate = 136498420;
  			PBXPrepackagedSmartGroups_v2 = (
[...1168 lines suppressed...]
- 		name = "LeagueTest.m: testInitWithLocalFile";
- 		rLen = 0;
- 		rLoc = 2272;
- 		rType = 0;
- 		vrLen = 885;
- 		vrLoc = 2336;
- 	};
- 	30DFA633082020D7000CE74D = {
- 		fRef = 30D0C7E80709DA6C00710CCA;
- 		isa = PBXTextBookmark;
- 		name = "LeagueTest.m: 40";
- 		rLen = 0;
- 		rLoc = 2593;
- 		rType = 0;
- 		vrLen = 756;
- 		vrLoc = 2242;
- 	};
  	30E284D4077EFCC400DB648A = {
  		uiCtxt = {
--- 5049,5052 ----

[Macattrick-commit] macattrick LineUpTree.m,1.6,1.7

[Geisschaes <gei...@us...>]

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

Modified Files:
	LineUpTree.m 
Log Message:
line up statistic bug fixed

Index: LineUpTree.m
===================================================================
RCS file: /cvsroot/macattrick/macattrick/LineUpTree.m,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** LineUpTree.m	25 Apr 2005 20:22:37 -0000	1.6
--- LineUpTree.m	29 Apr 2005 20:33:58 -0000	1.7
***************
*** 57,61 ****
  	double strength = 0.0;
  	NSArray *lineUp = [self bestLineUp];
! 	if(!([lineUp count] == [[self positions] count])) {
  		return -1;
  	}
--- 57,62 ----
  	double strength = 0.0;
  	NSArray *lineUp = [self bestLineUp];
! 	int nrOfPlayers = [lineUp count];
! 	if(!(nrOfPlayers == [[self positions] count])) {
  		return -1;
  	}
***************
*** 63,67 ****
  	for (i=0; i<[lineUp count]; i++) {
  		if([[positions objectAtIndex:i] belongsToSection: section]) {
! 			strength += [[[lineUp objectAtIndex:i] player] calculatePositionValue:[positions objectAtIndex:i]];
  		}
  	} 
--- 64,68 ----
  	for (i=0; i<[lineUp count]; i++) {
  		if([[positions objectAtIndex:i] belongsToSection: section]) {
! 			strength += [[[lineUp objectAtIndex:(nrOfPlayers-i-1)] player] calculatePositionValue:[positions objectAtIndex:i]];
  		}
  	} 

[Macattrick-commit] macattrick/Macattrick.xcode project.pbxproj,1.69,1.70 roman.mode1,1.27,1.28 roman.pbxuser,1.92,1.93

[Geisschaes <gei...@us...>]

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

Modified Files:
	project.pbxproj roman.mode1 roman.pbxuser 
Log Message:
missing plist files added

Index: project.pbxproj
===================================================================
RCS file: /cvsroot/macattrick/macattrick/Macattrick.xcode/project.pbxproj,v
retrieving revision 1.69
retrieving revision 1.70
diff -C2 -d -r1.69 -r1.70
*** project.pbxproj	27 Apr 2005 19:36:38 -0000	1.69
--- project.pbxproj	29 Apr 2005 19:18:37 -0000	1.70
***************
*** 305,309 ****
  				30744BA5069560A70039B82A,
  				309914170820019C00FBF240,
- 				30DFA46B082016C9000CE74D,
  				30DFA497082018F2000CE74D,
  			);
--- 305,308 ----
***************
*** 348,352 ****
  				30744BA4069560A70039B82A,
  				309914160820019C00FBF240,
- 				30DFA46A082016C9000CE74D,
  				30DFA496082018F2000CE74D,
  			);
--- 347,350 ----
***************
*** 371,377 ****
  				30744BA7069560A70039B82A,
  				309914180820019C00FBF240,
- 				309915CD0820075500FBF240,
- 				30DFA29208200F2F000CE74D,
- 				30DFA340082013A4000CE74D,
  				30DFA46C082016C9000CE74D,
  				30DFA498082018F2000CE74D,
--- 369,372 ----
***************
*** 4415,4426 ****
  			sourceTree = "<group>";
  		};
- 		309915CD0820075500FBF240 = {
- 			isa = PBXFileReference;
- 			lastKnownFileType = text.xml;
- 			name = "RunAllTests-Info copy.plist";
- 			path = "/Users/roman/Documents/dev/macattrick/RunAllTests-Info copy.plist";
- 			refType = 0;
- 			sourceTree = "<absolute>";
- 		};
  		30A1800D0640E5C300D2836F = {
  			fileEncoding = 30;
--- 4410,4413 ----
***************
*** 5261,5272 ****
  			};
  		};
- 		30DFA29208200F2F000CE74D = {
- 			isa = PBXFileReference;
- 			lastKnownFileType = text.xml;
- 			name = "Devel Macattrick-Info copy.plist";
- 			path = "/Users/roman/Documents/dev/macattrick/Devel Macattrick-Info copy.plist";
- 			refType = 0;
- 			sourceTree = "<absolute>";
- 		};
  		30DFA29B08200F58000CE74D = {
  			fileRef = 309913DF0820006E00FBF240;
--- 5248,5251 ----
***************
*** 5503,5673 ****
  			};
  		};
- 		30DFA340082013A4000CE74D = {
- 			isa = PBXFileReference;
- 			lastKnownFileType = text.xml;
- 			name = "Debug-Info.plist";
- 			path = "/Users/roman/Documents/dev/macattrick/Debug-Info.plist";
- 			refType = 0;
- 			sourceTree = "<absolute>";
- 		};
- 		30DFA467082016C9000CE74D = {
- 			buildActionMask = 2147483647;
- 			files = (
- 			);
- 			isa = PBXResourcesBuildPhase;
- 			runOnlyForDeploymentPostprocessing = 0;
- 		};
- 		30DFA468082016C9000CE74D = {
- 			buildActionMask = 2147483647;
- 			files = (
- 				30DFA5B308201A46000CE74D,
- 				30DFA5B408201A46000CE74D,
- 				30DFA5B508201A46000CE74D,
- 				30DFA5B608201A46000CE74D,
- 				30DFA5B708201A46000CE74D,
- 				30DFA5B808201A46000CE74D,
- 				30DFA5B908201A46000CE74D,
- 				30DFA5BA08201A46000CE74D,
- 				30DFA5BB08201A46000CE74D,
- 				30DFA5BC08201A46000CE74D,
- 				30DFA5BD08201A46000CE74D,
- 				30DFA5BE08201A46000CE74D,
- 				30DFA5BF08201A46000CE74D,
- 				30DFA5C008201A46000CE74D,
- 				30DFA5C108201A46000CE74D,
- 				30DFA5C208201A46000CE74D,
- 				30DFA5C308201A46000CE74D,
- 				30DFA5C408201A46000CE74D,
- 				30DFA5C508201A46000CE74D,
- 				30DFA5C608201A46000CE74D,
- 				30DFA5C708201A46000CE74D,
- 				30DFA5C808201A46000CE74D,
- 				30DFA5C908201A46000CE74D,
- 				30DFA5CA08201A46000CE74D,
- 				30DFA5CB08201A46000CE74D,
- 				30DFA5CC08201A46000CE74D,
- 				30DFA5CD08201A46000CE74D,
- 				30DFA5CE08201A46000CE74D,
- 				30DFA5CF08201A46000CE74D,
- 				30DFA5D008201A46000CE74D,
- 				30DFA5D108201A46000CE74D,
- 				30DFA5D208201A46000CE74D,
- 				30DFA5D308201A46000CE74D,
- 				30DFA5D408201A46000CE74D,
- 				30DFA5D508201A46000CE74D,
- 				30DFA5D608201A46000CE74D,
- 				30DFA5D708201A46000CE74D,
- 				30DFA5D808201A46000CE74D,
- 				30DFA58D08201A33000CE74D,
- 				30DFA58E08201A33000CE74D,
- 				30DFA58F08201A33000CE74D,
- 				30DFA59008201A33000CE74D,
- 				30DFA59108201A33000CE74D,
- 				30DFA59208201A33000CE74D,
- 				30DFA59308201A33000CE74D,
- 				30DFA59408201A33000CE74D,
- 				30DFA59508201A33000CE74D,
- 				30DFA59608201A33000CE74D,
- 				30DFA59708201A33000CE74D,
- 				30DFA59808201A33000CE74D,
- 				30DFA59908201A33000CE74D,
- 				30DFA59A08201A33000CE74D,
- 				30DFA59B08201A33000CE74D,
- 				30DFA59C08201A33000CE74D,
- 				30DFA59D08201A33000CE74D,
- 				30DFA59E08201A33000CE74D,
- 				30DFA59F08201A33000CE74D,
- 				30DFA5A008201A34000CE74D,
- 				30DFA5A108201A34000CE74D,
- 				30DFA5A208201A34000CE74D,
- 				30DFA5A308201A34000CE74D,
- 				30DFA5A408201A34000CE74D,
- 				30DFA5A508201A34000CE74D,
- 				30DFA5A608201A34000CE74D,
- 				30DFA5A708201A34000CE74D,
- 				30DFA5A808201A34000CE74D,
- 				30DFA5A908201A34000CE74D,
- 				30DFA5AA08201A34000CE74D,
- 				30DFA5AB08201A34000CE74D,
- 				30DFA5AC08201A34000CE74D,
- 				30DFA5AD08201A34000CE74D,
- 				30DFA5AE08201A34000CE74D,
- 				30DFA5AF08201A34000CE74D,
- 				30DFA5B008201A34000CE74D,
- 				30DFA5B108201A34000CE74D,
- 				30DFA5B208201A34000CE74D,
- 			);
- 			isa = PBXSourcesBuildPhase;
- 			runOnlyForDeploymentPostprocessing = 0;
- 		};
- 		30DFA469082016C9000CE74D = {
- 			buildActionMask = 2147483647;
- 			files = (
- 				30DFA5D908201A8C000CE74D,
- 				30DFA5DA08201A8D000CE74D,
- 				30DFA5DB08201A8D000CE74D,
- 				30DFA5DC08201A8F000CE74D,
- 			);
- 			isa = PBXFrameworksBuildPhase;
- 			runOnlyForDeploymentPostprocessing = 0;
- 		};
- 		30DFA46A082016C9000CE74D = {
- 			buildPhases = (
- 				30DFA467082016C9000CE74D,
- 				30DFA468082016C9000CE74D,
- 				30DFA469082016C9000CE74D,
- 			);
- 			buildRules = (
- 			);
- 			buildSettings = {
- 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
- 				GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h";
- 				INFOPLIST_FILE = "DebugBundle-Info.plist";
- 				INSTALL_PATH = "$(USER_LIBRARY_DIR)/Bundles";
- 				OPTIMIZATION_CFLAGS = "";
- 				OTHER_CFLAGS = "";
- 				OTHER_LDFLAGS = "-framework Foundation -framework AppKit";
- 				OTHER_REZFLAGS = "";
- 				PRODUCT_NAME = DebugBundle;
- 				SECTORDER_FLAGS = "";
- 				WARNING_CFLAGS = "-Wmost -Wno-four-char-constants -Wno-unknown-pragmas";
- 			};
- 			dependencies = (
- 			);
- 			isa = PBXNativeTarget;
- 			name = DebugBundle;
- 			productName = DebugBundle;
- 			productReference = 30DFA46B082016C9000CE74D;
- 			productSettingsXML = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>
- <!DOCTYPE plist PUBLIC \"-//Apple Computer//DTD PLIST 1.0//EN\" \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">
- <plist version=\"1.0\">
- <dict>
- 	<key>CFBundleDevelopmentRegion</key>
- 	<string>English</string>
- 	<key>CFBundleExecutable</key>
- 	<string>DebugBundle</string>
- 	<key>CFBundleIdentifier</key>
- 	<string>com.yourcompany.DebugBundle</string>
- 	<key>CFBundleInfoDictionaryVersion</key>
- 	<string>6.0</string>
- 	<key>CFBundlePackageType</key>
- 	<string>APPL</string>
- 	<key>CFBundleSignature</key>
- 	<string>????</string>
- 	<key>CFBundleVersion</key>
- 	<string>1.0</string>
- </dict>
- </plist>
- ";
- 			productType = "com.apple.product-type.bundle";
- 		};
- 		30DFA46B082016C9000CE74D = {
- 			explicitFileType = wrapper.cfbundle;
- 			includeInIndex = 0;
- 			isa = PBXFileReference;
- 			path = DebugBundle.bundle;
- 			refType = 3;
- 			sourceTree = BUILT_PRODUCTS_DIR;
- 		};
  		30DFA46C082016C9000CE74D = {
  			isa = PBXFileReference;
--- 5482,5485 ----
***************
*** 5812,5816 ****
  				INFOPLIST_FILE = "FastTests-Info.plist";
  				INSTALL_PATH = "$(USER_LIBRARY_DIR)/Bundles";
- 				OPTIMIZATION_CFLAGS = "";
  				OTHER_CFLAGS = "";
  				OTHER_LDFLAGS = "-framework Foundation";
--- 5624,5627 ----
***************
*** 6327,6810 ****
  			};
  		};
- 		30DFA58D08201A33000CE74D = {
- 			fileRef = 306096370793195B00BAA4CF;
- 			isa = PBXBuildFile;
- 			settings = {
- 			};
- 		};
- 		30DFA58E08201A33000CE74D = {
- 			fileRef = 306096360793195B00BAA4CF;
- 			isa = PBXBuildFile;
- 			settings = {
- 			};
- 		};
- 		30DFA58F08201A33000CE74D = {
- 			fileRef = 3094220C0706E9C000873206;
- 			isa = PBXBuildFile;
- 			settings = {
- 			};
- 		};
- 		30DFA59008201A33000CE74D = {
- 			fileRef = 3094220B0706E9C000873206;
- 			isa = PBXBuildFile;
- 			settings = {
- 			};
- 		};
- 		30DFA59108201A33000CE74D = {
- 			fileRef = 30CCAF4D07009E710005D3FA;
- 			isa = PBXBuildFile;
- 			settings = {
- 			};
- 		};
- 		30DFA59208201A33000CE74D = {
- 			fileRef = 30CCAF4C07009E710005D3FA;
- 			isa = PBXBuildFile;
- 			settings = {
- 			};
- 		};
- 		30DFA59308201A33000CE74D = {
- 			fileRef = 30A1800E0640E5C300D2836F;
- 			isa = PBXBuildFile;
- 			settings = {
- 			};
- 		};
- 		30DFA59408201A33000CE74D = {
- 			fileRef = 30A180100640E5C300D2836F;
- 			isa = PBXBuildFile;
- 			settings = {
- 			};
- 		};
- 		30DFA59508201A33000CE74D = {
- 			fileRef = 301CEB8F06746643001C1E37;
- 			isa = PBXBuildFile;
- 			settings = {
- 			};
- 		};
- 		30DFA59608201A33000CE74D = {
- 			fileRef = 301CEB8E06746643001C1E37;
- 			isa = PBXBuildFile;
- 			settings = {
- 			};
- 		};
- 		30DFA59708201A33000CE74D = {
- 			fileRef = 3034119F07B7FDB000B92C57;
- 			isa = PBXBuildFile;
- 			settings = {
- 			};
- 		};
- 		30DFA59808201A33000CE74D = {
- 			fileRef = 3034119E07B7FDB000B92C57;
- 			isa = PBXBuildFile;
- 			settings = {
- 			};
- 		};
- 		30DFA59908201A33000CE74D = {
- 			fileRef = 30D77AA206455BEF0095BAC8;
- 			isa = PBXBuildFile;
- 			settings = {
- 			};
- 		};
- 		30DFA59A08201A33000CE74D = {
- 			fileRef = 30D77AA106455BEF0095BAC8;
- 			isa = PBXBuildFile;
- 			settings = {
- 			};
- 		};
- 		30DFA59B08201A33000CE74D = {
- 			fileRef = 3041B58B06F623640055CB6D;
- 			isa = PBXBuildFile;
- 			settings = {
- 			};
- 		};
- 		30DFA59C08201A33000CE74D = {
- 			fileRef = 3041B58A06F623640055CB6D;
- 			isa = PBXBuildFile;
- 			settings = {
- 			};
- 		};
- 		30DFA59D08201A33000CE74D = {
- 			fileRef = 30A1800F0640E5C300D2836F;
- 			isa = PBXBuildFile;
- 			settings = {
- 			};
- 		};
- 		30DFA59E08201A33000CE74D = {
- 			fileRef = 30A1800D0640E5C300D2836F;
- 			isa = PBXBuildFile;
- 			settings = {
- 			};
- 		};
- 		30DFA59F08201A33000CE74D = {
- 			fileRef = 30D9FB430644FA8300390F49;
- 			isa = PBXBuildFile;
- 			settings = {
- 			};
- 		};
- 		30DFA5A008201A34000CE74D = {
- 			fileRef = 30D9FB420644FA8300390F49;
- 			isa = PBXBuildFile;
- 			settings = {
- 			};
- 		};
- 		30DFA5A108201A34000CE74D = {
- 			fileRef = 30C85EC7064647730016E5B3;
- 			isa = PBXBuildFile;
- 			settings = {
- 			};
- 		};
- 		30DFA5A208201A34000CE74D = {
- 			fileRef = 30C85EC6064647730016E5B3;
- 			isa = PBXBuildFile;
- 			settings = {
- 			};
- 		};
- 		30DFA5A308201A34000CE74D = {
- 			fileRef = 30C861C9064679F00016E5B3;
- 			isa = PBXBuildFile;
- 			settings = {
- 			};
- 		};
- 		30DFA5A408201A34000CE74D = {
- 			fileRef = 30C861C8064679F00016E5B3;
- 			isa = PBXBuildFile;
- 			settings = {
- 			};
- 		};
- 		30DFA5A508201A34000CE74D = {
- 			fileRef = 30C863DB0646A40D0016E5B3;
- 			isa = PBXBuildFile;
- 			settings = {
- 			};
- 		};
- 		30DFA5A608201A34000CE74D = {
- 			fileRef = 30C863DA0646A40D0016E5B3;
- 			isa = PBXBuildFile;
- 			settings = {
- 			};
- 		};
- 		30DFA5A708201A34000CE74D = {
- 			fileRef = 303E6D00070708480091C7D3;
- 			isa = PBXBuildFile;
- 			settings = {
- 			};
- 		};
- 		30DFA5A808201A34000CE74D = {
- 			fileRef = 303E6CFF070708480091C7D3;
- 			isa = PBXBuildFile;
- 			settings = {
- 			};
- 		};
- 		30DFA5A908201A34000CE74D = {
- 			fileRef = 30EC0BDF06425043008B3F6B;
- 			isa = PBXBuildFile;
- 			settings = {
- 			};
- 		};
- 		30DFA5AA08201A34000CE74D = {
- 			fileRef = 30EC0BDE06425043008B3F6B;
- 			isa = PBXBuildFile;
- 			settings = {
- 			};
- 		};
- 		30DFA5AB08201A34000CE74D = {
- 			fileRef = 3028FABE06FC637D002DAE54;
- 			isa = PBXBuildFile;
- 			settings = {
- 			};
- 		};
- 		30DFA5AC08201A34000CE74D = {
- 			fileRef = 3028FABD06FC637D002DAE54;
- 			isa = PBXBuildFile;
- 			settings = {
- 			};
- 		};
- 		30DFA5AD08201A34000CE74D = {
- 			fileRef = 3060966007931CA900BAA4CF;
- 			isa = PBXBuildFile;
- 			settings = {
- 			};
- 		};
- 		30DFA5AE08201A34000CE74D = {
- 			fileRef = 3060965F07931CA900BAA4CF;
- 			isa = PBXBuildFile;
- 			settings = {
- 			};
- 		};
- 		30DFA5AF08201A34000CE74D = {
- 			fileRef = 30BEEAAF070B3A8B00AF64D8;
- 			isa = PBXBuildFile;
- 			settings = {
- 			};
- 		};
- 		30DFA5B008201A34000CE74D = {
- 			fileRef = 30BEEAAE070B3A8B00AF64D8;
- 			isa = PBXBuildFile;
- 			settings = {
- 			};
- 		};
- 		30DFA5B108201A34000CE74D = {
- 			fileRef = 3053D57007008A6D004019F7;
- 			isa = PBXBuildFile;
- 			settings = {
- 			};
- 		};
- 		30DFA5B208201A34000CE74D = {
- 			fileRef = 3053D56F07008A6D004019F7;
- 			isa = PBXBuildFile;
- 			settings = {
- 			};
- 		};
- 		30DFA5B308201A46000CE74D = {
- 			fileRef = 30609696079320AC00BAA4CF;
- 			isa = PBXBuildFile;
- 			settings = {
- 			};
- 		};
- 		30DFA5B408201A46000CE74D = {
- 			fileRef = 30609695079320AC00BAA4CF;
- 			isa = PBXBuildFile;
- 			settings = {
- 			};
- 		};
- 		30DFA5B508201A46000CE74D = {
- 			fileRef = 309422B40706FA1100873206;
- 			isa = PBXBuildFile;
- 			settings = {
- 			};
- 		};
- 		30DFA5B608201A46000CE74D = {
- 			fileRef = 309422B30706FA1100873206;
- 			isa = PBXBuildFile;
- 			settings = {
- 			};
- 		};
- 		30DFA5B708201A46000CE74D = {
- 			fileRef = 30CCAFCD0700BAAC0005D3FA;
- 			isa = PBXBuildFile;
- 			settings = {
- 			};
- 		};
- 		30DFA5B808201A46000CE74D = {
- 			fileRef = 30CCAFCC0700BAAC0005D3FA;
- 			isa = PBXBuildFile;
- 			settings = {
- 			};
- 		};
- 		30DFA5B908201A46000CE74D = {
- 			fileRef = 307D961F063DA831008E2586;
- 			isa = PBXBuildFile;
- 			settings = {
- 			};
- 		};
- 		30DFA5BA08201A46000CE74D = {
- 			fileRef = 307D961E063DA831008E2586;
- 			isa = PBXBuildFile;
- 			settings = {
- 			};
- 		};
- 		30DFA5BB08201A46000CE74D = {
- 			fileRef = 306796E506BED27F00161E78;
- 			isa = PBXBuildFile;
- 			settings = {
- 			};
- 		};
- 		30DFA5BC08201A46000CE74D = {
- 			fileRef = 306796E406BED27F00161E78;
- 			isa = PBXBuildFile;
- 			settings = {
- 			};
- 		};
- 		30DFA5BD08201A46000CE74D = {
- 			fileRef = 30D77BEC0645778B0095BAC8;
- 			isa = PBXBuildFile;
- 			settings = {
- 			};
- 		};
- 		30DFA5BE08201A46000CE74D = {
- 			fileRef = 30D77BEB0645778B0095BAC8;
- 			isa = PBXBuildFile;
- 			settings = {
- 			};
- 		};
- 		30DFA5BF08201A46000CE74D = {
- 			fileRef = 306BE2A907B803D6009942ED;
- 			isa = PBXBuildFile;
- 			settings = {
- 			};
- 		};
- 		30DFA5C008201A46000CE74D = {
- 			fileRef = 306BE2A807B803D6009942ED;
- 			isa = PBXBuildFile;
- 			settings = {
- 			};
- 		};
- 		30DFA5C108201A46000CE74D = {
- 			fileRef = 307D95CA063DA10E008E2586;
- 			isa = PBXBuildFile;
- 			settings = {
- 			};
- 		};
- 		30DFA5C208201A46000CE74D = {
- 			fileRef = 307D95C9063DA10E008E2586;
- 			isa = PBXBuildFile;
- 			settings = {
- 			};
- 		};
- 		30DFA5C308201A46000CE74D = {
- 			fileRef = 30D9FB5A0645030C00390F49;
- 			isa = PBXBuildFile;
- 			settings = {
- 			};
- 		};
- 		30DFA5C408201A46000CE74D = {
- 			fileRef = 30D9FB590645030C00390F49;
- 			isa = PBXBuildFile;
- 			settings = {
- 			};
- 		};
- 		30DFA5C508201A46000CE74D = {
- 			fileRef = 3041B59306F6238C0055CB6D;
- 			isa = PBXBuildFile;
- 			settings = {
- 			};
- 		};
- 		30DFA5C608201A46000CE74D = {
- 			fileRef = 3041B59206F6238C0055CB6D;
- 			isa = PBXBuildFile;
- 			settings = {
- 			};
- 		};
- 		30DFA5C708201A46000CE74D = {
- 			fileRef = 30C863FC0646AAF30016E5B3;
- 			isa = PBXBuildFile;
- 			settings = {
- 			};
- 		};
- 		30DFA5C808201A46000CE74D = {
- 			fileRef = 30C863FB0646AAF30016E5B3;
- 			isa = PBXBuildFile;
- 			settings = {
- 			};
- 		};
- 		30DFA5C908201A46000CE74D = {
- 			fileRef = 30C8606C06464D3D0016E5B3;
- 			isa = PBXBuildFile;
- 			settings = {
- 			};
- 		};
- 		30DFA5CA08201A46000CE74D = {
- 			fileRef = 30C8606D06464D3D0016E5B3;
- 			isa = PBXBuildFile;
- 			settings = {
- 			};
- 		};
- 		30DFA5CB08201A46000CE74D = {
- 			fileRef = 30C8623C064681A00016E5B3;
- 			isa = PBXBuildFile;
- 			settings = {
- 			};
- 		};
- 		30DFA5CC08201A46000CE74D = {
- 			fileRef = 30C8623B064681A00016E5B3;
- 			isa = PBXBuildFile;
- 			settings = {
- 			};
- 		};
- 		30DFA5CD08201A46000CE74D = {
- 			fileRef = 30D0C7E80709DA6C00710CCA;
- 			isa = PBXBuildFile;
- 			settings = {
- 			};
- 		};
- 		30DFA5CE08201A46000CE74D = {
- 			fileRef = 30D0C7E70709DA6C00710CCA;
- 			isa = PBXBuildFile;
- 			settings = {
- 			};
- 		};
- 		30DFA5CF08201A46000CE74D = {
- 			fileRef = 30EC0BED06425140008B3F6B;
- 			isa = PBXBuildFile;
- 			settings = {
- 			};
- 		};
- 		30DFA5D008201A46000CE74D = {
- 			fileRef = 30EC0BEC06425140008B3F6B;
- 			isa = PBXBuildFile;
- 			settings = {
- 			};
- 		};
- 		30DFA5D108201A46000CE74D = {
- 			fileRef = 3028FC0106FC93F1002DAE54;
- 			isa = PBXBuildFile;
- 			settings = {
- 			};
- 		};
- 		30DFA5D208201A46000CE74D = {
- 			fileRef = 3028FC0006FC93F1002DAE54;
- 			isa = PBXBuildFile;
- 			settings = {
- 			};
- 		};
- 		30DFA5D308201A46000CE74D = {
- 			fileRef = 30BEEB03070B3EDC00AF64D8;
- 			isa = PBXBuildFile;
- 			settings = {
- 			};
- 		};
- 		30DFA5D408201A46000CE74D = {
- 			fileRef = 30BEEB02070B3EDC00AF64D8;
- 			isa = PBXBuildFile;
- 			settings = {
- 			};
- 		};
- 		30DFA5D508201A46000CE74D = {
- 			fileRef = 3053D58D07008CD0004019F7;
- 			isa = PBXBuildFile;
- 			settings = {
- 			};
- 		};
- 		30DFA5D608201A46000CE74D = {
- 			fileRef = 3053D58C07008CD0004019F7;
- 			isa = PBXBuildFile;
- 			settings = {
- 			};
- 		};
- 		30DFA5D708201A46000CE74D = {
- 			fileRef = 307D9591063D9FFD008E2586;
- 			isa = PBXBuildFile;
- 			settings = {
- 			};
- 		};
- 		30DFA5D808201A46000CE74D = {
- 			fileRef = 307D9590063D9FFD008E2586;
- 			isa = PBXBuildFile;
- 			settings = {
- 			};
- 		};
- 		30DFA5D908201A8C000CE74D = {
- 			fileRef = 309913DF0820006E00FBF240;
- 			isa = PBXBuildFile;
- 			settings = {
- 			};
- 		};
- 		30DFA5DA08201A8D000CE74D = {
- 			fileRef = 3070D2640775D4B000D7C16B;
- 			isa = PBXBuildFile;
- 			settings = {
- 			};
- 		};
- 		30DFA5DB08201A8D000CE74D = {
- 			fileRef = 29B97325FDCFA39411CA2CEA;
- 			isa = PBXBuildFile;
- 			settings = {
- 			};
- 		};
- 		30DFA5DC08201A8F000CE74D = {
- 			fileRef = 1058C7A1FEA54F0111CA2CBB;
- 			isa = PBXBuildFile;
- 			settings = {
- 			};
- 		};
  		30DFB645071FFAEA00D02508 = {
  			isa = PBXFileReference;
--- 6138,6141 ----

Index: roman.mode1
===================================================================
RCS file: /cvsroot/macattrick/macattrick/Macattrick.xcode/roman.mode1,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** roman.mode1	27 Apr 2005 19:36:39 -0000	1.27
--- roman.mode1	29 Apr 2005 19:18:38 -0000	1.28
***************
*** 206,209 ****
--- 206,211 ----
  			<array>
  				<dict>
+ 					<key>BecomeActive</key>
+ 					<true/>
  					<key>ContentConfiguration</key>
  					<dict>
***************
*** 242,248 ****
  							<array>
  								<string>29B97314FDCFA39411CA2CEA</string>
- 								<string>301244D406F3298200DE7918</string>
- 								<string>29B97323FDCFA39411CA2CEA</string>
- 								<string>1058C7A0FEA54F0111CA2CBB</string>
  								<string>1C37FBAC04509CD000000102</string>
  								<string>1C37FAAC04509CD000000102</string>
--- 244,247 ----
***************
*** 251,260 ****
  							<array>
  								<array>
! 									<integer>3</integer>
! 									<integer>0</integer>
  								</array>
  							</array>
  							<key>PBXSmartGroupTreeModuleOutlineStateVisibleRectKey</key>
! 							<string>{{0, 0}, {322, 605}}</string>
  						</dict>
  						<key>PBXTopSmartGroupGIDs</key>
--- 250,259 ----
  							<array>
  								<array>
! 									<integer>28</integer>
! 									<integer>25</integer>
  								</array>
  							</array>
  							<key>PBXSmartGroupTreeModuleOutlineStateVisibleRectKey</key>
! 							<string>{{0, 7}, {322, 605}}</string>
  						</dict>
  						<key>PBXTopSmartGroupGIDs</key>
***************
*** 271,275 ****
  						</array>
  						<key>RubberWindowFrame</key>
! 						<string>565 166 998 665 0 0 1280 832 </string>
  					</dict>
  					<key>Module</key>
--- 270,274 ----
  						</array>
  						<key>RubberWindowFrame</key>
! 						<string>240 129 998 665 0 0 1280 832 </string>
  					</dict>
  					<key>Module</key>
***************
*** 287,291 ****
  								<string>1CE0B20306471E060097A5F4</string>
  								<key>PBXProjectModuleLabel</key>
! 								<string>LeagueTest.m</string>
  								<key>PBXSplitModuleInNavigatorKey</key>
  								<dict>
--- 286,290 ----
  								<string>1CE0B20306471E060097A5F4</string>
  								<key>PBXProjectModuleLabel</key>
! 								<string>DebugBundle-Info.plist</string>
  								<key>PBXSplitModuleInNavigatorKey</key>
  								<dict>
***************
*** 295,301 ****
  										<string>1CE0B20406471E060097A5F4</string>
  										<key>PBXProjectModuleLabel</key>
! 										<string>LeagueTest.m</string>
  										<key>bookmark</key>
! 										<string>30DFA632082020D7000CE74D</string>
  										<key>history</key>
  										<array>
--- 294,300 ----
  										<string>1CE0B20406471E060097A5F4</string>
  										<key>PBXProjectModuleLabel</key>
! 										<string>DebugBundle-Info.plist</string>
  										<key>bookmark</key>
! 										<string>3028100F0822BF8900E09F89</string>
  										<key>history</key>
  										<array>
***************
*** 359,363 ****
  											<string>309914240820020A00FBF240</string>
  											<string>309915710820073A00FBF240</string>
- 											<string>30DFA42F08201444000CE74D</string>
  											<string>30DFA4E8082019A1000CE74D</string>
  											<string>30DFA4E9082019A1000CE74D</string>
--- 358,361 ----
***************
*** 435,439 ****
  											<string>30DFA61A08201FA5000CE74D</string>
  											<string>30DFA61B08201FA5000CE74D</string>
! 											<string>30DFA61C08201FA5000CE74D</string>
  										</array>
  										<key>prevStack</key>
--- 433,438 ----
  											<string>30DFA61A08201FA5000CE74D</string>
  											<string>30DFA61B08201FA5000CE74D</string>
! 											<string>300230B50822BBC600C8AB0C</string>
! 											<string>300230D80822BD7000C8AB0C</string>
  										</array>
  										<key>prevStack</key>
***************
*** 574,581 ****
  											<string>3099156E082006C500FBF240</string>
  											<string>309915730820073A00FBF240</string>
- 											<string>30DFA43408201444000CE74D</string>
- 											<string>30DFA61D08201FA5000CE74D</string>
- 											<string>30DFA61E08201FA5000CE74D</string>
- 											<string>30DFA61F08201FA5000CE74D</string>
  										</array>
  									</dict>
--- 573,576 ----
***************
*** 591,595 ****
  								<string>{{0, 0}, {653, 391}}</string>
  								<key>RubberWindowFrame</key>
! 								<string>565 166 998 665 0 0 1280 832 </string>
  							</dict>
  							<key>Module</key>
--- 586,590 ----
  								<string>{{0, 0}, {653, 391}}</string>
  								<key>RubberWindowFrame</key>
! 								<string>240 129 998 665 0 0 1280 832 </string>
  							</dict>
  							<key>Module</key>
***************
*** 599,604 ****
  						</dict>
  						<dict>
- 							<key>BecomeActive</key>
- 							<true/>
  							<key>ContentConfiguration</key>
  							<dict>
--- 594,597 ----
***************
*** 613,617 ****
  								<string>{{0, 398}, {653, 225}}</string>
  								<key>RubberWindowFrame</key>
! 								<string>565 166 998 665 0 0 1280 832 </string>
  							</dict>
  							<key>Module</key>
--- 606,610 ----
  								<string>{{0, 398}, {653, 225}}</string>
  								<key>RubberWindowFrame</key>
! 								<string>240 129 998 665 0 0 1280 832 </string>
  							</dict>
  							<key>Module</key>
***************
*** 637,643 ****
  			<key>TableOfContents</key>
  			<array>
! 				<string>30DFA60B08201D84000CE74D</string>
  				<string>1CE0B1FE06471DED0097A5F4</string>
! 				<string>30DFA60C08201D84000CE74D</string>
  				<string>1CE0B20306471E060097A5F4</string>
  				<string>1CE0B20506471E060097A5F4</string>
--- 630,636 ----
  			<key>TableOfContents</key>
  			<array>
! 				<string>302810010822BDE200E09F89</string>
  				<string>1CE0B1FE06471DED0097A5F4</string>
! 				<string>302810020822BDE200E09F89</string>
  				<string>1CE0B20306471E060097A5F4</string>
  				<string>1CE0B20506471E060097A5F4</string>
***************
*** 669,677 ****
  		<string>1C0AD2B3069F1EA900FABCE6</string>
  		<string>/Users/roman/Documents/dev/macattrick/Macattrick.xcode</string>
- 		<string>1C530D57069F1CE1000CFCEE</string>
- 		<string>303B68B1075A0D24009951CC</string>
  	</array>
  	<key>WindowString</key>
! 	<string>565 166 998 665 0 0 1280 832 </string>
  	<key>WindowTools</key>
  	<array>
--- 662,668 ----
  		<string>1C0AD2B3069F1EA900FABCE6</string>
  		<string>/Users/roman/Documents/dev/macattrick/Macattrick.xcode</string>
  	</array>
  	<key>WindowString</key>
! 	<string>240 129 998 665 0 0 1280 832 </string>
  	<key>WindowTools</key>
  	<array>
***************
*** 702,706 ****
  										<string>LeagueTest.m</string>
  										<key>bookmark</key>
! 										<string>30DFA633082020D7000CE74D</string>
  										<key>history</key>
  										<array>
--- 693,697 ----
  										<string>LeagueTest.m</string>
  										<key>bookmark</key>
! 										<string>300230D90822BD7000C8AB0C</string>
  										<key>history</key>
  										<array>
***************
*** 712,716 ****
  											<string>30DFA60D08201D84000CE74D</string>
  											<string>30DFA60E08201D84000CE74D</string>
! 											<string>30DFA60F08201D84000CE74D</string>
  										</array>
  										<key>prevStack</key>
--- 703,707 ----
  											<string>30DFA60D08201D84000CE74D</string>
  											<string>30DFA60E08201D84000CE74D</string>
! 											<string>30DFA633082020D7000CE74D</string>
  										</array>
  										<key>prevStack</key>
***************
*** 724,728 ****
  											<string>30DFA11C0820095F000CE74D</string>
  											<string>30DFA61008201D84000CE74D</string>
- 											<string>30DFA61108201D84000CE74D</string>
  										</array>
  									</dict>
--- 715,718 ----
***************
*** 738,742 ****
  								<string>{{0, 0}, {665, 241}}</string>
  								<key>RubberWindowFrame</key>
! 								<string>450 281 665 526 0 0 1280 832 </string>
  							</dict>
  							<key>Module</key>
--- 728,732 ----
  								<string>{{0, 0}, {665, 241}}</string>
  								<key>RubberWindowFrame</key>
! 								<string>349 167 665 526 0 0 1280 832 </string>
  							</dict>
  							<key>Module</key>
***************
*** 746,749 ****
--- 736,741 ----
  						</dict>
  						<dict>
+ 							<key>BecomeActive</key>
+ 							<true/>
  							<key>ContentConfiguration</key>
  							<dict>
***************
*** 762,766 ****
  								<string>{{0, 248}, {665, 236}}</string>
  								<key>RubberWindowFrame</key>
! 								<string>450 281 665 526 0 0 1280 832 </string>
  							</dict>
  							<key>Module</key>
--- 754,758 ----
  								<string>{{0, 248}, {665, 236}}</string>
  								<key>RubberWindowFrame</key>
! 								<string>349 167 665 526 0 0 1280 832 </string>
  							</dict>
  							<key>Module</key>
***************
*** 785,789 ****
  			<array>
  				<string>303B68B1075A0D24009951CC</string>
! 				<string>30DFA61308201D84000CE74D</string>
  				<string>1CD0528F0623707200166675</string>
  				<string>XCMainBuildResultsModuleGUID</string>
--- 777,781 ----
  			<array>
  				<string>303B68B1075A0D24009951CC</string>
! 				<string>300230BA0822BBC600C8AB0C</string>
  				<string>1CD0528F0623707200166675</string>
  				<string>XCMainBuildResultsModuleGUID</string>
***************
*** 792,796 ****
  			<string>xcode.toolbar.config.build</string>
  			<key>WindowString</key>
! 			<string>450 281 665 526 0 0 1280 832 </string>
  			<key>WindowToolGUID</key>
  			<string>303B68B1075A0D24009951CC</string>
--- 784,788 ----
  			<string>xcode.toolbar.config.build</string>
  			<key>WindowString</key>
! 			<string>349 167 665 526 0 0 1280 832 </string>
  			<key>WindowToolGUID</key>
  			<string>303B68B1075A0D24009951CC</string>
***************
*** 1125,1129 ****
  								<string>{{0, 0}, {707, 467}}</string>
  								<key>RubberWindowFrame</key>
! 								<string>388 222 707 509 0 0 1280 832 </string>
  							</dict>
  							<key>Module</key>
--- 1117,1121 ----
  								<string>{{0, 0}, {707, 467}}</string>
  								<key>RubberWindowFrame</key>
! 								<string>567 107 707 509 0 0 1280 832 </string>
  							</dict>
  							<key>Module</key>
***************
*** 1148,1159 ****
  			<array>
  				<string>1C0AD2B3069F1EA900FABCE6</string>
! 				<string>30DFA61408201D84000CE74D</string>
  				<string>1CD0528B0623707200166675</string>
! 				<string>30DFA61508201D84000CE74D</string>
  			</array>
  			<key>ToolbarConfiguration</key>
  			<string>xcode.toolbar.config.run</string>
  			<key>WindowString</key>
! 			<string>388 222 707 509 0 0 1280 832 </string>
  			<key>WindowToolGUID</key>
  			<string>1C0AD2B3069F1EA900FABCE6</string>
--- 1140,1151 ----
  			<array>
  				<string>1C0AD2B3069F1EA900FABCE6</string>
! 				<string>302810030822BDE200E09F89</string>
  				<string>1CD0528B0623707200166675</string>
! 				<string>302810040822BDE200E09F89</string>
  			</array>
  			<key>ToolbarConfiguration</key>
  			<string>xcode.toolbar.config.run</string>
  			<key>WindowString</key>
! 			<string>567 107 707 509 0 0 1280 832 </string>
  			<key>WindowToolGUID</key>
  			<string>1C0AD2B3069F1EA900FABCE6</string>

Index: roman.pbxuser
===================================================================
RCS file: /cvsroot/macattrick/macattrick/Macattrick.xcode/roman.pbxuser,v
retrieving revision 1.92
retrieving revision 1.93
diff -C2 -d -r1.92 -r1.93
*** roman.pbxuser	27 Apr 2005 19:36:39 -0000	1.92
--- roman.pbxuser	29 Apr 2005 19:18:38 -0000	1.93
***************
*** 39,44 ****
  	29B97313FDCFA39411CA2CEA = {
  		activeBuildStyle = 4A9504CCFFE6A4B311CA0CBA;
! 		activeExecutable = 30DFA4580820160F000CE74D;
! 		activeTarget = 30DFA496082018F2000CE74D;
  		addToTargets = (
  		);
--- 39,44 ----
  	29B97313FDCFA39411CA2CEA = {
  		activeBuildStyle = 4A9504CCFFE6A4B311CA0CBA;
! 		activeExecutable = 30744BA6069560A70039B82A;
! 		activeTarget = 30744BA4069560A70039B82A;
  		addToTargets = (
  		);
***************
*** 53,57 ****
  			30950684067C4D100077C270,
  			30744BA6069560A70039B82A,
! 			30DFA4580820160F000CE74D,
  		);
  		expressions = (
--- 53,57 ----
  			30950684067C4D100077C270,
  			30744BA6069560A70039B82A,
! 			300230D40822BD3100C8AB0C,
  		);
  		expressions = (
***************
*** 195,199 ****
  				);
  			};
! 			PBXPerProjectTemplateStateSaveDate = 136322215;
  			PBXPrepackagedSmartGroups_v2 = (
  				{
--- 195,199 ----
  				);
  			};
! 			PBXPerProjectTemplateStateSaveDate = 136494545;
  			PBXPrepackagedSmartGroups_v2 = (
  				{
***************
*** 1039,1045 ****
  				RubberWindowFrame = "496 457 599 209 0 0 1280 832 ";
  			};
! 			PBXWorkspaceStateSaveDate = 136322215;
  		};
  		perUserProjectItems = {
  			301CA97807C749EC00FABBCC = 301CA97807C749EC00FABBCC;
  			301CA97A07C749EC00FABBCC = 301CA97A07C749EC00FABBCC;
--- 1039,1081 ----
  				RubberWindowFrame = "496 457 599 209 0 0 1280 832 ";
  			};
! 			PBXWorkspaceStateSaveDate = 136494545;
  		};
  		perUserProjectItems = {
+ 			300230980822BAD500C8AB0C = 300230980822BAD500C8AB0C;
+ 			3002309D0822BADF00C8AB0C = 3002309D0822BADF00C8AB0C;
+ 			3002309E0822BAFA00C8AB0C = 3002309E0822BAFA00C8AB0C;
+ 			300230AF0822BB2400C8AB0C = 300230AF0822BB2400C8AB0C;
+ 			300230B00822BB3000C8AB0C = 300230B00822BB3000C8AB0C;
+ 			300230B10822BB3500C8AB0C = 300230B10822BB3500C8AB0C;
+ 			300230B50822BBC600C8AB0C = 300230B50822BBC600C8AB0C;
+ 			300230B60822BBC600C8AB0C = 300230B60822BBC600C8AB0C;
+ 			300230B70822BBC600C8AB0C = 300230B70822BBC600C8AB0C;
+ 			300230B80822BBC600C8AB0C = 300230B80822BBC600C8AB0C;
+ 			300230B90822BBC600C8AB0C = 300230B90822BBC600C8AB0C;
+ 			300230BF0822BC4200C8AB0C = 300230BF0822BC4200C8AB0C;
+ 			300230C00822BC4200C8AB0C = 300230C00822BC4200C8AB0C;
+ 			300230C10822BC4200C8AB0C = 300230C10822BC4200C8AB0C;
+ 			300230C20822BC6C00C8AB0C = 300230C20822BC6C00C8AB0C;
+ 			300230C30822BC6C00C8AB0C = 300230C30822BC6C00C8AB0C;
+ 			300230C40822BC8800C8AB0C = 300230C40822BC8800C8AB0C;
+ 			300230C50822BC8800C8AB0C = 300230C50822BC8800C8AB0C;
+ 			300230C60822BC9200C8AB0C = 300230C60822BC9200C8AB0C;
+ 			300230C70822BC9300C8AB0C = 300230C70822BC9300C8AB0C;
+ 			300230C80822BCBD00C8AB0C = 300230C80822BCBD00C8AB0C;
+ 			300230C90822BCBD00C8AB0C = 300230C90822BCBD00C8AB0C;
+ 			300230CA0822BCC000C8AB0C = 300230CA0822BCC000C8AB0C;
+ 			300230CB0822BCC000C8AB0C = 300230CB0822BCC000C8AB0C;
+ 			300230CC0822BCCF00C8AB0C = 300230CC0822BCCF00C8AB0C;
+ 			300230CD0822BCCF00C8AB0C = 300230CD0822BCCF00C8AB0C;
+ 			300230CE0822BCD500C8AB0C = 300230CE0822BCD500C8AB0C;
+ 			300230CF0822BCD500C8AB0C = 300230CF0822BCD500C8AB0C;
+ 			300230D00822BCE300C8AB0C = 300230D00822BCE300C8AB0C;
+ 			300230D10822BCE300C8AB0C = 300230D10822BCE300C8AB0C;
+ 			300230D20822BD0300C8AB0C = 300230D20822BD0300C8AB0C;
+ 			300230D30822BD0300C8AB0C = 300230D30822BD0300C8AB0C;
+ 			300230D60822BD6800C8AB0C = 300230D60822BD6800C8AB0C;
+ 			300230D70822BD6800C8AB0C = 300230D70822BD6800C8AB0C;
+ 			300230D80822BD7000C8AB0C = 300230D80822BD7000C8AB0C;
+ 			300230D90822BD7000C8AB0C = 300230D90822BD7000C8AB0C;
  			301CA97807C749EC00FABBCC = 301CA97807C749EC00FABBCC;
  			301CA97A07C749EC00FABBCC = 301CA97A07C749EC00FABBCC;
***************
*** 1077,1080 ****
--- 1113,1128 ----
  			30272D3B07F5809800B39CEA = 30272D3B07F5809800B39CEA;
  			30272D4607F5816400B39CEA = 30272D4607F5816400B39CEA;
+ 			302810000822BDE200E09F89 = 302810000822BDE200E09F89;
+ 			302810050822BE0500E09F89 = 302810050822BE0500E09F89;
+ 			302810060822BE2900E09F89 = 302810060822BE2900E09F89;
+ 			302810070822BE2E00E09F89 = 302810070822BE2E00E09F89;
+ 			302810080822BE7100E09F89 = 302810080822BE7100E09F89;
+ 			302810090822BEA000E09F89 = 302810090822BEA000E09F89;
+ 			3028100A0822BEE100E09F89 = 3028100A0822BEE100E09F89;
+ 			3028100B0822BEF500E09F89 = 3028100B0822BEF500E09F89;
+ 			3028100C0822BF0400E09F89 = 3028100C0822BF0400E09F89;
+ 			3028100D0822BF0B00E09F89 = 3028100D0822BF0B00E09F89;
+ 			3028100E0822BF4D00E09F89 = 3028100E0822BF4D00E09F89;
+ 			3028100F0822BF8900E09F89 = 3028100F0822BF8900E09F89;
  			302E1B1C081D6697004659AF = 302E1B1C081D6697004659AF;
  			302E1B3E081D741F004659AF = 302E1B3E081D741F004659AF;
***************
*** 1350,1353 ****
--- 1398,1794 ----
  		};
  	};
+ 	300230980822BAD500C8AB0C = {
+ 		fRef = 30D0C7E80709DA6C00710CCA;
+ 		isa = PBXTextBookmark;
+ 		name = "LeagueTest.m: testInitWithLocalFile";
+ 		rLen = 0;
+ 		rLoc = 2272;
+ 		rType = 0;
+ 		vrLen = 948;
+ 		vrLoc = 2273;
+ 	};
+ 	3002309D0822BADF00C8AB0C = {
+ 		fRef = 30D0C7E80709DA6C00710CCA;
+ 		isa = PBXTextBookmark;
+ 		name = "LeagueTest.m: testInitWithLocalFile";
+ 		rLen = 0;
+ 		rLoc = 2272;
+ 		rType = 0;
+ 		vrLen = 948;
+ 		vrLoc = 2273;
+ 	};
+ 	3002309E0822BAFA00C8AB0C = {
+ 		fRef = 30D0C7E80709DA6C00710CCA;
+ 		isa = PBXTextBookmark;
+ 		name = "LeagueTest.m: testInitWithLocalFile";
+ 		rLen = 0;
+ 		rLoc = 2272;
+ 		rType = 0;
+ 		vrLen = 948;
+ 		vrLoc = 2273;
+ 	};
+ 	300230AF0822BB2400C8AB0C = {
+ 		fRef = 30D0C7E80709DA6C00710CCA;
+ 		isa = PBXTextBookmark;
+ 		name = "LeagueTest.m: testInitWithLocalFile";
+ 		rLen = 0;
+ 		rLoc = 2272;
+ 		rType = 0;
+ 		vrLen = 948;
+ 		vrLoc = 2273;
+ 	};
+ 	300230B00822BB3000C8AB0C = {
+ 		fRef = 30D0C7E80709DA6C00710CCA;
+ 		isa = PBXTextBookmark;
+ 		name = "LeagueTest.m: testInitWithLocalFile";
+ 		rLen = 0;
+ 		rLoc = 2272;
+ 		rType = 0;
+ 		vrLen = 948;
+ 		vrLoc = 2273;
+ 	};
+ 	300230B10822BB3500C8AB0C = {
+ 		fRef = 30D0C7E80709DA6C00710CCA;
+ 		isa = PBXTextBookmark;
+ 		name = "LeagueTest.m: testInitWithLocalFile";
+ 		rLen = 0;
+ 		rLoc = 2272;
+ 		rType = 0;
+ 		vrLen = 948;
+ 		vrLoc = 2273;
+ 	};
+ 	300230B50822BBC600C8AB0C = {
+ 		fRef = 30D0C7E80709DA6C00710CCA;
+ 		isa = PBXTextBookmark;
+ 		name = "LeagueTest.m: testInitWithLocalFile";
+ 		rLen = 0;
+ 		rLoc = 2272;
+ 		rType = 0;
+ 		vrLen = 948;
+ 		vrLoc = 2273;
+ 	};
+ 	300230B60822BBC600C8AB0C = {
+ 		fRef = 30DFA46C082016C9000CE74D;
+ 		isa = PBXTextBookmark;
+ 		name = "DebugBundle-Info.plist: 1";
+ 		rLen = 0;
+ 		rLoc = 0;
+ 		rType = 0;
+ 		vrLen = 621;
+ 		vrLoc = 0;
+ 	};
+ 	300230B70822BBC600C8AB0C = {
+ 		fRef = 30D0C7E80709DA6C00710CCA;
+ 		isa = PBXTextBookmark;
+ 		name = "LeagueTest.m: testInitWithLocalFile";
+ 		rLen = 0;
+ 		rLoc = 2272;
+ 		rType = 0;
+ 		vrLen = 948;
+ 		vrLoc = 2273;
+ 	};
+ 	300230B80822BBC600C8AB0C = {
+ 		fRef = 30DFA46C082016C9000CE74D;
+ 		isa = PBXTextBookmark;
+ 		name = "DebugBundle-Info.plist: 1";
+ 		rLen = 0;
+ 		rLoc = 0;
+ 		rType = 0;
+ 		vrLen = 621;
+ 		vrLoc = 0;
+ 	};
+ 	300230B90822BBC600C8AB0C = {
+ 		fRef = 30D0C7E80709DA6C00710CCA;
+ 		isa = PBXTextBookmark;
+ 		name = "LeagueTest.m: 40";
+ 		rLen = 0;
+ 		rLoc = 2593;
+ 		rType = 0;
+ 		vrLen = 756;
+ 		vrLoc = 2242;
+ 	};
+ 	300230BF0822BC4200C8AB0C = {
+ 		fRef = 30DFA46C082016C9000CE74D;
+ 		isa = PBXTextBookmark;
+ 		name = "DebugBundle-Info.plist: 1";
+ 		rLen = 0;
+ 		rLoc = 0;
+ 		rType = 0;
+ 		vrLen = 621;
+ 		vrLoc = 0;
+ 	};
+ 	300230C00822BC4200C8AB0C = {
+ 		fRef = 30DFA46C082016C9000CE74D;
+ 		isa = PBXTextBookmark;
+ 		name = "DebugBundle-Info.plist: 1";
+ 		rLen = 0;
+ 		rLoc = 0;
+ 		rType = 0;
+ 		vrLen = 621;
+ 		vrLoc = 0;
+ 	};
+ 	300230C10822BC4200C8AB0C = {
+ 		fRef = 30D0C7E80709DA6C00710CCA;
+ 		isa = PBXTextBookmark;
+ 		name = "LeagueTest.m: 40";
+ 		rLen = 0;
+ 		rLoc = 2593;
+ 		rType = 0;
+ 		vrLen = 756;
+ 		vrLoc = 2242;
+ 	};
+ 	300230C20822BC6C00C8AB0C = {
+ 		fRef = 30DFA46C082016C9000CE74D;
+ 		isa = PBXTextBookmark;
+ 		name = "DebugBundle-Info.plist: 1";
+ 		rLen = 0;
+ 		rLoc = 0;
+ 		rType = 0;
+ 		vrLen = 621;
+ 		vrLoc = 0;
+ 	};
+ 	300230C30822BC6C00C8AB0C = {
+ 		fRef = 30D0C7E80709DA6C00710CCA;
+ 		isa = PBXTextBookmark;
+ 		name = "LeagueTest.m: 40";
+ 		rLen = 0;
+ 		rLoc = 2593;
+ 		rType = 0;
+ 		vrLen = 756;
+ 		vrLoc = 2242;
+ 	};
+ 	300230C40822BC8800C8AB0C = {
+ 		fRef = 30DFA46C082016C9000CE74D;
+ 		isa = PBXTextBookmark;
+ 		name = "DebugBundle-Info.plist: 1";
+ 		rLen = 0;
+ 		rLoc = 0;
+ 		rType = 0;
+ 		vrLen = 621;
+ 		vrLoc = 0;
+ 	};
+ 	300230C50822BC8800C8AB0C = {
+ 		fRef = 30D0C7E80709DA6C00710CCA;
+ 		isa = PBXTextBookmark;
+ 		name = "LeagueTest.m: 40";
+ 		rLen = 0;
+ 		rLoc = 2593;
+ 		rType = 0;
+ 		vrLen = 756;
+ 		vrLoc = 2242;
+ 	};
+ 	300230C60822BC9200C8AB0C = {
+ 		fRef = 30DFA46C082016C9000CE74D;
+ 		isa = PBXTextBookmark;
+ 		name = "DebugBundle-Info.plist: 1";
+ 		rLen = 0;
+ 		rLoc = 0;
+ 		rType = 0;
+ 		vrLen = 621;
+ 		vrLoc = 0;
+ 	};
+ 	300230C70822BC9300C8AB0C = {
+ 		fRef = 30D0C7E80709DA6C00710CCA;
+ 		isa = PBXTextBookmark;
+ 		name = "LeagueTest.m: 40";
+ 		rLen = 0;
+ 		rLoc = 2593;
+ 		rType = 0;
+ 		vrLen = 756;
+ 		vrLoc = 2242;
+ 	};
+ 	300230C80822BCBD00C8AB0C = {
+ 		fRef = 30DFA46C082016C9000CE74D;
+ 		isa = PBXTextBookmark;
+ 		name = "DebugBundle-Info.plist: 1";
+ 		rLen = 0;
+ 		rLoc = 0;
+ 		rType = 0;
+ 		vrLen = 621;
+ 		vrLoc = 0;
+ 	};
+ 	300230C90822BCBD00C8AB0C = {
+ 		fRef = 30D0C7E80709DA6C00710CCA;
+ 		isa = PBXTextBookmark;
+ 		name = "LeagueTest.m: 40";
+ 		rLen = 0;
+ 		rLoc = 2593;
+ 		rType = 0;
+ 		vrLen = 756;
+ 		vrLoc = 2242;
+ 	};
+ 	300230CA0822BCC000C8AB0C = {
+ 		fRef = 30DFA46C082016C9000CE74D;
+ 		isa = PBXTextBookmark;
+ 		name = "DebugBundle-Info.plist: 1";
+ 		rLen = 0;
+ 		rLoc = 0;
+ 		rType = 0;
+ 		vrLen = 621;
+ 		vrLoc = 0;
+ 	};
+ 	300230CB0822BCC000C8AB0C = {
+ 		fRef = 30D0C7E80709DA6C00710CCA;
+ 		isa = PBXTextBookmark;
+ 		name = "LeagueTest.m: 40";
+ 		rLen = 0;
+ 		rLoc = 2593;
+ 		rType = 0;
+ 		vrLen = 756;
+ 		vrLoc = 2242;
+ 	};
+ 	300230CC0822BCCF00C8AB0C = {
+ 		fRef = 30DFA46C082016C9000CE74D;
+ 		isa = PBXTextBookmark;
+ 		name = "DebugBundle-Info.plist: 1";
+ 		rLen = 0;
+ 		rLoc = 0;
+ 		rType = 0;
+ 		vrLen = 621;
+ 		vrLoc = 0;
+ 	};
+ 	300230CD0822BCCF00C8AB0C = {
+ 		fRef = 30D0C7E80709DA6C00710CCA;
+ 		isa = PBXTextBookmark;
+ 		name = "LeagueTest.m: 40";
+ 		rLen = 0;
+ 		rLoc = 2593;
+ 		rType = 0;
+ 		vrLen = 756;
+ 		vrLoc = 2242;
+ 	};
+ 	300230CE0822BCD500C8AB0C = {
+ 		fRef = 30DFA46C082016C9000CE74D;
+ 		isa = PBXTextBookmark;
+ 		name = "DebugBundle-Info.plist: 1";
+ 		rLen = 0;
+ 		rLoc = 0;
+ 		rType = 0;
+ 		vrLen = 621;
+ 		vrLoc = 0;
+ 	};
+ 	300230CF0822BCD500C8AB0C = {
+ 		fRef = 30D0C7E80709DA6C00710CCA;
+ 		isa = PBXTextBookmark;
+ 		name = "LeagueTest.m: 40";
+ 		rLen = 0;
+ 		rLoc = 2593;
+ 		rType = 0;
+ 		vrLen = 756;
+ 		vrLoc = 2242;
+ 	};
+ 	300230D00822BCE300C8AB0C = {
+ 		fRef = 30DFA46C082016C9000CE74D;
+ 		isa = PBXTextBookmark;
+ 		name = "DebugBundle-Info.plist: 1";
+ 		rLen = 0;
+ 		rLoc = 0;
+ 		rType = 0;
+ 		vrLen = 621;
+ 		vrLoc = 0;
+ 	};
+ 	300230D10822BCE300C8AB0C = {
+ 		fRef = 30D0C7E80709DA6C00710CCA;
+ 		isa = PBXTextBookmark;
+ 		name = "LeagueTest.m: 40";
+ 		rLen = 0;
+ 		rLoc = 2593;
+ 		rType = 0;
+ 		vrLen = 756;
+ 		vrLoc = 2242;
+ 	};
+ 	300230D20822BD0300C8AB0C = {
+ 		fRef = 30DFA46C082016C9000CE74D;
+ 		isa = PBXTextBookmark;
+ 		name = "DebugBundle-Info.plist: 1";
+ 		rLen = 0;
+ 		rLoc = 0;
+ 		rType = 0;
+ 		vrLen = 621;
+ 		vrLoc = 0;
+ 	};
+ 	300230D30822BD0300C8AB0C = {
+ 		fRef = 30D0C7E80709DA6C00710CCA;
+ 		isa = PBXTextBookmark;
+ 		name = "LeagueTest.m: 40";
+ 		rLen = 0;
+ 		rLoc = 2593;
+ 		rType = 0;
+ 		vrLen = 756;
+ 		vrLoc = 2242;
+ 	};
+ 	300230D40822BD3100C8AB0C = {
+ 		activeArgIndex = 2147483647;
+ 		activeArgIndices = (
+ 		);
+ 		argumentStrings = (
+ 		);
+ 		configStateDict = {
+ 		};
+ 		cppStopOnCatchEnabled = 0;
+ 		cppStopOnThrowEnabled = 0;
+ 		customDataFormattersEnabled = 1;
+ 		debuggerPlugin = GDBDebugging;
+ 		disassemblyDisplayState = 0;
+ 		enableDebugStr = 1;
+ 		environmentEntries = (
+ 		);
+ 		isa = PBXExecutable;
+ 		launchableReference = 300230D50822BD3100C8AB0C;
+ 		libgmallocEnabled = 0;
+ 		name = Executable;
+ 		shlibInfoDictList = (
+ 		);
+ 		sourceDirectories = (
+ 		);
+ 	};
+ 	300230D50822BD3100C8AB0C = {
+ 		isa = PBXFileReference;
+ 		lastKnownFileType = text.script.sh;
+ 		name = ukrun;
+ 		path = /usr/local/bin/ukrun;
+ 		refType = 0;
+ 		sourceTree = "<absolute>";
+ 	};
+ 	300230D60822BD6800C8AB0C = {
+ 		fRef = 30DFA46C082016C9000CE74D;
+ 		isa = PBXTextBookmark;
+ 		name = "DebugBundle-Info.plist: 1";
+ 		rLen = 0;
+ 		rLoc = 0;
+ 		rType = 0;
+ 		vrLen = 621;
+ 		vrLoc = 0;
+ 	};
+ 	300230D70822BD6800C8AB0C = {
+ 		fRef = 30D0C7E80709DA6C00710CCA;
+ 		isa = PBXTextBookmark;
+ 		name = "LeagueTest.m: 40";
+ 		rLen = 0;
+ 		rLoc = 2593;
+ 		rType = 0;
+ 		vrLen = 756;
+ 		vrLoc = 2242;
+ 	};
+ 	300230D80822BD7000C8AB0C = {
+ 		fRef = 30DFA46C082016C9000CE74D;
+ 		isa = PBXTextBookmark;
+ 		name = "DebugBundle-Info.plist: 1";
+ 		rLen = 0;
+ 		rLoc = 0;
+ 		rType = 0;
+ 		vrLen = 621;
+ 		vrLoc = 0;
+ 	};
+ 	300230D90822BD7000C8AB0C = {
+ 		fRef = 30D0C7E80709DA6C00710CCA;
+ 		isa = PBXTextBookmark;
+ 		name = "LeagueTest.m: 40";
+ 		rLen = 0;
+ 		rLoc = 2593;
+ 		rType = 0;
+ 		vrLen = 756;
+ 		vrLoc = 2242;
+ 	};
  	301244D506F329CA00DE7918 = {
  		uiCtxt = {
***************
*** 1744,1747 ****
--- 2185,2308 ----
  		vrLoc = 1121;
  	};
+ 	302810000822BDE200E09F89 = {
+ 		fRef = 30DFA46C082016C9000CE74D;
+ 		isa = PBXTextBookmark;
+ 		name = "DebugBundle-Info.plist: 1";
+ 		rLen = 0;
+ 		rLoc = 0;
+ 		rType = 0;
+ 		vrLen = 621;
+ 		vrLoc = 0;
+ 	};
+ 	302810050822BE0500E09F89 = {
+ 		fRef = 30DFA46C082016C9000CE74D;
+ 		isa = PBXTextBookmark;
+ 		name = "DebugBundle-Info.plist: 1";
+ 		rLen = 0;
+ 		rLoc = 0;
+ 		rType = 0;
+ 		vrLen = 621;
+ 		vrLoc = 0;
+ 	};
+ 	302810060822BE2900E09F89 = {
+ 		fRef = 30DFA46C082016C9000CE74D;
+ 		isa = PBXTextBookmark;
+ 		name = "DebugBundle-Info.plist: 1";
+ 		rLen = 0;
+ 		rLoc = 0;
+ 		rType = 0;
+ 		vrLen = 621;
+ 		vrLoc = 0;
+ 	};
+ 	302810070822BE2E00E09F89 = {
+ 		fRef = 30DFA46C082016C9000CE74D;
+ 		isa = PBXTextBookmark;
+ 		name = "DebugBundle-Info.plist: 1";
+ 		rLen = 0;
+ 		rLoc = 0;
+ 		rType = 0;
+ 		vrLen = 621;
+ 		vrLoc = 0;
+ 	};
+ 	302810080822BE7100E09F89 = {
+ 		fRef = 30DFA46C082016C9000CE74D;
+ 		isa = PBXTextBookmark;
+ 		name = "DebugBundle-Info.plist: 1";
+ 		rLen = 0;
+ 		rLoc = 0;
+ 		rType = 0;
+ 		vrLen = 621;
+ 		vrLoc = 0;
+ 	};
+ 	302810090822BEA000E09F89 = {
+ 		fRef = 30DFA46C082016C9000CE74D;
+ 		isa = PBXTextBookmark;
+ 		name = "DebugBundle-Info.plist: 1";
+ 		rLen = 0;
+ 		rLoc = 0;
+ 		rType = 0;
+ 		vrLen = 621;
+ 		vrLoc = 0;
+ 	};
+ 	3028100A0822BEE100E09F89 = {
+ 		fRef = 30DFA46C082016C9000CE74D;
+ 		isa = PBXTextBookmark;
+ 		name = "DebugBundle-Info.plist: 1";
+ 		rLen = 0;
+ 		rLoc = 0;
+ 		rType = 0;
+ 		vrLen = 621;
+ 		vrLoc = 0;
+ 	};
+ 	3028100B0822BEF500E09F89 = {
+ 		fRef = 30DFA46C082016C9000CE74D;
+ 		isa = PBXTextBookmark;
+ 		name = "DebugBundle-Info.plist: 1";
+ 		rLen = 0;
+ 		rLoc = 0;
+ 		rType = 0;
+ 		vrLen = 621;
+ 		vrLoc = 0;
+ 	};
+ 	3028100C0822BF0400E09F89 = {
+ 		fRef = 30DFA46C082016C9000CE74D;
+ 		isa = PBXTextBookmark;
+ 		name = "DebugBundle-Info.plist: 1";
+ 		rLen = 0;
+ 		rLoc = 0;
+ 		rType = 0;
+ 		vrLen = 621;
+ 		vrLoc = 0;
+ 	};
+ 	3028100D0822BF0B00E09F89 = {
+ 		fRef = 30DFA46C082016C9000CE74D;
+ 		isa = PBXTextBookmark;
+ 		name = "DebugBundle-Info.plist: 1";
+ 		rLen = 0;
+ 		rLoc = 0;
+ 		rType = 0;
+ 		vrLen = 621;
+ 		vrLoc = 0;
+ 	};
+ 	3028100E0822BF4D00E09F89 = {
+ 		fRef = 30DFA46C082016C9000CE74D;
+ 		isa = PBXTextBookmark;
+ 		name = "DebugBundle-Info.plist: 1";
+ 		rLen = 0;
+ 		rLoc = 0;
+ 		rType = 0;
+ 		vrLen = 621;
+ 		vrLoc = 0;
+ 	};
+ 	3028100F0822BF8900E09F89 = {
+ 		fRef = 30DFA46C082016C9000CE74D;
+ 		isa = PBXTextBookmark;
+ 		name = "DebugBundle-Info.plist: 1";
+ 		rLen = 0;
+ 		rLoc = 0;
+ 		rType = 0;
+ 		vrLen = 621;
+ 		vrLoc = 0;
+ 	};
  	3028FABD06FC637D002DAE54 = {
  		uiCtxt = {
***************
*** 4161,4165 ****
  			sepNavIntBoundsRect = "{{0, 0}, {674, 867}}";
  			sepNavSelRange = "{2593, 0}";
! 			sepNavVisRect = "{{0, 477}, {618, 209}}";
  		};
  	};
--- 4722,4726 ----
  			sepNavIntBoundsRect = "{{0, 0}, {674, 867}}";
  			sepNavSelRange = "{2593, 0}";
! 			sepNavVisRect = "{{0, 476}, {618, 209}}";
  		};
  	};
***************
*** 4334,4342 ****
  	};
  	30DFA29208200F2F000CE74D = {
! 		uiCtxt = {
! 			sepNavIntBoundsRect = "{{0, 0}, {686, 433}}";
! 			sepNavSelRange = "{0, 0}";
! 			sepNavVisRect = "{{0, 0}, {606, 326}}";
! 		};
  	};
  	30DFA42F08201444000CE74D = {
--- 4895,4904 ----
  	};
  	30DFA29208200F2F000CE74D = {
! 		isa = PBXFileReference;
! 		lastKnownFileType = text.xml;
! 		name = "Devel Macattrick-Info copy.plist";
! 		path = "/Users/roman/Documents/dev/macattrick/Devel Macattrick-Info copy.plist";
! 		refType = 0;
! 		sourceTree = "<absolute>";
  	};
  	30DFA42F08201444000CE74D = {
***************
*** 4360,4413 ****
  		vrLoc = 0;
  	};
! 	30DFA4580820160F000CE74D = {
! 		activeArgIndex = 0;
! 		activeArgIndices = (
! 			YES,
! 		);
! 		argumentStrings = (
! 			DebugBundle,
! 		);
! 		configStateDict = {
! 			"PBXLSLaunchAction-0" = {
! 				PBXLSLaunchAction = 0;
! 				PBXLSLaunchStartAction = 1;
! 				PBXLSLaunchStdioStyle = 2;
! 				PBXLSLaunchStyle = 0;
! 				class = PBXLSRunLaunchConfig;
! 				displayName = "Executable Runner";
! 				identifier = com.apple.Xcode.launch.runConfig;
! 				remoteHostInfo = "";
! 				startActionInfo = "";
! 			};
  		};
- 		cppStopOnCatchEnabled = 0;
- 		cppStopOnThrowEnabled = 0;
- 		customDataFormattersEnabled = 1;
- 		debuggerPlugin = GDBDebugging;
- 		disassemblyDisplayState = 0;
- 		dylibVariantSuffix = _debug;
- 		enableDebugStr = 1;
- 		environmentEntries = (
- 		);
- 		isa = PBXExecutable;
- 		launchableReference = 30DFA4590820160F000CE74D;
- 		libgmallocEnabled = 0;
- 		name = Executable;
- 		shlibInfoDictList = (
- 		);
- 		sourceDirectories = (
- 		);
- 		startupPath = "<<ProductDirectory>>";
- 	};
- 	30DFA4590820160F000CE74D = {
- 		isa = PBXFileReference;
- 		lastKnownFileType = text.script.sh;
- 		name = ukrun;
- 		path = /usr/local/bin/ukrun;
- 		refType = 0;
- 		sourceTree = "<absolute>";
- 	};
- 	30DFA46A082016C9000CE74D = {
- 		activeExec = 0;
  	};
  	30DFA496082018F2000CE74D = {
--- 4922,4931 ----
  		vrLoc = 0;
  	};
! 	30DFA46C082016C9000CE74D = {
! 		uiCtxt = {
! 			sepNavIntBoundsRect = "{{0, 0}, {686, 359}}";
! 			sepNavSelRange = "{0, 0}";
! 			sepNavVisRect = "{{0, 0}, {606, 359}}";
  		};
  	};
  	30DFA496082018F2000CE74D = {

[Macattrick-commit] macattrick FastTests-Info.plist,NONE,1.1 RunAllTests-Info.plist,NONE,1.1

[Geisschaes <gei...@us...>]

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

Added Files:
	FastTests-Info.plist RunAllTests-Info.plist 
Log Message:
missing plist files added

--- NEW FILE: RunAllTests-Info.plist ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
	<key>CFBundleDevelopmentRegion</key>
	<string>English</string>
	<key>CFBundleExecutable</key>
	<string>RunAllTests</string>
	<key>CFBundleGetInfoString</key>
	<string></string>
	<key>CFBundleIconFile</key>
	<string></string>
	<key>CFBundleIdentifier</key>
	<string>com.MySoftwareCompany.RunAllTests</string>
	<key>CFBundleInfoDictionaryVersion</key>
	<string>6.0</string>
	<key>CFBundlePackageType</key>
	<string>APPL</string>
	<key>CFBundleShortVersionString</key>
	<string></string>
	<key>CFBundleSignature</key>
	<string>????</string>
	<key>CFBundleVersion</key>
	<string>1.0.0d1</string>
</dict>
</plist>

--- NEW FILE: FastTests-Info.plist ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
	<key>CFBundleDevelopmentRegion</key>
	<string>English</string>
	<key>CFBundleExecutable</key>
	<string>FastTests</string>
	<key>CFBundleGetInfoString</key>
	<string></string>
	<key>CFBundleIconFile</key>
	<string></string>
	<key>CFBundleIdentifier</key>
	<string>com.MySoftwareCompany.FastTests</string>
	<key>CFBundleInfoDictionaryVersion</key>
	<string>6.0</string>
	<key>CFBundlePackageType</key>
	<string>APPL</string>
	<key>CFBundleShortVersionString</key>
	<string></string>
	<key>CFBundleSignature</key>
	<string>????</string>
	<key>CFBundleVersion</key>
	<string>1.0.0d1</string>
</dict>
</plist>

[Macattrick-commit] macattrick Player.h,1.16,1.17 Team.m,1.21,1.22 main.m,1.16,1.17

[Geisschaes <gei...@us...>]

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

Modified Files:
	Player.h Team.m main.m 
Log Message:
Migration of tests from ObjcUnit to UnitKit, small bugs fixed

Index: Player.h
===================================================================
RCS file: /cvsroot/macattrick/macattrick/Player.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** Player.h	15 Jan 2005 17:39:40 -0000	1.16
--- Player.h	27 Apr 2005 19:36:38 -0000	1.17
***************
*** 27,30 ****
--- 27,31 ----
  //---- eo licence ------------------------------------------------------------//
  
+ #import <Cocoa/Cocoa.h>
  #import <Foundation/Foundation.h>
  #import "Position.h"

Index: main.m
===================================================================
RCS file: /cvsroot/macattrick/macattrick/main.m,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** main.m	14 Mar 2005 19:30:52 -0000	1.16
--- main.m	27 Apr 2005 19:36:38 -0000	1.17
***************
*** 33,40 ****
  #include <CoreServices/CoreServices.h>
  
- // comment out for main build
- #import "Test/AllTests.h"
- //
- 
  
  int main(int argc, char *argv[])
--- 33,36 ----
***************
*** 47,57 ****
  
  	[Properties initializeUserDefaults];
- 	// comment out for main build
- 	NSArray *args = [[NSProcessInfo processInfo] arguments];
- 	if ([args count] >= 2 && [[args objectAtIndex:1] isEqualToString: @"test"]) {
- 		TestRunnerMain([AllTests class]);
- 		return 0;
- 	}
- 	//
  	
  	return NSApplicationMain(argc, argv);
--- 43,46 ----

Index: Team.m
===================================================================
RCS file: /cvsroot/macattrick/macattrick/Team.m,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** Team.m	27 Feb 2005 15:14:44 -0000	1.21
--- Team.m	27 Apr 2005 19:36:38 -0000	1.22
***************
*** 144,147 ****
--- 144,151 ----
  
  + (Team*) currentTeam {
+ 	if(!currentTeam) {
+ 		Team *temp = [[Team alloc] init];
+ 		[temp release];
+ 	}
  	return currentTeam;
  }

[Macattrick-commit] macattrick/Test AllTests.h,1.4,1.5 AllTests.m,1.19,1.20 ArenaTest.h,1.1,1.2 ArenaTest.m,1.1,1.2 ClubTest.h,1.1,1.2 ClubTest.m,1.1,1.2 EconomyTest.h,1.2,1.3 EconomyTest.m,1.3,1.4 HattrickOrgTest.h,1.3,1.4 HattrickOrgTest.m,1.12,1.13 LeagueTest.h,1.1,1.2 LeagueTest.m,1.2,1.3 LineUpTreeLayerTest.h,1.1,1.2 LineUpTreeLayerTest.m,1.5,1.6 LineUpTreeNodeTest.h,1.1,1.2 LineUpTreeNodeTest.m,1.6,1.7 LineUpTreeTest.h,1.2,1.3 LineUpTreeTest.m,1.11,1.12 PlayerListTest.h,1.2,1.3 PlayerListTest.m,1.5,1.6 PlayerSortingTest.h,1.1,1.2 PlayerSortingTest.m,1.3,1.4 PlayerTest.h,1.5,1.6 PlayerTest.m,1.15,1.16 PositionHeapTest.h,1.1,1.2 PositionHeapTest.m,1.1,1.2 PositionTest.h,1.2,1.3 PositionTest.m,1.10,1.11 PropertiesTest.h,1.1,1.2 PropertiesTest.m,1.2,1.3 TeamTest.h,1.5,1.6 TeamTest.m,1.17,1.18 TrainingTest.h,1.1,1.2 TrainingTest.m,1.3,1.4 UserTest.h,1.1,1.2 UserTest.m,1.2,1.3 WorldTest.h,1.1,1.2 WorldTest.m,1.2,1.3

[Geisschaes <gei...@us...>]

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

Modified Files:
	AllTests.h AllTests.m ArenaTest.h ArenaTest.m ClubTest.h 
	ClubTest.m EconomyTest.h EconomyTest.m HattrickOrgTest.h 
	HattrickOrgTest.m LeagueTest.h LeagueTest.m 
	LineUpTreeLayerTest.h LineUpTreeLayerTest.m 
	LineUpTreeNodeTest.h LineUpTreeNodeTest.m LineUpTreeTest.h 
	LineUpTreeTest.m PlayerListTest.h PlayerListTest.m 
	PlayerSortingTest.h PlayerSortingTest.m PlayerTest.h 
	PlayerTest.m PositionHeapTest.h PositionHeapTest.m 
	PositionTest.h PositionTest.m PropertiesTest.h 
	PropertiesTest.m TeamTest.h TeamTest.m TrainingTest.h 
	TrainingTest.m UserTest.h UserTest.m WorldTest.h WorldTest.m 
Log Message:
Migration of tests from ObjcUnit to UnitKit, small bugs fixed

Index: LeagueTest.m
===================================================================
RCS file: /cvsroot/macattrick/macattrick/Test/LeagueTest.m,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** LeagueTest.m	3 Oct 2004 19:26:57 -0000	1.2
--- LeagueTest.m	27 Apr 2005 19:36:45 -0000	1.3
***************
*** 37,51 ****
  	NSString* urlString = [NSString stringWithFormat:@"%@/Test/leagueDetails.xml", [Properties libraryPath]];
  	League* leagueLocal = [[League alloc] initFromXML:[NSURL fileURLWithPath:urlString]];
! 	[self assertNotNil:leagueLocal message:@"league nil"];
! 	[self assertString:[leagueLocal country] equals:@"Schweiz"];
! 	[self assertString:[leagueLocal leagueName] equals:@"VI.279"];
! 	[self assertInt:[leagueLocal leagueLevel] equals:6];
! 	[self assertInt:[leagueLocal maxLevel] equals:8];
! 	[self assertInt:[leagueLocal position] equals:1];
! 	[self assertInt:[leagueLocal matches] equals:11];	
! 	[self assertInt:[leagueLocal goalsFor] equals:44];
! 	[self assertInt:[leagueLocal goalsAgainst] equals:22];	
! 	[self assertInt:[leagueLocal points] equals:23];
! 	[self assertInt:[leagueLocal leagueID] equals:46];
  	[pool release];
  }
--- 37,51 ----
  	NSString* urlString = [NSString stringWithFormat:@"%@/Test/leagueDetails.xml", [Properties libraryPath]];
  	League* leagueLocal = [[League alloc] initFromXML:[NSURL fileURLWithPath:urlString]];
! 	UKNotNil(leagueLocal );
! 	UKStringsEqual([leagueLocal country] ,@"Schweiz");
! 	UKStringsEqual([leagueLocal leagueName] ,@"VI.279");
! 	UKIntsEqual([leagueLocal leagueLevel] ,6);
! 	UKIntsEqual([leagueLocal maxLevel] ,8);
! 	UKIntsEqual([leagueLocal position] ,1);
! 	UKIntsEqual([leagueLocal matches] ,11);
! 	UKIntsEqual([leagueLocal goalsFor] ,44);
! 	UKIntsEqual([leagueLocal goalsAgainst] ,22);
! 	UKIntsEqual([leagueLocal points] ,23);
! 	UKIntsEqual([leagueLocal leagueID] ,46);
  	[pool release];
  }
***************
*** 53,60 ****
  -(void) testInit {
  	League* league = [[League alloc] init];
! 	[self assertNotNil:league message:@"league nil"];
! 	[self assertNotNil:[league country] message:@"country nil"];
! 	[self assertNotNil:[league leagueName] message:@"league name nil"];
! 	[self assertTrue:[league leagueLevel] <= [league maxLevel]];
  }
  
--- 53,60 ----
  -(void) testInit {
  	League* league = [[League alloc] init];
! 	UKNotNil(league );
! 	UKNotNil([league country] );
! 	UKNotNil([league leagueName] );
! 	UKTrue([league leagueLevel] <= [league maxLevel]);
  }
  

Index: LineUpTreeLayerTest.m
===================================================================
RCS file: /cvsroot/macattrick/macattrick/Test/LineUpTreeLayerTest.m,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** LineUpTreeLayerTest.m	7 Feb 2005 21:16:28 -0000	1.5
--- LineUpTreeLayerTest.m	27 Apr 2005 19:36:45 -0000	1.6
***************
*** 33,36 ****
--- 33,44 ----
  
  
+ - (id) init {
+   self = [super init];
+   if(self) {
+ 		[self setUp];
+   }
+   return self;
+ }
+ 
  - (void)setUp {
  	player1 = [[Player alloc] init];
***************
*** 73,81 ****
  - (void) testRunProvidesResult {
  	LineUpTreeLayer *layer1 = [rootLayer calculateNextLayer:position1];
! 	[self assertInt: [[layer1 layerNodes] count] equals:  3];
  	LineUpTreeLayer *layer2 = [layer1 calculateNextLayer:position2];
! 	[self assertInt: [[layer2 layerNodes] count] equals:  6];
  	LineUpTreeLayer *layer3 = [layer1 calculateNextLayer:position3];
! 	[self assertInt: [[layer3 layerNodes] count] equals:  6];
  }
  
--- 81,89 ----
  - (void) testRunProvidesResult {
  	LineUpTreeLayer *layer1 = [rootLayer calculateNextLayer:position1];
! 	UKIntsEqual( [[layer1 layerNodes] count] ,  3);
  	LineUpTreeLayer *layer2 = [layer1 calculateNextLayer:position2];
! 	UKIntsEqual( [[layer2 layerNodes] count] ,  6);
  	LineUpTreeLayer *layer3 = [layer1 calculateNextLayer:position3];
! 	UKIntsEqual( [[layer3 layerNodes] count] ,  6);
  }
  
***************
*** 83,102 ****
  - (void) testRunProvidesResultWithPruning {
  	LineUpTreeLayer *layer1 = [rootLayer2 calculateNextLayer:position1];
! 	[self assertTrue: [[layer1 layerNodes] count] >  0];
! 	[self assertTrue: [[layer1 layerNodes] count] <=  3];
! 	[self assertInt: [[layer1 layerNodes] count] equals:  1];
  	LineUpTreeLayer *layer2 = [layer1 calculateNextLayer:position2];
! 	[self assertTrue: [[layer2 layerNodes] count] >  0];
! 	[self assertTrue: [[layer2 layerNodes] count] <=  6];
! 	[self assertInt: [[layer2 layerNodes] count] equals:  2];
  	LineUpTreeLayer *layer3 = [layer1 calculateNextLayer:position3];
! 	[self assertTrue: [[layer3 layerNodes] count] >  0];
! 	[self assertTrue: [[layer3 layerNodes] count] <=  6];
! 	[self assertInt: [[layer3 layerNodes] count] equals:  2];
  }
  
  - (void) testBestScoringNode {
  	LineUpTreeLayer *finalLayer = [[[rootLayer calculateNextLayer:position1] calculateNextLayer:position2] calculateNextLayer:position3];	
! 	[self assertFloat:[[finalLayer bestScoringNode] score]equals:18.3 precision:0.01];
  }
  @end
--- 91,110 ----
  - (void) testRunProvidesResultWithPruning {
  	LineUpTreeLayer *layer1 = [rootLayer2 calculateNextLayer:position1];
! 	UKTrue( [[layer1 layerNodes] count] >  0);
! 	UKTrue( [[layer1 layerNodes] count] <=  3);
! 	UKIntsEqual( [[layer1 layerNodes] count] ,  1);
  	LineUpTreeLayer *layer2 = [layer1 calculateNextLayer:position2];
! 	UKTrue( [[layer2 layerNodes] count] >  0);
! 	UKTrue( [[layer2 layerNodes] count] <=  6);
! 	UKIntsEqual( [[layer2 layerNodes] count] ,  2);
  	LineUpTreeLayer *layer3 = [layer1 calculateNextLayer:position3];
! 	UKTrue( [[layer3 layerNodes] count] >  0);
! 	UKTrue( [[layer3 layerNodes] count] <=  6);
! 	UKIntsEqual( [[layer3 layerNodes] count] ,  2);
  }
  
  - (void) testBestScoringNode {
  	LineUpTreeLayer *finalLayer = [[[rootLayer calculateNextLayer:position1] calculateNextLayer:position2] calculateNextLayer:position3];	
! 	UKFloatsEqual([[finalLayer bestScoringNode] score],18.3 ,0.01);
  }
  @end

Index: LeagueTest.h
===================================================================
RCS file: /cvsroot/macattrick/macattrick/Test/LeagueTest.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** LeagueTest.h	28 Sep 2004 17:59:04 -0000	1.1
--- LeagueTest.h	27 Apr 2005 19:36:45 -0000	1.2
***************
*** 28,35 ****
  
  #import <Cocoa/Cocoa.h>
! #import <ObjcUnit/ObjcUnit.h>
  
  
! @interface LeagueTest : TestCase {
  
  }
--- 28,35 ----
  
  #import <Cocoa/Cocoa.h>
! #import <UnitKit/UnitKit.h>
  
  
! @interface LeagueTest : NSObject <UKTest> {
  
  }

Index: ArenaTest.m
===================================================================
RCS file: /cvsroot/macattrick/macattrick/Test/ArenaTest.m,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ArenaTest.m	21 Sep 2004 17:02:14 -0000	1.1
--- ArenaTest.m	27 Apr 2005 19:36:44 -0000	1.2
***************
*** 37,47 ****
  	NSString* urlString = [NSString stringWithFormat:@"%@/Test/arenaDetails.xml", [Properties libraryPath]];
  	Arena* arenaLocal = [[Arena alloc] initFromXML:[NSURL fileURLWithPath:urlString]];
! 	[self assertNotNil:arenaLocal];
! 	[self assertString:[arenaLocal name] equals:@"Arena Name"];
! 	[self assertInt:[arenaLocal terraces] equals:15750];
! 	[self assertInt:[arenaLocal basic] equals:6250];
! 	[self assertInt:[arenaLocal roof] equals:2500];
! 	[self assertInt:[arenaLocal vip] equals:500];
! 	[self assertInt:[arenaLocal total] equals:25000];
  	[arenaLocal release];
      [pool release];
--- 37,47 ----
  	NSString* urlString = [NSString stringWithFormat:@"%@/Test/arenaDetails.xml", [Properties libraryPath]];
  	Arena* arenaLocal = [[Arena alloc] initFromXML:[NSURL fileURLWithPath:urlString]];
! 	UKNotNil(arenaLocal);
! 	UKStringsEqual([arenaLocal name] ,@"Arena Name");
! 	UKIntsEqual([arenaLocal terraces] ,15750);
! 	UKIntsEqual([arenaLocal basic] ,6250);
! 	UKIntsEqual([arenaLocal roof] ,2500);
! 	UKIntsEqual([arenaLocal vip] ,500);
! 	UKIntsEqual([arenaLocal total] ,25000);
  	[arenaLocal release];
      [pool release];
***************
*** 50,60 ****
  -(void) testDownload {
  	Arena * arena = [[Arena alloc]init];
! 	[self assertNotNil:arena message: @"is nil"];
! 	[self assertNotNil:[arena name]  message: @"name is nil"];
! 	[self assertTrue:[arena terraces] > 0 message: @"terraces"];
! 	[self assertTrue:[arena basic] >= 0 message: @"basic"];
! 	[self assertTrue:[arena roof] >= 0 message:  @"roof"];
! 	[self assertTrue:[arena vip] >= 0 message: @"vip"];	
! 	[self assertInt:[arena total] equals:[arena terraces] +[arena basic]+[arena roof]+[arena vip] ];
  	[arena release];	
  }
--- 50,60 ----
  -(void) testDownload {
  	Arena * arena = [[Arena alloc]init];
! 	UKNotNil(arena );
! 	UKNotNil([arena name]  );
! 	UKTrue([arena terraces] > 0 );
! 	UKTrue([arena basic] >= 0 );
! 	UKTrue([arena roof] >= 0 );
! 	UKTrue([arena vip] >= 0 );
! 	UKIntsEqual([arena total] ,[arena terraces] +[arena basic]+[arena roof]+[arena vip] );
  	[arena release];	
  }

Index: LineUpTreeLayerTest.h
===================================================================
RCS file: /cvsroot/macattrick/macattrick/Test/LineUpTreeLayerTest.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** LineUpTreeLayerTest.h	4 May 2004 10:38:04 -0000	1.1
--- LineUpTreeLayerTest.h	27 Apr 2005 19:36:45 -0000	1.2
***************
*** 27,36 ****
  //---- eo licence ------------------------------------------------------------//
  
! #import <ObjcUnit/ObjcUnit.h>
  #import <Foundation/Foundation.h>
  #import "LineUpTreeLayer.h"
  #import "LineUpTreeNode.h"
  
! @interface LineUpTreeLayerTest : TestCase {
  	Player *player1;
  	Player *player2;
--- 27,36 ----
  //---- eo licence ------------------------------------------------------------//
  
! #import <UnitKit/UnitKit.h>
  #import <Foundation/Foundation.h>
  #import "LineUpTreeLayer.h"
  #import "LineUpTreeNode.h"
  
! @interface LineUpTreeLayerTest : NSObject <UKTest> {
  	Player *player1;
  	Player *player2;

Index: PropertiesTest.m
===================================================================
RCS file: /cvsroot/macattrick/macattrick/Test/PropertiesTest.m,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** PropertiesTest.m	11 Sep 2004 15:44:34 -0000	1.2
--- PropertiesTest.m	27 Apr 2005 19:36:45 -0000	1.3
***************
*** 32,36 ****
  @implementation PropertiesTest
  -(void)  testOnlineVersion {
! 	[self assertTrue: [Properties onlineVersion] >= 0.2];
  }
  
--- 32,36 ----
  @implementation PropertiesTest
  -(void)  testOnlineVersion {
! 	UKTrue( [Properties onlineVersion] >= 0.2);
  }
  

Index: TeamTest.m
===================================================================
RCS file: /cvsroot/macattrick/macattrick/Test/TeamTest.m,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** TeamTest.m	3 Oct 2004 09:30:16 -0000	1.17
--- TeamTest.m	27 Apr 2005 19:36:45 -0000	1.18
***************
*** 31,34 ****
--- 31,42 ----
  @implementation TeamTest
  
+ - (id) init {
+   self = [super init];
+   if(self) {
+ 		[self setUp];
+   }
+   return self;
+ }
+ 
  - (void)setUp {
  	team = [[Team alloc] init];
***************
*** 36,70 ****
  
  - (void) testInit {
! 	[self assertNotNil:team message: @"team nil"];
! 	[self assertNotNil:[team user] message: @"user nil"];
! 	[self assertNotNil:[team economy] message: @"economy nil"];
! 	[self assertNotNil:[team playerList] message: @"playerList nil"];
! 	[self assertNotNil:[team arena] message: @"arena nil"];
! 	[self assertNotNil:[team training] message: @"training nil"];
  }
  
  
  -(void) testCurrentTeam {
! 	[self assert:[Team currentTeam] equals:team];
  }
  
  
  -(void) testTeamID {
! 	[self assertTrue:[team teamID] > 0 message: @"team id <=0"];
  }
  
  -(void) testTeamName {
! 	[self assertTrue:[[team teamName]length] > 0 message: @"team name lenght <=0"];
  }
  
  
  -(void) testHomepage {
! 	[self assertTrue:[[[team homepage] absoluteString]length] > 0 message: @"team homepage lenght <=0"];
  }
  -(void) testNumberOfVictories {
! 	[self assertTrue:[team numberOfVictories] >= 0 message: @"victories <=0"];
  }
  -(void) testNumberOfUndefeated {
! 	[self assertTrue:[team numberOfUndefeated] >= 0 message: @"undefeated <=0"];
  }
  
--- 44,78 ----
  
  - (void) testInit {
! 	UKNotNil(team );
! 	UKNotNil([team user] );
! 	UKNotNil([team economy] );
! 	UKNotNil([team playerList] );
! 	UKNotNil([team arena] );
! 	UKNotNil([team training] );
  }
  
  
  -(void) testCurrentTeam {
! 	UKObjectsEqual([Team currentTeam] ,team);
  }
  
  
  -(void) testTeamID {
! 	UKTrue([team teamID] > 0 );
  }
  
  -(void) testTeamName {
! 	UKTrue([[team teamName]length] > 0 );
  }
  
  
  -(void) testHomepage {
! 	UKTrue([[[team homepage] absoluteString]length] > 0 );
  }
  -(void) testNumberOfVictories {
! 	UKTrue([team numberOfVictories] >= 0 );
  }
  -(void) testNumberOfUndefeated {
! 	UKTrue([team numberOfUndefeated] >= 0 );
  }
  

Index: TrainingTest.m
===================================================================
RCS file: /cvsroot/macattrick/macattrick/Test/TrainingTest.m,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** TrainingTest.m	29 Sep 2004 18:42:33 -0000	1.3
--- TrainingTest.m	27 Apr 2005 19:36:45 -0000	1.4
***************
*** 38,46 ****
  	NSString* urlString = [NSString stringWithFormat:@"%@/Test/training.xml", [Properties libraryPath]];
  	Training* trainingLocal = [[Training alloc] initFromXML:[NSURL fileURLWithPath:urlString]];
! 	[self assertNotNil:trainingLocal];
! 	[self assertString:[trainingLocal trainingType] equals:NSLocalizedString(@"Defending", @"Defending")];
! 	[self assertInt:[trainingLocal level] equals:100];
! 	[self assertInt:[trainingLocal morale] equals:8];
! 	[self assertInt:[trainingLocal selfConfidence] equals:5];
  	[trainingLocal release];
      [pool release];
--- 38,46 ----
  	NSString* urlString = [NSString stringWithFormat:@"%@/Test/training.xml", [Properties libraryPath]];
  	Training* trainingLocal = [[Training alloc] initFromXML:[NSURL fileURLWithPath:urlString]];
! 	UKNotNil(trainingLocal);
! 	UKStringsEqual([trainingLocal trainingType] ,NSLocalizedString(@"Defending", @"Defending"));
! 	UKIntsEqual([trainingLocal level] ,100);
! 	UKIntsEqual([trainingLocal morale] ,8);
! 	UKIntsEqual([trainingLocal selfConfidence] ,5);
  	[trainingLocal release];
      [pool release];
***************
*** 49,55 ****
  -(void) testLoading {
  	Training * training = [[Training alloc]init];
! 	[self assertNotNil:training message: @"is nil"];
! 	[self assertTrue:[training level] >= 0 message: @"training level negative"];
! 	[self assertNotNil:[training trainingType] message: @"trainingType nil"];
  	[training release];	
  }
--- 49,55 ----
  -(void) testLoading {
  	Training * training = [[Training alloc]init];
! 	UKNotNil(training );
! 	UKTrue([training level] >= 0 );
! 	UKNotNil([training trainingType] );
  	[training release];	
  }
***************
*** 57,61 ****
  -(void) testTrainerLoading {
  	Team *team = [[Team alloc] init];
! 	[self assertNotNil:[[team training] trainer] message: @"trainer nil"];
  	[team release];
  }
--- 57,61 ----
  -(void) testTrainerLoading {
  	Team *team = [[Team alloc] init];
! 	UKNotNil([[team training] trainer] );
  	[team release];
  }

Index: UserTest.m
===================================================================
RCS file: /cvsroot/macattrick/macattrick/Test/UserTest.m,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** UserTest.m	28 Nov 2004 14:07:06 -0000	1.2
--- UserTest.m	27 Apr 2005 19:36:45 -0000	1.3
***************
*** 36,44 ****
  	NSString* urlString = [NSString stringWithFormat:@"%@/Test/teamDetails.xml", [Properties libraryPath]];
  	User* user = [[User alloc] initFromXML:[NSURL fileURLWithPath:urlString]];
! 	[self assertString:[user loginname] equals:@"FelicioFalcio"];
! 	[self assertString:[user name] equals:@"-"];
! 	[self assertString:[user email] equals:@"-"];
! 	[self assertString:[user icq] equals:@"-"];
! 	[self assertTrue:[user isSupporter]];
  	[user release];
  	[pool release];
--- 36,44 ----
  	NSString* urlString = [NSString stringWithFormat:@"%@/Test/teamDetails.xml", [Properties libraryPath]];
  	User* user = [[User alloc] initFromXML:[NSURL fileURLWithPath:urlString]];
! 	UKStringsEqual([user loginname] ,@"FelicioFalcio");
! 	UKStringsEqual([user name] ,@"-");
! 	UKStringsEqual([user email] ,@"-");
! 	UKStringsEqual([user icq] ,@"-");
! 	UKTrue([user isSupporter]);
  	[user release];
  	[pool release];
***************
*** 48,54 ****
  -(void) testInit {
  	User* user = [[User alloc] init];
! 	[self assertNotNil:[user loginname] message:@"loginname"];
! 	[self assertNotNil:[user name] message:@"name"];
! 	[self assertNotNil:[user email] message:@"email"];
  	[user release];
  }
--- 48,54 ----
  -(void) testInit {
  	User* user = [[User alloc] init];
! 	UKNotNil([user loginname] );
! 	UKNotNil([user name] );
! 	UKNotNil([user email] );
  	[user release];
  }

Index: TrainingTest.h
===================================================================
RCS file: /cvsroot/macattrick/macattrick/Test/TrainingTest.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TrainingTest.h	26 Sep 2004 12:04:10 -0000	1.1
--- TrainingTest.h	27 Apr 2005 19:36:45 -0000	1.2
***************
*** 27,34 ****
  //---- eo licence ------------------------------------------------------------//
  
! #import <ObjcUnit/ObjcUnit.h>
  #import "Training.h"
  #import "Properties.h"
! @interface TrainingTest : TestCase {
  
  }
--- 27,34 ----
  //---- eo licence ------------------------------------------------------------//
  
! #import <UnitKit/UnitKit.h>
  #import "Training.h"
  #import "Properties.h"
! @interface TrainingTest : NSObject <UKTest> {
  
  }

Index: TeamTest.h
===================================================================
RCS file: /cvsroot/macattrick/macattrick/Test/TeamTest.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** TeamTest.h	19 Sep 2004 17:06:46 -0000	1.5
--- TeamTest.h	27 Apr 2005 19:36:45 -0000	1.6
***************
*** 27,31 ****
  //---- eo licence ------------------------------------------------------------//
  
! #import <ObjcUnit/ObjcUnit.h>
  #import "AllTests.h"
  #import "HattrickOrg.h"
--- 27,31 ----
  //---- eo licence ------------------------------------------------------------//
  
! #import <UnitKit/UnitKit.h>
  #import "AllTests.h"
  #import "HattrickOrg.h"
***************
*** 33,37 ****
  #import "Team.h"
  
! @interface TeamTest : TestCase {
  	Team *team;
  }
--- 33,37 ----
  #import "Team.h"
  
! @interface TeamTest : NSObject <UKTest> {
  	Team *team;
  }

Index: PlayerTest.m
===================================================================
RCS file: /cvsroot/macattrick/macattrick/Test/PlayerTest.m,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** PlayerTest.m	7 Feb 2005 21:16:29 -0000	1.15
--- PlayerTest.m	27 Apr 2005 19:36:45 -0000	1.16
***************
*** 35,38 ****
--- 35,46 ----
  @implementation PlayerTest
  
+ - (id) init {
+   self = [super init];
+   if(self) {
+ 		[self setUp];
+   }
+   return self;
+ }
+ 
  - (void)setUp {
      player1 = [[Player alloc] init];
***************
*** 49,119 ****
  
  - (void)testStamina {
!     [self assertInt:[player1 staminaSkill] equals:3 message:@"stamina incorrect"];
  }
  
  
  - (void)testCountryID {
!     [self assertInt:[marcel countryID] equals:41];
!     [self assertInt:[walter countryID] equals:40];
  }
  - (void)testCountryName {
!     [self assertString:[walter countryName] equals:@"Schweiz"];
  }
  
  -(void)testPlayerForm {
! 	[self assertInt:[player1 playerForm] equals:5];
  }
  
  -(void)testLoadedPlayer {
! 	[self assert:[walter playerName] equals: @"Walter  Gasparin"];
!     [self assertInt:[walter injuryLevel] equals: -1 ];
!     [self assertInt:[walter playerForm] equals: 5 ];
!     [self assertInt:[walter experience] equals: 4 ];
  }
  
  -(void)testLoadedPlayerSkills {
!     [self assertInt:[walter staminaSkill] equals: 7 ];
!     [self assertInt:[walter keeperSkill] equals: 2 ];
!     [self assertInt:[walter playmakerSkill] equals: 5 ];
!     [self assertInt:[walter scorerSkill] equals: 2 ];
!     [self assertInt:[walter passingSkill] equals: 5 ];
!     [self assertInt:[walter wingerSkill] equals: 7 ];
!     [self assertInt:[walter defenderSkill] equals: 4 ];
!     [self assertInt:[walter setPiecesSkill] equals: 3 ];
  }
  
  -(void) testPossiblePlayerSkillsAbilities {
  	NSArray *possibleSkills = [player1 possiblePlayerSkillsAbilities];
! 	[self assertInt:[possibleSkills count] equals: 20];	
! 	[self assertString:[possibleSkills objectAtIndex:0] equals:NSLocalizedString(@"disastrous", @"disastrous")];
! 	[self assertString:[possibleSkills objectAtIndex:12] equals:NSLocalizedString(@"world class", @"world class")];
! 	[self assertString:[possibleSkills objectAtIndex:19] equals:NSLocalizedString(@"divine", @"divine")];
  }
  -(void) testPossiblePlayerStaminaAbilities {
  	NSArray *possibleSkills = [player1 possiblePlayerStaminaAbilities];
! 	[self assertInt:[possibleSkills count] equals: 9];	
! 	[self assertString:[possibleSkills objectAtIndex:0] equals:NSLocalizedString(@"disastrous", @"disastrous")];
! 	[self assertString:[possibleSkills objectAtIndex:8] equals:NSLocalizedString(@"formidable", @"formidable")];
  }
  -(void) testPossiblePlayerFormAbilities {
  	NSArray *possibleSkills = [player1 possiblePlayerFormAbilities];
! 	[self assertInt:[possibleSkills count] equals: 8];	
! 	[self assertString:[possibleSkills objectAtIndex:0] equals:NSLocalizedString(@"disastrous", @"disastrous")];
! 	[self assertString:[possibleSkills objectAtIndex:7] equals:NSLocalizedString(@"excellent", @"excellent")];
  }
  
  -(void) testBestPosition {
! 	[self assertTrue:[[walter bestPosition] isEqual:[[PositionHeap uniqueInstance] positionWithIdentifier:@"Winger Offensive"]]]; 
  }
  
  -(void) testCards {
! 	[self assertInt:[walter cards] equals:3];
! 	[self assertInt:[pirmin cards] equals:0];
! 	[self assertInt:[marcel cards] equals:1];
  }
  -(void) testDisqualified {
! 	[self assertTrue: [walter isDisqualified]];
! 	[self assertFalse: [marcel isDisqualified]];
! 	[self assertFalse: [pirmin isDisqualified]];
  }
  
--- 57,127 ----
  
  - (void)testStamina {
!     UKIntsEqual([player1 staminaSkill] ,3 );
  }
  
  
  - (void)testCountryID {
!     UKIntsEqual([marcel countryID] ,41);
!     UKIntsEqual([walter countryID] ,40);
  }
  - (void)testCountryName {
!     UKStringsEqual([walter countryName] ,@"Schweiz");
  }
  
  -(void)testPlayerForm {
! 	UKIntsEqual([player1 playerForm] ,5);
  }
  
  -(void)testLoadedPlayer {
! 	UKObjectsEqual([walter playerName] , @"Walter  Gasparin");
!     UKIntsEqual([walter injuryLevel] , -1 );
!     UKIntsEqual([walter playerForm] , 5 );
!     UKIntsEqual([walter experience] , 4 );
  }
  
  -(void)testLoadedPlayerSkills {
!     UKIntsEqual([walter staminaSkill] , 7 );
!     UKIntsEqual([walter keeperSkill] , 2 );
!     UKIntsEqual([walter playmakerSkill] , 5 );
!     UKIntsEqual([walter scorerSkill] , 2 );
!     UKIntsEqual([walter passingSkill] , 5 );
!     UKIntsEqual([walter wingerSkill] , 7 );
!     UKIntsEqual([walter defenderSkill] , 4 );
!     UKIntsEqual([walter setPiecesSkill] , 3 );
  }
  
  -(void) testPossiblePlayerSkillsAbilities {
  	NSArray *possibleSkills = [player1 possiblePlayerSkillsAbilities];
! 	UKIntsEqual([possibleSkills count] , 20);
! 	UKStringsEqual([possibleSkills objectAtIndex:0] ,NSLocalizedString(@"disastrous", @"disastrous"));
! 	UKStringsEqual([possibleSkills objectAtIndex:12] ,NSLocalizedString(@"world class", @"world class"));
! 	UKStringsEqual([possibleSkills objectAtIndex:19] ,NSLocalizedString(@"divine", @"divine"));
  }
  -(void) testPossiblePlayerStaminaAbilities {
  	NSArray *possibleSkills = [player1 possiblePlayerStaminaAbilities];
! 	UKIntsEqual([possibleSkills count] , 9);
! 	UKStringsEqual([possibleSkills objectAtIndex:0] ,NSLocalizedString(@"disastrous", @"disastrous"));
! 	UKStringsEqual([possibleSkills objectAtIndex:8] ,NSLocalizedString(@"formidable", @"formidable"));
  }
  -(void) testPossiblePlayerFormAbilities {
  	NSArray *possibleSkills = [player1 possiblePlayerFormAbilities];
! 	UKIntsEqual([possibleSkills count] , 8);
! 	UKStringsEqual([possibleSkills objectAtIndex:0] ,NSLocalizedString(@"disastrous", @"disastrous"));
! 	UKStringsEqual([possibleSkills objectAtIndex:7] ,NSLocalizedString(@"excellent", @"excellent"));
  }
  
  -(void) testBestPosition {
! 	UKTrue([[walter bestPosition] isEqual:[[PositionHeap uniqueInstance] positionWithIdentifier:@"Winger Offensive"]]);
  }
  
  -(void) testCards {
! 	UKIntsEqual([walter cards] ,3);
! 	UKIntsEqual([pirmin cards] ,0);
! 	UKIntsEqual([marcel cards] ,1);
  }
  -(void) testDisqualified {
! 	UKTrue( [walter isDisqualified]);
! 	UKFalse( [marcel isDisqualified]);
! 	UKFalse( [pirmin isDisqualified]);
  }
  
***************
*** 121,127 ****
  	PlayerList *tempPlayerList = [[PlayerList alloc] init];
  	Player *downloadedPlayer = [tempPlayerList playerAtIndex:0];
! 	[self assertNotNil:downloadedPlayer];
! 	[self assertTrue:[downloadedPlayer tsi] > 0 message: @"tsi <= 0"];
! 	[self assertTrue: [downloadedPlayer keeperSkill] > 0 message: @"keeper <= 0"];
  	[tempPlayerList release];
  
--- 129,135 ----
  	PlayerList *tempPlayerList = [[PlayerList alloc] init];
  	Player *downloadedPlayer = [tempPlayerList playerAtIndex:0];
! 	UKNotNil(downloadedPlayer);
! 	UKTrue([downloadedPlayer tsi] > 0 );
! 	UKTrue( [downloadedPlayer keeperSkill] > 0 );
  	[tempPlayerList release];
  
***************
*** 129,157 ****
  
  - (void) testSalary {
! 	[self assertInt:[walter salary] equals:11000];
! 	[self assertInt:[marcel salary] equals:9900];
! 	[self assertInt:[pirmin salary] equals:11900];
  }
  
  -(void) testSpecialty {
! 	[self assertInt:[walter specialty] equals:1];
! 	[self assertInt:[marcel specialty] equals:0];
! 	[self assertInt:[pirmin specialty] equals:0];
  }
  
  -(void) testHonesty {
! 	[self assertInt:[walter honesty] equals:2];
! 	[self assertInt:[marcel honesty] equals:2];
! 	[self assertInt:[pirmin honesty] equals:2];
  }
  -(void) testAgreeability {
! 	[self assertInt:[walter agreeability] equals:3];
! 	[self assertInt:[marcel agreeability] equals:2];
! 	[self assertInt:[pirmin agreeability] equals:1];
  }
  -(void) testAgressiveness {
! 	[self assertInt:[walter aggressiveness] equals:1];
! 	[self assertInt:[marcel aggressiveness] equals:2];
! 	[self assertInt:[pirmin aggressiveness] equals:2];
  }
  
--- 137,165 ----
  
  - (void) testSalary {
! 	UKIntsEqual([walter salary] ,11000);
! 	UKIntsEqual([marcel salary] ,9900);
! 	UKIntsEqual([pirmin salary] ,11900);
  }
  
  -(void) testSpecialty {
! 	UKIntsEqual([walter specialty] ,1);
! 	UKIntsEqual([marcel specialty] ,0);
! 	UKIntsEqual([pirmin specialty] ,0);
  }
  
  -(void) testHonesty {
! 	UKIntsEqual([walter honesty] ,2);
! 	UKIntsEqual([marcel honesty] ,2);
! 	UKIntsEqual([pirmin honesty] ,2);
  }
  -(void) testAgreeability {
! 	UKIntsEqual([walter agreeability] ,3);
! 	UKIntsEqual([marcel agreeability] ,2);
! 	UKIntsEqual([pirmin agreeability] ,1);
  }
  -(void) testAgressiveness {
! 	UKIntsEqual([walter aggressiveness] ,1);
! 	UKIntsEqual([marcel aggressiveness] ,2);
! 	UKIntsEqual([pirmin aggressiveness] ,2);
  }
  

Index: HattrickOrgTest.m
===================================================================
RCS file: /cvsroot/macattrick/macattrick/Test/HattrickOrgTest.m,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** HattrickOrgTest.m	27 Mar 2005 12:23:35 -0000	1.12
--- HattrickOrgTest.m	27 Apr 2005 19:36:45 -0000	1.13
***************
*** 32,35 ****
--- 32,43 ----
  @implementation HattrickOrgTest
  
+ - (id) init {
+   self = [super init];
+   if(self) {
+ 		[self setUp];
+   }
+   return self;
+ }
+ 
  - (void) setUp {
  }
***************
*** 39,48 ****
  	[fileManager removeFileAtPath:[Properties loginFile] handler:nil];
  	int error = [[HattrickOrg uniqueInstance] login];
! 	[self assertInt:error equals:0];
  	[[HattrickOrg uniqueInstance] logout];
! 	[self assertTrue: [fileManager fileExistsAtPath:[Properties loginFile] isDirectory:NO]];
  	NSString *file = [NSString stringWithContentsOfFile:[Properties loginFile]];
! 	[self assertTrue: [file length] > 250];
! 	[self assertTrue: [file length] < 350];
  }
  
--- 47,56 ----
  	[fileManager removeFileAtPath:[Properties loginFile] handler:nil];
  	int error = [[HattrickOrg uniqueInstance] login];
! 	UKIntsEqual(error ,0);
  	[[HattrickOrg uniqueInstance] logout];
! 	UKTrue( [fileManager fileExistsAtPath:[Properties loginFile] isDirectory:NO]);
  	NSString *file = [NSString stringWithContentsOfFile:[Properties loginFile]];
! 	UKTrue( [file length] > 250);
! 	UKTrue( [file length] < 350);
  }
  
***************
*** 54,61 ****
  	[[HattrickOrg uniqueInstance] downloadPlayers];
  	[[HattrickOrg uniqueInstance] logout];
! 	[self assertTrue: [fileManager fileExistsAtPath:filename isDirectory:NO]];
  	NSString *file = [NSString stringWithContentsOfFile:filename];
! 	[self assertTrue: [file length] > 2000];
! 	[self assertTrue: [file length] < 100000];
  }
  
--- 62,69 ----
  	[[HattrickOrg uniqueInstance] downloadPlayers];
  	[[HattrickOrg uniqueInstance] logout];
! 	UKTrue( [fileManager fileExistsAtPath:filename isDirectory:NO]);
  	NSString *file = [NSString stringWithContentsOfFile:filename];
! 	UKTrue( [file length] > 2000);
! 	UKTrue( [file length] < 100000);
  }
  
***************
*** 67,74 ****
  	[[HattrickOrg uniqueInstance] downloadEconomy];
  	[[HattrickOrg uniqueInstance] logout];
! 	[self assertTrue: [fileManager fileExistsAtPath:filename isDirectory:NO]];
  	NSString *file = [NSString stringWithContentsOfFile:filename];
! 	[self assertTrue: [file length] > 200];
! 	[self assertTrue: [file length] < 100000];
  }
  
--- 75,82 ----
  	[[HattrickOrg uniqueInstance] downloadEconomy];
  	[[HattrickOrg uniqueInstance] logout];
! 	UKTrue( [fileManager fileExistsAtPath:filename isDirectory:NO]);
  	NSString *file = [NSString stringWithContentsOfFile:filename];
! 	UKTrue( [file length] > 200);
! 	UKTrue( [file length] < 100000);
  }
  
***************
*** 80,87 ****
  	[[HattrickOrg uniqueInstance] downloadTeamDetails];
  	[[HattrickOrg uniqueInstance] logout];
! 	[self assertTrue: [fileManager fileExistsAtPath:filename isDirectory:NO]];
  	NSString *file = [NSString stringWithContentsOfFile:filename];
! 	[self assertTrue: [file length] > 200];
! 	[self assertTrue: [file length] < 100000];
  }
  
--- 88,95 ----
  	[[HattrickOrg uniqueInstance] downloadTeamDetails];
  	[[HattrickOrg uniqueInstance] logout];
! 	UKTrue( [fileManager fileExistsAtPath:filename isDirectory:NO]);
  	NSString *file = [NSString stringWithContentsOfFile:filename];
! 	UKTrue( [file length] > 200);
! 	UKTrue( [file length] < 100000);
  }
  
***************
*** 93,100 ****
  	[[HattrickOrg uniqueInstance] downloadLeagueDetails];
  	[[HattrickOrg uniqueInstance] logout];
! 	[self assertTrue: [fileManager fileExistsAtPath:filename isDirectory:NO]];
  	NSString *file = [NSString stringWithContentsOfFile:filename];
! 	[self assertTrue: [file length] > 200];
! 	[self assertTrue: [file length] < 100000];
  }
  
--- 101,108 ----
  	[[HattrickOrg uniqueInstance] downloadLeagueDetails];
  	[[HattrickOrg uniqueInstance] logout];
! 	UKTrue( [fileManager fileExistsAtPath:filename isDirectory:NO]);
  	NSString *file = [NSString stringWithContentsOfFile:filename];
! 	UKTrue( [file length] > 200);
! 	UKTrue( [file length] < 100000);
  }
  
***************
*** 106,113 ****
  	[[HattrickOrg uniqueInstance] downloadClub];
  	[[HattrickOrg uniqueInstance] logout];
! 	[self assertTrue: [fileManager fileExistsAtPath:filename isDirectory:NO]];
  	NSString *file = [NSString stringWithContentsOfFile:filename];
! 	[self assertTrue: [file length] > 200];
! 	[self assertTrue: [file length] < 100000];
  }
  
--- 114,121 ----
  	[[HattrickOrg uniqueInstance] downloadClub];
  	[[HattrickOrg uniqueInstance] logout];
! 	UKTrue( [fileManager fileExistsAtPath:filename isDirectory:NO]);
  	NSString *file = [NSString stringWithContentsOfFile:filename];
! 	UKTrue( [file length] > 200);
! 	UKTrue( [file length] < 100000);
  }
  
***************
*** 119,126 ****
  	[[HattrickOrg uniqueInstance] downloadTraining];
  	[[HattrickOrg uniqueInstance] logout];
! 	[self assertTrue: [fileManager fileExistsAtPath:filename isDirectory:NO]];
  	NSString *file = [NSString stringWithContentsOfFile:filename];
! 	[self assertTrue: [file length] > 200];
! 	[self assertTrue: [file length] < 100000];
  }
  
--- 127,134 ----
  	[[HattrickOrg uniqueInstance] downloadTraining];
  	[[HattrickOrg uniqueInstance] logout];
! 	UKTrue( [fileManager fileExistsAtPath:filename isDirectory:NO]);
  	NSString *file = [NSString stringWithContentsOfFile:filename];
! 	UKTrue( [file length] > 200);
! 	UKTrue( [file length] < 100000);
  }
  
***************
*** 132,139 ****
  	[[HattrickOrg uniqueInstance] downloadArenaDetails];
  	[[HattrickOrg uniqueInstance] logout];
! 	[self assertTrue: [fileManager fileExistsAtPath:filename isDirectory:NO]];
  	NSString *file = [NSString stringWithContentsOfFile:filename];
! 	[self assertTrue: [file length] > 200];
! 	[self assertTrue: [file length] < 100000];
  }
  
--- 140,147 ----
  	[[HattrickOrg uniqueInstance] downloadArenaDetails];
  	[[HattrickOrg uniqueInstance] logout];
! 	UKTrue( [fileManager fileExistsAtPath:filename isDirectory:NO]);
  	NSString *file = [NSString stringWithContentsOfFile:filename];
! 	UKTrue( [file length] > 200);
! 	UKTrue( [file length] < 100000);
  }
  
***************
*** 145,152 ****
  	[[HattrickOrg uniqueInstance] downloadWorldDetails];
  	[[HattrickOrg uniqueInstance] logout];
! 	[self assertTrue: [fileManager fileExistsAtPath:filename isDirectory:NO]];
  	NSString *file = [NSString stringWithContentsOfFile:filename];
! 	[self assertTrue: [file length] > 200];
! 	[self assertTrue: [file length] < 100000];
  }
  
--- 153,160 ----
  	[[HattrickOrg uniqueInstance] downloadWorldDetails];
  	[[HattrickOrg uniqueInstance] logout];
! 	UKTrue( [fileManager fileExistsAtPath:filename isDirectory:NO]);
  	NSString *file = [NSString stringWithContentsOfFile:filename];
! 	UKTrue( [file length] > 200);
! 	UKTrue( [file length] < 100000);
  }
  
***************
*** 155,165 ****
  	[[HattrickOrg uniqueInstance] downloadPlayers];
  	NSFileManager *fileManager = [NSFileManager defaultManager];
! 	[self assertTrue: [fileManager fileExistsAtPath:[Properties playersFile] isDirectory:NO]];
  	NSString *playersFile = [NSString stringWithContentsOfFile:[Properties playersFile]];
! 	[self assertTrue: [playersFile length] > 20000];
  	[[HattrickOrg uniqueInstance] logout];
  	[[HattrickOrg uniqueInstance] downloadPlayers];
  	NSString *playersFileNew = [NSString stringWithContentsOfFile:[Properties playersFile]];
! 	[self assertTrue: [playersFileNew length] < 20000];
  	// replace the incorrect file with the correct one	
  	[[HattrickOrg uniqueInstance] login];
--- 163,173 ----
  	[[HattrickOrg uniqueInstance] downloadPlayers];
  	NSFileManager *fileManager = [NSFileManager defaultManager];
! 	UKTrue( [fileManager fileExistsAtPath:[Properties playersFile] isDirectory:NO]);
  	NSString *playersFile = [NSString stringWithContentsOfFile:[Properties playersFile]];
! 	UKTrue( [playersFile length] > 20000);
  	[[HattrickOrg uniqueInstance] logout];
  	[[HattrickOrg uniqueInstance] downloadPlayers];
  	NSString *playersFileNew = [NSString stringWithContentsOfFile:[Properties playersFile]];
! 	UKTrue( [playersFileNew length] < 20000);
  	// replace the incorrect file with the correct one	
  	[[HattrickOrg uniqueInstance] login];
***************
*** 172,176 ****
  	[[HattrickOrg uniqueInstance] setServerName:@"www.hattttrick.org"];
  	int errorCode = [[HattrickOrg uniqueInstance] login];
! 	[self assertTrue: errorCode != 0];
  	[[HattrickOrg uniqueInstance] setServerName:currentServerName];
  	[currentServerName release];
--- 180,184 ----
  	[[HattrickOrg uniqueInstance] setServerName:@"www.hattttrick.org"];
  	int errorCode = [[HattrickOrg uniqueInstance] login];
! 	UKTrue( errorCode != 0);
  	[[HattrickOrg uniqueInstance] setServerName:currentServerName];
  	[currentServerName release];
***************
*** 180,184 ****
  	[[HattrickOrg uniqueInstance] setLoginName:@"testli"];
  	int errorCode = [[HattrickOrg uniqueInstance] login];
! 	[self assertInt: errorCode equals: -3];
  	[[HattrickOrg uniqueInstance] setLoginName:currentLoginname];
  	[currentLoginname release];
--- 188,192 ----
  	[[HattrickOrg uniqueInstance] setLoginName:@"testli"];
  	int errorCode = [[HattrickOrg uniqueInstance] login];
! 	UKIntsEqual( errorCode , -3);
  	[[HattrickOrg uniqueInstance] setLoginName:currentLoginname];
  	[currentLoginname release];
***************
*** 189,193 ****
  	[[HattrickOrg uniqueInstance] setPassword:@"testli"];
  	int errorCode = [[HattrickOrg uniqueInstance] login];
! 	[self assertInt: errorCode equals: -3];
  	[[HattrickOrg uniqueInstance] setPassword:currentPassword];
  	[currentPassword release];
--- 197,201 ----
  	[[HattrickOrg uniqueInstance] setPassword:@"testli"];
  	int errorCode = [[HattrickOrg uniqueInstance] login];
! 	UKIntsEqual( errorCode , -3);
  	[[HattrickOrg uniqueInstance] setPassword:currentPassword];
  	[currentPassword release];

Index: EconomyTest.h
===================================================================
RCS file: /cvsroot/macattrick/macattrick/Test/EconomyTest.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** EconomyTest.h	4 Dec 2004 14:26:04 -0000	1.2
--- EconomyTest.h	27 Apr 2005 19:36:45 -0000	1.3
***************
*** 27,35 ****
  //---- eo licence ------------------------------------------------------------//
  
! #import <ObjcUnit/ObjcUnit.h>
  #import "Properties.h"
  #import "Economy.h"
  
! @interface EconomyTest  : TestCase {
  	Economy *economyLocal;
  }
--- 27,35 ----
  //---- eo licence ------------------------------------------------------------//
  
! #import <UnitKit/UnitKit.h>
  #import "Properties.h"
  #import "Economy.h"
  
! @interface EconomyTest  : NSObject <UKTest> {
  	Economy *economyLocal;
  }

Index: UserTest.h
===================================================================
RCS file: /cvsroot/macattrick/macattrick/Test/UserTest.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** UserTest.h	26 Sep 2004 13:45:38 -0000	1.1
--- UserTest.h	27 Apr 2005 19:36:45 -0000	1.2
***************
*** 28,35 ****
  
  #import <Cocoa/Cocoa.h>
! #import <ObjcUnit/ObjcUnit.h>
  #import "User.h"
  
! @interface UserTest : TestCase {
  
  }
--- 28,35 ----
  
  #import <Cocoa/Cocoa.h>
! #import <UnitKit/UnitKit.h>
  #import "User.h"
  
! @interface UserTest : NSObject <UKTest> {
  
  }

Index: PlayerTest.h
===================================================================
RCS file: /cvsroot/macattrick/macattrick/Test/PlayerTest.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** PlayerTest.h	28 Nov 2004 14:07:05 -0000	1.5
--- PlayerTest.h	27 Apr 2005 19:36:45 -0000	1.6
***************
*** 27,35 ****
  //---- eo licence ------------------------------------------------------------//
  
! #import <ObjcUnit/ObjcUnit.h>
  
  @class Player;
  
! @interface PlayerTest : TestCase {
  	Player *player1;
  	Player *walter;
--- 27,35 ----
  //---- eo licence ------------------------------------------------------------//
  
! #import <UnitKit/UnitKit.h>
  
  @class Player;
  
! @interface PlayerTest : NSObject <UKTest> {
  	Player *player1;
  	Player *walter;

Index: EconomyTest.m
===================================================================
RCS file: /cvsroot/macattrick/macattrick/Test/EconomyTest.m,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** EconomyTest.m	4 Dec 2004 14:26:04 -0000	1.3
--- EconomyTest.m	27 Apr 2005 19:36:45 -0000	1.4
***************
*** 33,36 ****
--- 33,44 ----
  
  
+ - (id) init {
+   self = [super init];
+   if(self) {
+ 		[self setUp];
+   }
+   return self;
+ }
+ 
  -(void) setUp {	
  	NSAutoreleasePool * pool = [[NSAutoreleasePool alloc] init];	
***************
*** 46,104 ****
  
  -(void) testInitWithLocalFile {
! 	[self assertNotNil:economyLocal];
! 	[self assertInt:[economyLocal cash] equals:3292300];
! 	[self assertInt:[economyLocal expectedCash] equals:4329401];
! 	[self assertInt:[economyLocal sponsorsPopularity] equals:8];
! 	[self assertInt:[economyLocal supportersPopularity] equals:7];
! 	[self assertInt:[economyLocal fanClubSize] equals:1187];
! 	[self assertInt:[economyLocal incomeSpectators] equals:1399925];
! 	[self assertInt:[economyLocal incomeSponsors] equals:608850];
! 	[self assertInt:[economyLocal incomeFinancial] equals:0];
! 	[self assertInt:[economyLocal incomeTemporary] equals:0];
! 	[self assertInt:[economyLocal incomeSum] equals:2008775];
! 	[self assertInt:[economyLocal costsArena] equals:160000];
! 	[self assertInt:[economyLocal costsPlayers] equals:231674];
! 	[self assertInt:[economyLocal costsFinancial] equals:0];
! 	[self assertInt:[economyLocal costsTemporary] equals:20000];
! 	[self assertInt:[economyLocal costsStaff] equals:360000];
! 	[self assertInt:[economyLocal costsYouth] equals:200000];
! 	[self assertInt:[economyLocal costsSum] equals:971674];
! 	[self assertInt:[economyLocal expectedWeeksTotal] equals:1037101];
! 	[self assertInt:[economyLocal lastIncomeSpectators] equals:26150];
! 	[self assertInt:[economyLocal lastIncomeSponsors] equals:600600];
! 	[self assertInt:[economyLocal lastIncomeFinancial] equals:0];
! 	[self assertInt:[economyLocal lastIncomeTemporary] equals:464709];
! 	[self assertInt:[economyLocal lastIncomeSum] equals:1091459];
! 	[self assertInt:[economyLocal lastCostsArena] equals:160000];
! 	[self assertInt:[economyLocal lastCostsPlayers] equals:222277];
! 	[self assertInt:[economyLocal lastCostsFinancial] equals:0];
! 	[self assertInt:[economyLocal lastCostsTemporary] equals:7865565];
! 	[self assertInt:[economyLocal lastCostsStaff] equals:405000];
! 	[self assertInt:[economyLocal lastCostsYouth] equals:200000];
! 	[self assertInt:[economyLocal lastCostsSum] equals:8852842];
! 	[self assertInt:[economyLocal lastWeeksTotal] equals:-7761383];
  }
  
  -(void) testDownload {
  	Economy* economy = [[Economy alloc] init];
! 	[self assertNotNil:economy message: @"is nil"];
! 	[self assertTrue:[economy incomeSponsors] > 0  message: @"incomeSponsors"];
! 	[self assertTrue:[economy incomeSum] > 0 message: @"incomeSum"];
! 	[self assertTrue:[economy costsSum] > 0 message: @"costsSum"];
! 	[self assertTrue:[economy lastIncomeSum] > 0 message:  @"lastIncomeSum"];
! 	[self assertTrue:[economy lastCostsSum] > 0 message: @"lastCostsSum"];	
! 	[self assertNotNil:[economy currencyName] message: @"currency name nil"];
! 	[self assertTrue:[economy currencyRate] > 0 message:@"currency rate <= 0"];
  	[economy release];
  }
  
  - (void) testTwoWeeksBalance {
! 	[self assertInt:[economyLocal twoWeeksBalance] equals:696574];
! 	[self assertInt:[economyLocal twoWeeksBalance] equals: 
  		([economyLocal incomeSum]-[economyLocal incomeTemporary]) 
  		+ ([economyLocal lastIncomeSum] - [economyLocal lastIncomeTemporary]) 
  		- ([economyLocal costsSum] - [economyLocal costsTemporary])
  		- ([economyLocal lastCostsSum] - [economyLocal lastCostsTemporary])
! 	];
  }
  
--- 54,112 ----
  
  -(void) testInitWithLocalFile {
! 	UKNotNil(economyLocal);
! 	UKIntsEqual([economyLocal cash] ,3292300);
! 	UKIntsEqual([economyLocal expectedCash] ,4329401);
! 	UKIntsEqual([economyLocal sponsorsPopularity] ,8);
! 	UKIntsEqual([economyLocal supportersPopularity] ,7);
! 	UKIntsEqual([economyLocal fanClubSize] ,1187);
! 	UKIntsEqual([economyLocal incomeSpectators] ,1399925);
! 	UKIntsEqual([economyLocal incomeSponsors] ,608850);
! 	UKIntsEqual([economyLocal incomeFinancial] ,0);
! 	UKIntsEqual([economyLocal incomeTemporary] ,0);
! 	UKIntsEqual([economyLocal incomeSum] ,2008775);
! 	UKIntsEqual([economyLocal costsArena] ,160000);
! 	UKIntsEqual([economyLocal costsPlayers] ,231674);
! 	UKIntsEqual([economyLocal costsFinancial] ,0);
! 	UKIntsEqual([economyLocal costsTemporary] ,20000);
! 	UKIntsEqual([economyLocal costsStaff] ,360000);
! 	UKIntsEqual([economyLocal costsYouth] ,200000);
! 	UKIntsEqual([economyLocal costsSum] ,971674);
! 	UKIntsEqual([economyLocal expectedWeeksTotal] ,1037101);
! 	UKIntsEqual([economyLocal lastIncomeSpectators] ,26150);
! 	UKIntsEqual([economyLocal lastIncomeSponsors] ,600600);
! 	UKIntsEqual([economyLocal lastIncomeFinancial] ,0);
! 	UKIntsEqual([economyLocal lastIncomeTemporary] ,464709);
! 	UKIntsEqual([economyLocal lastIncomeSum] ,1091459);
! 	UKIntsEqual([economyLocal lastCostsArena] ,160000);
! 	UKIntsEqual([economyLocal lastCostsPlayers] ,222277);
! 	UKIntsEqual([economyLocal lastCostsFinancial] ,0);
! 	UKIntsEqual([economyLocal lastCostsTemporary] ,7865565);
! 	UKIntsEqual([economyLocal lastCostsStaff] ,405000);
! 	UKIntsEqual([economyLocal lastCostsYouth] ,200000);
! 	UKIntsEqual([economyLocal lastCostsSum] ,8852842);
! 	UKIntsEqual([economyLocal lastWeeksTotal] ,-7761383);
  }
  
  -(void) testDownload {
  	Economy* economy = [[Economy alloc] init];
! 	UKNotNil(economy );
! 	UKTrue([economy incomeSponsors] > 0  );
! 	UKTrue([economy incomeSum] > 0 );
! 	UKTrue([economy costsSum] > 0 );
! 	UKTrue([economy lastIncomeSum] > 0 );
! 	UKTrue([economy lastCostsSum] > 0 );
! 	UKNotNil([economy currencyName]);
! 	UKTrue([economy currencyRate] > 0 );
  	[economy release];
  }
  
  - (void) testTwoWeeksBalance {
! 	UKIntsEqual([economyLocal twoWeeksBalance] ,696574);
! 	UKIntsEqual([economyLocal twoWeeksBalance], 
  		([economyLocal incomeSum]-[economyLocal incomeTemporary]) 
  		+ ([economyLocal lastIncomeSum] - [economyLocal lastIncomeTemporary]) 
  		- ([economyLocal costsSum] - [economyLocal costsTemporary])
  		- ([economyLocal lastCostsSum] - [economyLocal lastCostsTemporary])
! 	);
  }
  

Index: ArenaTest.h
===================================================================
RCS file: /cvsroot/macattrick/macattrick/Test/ArenaTest.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ArenaTest.h	21 Sep 2004 17:02:14 -0000	1.1
--- ArenaTest.h	27 Apr 2005 19:36:44 -0000	1.2
***************
*** 27,34 ****
  //---- eo licence ------------------------------------------------------------//
  
! #import <ObjcUnit/ObjcUnit.h>
  #import "Arena.h"
  
! @interface ArenaTest : TestCase {
  
  }
--- 27,34 ----
  //---- eo licence ------------------------------------------------------------//
  
! #import <UnitKit/UnitKit.h>
  #import "Arena.h"
  
! @interface ArenaTest : NSObject <UKTest> {
  
  }

Index: PlayerListTest.m
===================================================================
RCS file: /cvsroot/macattrick/macattrick/Test/PlayerListTest.m,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** PlayerListTest.m	28 Nov 2004 14:07:05 -0000	1.5
--- PlayerListTest.m	27 Apr 2005 19:36:45 -0000	1.6
***************
*** 31,34 ****
--- 31,42 ----
  @implementation PlayerListTest
  
+ - (id) init {
+   self = [super init];
+   if(self) {
+ 		[self setUp];
+   }
+   return self;
+ }
+ 
  - (void)setUp {
  	playerListLocal = [[PlayerList alloc] initFromXML:
***************
*** 50,59 ****
  	for(i = 0; i<26;i++)
  	{
! 		[self assertInt: [[playerListLocal playerAtIndex:i] playerID] equals: ids[i]];
  	}
  }
  
  - (void)testInitFromXML {
! 	[self assertInt:[playerListLocal numberOfPlayers] equals:  26];
  }
  
--- 58,67 ----
  	for(i = 0; i<26;i++)
  	{
! 		UKIntsEqual( [[playerListLocal playerAtIndex:i] playerID] , ids[i]);
  	}
  }
  
  - (void)testInitFromXML {
! 	UKIntsEqual([playerListLocal numberOfPlayers] ,  26);
  }
  
***************
*** 62,66 ****
  - (void)testDownload {
  	playerListDownload = [[PlayerList alloc] init];	
! 	[self assertTrue: [[playerListDownload playerList] count] > 0];
  	[playerListDownload release];
  }
--- 70,74 ----
  - (void)testDownload {
  	playerListDownload = [[PlayerList alloc] init];	
! 	UKTrue( [[playerListDownload playerList] count] > 0);
  	[playerListDownload release];
  }
***************
*** 68,86 ****
  - (void) testNonInjuredPlayers {
  	NSArray *nonInjured = [playerListLocal playersWithInjured:NO diqualified:YES];
! 	[self assertInt:[nonInjured count] equals:24];
  }
  
  - (void) testNonDiqualified {
  	NSArray *nonDisqualified = [playerListLocal playersWithInjured:YES diqualified:NO];
! 	[self assertInt:[nonDisqualified count] equals:25];
  }
  
  - (void) testPlayerWithID {
  	Player *marcel = [playerListLocal playerWithID:17108671];
! 	//[self assertNil: marcel message:@"marcel nil" ];
! 	[self assertString:[marcel playerName] equals:@"Marcel  Saledad"];
  	Player *hezi = [playerListLocal playerWithID:10589359];
! 	//[self assertNotNil: hezi message:@"hezi nil" ];
! 	[self assertString:[hezi playerName] equals:@"Hezi  Arad"];
  }
  
--- 76,94 ----
  - (void) testNonInjuredPlayers {
  	NSArray *nonInjured = [playerListLocal playersWithInjured:NO diqualified:YES];
! 	UKIntsEqual([nonInjured count] ,24);
  }
  
  - (void) testNonDiqualified {
  	NSArray *nonDisqualified = [playerListLocal playersWithInjured:YES diqualified:NO];
! 	UKIntsEqual([nonDisqualified count] ,25);
  }
  
  - (void) testPlayerWithID {
  	Player *marcel = [playerListLocal playerWithID:17108671];
! 	//UKNil( marcel );
! 	UKStringsEqual([marcel playerName] ,@"Marcel  Saledad");
  	Player *hezi = [playerListLocal playerWithID:10589359];
! 	//UKNotNil( hezi );
! 	UKStringsEqual([hezi playerName] ,@"Hezi  Arad");
  }
  
***************
*** 88,92 ****
  - (void) testTotalTsi {
  	playerListDownload = [[PlayerList alloc] init];	
! 	[self assertTrue: [playerListDownload totalTSI] > 100 message: @"total tsi <= 100"];
  	[playerListDownload release];	
  }
--- 96,100 ----
  - (void) testTotalTsi {
  	playerListDownload = [[PlayerList alloc] init];	
! 	UKTrue( [playerListDownload totalTSI] > 100 );
  	[playerListDownload release];	
  }
***************
*** 94,107 ****
  - (void) testAverageTsi {
  	playerListDownload = [[PlayerList alloc] init];	
! 	[self assertTrue: [playerListDownload averageTSI] > 10 message: @"average tsi <= 10"];
! 	[self assertInt:[playerListDownload averageTSI] equals:[playerListDownload totalTSI]/[playerListDownload numberOfPlayers]];
  	[playerListDownload release];	
  }
  
  - (void) testAverageAge {
! 	[self assertFloat:[playerListLocal averageAge] equals:24.53 precision:0.1];
  	playerListDownload = [[PlayerList alloc] init];		
! 	[self assertTrue:[playerListDownload averageAge] > 17 message: @"average age <= 17"];
! 	[self assertTrue:[playerListDownload averageAge] < 40 message: @"average age >= 40"];	
  	[playerListDownload release];
  }
--- 102,115 ----
  - (void) testAverageTsi {
  	playerListDownload = [[PlayerList alloc] init];	
! 	UKTrue( [playerListDownload averageTSI] > 10 );
! 	UKIntsEqual([playerListDownload averageTSI] ,[playerListDownload totalTSI]/[playerListDownload numberOfPlayers]);
  	[playerListDownload release];	
  }
  
  - (void) testAverageAge {
! 	UKFloatsEqual([playerListLocal averageAge] ,24.53 ,0.1);
  	playerListDownload = [[PlayerList alloc] init];		
! 	UKTrue([playerListDownload averageAge] > 17 );
! 	UKTrue([playerListDownload averageAge] < 40 );
  	[playerListDownload release];
  }

Index: LineUpTreeTest.h
===================================================================
RCS file: /cvsroot/macattrick/macattrick/Test/LineUpTreeTest.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** LineUpTreeTest.h	13 Sep 2004 19:38:25 -0000	1.2
--- LineUpTreeTest.h	27 Apr 2005 19:36:45 -0000	1.3
***************
*** 27,31 ****
  //---- eo licence ------------------------------------------------------------//
  #import <Foundation/Foundation.h>
! #import <ObjcUnit/ObjcUnit.h>
  #import "LineUpTree.h"
  #import "LineUpTreeLayer.h"
--- 27,31 ----
  //---- eo licence ------------------------------------------------------------//
  #import <Foundation/Foundation.h>
! #import <UnitKit/UnitKit.h>
  #import "LineUpTree.h"
  #import "LineUpTreeLayer.h"
***************
*** 33,37 ****
  #import "PlayerList.h"
  
! @interface LineUpTreeTest : TestCase {
  	PlayerList *playerList;
  	LineUpTree *lineUpTree;
--- 33,37 ----
  #import "PlayerList.h"
  
! @interface LineUpTreeTest : NSObject <UKTest> {
  	PlayerList *playerList;
  	LineUpTree *lineUpTree;

Index: PlayerListTest.h
===================================================================
RCS file: /cvsroot/macattrick/macattrick/Test/PlayerListTest.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** PlayerListTest.h	26 Sep 2004 12:04:10 -0000	1.2
--- PlayerListTest.h	27 Apr 2005 19:36:45 -0000	1.3
***************
*** 27,31 ****
  //---- eo licence ------------------------------------------------------------//
  
! #import <ObjcUnit/ObjcUnit.h>
  #import "AllTests.h"
  #import "HattrickOrg.h"
--- 27,31 ----
  //---- eo licence ------------------------------------------------------------//
  
! #import <UnitKit/UnitKit.h>
  #import "AllTests.h"
  #import "HattrickOrg.h"
***************
*** 34,38 ****
  #import "Player.h"
  
! @interface PlayerListTest : TestCase {
  	PlayerList *playerListDownload;
  	PlayerList *playerListLocal;
--- 34,38 ----
  #import "Player.h"
  
! @interface PlayerListTest : NSObject <UKTest> {
  	PlayerList *playerListDownload;
  	PlayerList *playerListLocal;

Index: LineUpTreeTest.m
===================================================================
RCS file: /cvsroot/macattrick/macattrick/Test/LineUpTreeTest.m,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** LineUpTreeTest.m	25 Apr 2005 20:23:02 -0000	1.11
--- LineUpTreeTest.m	27 Apr 2005 19:36:45 -0000	1.12
***************
*** 35,38 ****
--- 35,46 ----
  
  @implementation LineUpTreeTest
+ - (id) init {
+   self = [super init];
+   if(self) {
+ 		[self setUp];
+   }
+   return self;
+ }
+ 
  - (void)setUp {
  	playerList = [[PlayerList alloc] initFromXML:
***************
*** 46,57 ****
  	[lineUpTree buildTree: 0.98 playerList:  playerSet];
  	LineUpTreeLayer *finalLayer = [lineUpTree finalLayer];
! 	[self assertNotNil:finalLayer];
! 	[self assertTrue: ([[finalLayer layerNodes] count] >70) ];
  	NSArray *lineUp = [lineUpTree bestLineUp];
! 	[self assertInt:[lineUp count] equals:11];
  	NSEnumerator *en = [lineUp objectEnumerator];
  	LineUpTreeNode *node;
  	while (node = [en nextObject]) {
! 		[self assertNotNil: [[node player] playerName]];
  	}
  }
--- 54,65 ----
  	[lineUpTree buildTree: 0.98 playerList:  playerSet];
  	LineUpTreeLayer *finalLayer = [lineUpTree finalLayer];
! 	UKNotNil(finalLayer);
! 	UKTrue( ([[finalLayer layerNodes] count] >70) );
  	NSArray *lineUp = [lineUpTree bestLineUp];
! 	UKIntsEqual([lineUp count] ,11);
  	NSEnumerator *en = [lineUp objectEnumerator];
  	LineUpTreeNode *node;
  	while (node = [en nextObject]) {
! 		UKNotNil( [[node player] playerName]);
  	}
  }
***************
*** 76,83 ****
  	NSSet *playerSet = [NSSet setWithArray:[playerList playerList]];
  	[lineUpTree buildTree: 0.99 playerList:  playerSet];
! 	[self assertFloat: [lineUpTree strength:@"Total"] equals:40.0 precision:1.5];
! 	[self assertFloat: [lineUpTree strength:@"Defense"] equals:16.0 precision:1.5];
! 	[self assertFloat: [lineUpTree strength:@"Midfield"] equals:18.0 precision:1.5];
! 	[self assertFloat: [lineUpTree strength:@"Attack"] equals:6 precision:1.5];
  	
  }
--- 84,91 ----
  	NSSet *playerSet = [NSSet setWithArray:[playerList playerList]];
  	[lineUpTree buildTree: 0.99 playerList:  playerSet];
! 	UKFloatsEqual( [lineUpTree strength:@"Total"] ,40.0 ,1.5);
! 	UKFloatsEqual( [lineUpTree strength:@"Defense"] ,16.0 ,1.5);
! 	UKFloatsEqual( [lineUpTree strength:@"Midfield"] ,18.0 ,1.5);
! 	UKFloatsEqual( [lineUpTree strength:@"Attack"] ,6 ,1.5);
  	
  }

Index: AllTests.m
===================================================================
RCS file: /cvsroot/macattrick/macattrick/Test/AllTests.m,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** AllTests.m	7 Feb 2005 21:16:28 -0000	1.19
--- AllTests.m	27 Apr 2005 19:36:44 -0000	1.20
***************
*** 52,56 ****
  
  @implementation AllTests
! 
  + (AllTests *)suite {
      return [[[self alloc] initWithName:@"All Example Tests"] autorelease];
--- 52,56 ----
  
  @implementation AllTests
! /*
  + (AllTests *)suite {
      return [[[self alloc] initWithName:@"All Example Tests"] autorelease];
***************
*** 81,84 ****
--- 81,85 ----
      return self;
  }
+ */
  
  +(id) getProperty: (id) aKey {
***************
*** 96,98 ****
  }
  
! @end
\ No newline at end of file
--- 97,99 ----
  }
  
! @end

Index: PositionTest.m
===================================================================
RCS file: /cvsroot/macattrick/macattrick/Test/PositionTest.m,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** PositionTest.m	25 Apr 2005 20:23:02 -0000	1.10
--- PositionTest.m	27 Apr 2005 19:36:45 -0000	1.11
***************
*** 32,35 ****
--- 32,43 ----
  @implementation PositionTest
  
+ - (id) init {
+   self = [super init];
+   if(self) {
+ 		[self setUp];
+   }
+   return self;
+ }
+ 
  - (void) setUp {
  	positionKeeper = [[PositionHeap uniqueInstance] defaultPositionWithIdentifier:@"Keeper"];
***************
*** 53,151 ****
  
  - (void) testPositionKeeper{
! 	[self assertFloat:[player1 calculatePositionValue: [[PositionHeap uniqueInstance] defaultPositionWithIdentifier:@"Keeper"]] equals: 6 precision:0.1];
! 	[self assertFloat:[player2 calculatePositionValue: [[PositionHeap uniqueInstance] defaultPositionWithIdentifier:@"Keeper"]] equals: 1 precision:0.1];
  }
  - (void) testPositionCentralDefender {
! 	[self assertFloat:[player1 calculatePositionValue: [[PositionHeap uniqueInstance] defaultPositionWithIdentifier:@"Central Defender"]] equals: 1.5 precision:0.1];
! 	[self assertFloat:[player2 calculatePositionValue: [[PositionHeap uniqueInstance] defaultPositionWithIdentifier:@"Central Defender"]] equals: 3.5 precision:0.1];	
  }
  - (void) testPositionCentralDefenderTowardsWing {
! 	[self assertFloat:[player1 calculatePositionValue: [[PositionHeap uniqueInstance] defaultPositionWithIdentifier:@"Central Defender Towards Wing"]] equals: 1.5 precision:0.1];
! 	[self assertFloat:[player2 calculatePositionValue: [[PositionHeap uniqueInstance] defaultPositionWithIdentifier:@"Central Defender Towards Wing"]] equals: 3.5 precision:0.1];	
  }
  - (void) testPositionCentralDefenderOffensive {
! 	[self assertFloat:[player1 calculatePositionValue: [[PositionHeap uniqueInstance] defaultPositionWithIdentifier:@"Central Defender Offensive"]] equals: 1.5 precision:0.1];
! 	[self assertFloat:[player2 calculatePositionValue: [[PositionHeap uniqueInstance] defaultPositionWithIdentifier:@"Central Defender Offensive"]] equals: 3.9 precision:0.1];	
  }
  - (void) testPositionWingBack {
! 	[self assertFloat:[player1 calculatePositionValue: [[PositionHeap uniqueInstance] defaultPositionWithIdentifier:@"Wingback"]] equals: 1.5 precision:0.1];
! 	[self assertFloat:[player2 calculatePositionValue: [[PositionHeap uniqueInstance] defaultPositionWithIdentifier:@"Wingback"]] equals: 3.6 precision:0.1];	
  }
  - (void) testPositionWingBackTowardsMiddle {
! 	[self assertFloat:[player1 calculatePositionValue: [[PositionHeap uniqueInstance] defaultPositionWithIdentifier:@"Wingback Towards Middle"]] equals: 1.5 precision:0.1];
! 	[self assertFloat:[player2 calculatePositionValue: [[PositionHeap uniqueInstance] defaultPositionWithIdentifier:@"Wingback Towards Middle"]] equals: 3.6 precision:0.1];	
  }
  - (void) testPositionWingBackDefensive {
!...
 
[truncated message content]