Menu
▾
▴
macattrick-commit — Every CVS commit will be sent to macattrick-commit.
You can subscribe to this list here.
| 2005 |
Jan
(13) |
Feb
(37) |
Mar
(12) |
Apr
(15) |
May
(46) |
Jun
(40) |
Jul
(27) |
Aug
|
Sep
(35) |
Oct
(15) |
Nov
|
Dec
|
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(6) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Geisschaes <gei...@us...> - 2005-04-27 19:36:55
|
Update of /cvsroot/macattrick/macattrick/Macattrick.xcode In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5163/Macattrick.xcode Modified Files: project.pbxproj roman.mode1 roman.pbxuser Log Message: Migration of tests from ObjcUnit to UnitKit, small bugs fixed Index: project.pbxproj =================================================================== RCS file: /cvsroot/macattrick/macattrick/Macattrick.xcode/project.pbxproj,v retrieving revision 1.68 retrieving revision 1.69 diff -C2 -d -r1.68 -r1.69 *** project.pbxproj 27 Mar 2005 12:23:33 -0000 1.68 --- project.pbxproj 27 Apr 2005 19:36:38 -0000 1.69 *************** *** 160,163 **** --- 160,164 ---- 1058C7A0FEA54F0111CA2CBB = { children = ( + 309913DF0820006E00FBF240, 29B97325FDCFA39411CA2CEA, 3070D2640775D4B000D7C16B, *************** *** 179,183 **** 1058C7A2FEA54F0111CA2CBB = { children = ( [...3658 lines suppressed...] --- 6957,6960 ---- *************** *** 5690,5705 **** }; }; - 30E28526077F06F700DB648A = { - fileRef = 30E28520077F06F700DB648A; - isa = PBXBuildFile; - settings = { - }; - }; - 30E28527077F06F700DB648A = { - fileRef = 30E28521077F06F700DB648A; - isa = PBXBuildFile; - settings = { - }; - }; 30E66334066DF49000D9A3DD = { isa = PBXFileReference; --- 6997,7000 ---- Index: roman.mode1 =================================================================== RCS file: /cvsroot/macattrick/macattrick/Macattrick.xcode/roman.mode1,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** roman.mode1 25 Apr 2005 20:22:38 -0000 1.26 --- roman.mode1 27 Apr 2005 19:36:39 -0000 1.27 *************** *** 206,211 **** <array> <dict> - <key>BecomeActive</key> - <true/> <key>ContentConfiguration</key> <dict> --- 206,209 ---- *************** *** 244,249 **** <array> <string>29B97314FDCFA39411CA2CEA</string> <string>1C37FBAC04509CD000000102</string> - <string>302E1BDA081D87CE004659AF</string> <string>1C37FAAC04509CD000000102</string> </array> --- 242,249 ---- <array> <string>29B97314FDCFA39411CA2CEA</string> + <string>301244D406F3298200DE7918</string> + <string>29B97323FDCFA39411CA2CEA</string> + <string>1058C7A0FEA54F0111CA2CBB</string> <string>1C37FBAC04509CD000000102</string> <string>1C37FAAC04509CD000000102</string> </array> *************** *** 251,255 **** <array> <array> ! <integer>4</integer> <integer>0</integer> </array> --- 251,255 ---- <array> <array> ! <integer>3</integer> <integer>0</integer> </array> *************** *** 271,275 **** </array> <key>RubberWindowFrame</key> ! <string>125 163 998 665 0 0 1280 832 </string> </dict> <key>Module</key> --- 271,275 ---- </array> <key>RubberWindowFrame</key> ! <string>565 166 998 665 0 0 1280 832 </string> </dict> <key>Module</key> *************** *** 287,291 **** <string>1CE0B20306471E060097A5F4</string> <key>PBXProjectModuleLabel</key> ! <string>LineUpController.m</string> <key>PBXSplitModuleInNavigatorKey</key> <dict> --- 287,291 ---- <string>1CE0B20306471E060097A5F4</string> <key>PBXProjectModuleLabel</key> ! <string>LeagueTest.m</string> <key>PBXSplitModuleInNavigatorKey</key> <dict> *************** *** 295,301 **** <string>1CE0B20406471E060097A5F4</string> <key>PBXProjectModuleLabel</key> ! <string>LineUpController.m</string> <key>bookmark</key> ! <string>302E1BFB081D88CA004659AF</string> <key>history</key> <array> --- 295,301 ---- <string>1CE0B20406471E060097A5F4</string> <key>PBXProjectModuleLabel</key> ! <string>LeagueTest.m</string> <key>bookmark</key> ! <string>30DFA632082020D7000CE74D</string> <key>history</key> <array> *************** *** 310,329 **** <string>306095380792FF3E00BAA4CF</string> <string>30609625079318BE00BAA4CF</string> - <string>306096300793190400BAA4CF</string> - <string>3060964307931A3C00BAA4CF</string> - <string>3060967E07931DDA00BAA4CF</string> - <string>306096C4079325B700BAA4CF</string> - <string>306F7F9707992C5300FC68E8</string> - <string>306F7F9F07992D0F00FC68E8</string> <string>304A3C52079ACC7700358038</string> <string>304A3CA2079AD44E00358038</string> <string>304A3CB4079AD56A00358038</string> <string>3031CB3407A0495A006539CD</string> - <string>3031CB4007A04A5B006539CD</string> <string>3021F78507A56FCE0073597B</string> - <string>3021F79F07A575590073597B</string> - <string>3021F7DE07A57D510073597B</string> - <string>3021F7E407A5810F0073597B</string> - <string>3021F7FA07A590F30073597B</string> <string>30884AD707ABF924001F2ACB</string> <string>3092DC1807B66D430043063E</string> --- 310,318 ---- *************** *** 331,341 **** <string>3092DC1D07B66D430043063E</string> <string>30CBF0FA07B693F8005A0707</string> - <string>30CBF0FB07B693F8005A0707</string> - <string>306BE2D007B80670009942ED</string> - <string>306BE2D207B80670009942ED</string> - <string>30BA8B5307B80A60001B29F3</string> - <string>30BA8BAB07B81026001B29F3</string> - <string>30DE3EC607C3BC3600342677</string> - <string>30DE3EE507C3C66400342677</string> <string>301CA97807C749EC00FABBCC</string> <string>307FFA9607C7839400F1D476</string> --- 320,323 ---- *************** *** 345,372 **** <string>307FFA9A07C7839400F1D476</string> <string>307C1F3407D1FC7A00CA6B3D</string> - <string>307C1F3507D1FC7A00CA6B3D</string> - <string>307C1F3607D1FC7A00CA6B3D</string> - <string>307C1F3C07D1FCAA00CA6B3D</string> - <string>307C1F5E07D200EF00CA6B3D</string> <string>307C1F7507D2033400CA6B3D</string> - <string>3077E26307D2177A00C67D29</string> <string>3092461907D77EA20052A124</string> - <string>3092461B07D77EA20052A124</string> <string>3088330307E613DD0078CE5B</string> - <string>302FC30707E617FE00334603</string> - <string>302FC30807E617FE00334603</string> - <string>302FC30907E617FE00334603</string> - <string>302FC30A07E617FE00334603</string> - <string>302FC30B07E617FE00334603</string> - <string>302FC30C07E617FE00334603</string> - <string>302FC30D07E617FE00334603</string> - <string>302FC30E07E617FE00334603</string> - <string>302FC30F07E617FE00334603</string> - <string>302FC31007E617FE00334603</string> - <string>302FC31107E617FE00334603</string> - <string>302FC31207E617FE00334603</string> - <string>302FC31307E617FE00334603</string> - <string>302FC32807E6187500334603</string> - <string>30272CA707F5672900B39CEA</string> <string>30272CF107F57DD400B39CEA</string> <string>30272CF207F57DD400B39CEA</string> --- 327,333 ---- *************** *** 394,414 **** <string>30272D2A07F57E2100B39CEA</string> <string>30272D3507F5809800B39CEA</string> - <string>30272D3707F5809800B39CEA</string> - <string>30272D4207F5816400B39CEA</string> - <string>30272D4307F5816400B39CEA</string> - <string>30EFC39107F6CFF500009D39</string> - <string>30EFC39207F6CFF500009D39</string> - <string>30EFC3B607F6D5F600009D39</string> - <string>30EFC3D507F6DA9000009D39</string> <string>3081C09707F7F83900C958A9</string> ! <string>30DD3C8B07F874EB00FE74BF</string> ! <string>302E1B18081D6697004659AF</string> ! <string>302E1B3C081D741F004659AF</string> ! <string>302E1B3D081D741F004659AF</string> ! <string>302E1B99081D7EA9004659AF</string> ! <string>302E1BA0081D8004004659AF</string> ! <string>302E1BA1081D8004004659AF</string> ! <string>302E1BC7081D83D3004659AF</string> ! <string>302E1BC8081D83D3004659AF</string> </array> <key>prevStack</key> --- 355,439 ---- <string>30272D2A07F57E2100B39CEA</string> <string>30272D3507F5809800B39CEA</string> <string>3081C09707F7F83900C958A9</string> ! <string>309913D6081FFED700FBF240</string> ! <string>309914240820020A00FBF240</string> ! <string>309915710820073A00FBF240</string> ! <string>30DFA42F08201444000CE74D</string> ! <string>30DFA4E8082019A1000CE74D</string> ! <string>30DFA4E9082019A1000CE74D</string> ! <string>30DFA4EA082019A1000CE74D</string> ! <string>30DFA4EB082019A1000CE74D</string> ! <string>30DFA4EC082019A1000CE74D</string> ! <string>30DFA4EE082019A1000CE74D</string> ! <string>30DFA4EF082019A1000CE74D</string> ! <string>30DFA4F1082019A1000CE74D</string> ! <string>30DFA4F2082019A1000CE74D</string> ! <string>30DFA4F3082019A1000CE74D</string> ! <string>30DFA4F4082019A1000CE74D</string> ! <string>30DFA4F5082019A1000CE74D</string> ! <string>30DFA4F6082019A1000CE74D</string> ! <string>30DFA4F7082019A1000CE74D</string> ! <string>30DFA4F8082019A1000CE74D</string> ! <string>30DFA4F9082019A1000CE74D</string> ! <string>30DFA4FA082019A1000CE74D</string> ! <string>30DFA4FB082019A1000CE74D</string> ! <string>30DFA4FC082019A1000CE74D</string> ! <string>30DFA4FD082019A1000CE74D</string> ! <string>30DFA4FF082019A1000CE74D</string> ! <string>30DFA500082019A1000CE74D</string> ! <string>30DFA501082019A1000CE74D</string> ! <string>30DFA502082019A1000CE74D</string> ! <string>30DFA503082019A1000CE74D</string> ! <string>30DFA504082019A1000CE74D</string> ! <string>30DFA505082019A1000CE74D</string> ! <string>30DFA506082019A1000CE74D</string> ! <string>30DFA507082019A1000CE74D</string> ! <string>30DFA508082019A1000CE74D</string> ! <string>30DFA509082019A1000CE74D</string> ! <string>30DFA50A082019A1000CE74D</string> ! <string>30DFA50B082019A1000CE74D</string> ! <string>30DFA50C082019A1000CE74D</string> ! <string>30DFA50E082019A1000CE74D</string> ! <string>30DFA50F082019A1000CE74D</string> ! <string>30DFA510082019A1000CE74D</string> ! <string>30DFA511082019A1000CE74D</string> ! <string>30DFA512082019A1000CE74D</string> ! <string>30DFA514082019A1000CE74D</string> ! <string>30DFA515082019A1000CE74D</string> ! <string>30DFA516082019A1000CE74D</string> ! <string>30DFA517082019A1000CE74D</string> ! <string>30DFA518082019A1000CE74D</string> ! <string>30DFA519082019A1000CE74D</string> ! <string>30DFA51A082019A1000CE74D</string> ! <string>30DFA51B082019A1000CE74D</string> ! <string>30DFA51C082019A1000CE74D</string> ! <string>30DFA51D082019A1000CE74D</string> ! <string>30DFA51E082019A1000CE74D</string> ! <string>30DFA51F082019A1000CE74D</string> ! <string>30DFA520082019A1000CE74D</string> ! <string>30DFA521082019A1000CE74D</string> ! <string>30DFA522082019A1000CE74D</string> ! <string>30DFA523082019A1000CE74D</string> ! <string>30DFA524082019A1000CE74D</string> ! <string>30DFA526082019A1000CE74D</string> ! <string>30DFA527082019A1000CE74D</string> ! <string>30DFA528082019A1000CE74D</string> ! <string>30DFA529082019A1000CE74D</string> ! <string>30DFA52A082019A1000CE74D</string> ! <string>30DFA52B082019A1000CE74D</string> ! <string>30DFA52C082019A1000CE74D</string> ! <string>30DFA52D082019A1000CE74D</string> ! <string>30DFA52E082019A1000CE74D</string> ! <string>30DFA52F082019A1000CE74D</string> ! <string>30DFA530082019A1000CE74D</string> ! <string>30DFA531082019A1000CE74D</string> ! <string>30DFA5E008201A96000CE74D</string> ! <string>30DFA5E108201A96000CE74D</string> ! <string>30DFA5E208201A96000CE74D</string> ! <string>30DFA5E308201A96000CE74D</string> ! <string>30DFA5F008201AFB000CE74D</string> ! <string>30DFA61A08201FA5000CE74D</string> ! <string>30DFA61B08201FA5000CE74D</string> ! <string>30DFA61C08201FA5000CE74D</string> </array> <key>prevStack</key> *************** *** 522,533 **** <string>3068914307F8506600B7B336</string> <string>30DD3C8C07F874EB00FE74BF</string> - <string>302E1B1B081D6697004659AF</string> <string>302E1B1C081D6697004659AF</string> <string>302E1B3E081D741F004659AF</string> - <string>302E1B3F081D741F004659AF</string> - <string>302E1B9B081D7EA9004659AF</string> <string>302E1BA2081D8004004659AF</string> ! <string>302E1BA3081D8004004659AF</string> ! <string>302E1BC9081D83D3004659AF</string> </array> </dict> --- 547,581 ---- <string>3068914307F8506600B7B336</string> <string>30DD3C8C07F874EB00FE74BF</string> <string>302E1B1C081D6697004659AF</string> <string>302E1B3E081D741F004659AF</string> <string>302E1BA2081D8004004659AF</string> ! <string>309914270820020A00FBF240</string> ! <string>3099144F0820025B00FBF240</string> ! <string>309914500820025B00FBF240</string> ! <string>309914550820025B00FBF240</string> ! <string>309914D9082002CD00FBF240</string> ! <string>309914DE082002CD00FBF240</string> ! <string>309914DF082002CD00FBF240</string> ! <string>309914E2082002CD00FBF240</string> ! <string>309914E5082002CD00FBF240</string> ! <string>309914E8082002CD00FBF240</string> ! <string>309914F0082002CE00FBF240</string> ! <string>309914F3082002CE00FBF240</string> ! <string>309914F6082002CE00FBF240</string> ! <string>309914F7082002CE00FBF240</string> ! <string>309914F8082002CE00FBF240</string> ! <string>309914FA082002CE00FBF240</string> ! <string>309914FE082002CE00FBF240</string> ! <string>309914FF082002CE00FBF240</string> ! <string>30991501082002CE00FBF240</string> ! <string>3099150B082002CE00FBF240</string> ! <string>3099150E082002CE00FBF240</string> ! <string>30991510082002CE00FBF240</string> ! <string>3099156E082006C500FBF240</string> ! <string>309915730820073A00FBF240</string> ! <string>30DFA43408201444000CE74D</string> ! <string>30DFA61D08201FA5000CE74D</string> ! <string>30DFA61E08201FA5000CE74D</string> ! <string>30DFA61F08201FA5000CE74D</string> </array> </dict> *************** *** 541,554 **** <dict> <key>Frame</key> ! <string>{{0, 0}, {653, 358}}</string> <key>RubberWindowFrame</key> ! <string>125 163 998 665 0 0 1280 832 </string> </dict> <key>Module</key> <string>PBXNavigatorGroup</string> <key>Proportion</key> ! <string>358pt</string> </dict> <dict> <key>ContentConfiguration</key> <dict> --- 589,604 ---- <dict> <key>Frame</key> ! <string>{{0, 0}, {653, 391}}</string> <key>RubberWindowFrame</key> ! <string>565 166 998 665 0 0 1280 832 </string> </dict> <key>Module</key> <string>PBXNavigatorGroup</string> <key>Proportion</key> ! <string>391pt</string> </dict> <dict> + <key>BecomeActive</key> + <true/> <key>ContentConfiguration</key> <dict> *************** *** 561,572 **** <dict> <key>Frame</key> ! <string>{{0, 365}, {653, 258}}</string> <key>RubberWindowFrame</key> ! <string>125 163 998 665 0 0 1280 832 </string> </dict> <key>Module</key> <string>XCDetailModule</string> <key>Proportion</key> ! <string>258pt</string> </dict> </array> --- 611,622 ---- <dict> <key>Frame</key> ! <string>{{0, 398}, {653, 225}}</string> <key>RubberWindowFrame</key> ! <string>565 166 998 665 0 0 1280 832 </string> </dict> <key>Module</key> <string>XCDetailModule</string> <key>Proportion</key> ! <string>225pt</string> </dict> </array> *************** *** 587,593 **** <key>TableOfContents</key> <array> ! <string>302E1B06081D63A7004659AF</string> <string>1CE0B1FE06471DED0097A5F4</string> ! <string>302E1B07081D63A7004659AF</string> <string>1CE0B20306471E060097A5F4</string> <string>1CE0B20506471E060097A5F4</string> --- 637,643 ---- <key>TableOfContents</key> <array> ! <string>30DFA60B08201D84000CE74D</string> <string>1CE0B1FE06471DED0097A5F4</string> ! <string>30DFA60C08201D84000CE74D</string> <string>1CE0B20306471E060097A5F4</string> <string>1CE0B20506471E060097A5F4</string> *************** *** 617,630 **** <key>WindowOrderList</key> <array> - <string>302E1B09081D63A7004659AF</string> - <string>1CD10A99069EF8BA00B06720</string> - <string>1C530D57069F1CE1000CFCEE</string> - <string>303B689D075A03FF009951CC</string> - <string>303B68B1075A0D24009951CC</string> <string>1C0AD2B3069F1EA900FABCE6</string> <string>/Users/roman/Documents/dev/macattrick/Macattrick.xcode</string> </array> <key>WindowString</key> ! <string>125 163 998 665 0 0 1280 832 </string> <key>WindowTools</key> <array> --- 667,677 ---- <key>WindowOrderList</key> <array> <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> *************** *** 645,649 **** <string>1CD0528F0623707200166675</string> <key>PBXProjectModuleLabel</key> ! <string>Position.m</string> <key>PBXSplitModuleInNavigatorKey</key> <dict> --- 692,696 ---- <string>1CD0528F0623707200166675</string> <key>PBXProjectModuleLabel</key> ! <string>LeagueTest.m</string> <key>PBXSplitModuleInNavigatorKey</key> <dict> *************** *** 653,664 **** <string>1CD052900623707200166675</string> <key>PBXProjectModuleLabel</key> ! <string>Position.m</string> <key>bookmark</key> ! <string>302E1BFC081D88CA004659AF</string> <key>history</key> <array> <string>302E1B51081D7557004659AF</string> <string>302E1B6A081D79E6004659AF</string> ! <string>302E1B6B081D79E6004659AF</string> </array> <key>prevStack</key> --- 700,716 ---- <string>1CD052900623707200166675</string> <key>PBXProjectModuleLabel</key> ! <string>LeagueTest.m</string> <key>bookmark</key> ! <string>30DFA633082020D7000CE74D</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>30DFA60F08201D84000CE74D</string> </array> <key>prevStack</key> *************** *** 666,669 **** --- 718,728 ---- <string>302E1B53081D7557004659AF</string> <string>302E1B6C081D79E6004659AF</string> + <string>3099154E082003B900FBF240</string> + <string>309915620820063500FBF240</string> + <string>30DFA11A0820095F000CE74D</string> + <string>30DFA11B0820095F000CE74D</string> + <string>30DFA11C0820095F000CE74D</string> + <string>30DFA61008201D84000CE74D</string> + <string>30DFA61108201D84000CE74D</string> </array> </dict> *************** *** 679,683 **** <string>{{0, 0}, {665, 241}}</string> <key>RubberWindowFrame</key> ! <string>571 169 665 526 0 0 1280 832 </string> </dict> <key>Module</key> --- 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> *************** *** 687,692 **** </dict> <dict> - <key>BecomeActive</key> - <true/> <key>ContentConfiguration</key> <dict> --- 746,749 ---- *************** *** 705,709 **** <string>{{0, 248}, {665, 236}}</string> <key>RubberWindowFrame</key> ! <string>571 169 665 526 0 0 1280 832 </string> </dict> <key>Module</key> --- 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> *************** *** 728,732 **** <array> <string>303B68B1075A0D24009951CC</string> ! <string>302E1B4A081D74B0004659AF</string> <string>1CD0528F0623707200166675</string> <string>XCMainBuildResultsModuleGUID</string> --- 785,789 ---- <array> <string>303B68B1075A0D24009951CC</string> ! <string>30DFA61308201D84000CE74D</string> <string>1CD0528F0623707200166675</string> <string>XCMainBuildResultsModuleGUID</string> *************** *** 735,739 **** <string>xcode.toolbar.config.build</string> <key>WindowString</key> ! <string>571 169 665 526 0 0 1280 832 </string> <key>WindowToolGUID</key> <string>303B68B1075A0D24009951CC</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> *************** *** 873,882 **** <key>PBXProjectModuleLabel</key> <string>LineUpController.m</string> - <key>bookmark</key> - <string>302E1BFD081D88CA004659AF</string> - <key>history</key> - <array> - <string>302E1B28081D717A004659AF</string> - </array> </dict> <key>SplitCount</key> --- 930,933 ---- *************** *** 903,906 **** --- 954,959 ---- </dict> <dict> + <key>BecomeActive</key> + <true/> <key>ContentConfiguration</key> <dict> *************** *** 938,943 **** <array> <string>1C530D57069F1CE1000CFCEE</string> ! <string>302E1B0F081D6465004659AF</string> ! <string>302E1B10081D6465004659AF</string> <string>1CDD528C0622207200134675</string> <string>1CD0528E0623707200166675</string> --- 991,996 ---- <array> <string>1C530D57069F1CE1000CFCEE</string> ! <string>30DFA6280820204A000CE74D</string> ! <string>30DFA6290820204A000CE74D</string> <string>1CDD528C0622207200134675</string> <string>1CD0528E0623707200166675</string> *************** *** 1045,1050 **** <key>sizes</key> <array> ! <string>{{0, 0}, {366, 167}}</string> ! <string>{{0, 176}, {366, 267}}</string> </array> </dict> --- 1098,1103 ---- <key>sizes</key> <array> ! <string>{{0, 0}, {491, 167}}</string> ! <string>{{0, 176}, {491, 267}}</string> </array> </dict> *************** *** 1072,1076 **** <string>{{0, 0}, {707, 467}}</string> <key>RubberWindowFrame</key> ! <string>265 191 707 509 0 0 1280 832 </string> </dict> <key>Module</key> --- 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> *************** *** 1095,1106 **** <array> <string>1C0AD2B3069F1EA900FABCE6</string> ! <string>302E1B0A081D63A7004659AF</string> <string>1CD0528B0623707200166675</string> ! <string>302E1B0B081D63A7004659AF</string> </array> <key>ToolbarConfiguration</key> <string>xcode.toolbar.config.run</string> <key>WindowString</key> ! <string>265 191 707 509 0 0 1280 832 </string> <key>WindowToolGUID</key> <string>1C0AD2B3069F1EA900FABCE6</string> --- 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> Index: roman.pbxuser =================================================================== RCS file: /cvsroot/macattrick/macattrick/Macattrick.xcode/roman.pbxuser,v retrieving revision 1.91 retrieving revision 1.92 diff -C2 -d -r1.91 -r1.92 *** roman.pbxuser 25 Apr 2005 20:22:39 -0000 1.91 --- roman.pbxuser 27 Apr 2005 19:36:39 -0000 1.92 *************** *** 38,47 **** }; 29B97313FDCFA39411CA2CEA = { ! activeBuildStyle = 4A9504CDFFE6A4B311CA0CBA; ! activeExecutable = 30744BA6069560A70039B82A; ! activeTarget = 30744BA4069560A70039B82A; addToTargets = ( - 30744BA4069560A70039B82A, - 30950682067C4D100077C270, ); breakpoints = ( [...3872 lines suppressed...] - vrLoc = 6408; - }; 32CA4F630368D1EE00C91783 = { uiCtxt = { --- 5390,5404 ---- sepNavIntBoundsRect = "{{0, 0}, {606, 545}}"; sepNavSelRange = "{2147, 0}"; ! sepNavVisRect = "{{0, 150}, {606, 359}}"; }; }; 30EC0BED06425140008B3F6B = { uiCtxt = { ! sepNavIntBoundsRect = "{{0, 0}, {606, 2869}}"; ! sepNavSelRange = "{8861, 0}"; ! sepNavVisRect = "{{0, 1991}, {606, 359}}"; sepNavWindowFrame = "{{200, 70}, {965, 582}}"; }; }; 32CA4F630368D1EE00C91783 = { uiCtxt = { |
|
From: Geisschaes <gei...@us...> - 2005-04-27 19:36:55
|
Update of /cvsroot/macattrick/macattrick/scripts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5163/scripts Modified Files: objcunit2unitkit.pl Log Message: Migration of tests from ObjcUnit to UnitKit, small bugs fixed Index: objcunit2unitkit.pl =================================================================== RCS file: /cvsroot/macattrick/macattrick/scripts/objcunit2unitkit.pl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** objcunit2unitkit.pl 27 Apr 2005 08:05:56 -0000 1.2 --- objcunit2unitkit.pl 27 Apr 2005 19:36:45 -0000 1.3 *************** *** 54,58 **** } elsif(/assertFalse:/) { ! if(s/^(.*)\[\s*self\s+assertFalse:(.*)\]\s*;\s*$/${1}UKTrue($2);/) { pl($line, "assertFalse: replaced with UKFalse"); } else {wrong($basename, $line, $_);} --- 54,58 ---- } elsif(/assertFalse:/) { ! if(s/^(.*)\[\s*self\s+assertFalse:(.*)\]\s*;\s*$/${1}UKFalse($2);/) { pl($line, "assertFalse: replaced with UKFalse"); } else {wrong($basename, $line, $_);} |
|
From: Geisschaes <gei...@us...> - 2005-04-27 08:06:14
|
Update of /cvsroot/macattrick/macattrick/scripts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1199 Modified Files: objcunit2unitkit.pl Log Message: init method creation added Index: objcunit2unitkit.pl =================================================================== RCS file: /cvsroot/macattrick/macattrick/scripts/objcunit2unitkit.pl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** objcunit2unitkit.pl 26 Apr 2005 15:51:59 -0000 1.1 --- objcunit2unitkit.pl 27 Apr 2005 08:05:56 -0000 1.2 *************** *** 54,91 **** } elsif(/assertFalse:/) { ! if(s/^(.*)\[self\s+assertFalse:(.*)\]\s*;\s*$/${1}UKTrue($2);/) { pl($line, "assertFalse: replaced with UKFalse"); } else {wrong($basename, $line, $_);} } elsif(/assertNil:/) { ! if(s/^(.*)\[self\s+assertNil:(.*)\]\s*;\s*$/${1}UKNil($2);/) { pl($line, "assertNil: replaced with UKNil"); } else {wrong($basename, $line, $_);} } elsif(/assertNotNil:/) { ! if(s/^(.*)\[self\s+assertNotNil:(.*)\]\s*;\s*$/${1}UKNotNil($2);/) { pl($line, "assertNotNil: replaced with UKNotNil"); } else {wrong($basename, $line, $_);} } elsif(/assertInt:/) { ! if(s/^(.*)\[self\s+assertInt:(.*)equals:(.*)\s*\]\s*;\s*$/${1}UKIntsEqual($2,$3);/) { pl($line, "assertInt:equals: replaced with UKIntsEqual"); } else {wrong($basename, $line, $_);} } elsif(/assertFloat:/) { ! if(s/^(.*)\[self\s+assertFloat:(.*)equals:(.*)\s*precision:(.*)\]\s*;\s*$/${1}UKFloatsEqual($2,$3,$4);/) { pl($line, "assertFloat:equals:precision: replaced with UKFloatsEqual"); } else {wrong($basename, $line, $_);} } elsif(/assertString:/) { ! if(s/^(.*)\[self\s+assertString:(.*)equals:(.*)\s*\]\s*;\s*$/${1}UKStringsEqual($2,$3);/) { pl($line, "assertString:equals replaced with UKStringsEqual"); } else {wrong($basename, $line, $_);} } elsif(/assert:/) { ! if(s/^(.*)\[self\s+assert:(.*)equals:(.*)\s*\]\s*;\s*$/${1}UKObjectsEqual($2,$3);/) { pl($line, "assert:equals replaced with UKObjectsEqual"); } ! elsif(s/^(.*)\[self\s+assert:(.*)same:(.*)\s*\]\s*;\s*$/${1}UKObjectsSame($2,$3);/) { pl($line, "assert:same replaced with UKObjectsSame"); } else {wrong($basename, $line, $_);} --- 54,96 ---- } elsif(/assertFalse:/) { ! if(s/^(.*)\[\s*self\s+assertFalse:(.*)\]\s*;\s*$/${1}UKTrue($2);/) { pl($line, "assertFalse: replaced with UKFalse"); } else {wrong($basename, $line, $_);} + } + elsif(/self\s+fail/) { + if(s/^(.*)\[\s*self\s+fail\s*\]\s*;\s*$/${1}UKFail();/) { + pl($line, "fail replaced with UKFail"); + } else {wrong($basename, $line, $_);} } elsif(/assertNil:/) { ! if(s/^(.*)\[\s*self\s+assertNil:(.*)\]\s*;\s*$/${1}UKNil($2);/) { pl($line, "assertNil: replaced with UKNil"); } else {wrong($basename, $line, $_);} } elsif(/assertNotNil:/) { ! if(s/^(.*)\[\s*self\s+assertNotNil:(.*)\]\s*;\s*$/${1}UKNotNil($2);/) { pl($line, "assertNotNil: replaced with UKNotNil"); } else {wrong($basename, $line, $_);} } elsif(/assertInt:/) { ! if(s/^(.*)\[\s*self\s+assertInt:(.*)equals:(.*)\s*\]\s*;\s*$/${1}UKIntsEqual($2,$3);/) { pl($line, "assertInt:equals: replaced with UKIntsEqual"); } else {wrong($basename, $line, $_);} } elsif(/assertFloat:/) { ! if(s/^(.*)\[\s*self\s+assertFloat:(.*)equals:(.*)\s*precision:(.*)\]\s*;\s*$/${1}UKFloatsEqual($2,$3,$4);/) { pl($line, "assertFloat:equals:precision: replaced with UKFloatsEqual"); } else {wrong($basename, $line, $_);} } elsif(/assertString:/) { ! if(s/^(.*)\[\s*self\s+assertString:(.*)equals:(.*)\s*\]\s*;\s*$/${1}UKStringsEqual($2,$3);/) { pl($line, "assertString:equals replaced with UKStringsEqual"); } else {wrong($basename, $line, $_);} } elsif(/assert:/) { ! if(s/^(.*)\[\s*self\s+assert:(.*)equals:(.*)\s*\]\s*;\s*$/${1}UKObjectsEqual($2,$3);/) { pl($line, "assert:equals replaced with UKObjectsEqual"); } ! elsif(s/^(.*)\[\s*self\s+assert:(.*)same:(.*)\s*\]\s*;\s*$/${1}UKObjectsSame($2,$3);/) { pl($line, "assert:same replaced with UKObjectsSame"); } else {wrong($basename, $line, $_);} *************** *** 95,99 **** } elsif(/setUp/) { ! wrong($basename, $line, $_); } print OUT "$_\n"; --- 100,113 ---- } elsif(/setUp/) { ! print OUT "- (id) init {\n"; ! print OUT " self = [super init];\n"; ! print OUT " if(self) {\n"; ! print OUT " [self setUp];\n"; ! print OUT " }\n"; ! print OUT " return self;\n"; ! print OUT "}\n"; ! print OUT "\n"; ! pl($basename, "init added"); ! $line += 8; } print OUT "$_\n"; |
|
From: Geisschaes <gei...@us...> - 2005-04-26 15:52:09
|
Update of /cvsroot/macattrick/macattrick/scripts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3616 Added Files: objcunit2unitkit.pl Log Message: first version of objcunit2unitkit.pl added --- NEW FILE: objcunit2unitkit.pl --- #!/usr/bin/perl use strict; use warnings; use Getopt::Long; use Pod::Usage; use File::Basename; my $inputdir = shift @ARGV; my $outputdir = shift @ARGV; die "output directory must be different from input directory. \n backup your files!" if $inputdir eq $outputdir; my @m_files = <$inputdir/*.m>; my @h_files = <$inputdir/*.h>; my @problems = (); foreach (@h_files) { process_header_file($_); } foreach (@m_files) { process_implementation_file($_); } print "\n\n\n-----------------------------------------\n"; if(@problems == 0) { print "NO PROBLEMS DETECTED-----------------------------------------\n"; } else { print "PLEASE REPAIR MANUALLY THE FOLLOWING PROBLEMS:\n-----------------------------------------\n"; foreach(@problems) { print "$_\n"; } print "\n" } sub process_implementation_file { my ($implementation_file) = @_; my $basename = basename $implementation_file; print "\n-----------------------------------------\nMIGRATING Implementation: $basename\n-----------------------------------------\n"; my $target_file = "$outputdir/$basename"; open IN, $implementation_file or die "could not read from $implementation_file"; open OUT, ">$target_file" or die "could not write to $target_file"; my $line = ""; while(<IN>) { chomp; if(s/message:(.*)\];\s*$/\];/) { pl($line, "message: $1 removed"); } if(/assertTrue:/) { if(s/^(.*)\[self\s+assertTrue:(.*)\]\s*;\s*$/${1}UKTrue($2);/) { pl($line, "assertTrue: replaced with UKTrue"); } else {wrong($basename, $line, $_);} } elsif(/assertFalse:/) { if(s/^(.*)\[self\s+assertFalse:(.*)\]\s*;\s*$/${1}UKTrue($2);/) { pl($line, "assertFalse: replaced with UKFalse"); } else {wrong($basename, $line, $_);} } elsif(/assertNil:/) { if(s/^(.*)\[self\s+assertNil:(.*)\]\s*;\s*$/${1}UKNil($2);/) { pl($line, "assertNil: replaced with UKNil"); } else {wrong($basename, $line, $_);} } elsif(/assertNotNil:/) { if(s/^(.*)\[self\s+assertNotNil:(.*)\]\s*;\s*$/${1}UKNotNil($2);/) { pl($line, "assertNotNil: replaced with UKNotNil"); } else {wrong($basename, $line, $_);} } elsif(/assertInt:/) { if(s/^(.*)\[self\s+assertInt:(.*)equals:(.*)\s*\]\s*;\s*$/${1}UKIntsEqual($2,$3);/) { pl($line, "assertInt:equals: replaced with UKIntsEqual"); } else {wrong($basename, $line, $_);} } elsif(/assertFloat:/) { if(s/^(.*)\[self\s+assertFloat:(.*)equals:(.*)\s*precision:(.*)\]\s*;\s*$/${1}UKFloatsEqual($2,$3,$4);/) { pl($line, "assertFloat:equals:precision: replaced with UKFloatsEqual"); } else {wrong($basename, $line, $_);} } elsif(/assertString:/) { if(s/^(.*)\[self\s+assertString:(.*)equals:(.*)\s*\]\s*;\s*$/${1}UKStringsEqual($2,$3);/) { pl($line, "assertString:equals replaced with UKStringsEqual"); } else {wrong($basename, $line, $_);} } elsif(/assert:/) { if(s/^(.*)\[self\s+assert:(.*)equals:(.*)\s*\]\s*;\s*$/${1}UKObjectsEqual($2,$3);/) { pl($line, "assert:equals replaced with UKObjectsEqual"); } elsif(s/^(.*)\[self\s+assert:(.*)same:(.*)\s*\]\s*;\s*$/${1}UKObjectsSame($2,$3);/) { pl($line, "assert:same replaced with UKObjectsSame"); } else {wrong($basename, $line, $_);} } elsif(/assert/) { wrong($basename, $line, $_); } elsif(/setUp/) { wrong($basename, $line, $_); } print OUT "$_\n"; $line++; } } sub wrong { my ($filename, $linenr, $linetext) = @_; push @problems, "$filename line $linenr: $linetext"; print "some problems on line $linenr $linetext\n"; } sub pl { my ($line, $text) = @_; print "line $line: $text\n"; } sub process_header_file { my ($header_file) = @_; my $basename = basename $header_file; print "\n-----------------------------------------\nMIGRATING Header: $basename\n-----------------------------------------\n"; my $target_file = "$outputdir/$basename"; open IN, $header_file or die "could not read from $header_file"; open OUT, ">$target_file" or die "could not write to $target_file"; my $line = 1; while(<IN>) { if(s/^(.*)import\s+<ObjcUnit\/ObjcUnit.h>(.*)$/${1}import <UnitKit\/UnitKit.h>$2/) { pl($line, "import statement replaced"); } if(s/^(.*):\s*TestCase(.*)$/${1}: NSObject <UKTest>$2/) { pl($line, "super class TestCase changed to NSObject <UKTest>") } if(s/^(.*):\s*TestSuite(.*)$/${1}: NSObject$2/) { pl($line, "super class TestSuite changed to NSObject. This file can probably be removed."); } $line++; print OUT $_; } } __END__ =head1 NAME objcunit2unitkit.pl - migrate unit test of objcunit to unitkit =head1 SYNOPSIS objcunit2unitkit.pl inputdir outputdir =head1 OPTIONS =over 8 =item B<-h, -help> Print a brief help message and exits. =item B<-m, --man> Prints the manual page and exits. =back =head1 REQUIRES File::Basename, Getopt::Long, Pod::Usage =head1 AUTHOR Roman Bertolami 2005, gei...@us... =cut |
|
From: Geisschaes <gei...@us...> - 2005-04-25 20:23:31
|
Update of /cvsroot/macattrick/macattrick/Macattrick.xcode In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29600/Macattrick.xcode Modified Files: roman.mode1 roman.pbxuser Log Message: some line up statistics added. but do not seem correct yet Index: roman.mode1 =================================================================== RCS file: /cvsroot/macattrick/macattrick/Macattrick.xcode/roman.mode1,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** roman.mode1 28 Mar 2005 14:58:39 -0000 1.25 --- roman.mode1 25 Apr 2005 20:22:38 -0000 1.26 *************** *** 206,209 **** --- 206,211 ---- <array> <dict> + <key>BecomeActive</key> + <true/> <key>ContentConfiguration</key> <dict> *************** *** 243,246 **** --- 245,249 ---- <string>29B97314FDCFA39411CA2CEA</string> <string>1C37FBAC04509CD000000102</string> + <string>302E1BDA081D87CE004659AF</string> <string>1C37FAAC04509CD000000102</string> </array> *************** *** 248,252 **** <array> <array> ! <integer>3</integer> <integer>0</integer> </array> --- 251,255 ---- <array> <array> ! <integer>4</integer> <integer>0</integer> </array> *************** *** 268,272 **** </array> <key>RubberWindowFrame</key> ! <string>123 163 998 665 0 0 1280 832 </string> </dict> <key>Module</key> --- 271,275 ---- </array> <key>RubberWindowFrame</key> ! <string>125 163 998 665 0 0 1280 832 </string> </dict> <key>Module</key> *************** *** 284,288 **** <string>1CE0B20306471E060097A5F4</string> <key>PBXProjectModuleLabel</key> ! <string>Arena.m</string> <key>PBXSplitModuleInNavigatorKey</key> <dict> --- 287,291 ---- <string>1CE0B20306471E060097A5F4</string> <key>PBXProjectModuleLabel</key> ! <string>LineUpController.m</string> <key>PBXSplitModuleInNavigatorKey</key> <dict> *************** *** 292,298 **** <string>1CE0B20406471E060097A5F4</string> <key>PBXProjectModuleLabel</key> ! <string>Arena.m</string> <key>bookmark</key> ! <string>3068914907F8521700B7B336</string> <key>history</key> <array> --- 295,301 ---- <string>1CE0B20406471E060097A5F4</string> <key>PBXProjectModuleLabel</key> ! <string>LineUpController.m</string> <key>bookmark</key> ! <string>302E1BFB081D88CA004659AF</string> <key>history</key> <array> *************** *** 329,333 **** <string>30CBF0FA07B693F8005A0707</string> <string>30CBF0FB07B693F8005A0707</string> - <string>306BE29307B80208009942ED</string> <string>306BE2D007B80670009942ED</string> <string>306BE2D207B80670009942ED</string> --- 332,335 ---- *************** *** 335,339 **** <string>30BA8BAB07B81026001B29F3</string> <string>30DE3EC607C3BC3600342677</string> - <string>30DE3EC707C3BC3600342677</string> <string>30DE3EE507C3C66400342677</string> <string>301CA97807C749EC00FABBCC</string> --- 337,340 ---- *************** *** 352,356 **** <string>3092461907D77EA20052A124</string> <string>3092461B07D77EA20052A124</string> - <string>308832FC07E6139F0078CE5B</string> <string>3088330307E613DD0078CE5B</string> <string>302FC30707E617FE00334603</string> --- 353,356 ---- *************** *** 402,408 **** <string>30EFC3D507F6DA9000009D39</string> <string>3081C09707F7F83900C958A9</string> ! <string>3081C09D07F7F98800C958A9</string> ! <string>3068914107F8506600B7B336</string> ! <string>3068914207F8506600B7B336</string> </array> <key>prevStack</key> --- 402,414 ---- <string>30EFC3D507F6DA9000009D39</string> <string>3081C09707F7F83900C958A9</string> ! <string>30DD3C8B07F874EB00FE74BF</string> ! <string>302E1B18081D6697004659AF</string> ! <string>302E1B3C081D741F004659AF</string> ! <string>302E1B3D081D741F004659AF</string> ! <string>302E1B99081D7EA9004659AF</string> ! <string>302E1BA0081D8004004659AF</string> ! <string>302E1BA1081D8004004659AF</string> ! <string>302E1BC7081D83D3004659AF</string> ! <string>302E1BC8081D83D3004659AF</string> </array> <key>prevStack</key> *************** *** 515,518 **** --- 521,533 ---- <string>30272D4607F5816400B39CEA</string> <string>3068914307F8506600B7B336</string> + <string>30DD3C8C07F874EB00FE74BF</string> + <string>302E1B1B081D6697004659AF</string> + <string>302E1B1C081D6697004659AF</string> + <string>302E1B3E081D741F004659AF</string> + <string>302E1B3F081D741F004659AF</string> + <string>302E1B9B081D7EA9004659AF</string> + <string>302E1BA2081D8004004659AF</string> + <string>302E1BA3081D8004004659AF</string> + <string>302E1BC9081D83D3004659AF</string> </array> </dict> *************** *** 528,532 **** <string>{{0, 0}, {653, 358}}</string> <key>RubberWindowFrame</key> ! <string>123 163 998 665 0 0 1280 832 </string> </dict> <key>Module</key> --- 543,547 ---- <string>{{0, 0}, {653, 358}}</string> <key>RubberWindowFrame</key> ! <string>125 163 998 665 0 0 1280 832 </string> </dict> <key>Module</key> *************** *** 536,541 **** </dict> <dict> - <key>BecomeActive</key> - <true/> <key>ContentConfiguration</key> <dict> --- 551,554 ---- *************** *** 550,554 **** <string>{{0, 365}, {653, 258}}</string> <key>RubberWindowFrame</key> ! <string>123 163 998 665 0 0 1280 832 </string> </dict> <key>Module</key> --- 563,567 ---- <string>{{0, 365}, {653, 258}}</string> <key>RubberWindowFrame</key> ! <string>125 163 998 665 0 0 1280 832 </string> </dict> <key>Module</key> *************** *** 574,580 **** <key>TableOfContents</key> <array> ! <string>3068913C07F8501700B7B336</string> <string>1CE0B1FE06471DED0097A5F4</string> ! <string>3068913D07F8501700B7B336</string> <string>1CE0B20306471E060097A5F4</string> <string>1CE0B20506471E060097A5F4</string> --- 587,593 ---- <key>TableOfContents</key> <array> ! <string>302E1B06081D63A7004659AF</string> <string>1CE0B1FE06471DED0097A5F4</string> ! <string>302E1B07081D63A7004659AF</string> <string>1CE0B20306471E060097A5F4</string> <string>1CE0B20506471E060097A5F4</string> *************** *** 604,615 **** <key>WindowOrderList</key> <array> ! <string>3068913F07F8501700B7B336</string> <string>1CD10A99069EF8BA00B06720</string> ! <string>3068914507F8506600B7B336</string> ! <string>/Users/roman/Documents/dev/macattrick/Macattrick.xcode</string> <string>1C0AD2B3069F1EA900FABCE6</string> </array> <key>WindowString</key> ! <string>123 163 998 665 0 0 1280 832 </string> <key>WindowTools</key> <array> --- 617,630 ---- <key>WindowOrderList</key> <array> ! <string>302E1B09081D63A7004659AF</string> <string>1CD10A99069EF8BA00B06720</string> ! <string>1C530D57069F1CE1000CFCEE</string> ! <string>303B689D075A03FF009951CC</string> ! <string>303B68B1075A0D24009951CC</string> <string>1C0AD2B3069F1EA900FABCE6</string> + <string>/Users/roman/Documents/dev/macattrick/Macattrick.xcode</string> </array> <key>WindowString</key> ! <string>125 163 998 665 0 0 1280 832 </string> <key>WindowTools</key> <array> *************** *** 630,634 **** <string>1CD0528F0623707200166675</string> <key>PBXProjectModuleLabel</key> ! <string>HattrickOrg.m</string> <key>PBXSplitModuleInNavigatorKey</key> <dict> --- 645,649 ---- <string>1CD0528F0623707200166675</string> <key>PBXProjectModuleLabel</key> ! <string>Position.m</string> <key>PBXSplitModuleInNavigatorKey</key> <dict> *************** *** 638,647 **** <string>1CD052900623707200166675</string> <key>PBXProjectModuleLabel</key> ! <string>HattrickOrg.m</string> <key>bookmark</key> ! <string>30EFC3F807F6E34900009D39</string> <key>history</key> <array> ! <string>30EFC3CF07F6D80A00009D39</string> </array> </dict> --- 653,669 ---- <string>1CD052900623707200166675</string> <key>PBXProjectModuleLabel</key> ! <string>Position.m</string> <key>bookmark</key> ! <string>302E1BFC081D88CA004659AF</string> <key>history</key> <array> ! <string>302E1B51081D7557004659AF</string> ! <string>302E1B6A081D79E6004659AF</string> ! <string>302E1B6B081D79E6004659AF</string> ! </array> ! <key>prevStack</key> ! <array> ! <string>302E1B53081D7557004659AF</string> ! <string>302E1B6C081D79E6004659AF</string> </array> </dict> *************** *** 706,710 **** <array> <string>303B68B1075A0D24009951CC</string> ! <string>30EFC38B07F6AB4C00009D39</string> <string>1CD0528F0623707200166675</string> <string>XCMainBuildResultsModuleGUID</string> --- 728,732 ---- <array> <string>303B68B1075A0D24009951CC</string> ! <string>302E1B4A081D74B0004659AF</string> <string>1CD0528F0623707200166675</string> <string>XCMainBuildResultsModuleGUID</string> *************** *** 717,721 **** <string>303B68B1075A0D24009951CC</string> <key>WindowToolIsVisible</key> ! <false/> </dict> <dict> --- 739,743 ---- <string>303B68B1075A0D24009951CC</string> <key>WindowToolIsVisible</key> ! <true/> </dict> <dict> *************** *** 746,751 **** <key>sizes</key> <array> ! <string>{{0, 0}, {124, 242}}</string> ! <string>{{124, 0}, {765, 242}}</string> </array> </dict> --- 768,773 ---- <key>sizes</key> <array> ! <string>{{0, 0}, {106, 242}}</string> ! <string>{{106, 0}, {783, 242}}</string> </array> </dict> *************** *** 772,776 **** <string>1C162984064C10D400B95A72</string> <key>PBXProjectModuleLabel</key> ! <string>Debug - Macattrick (Test)</string> </dict> <key>GeometryConfiguration</key> --- 794,798 ---- <string>1C162984064C10D400B95A72</string> <key>PBXProjectModuleLabel</key> ! <string>Debug - Macattrick (Devel Macattrick)</string> </dict> <key>GeometryConfiguration</key> *************** *** 787,791 **** <string>{{0, 0}, {889, 567}}</string> <key>RubberWindowFrame</key> ! <string>266 169 889 609 0 0 1280 832 </string> </dict> <key>Module</key> --- 809,813 ---- <string>{{0, 0}, {889, 567}}</string> <key>RubberWindowFrame</key> ! <string>232 223 889 609 0 0 1280 832 </string> </dict> <key>Module</key> *************** *** 810,825 **** <array> <string>1CD10A99069EF8BA00B06720</string> ! <string>3068913E07F8501700B7B336</string> <string>1C162984064C10D400B95A72</string> ! <string>3068913F07F8501700B7B336</string> </array> <key>ToolbarConfiguration</key> <string>xcode.toolbar.config.debug</string> <key>WindowString</key> ! <string>266 169 889 609 0 0 1280 832 </string> <key>WindowToolGUID</key> <string>1CD10A99069EF8BA00B06720</string> <key>WindowToolIsVisible</key> ! <true/> </dict> <dict> --- 832,847 ---- <array> <string>1CD10A99069EF8BA00B06720</string> ! <string>302E1B08081D63A7004659AF</string> <string>1C162984064C10D400B95A72</string> ! <string>302E1B09081D63A7004659AF</string> </array> <key>ToolbarConfiguration</key> <string>xcode.toolbar.config.debug</string> <key>WindowString</key> ! <string>232 223 889 609 0 0 1280 832 </string> <key>WindowToolGUID</key> <string>1CD10A99069EF8BA00B06720</string> <key>WindowToolIsVisible</key> ! <false/> </dict> <dict> *************** *** 842,846 **** <string>1CDD528C0622207200134675</string> <key>PBXProjectModuleLabel</key> ! <string>World.m</string> <key>PBXSplitModuleInNavigatorKey</key> <dict> --- 864,868 ---- <string>1CDD528C0622207200134675</string> <key>PBXProjectModuleLabel</key> ! <string>LineUpController.m</string> <key>PBXSplitModuleInNavigatorKey</key> <dict> *************** *** 850,859 **** <string>1CD0528D0623707200166675</string> <key>PBXProjectModuleLabel</key> ! <string>World.m</string> <key>bookmark</key> ! <string>30EFC3F907F6E34900009D39</string> <key>history</key> <array> ! <string>30EFC39A07F6D1AE00009D39</string> </array> </dict> --- 872,881 ---- <string>1CD0528D0623707200166675</string> <key>PBXProjectModuleLabel</key> ! <string>LineUpController.m</string> <key>bookmark</key> ! <string>302E1BFD081D88CA004659AF</string> <key>history</key> <array> ! <string>302E1B28081D717A004659AF</string> </array> </dict> *************** *** 916,921 **** <array> <string>1C530D57069F1CE1000CFCEE</string> ! <string>30EFC39C07F6D1AE00009D39</string> ! <string>30EFC39D07F6D1AE00009D39</string> <string>1CDD528C0622207200134675</string> <string>1CD0528E0623707200166675</string> --- 938,943 ---- <array> <string>1C530D57069F1CE1000CFCEE</string> ! <string>302E1B0F081D6465004659AF</string> ! <string>302E1B10081D6465004659AF</string> <string>1CDD528C0622207200134675</string> <string>1CD0528E0623707200166675</string> *************** *** 926,930 **** <string>1C530D57069F1CE1000CFCEE</string> <key>WindowToolIsVisible</key> ! <false/> </dict> <dict> --- 948,952 ---- <string>1C530D57069F1CE1000CFCEE</string> <key>WindowToolIsVisible</key> ! <true/> </dict> <dict> *************** *** 943,946 **** --- 965,970 ---- <array> <dict> + <key>BecomeActive</key> + <true/> <key>ContentConfiguration</key> <dict> *************** *** 978,982 **** <array> <string>303B689D075A03FF009951CC</string> ! <string>30272D4A07F5816400B39CEA</string> <string>1C78EAAC065D492600B07095</string> </array> --- 1002,1006 ---- <array> <string>303B689D075A03FF009951CC</string> ! <string>302E1BA7081D8004004659AF</string> <string>1C78EAAC065D492600B07095</string> </array> *************** *** 986,990 **** <string>303B689D075A03FF009951CC</string> <key>WindowToolIsVisible</key> ! <false/> </dict> <dict> --- 1010,1014 ---- <string>303B689D075A03FF009951CC</string> <key>WindowToolIsVisible</key> ! <true/> </dict> <dict> *************** *** 1021,1026 **** <key>sizes</key> <array> ! <string>{{0, 0}, {491, 167}}</string> ! <string>{{0, 176}, {491, 267}}</string> </array> </dict> --- 1045,1050 ---- <key>sizes</key> <array> ! <string>{{0, 0}, {366, 167}}</string> ! <string>{{0, 176}, {366, 267}}</string> </array> </dict> *************** *** 1046,1061 **** <dict> <key>Frame</key> ! <string>{{0, 0}, {876, 463}}</string> <key>RubberWindowFrame</key> ! <string>41 283 876 505 0 0 1280 832 </string> </dict> <key>Module</key> <string>PBXRunSessionModule</string> <key>Proportion</key> ! <string>463pt</string> </dict> </array> <key>Proportion</key> ! <string>463pt</string> </dict> </array> --- 1070,1085 ---- <dict> <key>Frame</key> ! <string>{{0, 0}, {707, 467}}</string> <key>RubberWindowFrame</key> ! <string>265 191 707 509 0 0 1280 832 </string> </dict> <key>Module</key> <string>PBXRunSessionModule</string> <key>Proportion</key> ! <string>467pt</string> </dict> </array> <key>Proportion</key> ! <string>467pt</string> </dict> </array> *************** *** 1071,1082 **** <array> <string>1C0AD2B3069F1EA900FABCE6</string> ! <string>3068914A07F8521700B7B336</string> <string>1CD0528B0623707200166675</string> ! <string>3068914B07F8521700B7B336</string> </array> <key>ToolbarConfiguration</key> <string>xcode.toolbar.config.run</string> <key>WindowString</key> ! <string>41 283 876 505 0 0 1280 832 </string> <key>WindowToolGUID</key> <string>1C0AD2B3069F1EA900FABCE6</string> --- 1095,1106 ---- <array> <string>1C0AD2B3069F1EA900FABCE6</string> ! <string>302E1B0A081D63A7004659AF</string> <string>1CD0528B0623707200166675</string> ! <string>302E1B0B081D63A7004659AF</string> </array> <key>ToolbarConfiguration</key> <string>xcode.toolbar.config.run</string> <key>WindowString</key> ! <string>265 191 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.90 retrieving revision 1.91 diff -C2 -d -r1.90 -r1.91 *** roman.pbxuser 28 Mar 2005 14:58:39 -0000 1.90 --- roman.pbxuser 25 Apr 2005 20:22:39 -0000 1.91 *************** *** 39,44 **** 29B97313FDCFA39411CA2CEA = { activeBuildStyle = 4A9504CDFFE6A4B311CA0CBA; ! activeExecutable = 308427FB0643B8C700173CCD; ! activeTarget = 308427F90643B8C700173CCD; addToTargets = ( 30744BA4069560A70039B82A, --- 39,44 ---- 29B97313FDCFA39411CA2CEA = { activeBuildStyle = 4A9504CDFFE6A4B311CA0CBA; ! activeExecutable = 30744BA6069560A70039B82A; ! activeTarget = 30744BA4069560A70039B82A; addToTargets = ( 30744BA4069560A70039B82A, *************** *** 46,50 **** ); breakpoints = ( - 3041B5D706F628830055CB6D, 309421BD0706E11500873206, 303B6899075A039C009951CC, --- 46,49 ---- *************** *** 198,202 **** ); }; ! PBXPerProjectTemplateStateSaveDate = 133713935; PBXPrepackagedSmartGroups_v2 = ( { --- 197,201 ---- ); }; ! PBXPerProjectTemplateStateSaveDate = 136143773; PBXPrepackagedSmartGroups_v2 = ( { *************** *** 1042,1046 **** RubberWindowFrame = "496 457 599 209 0 0 1280 832 "; }; ! PBXWorkspaceStateSaveDate = 133713935; }; perUserProjectItems = { --- 1041,1045 ---- RubberWindowFrame = "496 457 599 209 0 0 1280 832 "; }; ! PBXWorkspaceStateSaveDate = 136143773; }; perUserProjectItems = { *************** *** 1088,1091 **** --- 1087,1115 ---- 30272D4307F5816400B39CEA = 30272D4307F5816400B39CEA; 30272D4607F5816400B39CEA = 30272D4607F5816400B39CEA; + 302E1B18081D6697004659AF = 302E1B18081D6697004659AF; + 302E1B1B081D6697004659AF = 302E1B1B081D6697004659AF; + 302E1B1C081D6697004659AF = 302E1B1C081D6697004659AF; + 302E1B28081D717A004659AF = 302E1B28081D717A004659AF; + 302E1B3C081D741F004659AF = 302E1B3C081D741F004659AF; + 302E1B3D081D741F004659AF = 302E1B3D081D741F004659AF; + 302E1B3E081D741F004659AF = 302E1B3E081D741F004659AF; + 302E1B3F081D741F004659AF = 302E1B3F081D741F004659AF; + 302E1B51081D7557004659AF = 302E1B51081D7557004659AF; + 302E1B53081D7557004659AF = 302E1B53081D7557004659AF; + 302E1B6A081D79E6004659AF = 302E1B6A081D79E6004659AF; + 302E1B6B081D79E6004659AF = 302E1B6B081D79E6004659AF; + 302E1B6C081D79E6004659AF = 302E1B6C081D79E6004659AF; + 302E1B99081D7EA9004659AF = 302E1B99081D7EA9004659AF; + 302E1B9B081D7EA9004659AF = 302E1B9B081D7EA9004659AF; + 302E1BA0081D8004004659AF = 302E1BA0081D8004004659AF; + 302E1BA1081D8004004659AF = 302E1BA1081D8004004659AF; + 302E1BA2081D8004004659AF = 302E1BA2081D8004004659AF; + 302E1BA3081D8004004659AF = 302E1BA3081D8004004659AF; + 302E1BC7081D83D3004659AF = 302E1BC7081D83D3004659AF; + 302E1BC8081D83D3004659AF = 302E1BC8081D83D3004659AF; + 302E1BC9081D83D3004659AF = 302E1BC9081D83D3004659AF; + 302E1BFB081D88CA004659AF = 302E1BFB081D88CA004659AF; + 302E1BFC081D88CA004659AF = 302E1BFC081D88CA004659AF; + 302E1BFD081D88CA004659AF = 302E1BFD081D88CA004659AF; 302FC30707E617FE00334603 = 302FC30707E617FE00334603; 302FC30807E617FE00334603 = 302FC30807E617FE00334603; *************** *** 1164,1177 **** 306096C5079325B700BAA4CF = 306096C5079325B700BAA4CF; 306096C6079325B700BAA4CF = 306096C6079325B700BAA4CF; - 3068913B07F8501700B7B336 = 3068913B07F8501700B7B336; - 3068914107F8506600B7B336 = 3068914107F8506600B7B336; - 3068914207F8506600B7B336 = 3068914207F8506600B7B336; 3068914307F8506600B7B336 = 3068914307F8506600B7B336; - 3068914407F8506600B7B336 = 3068914407F8506600B7B336; - 3068914607F8507100B7B336 = 3068914607F8507100B7B336; - 3068914707F850A100B7B336 = 3068914707F850A100B7B336; - 3068914807F851B100B7B336 = 3068914807F851B100B7B336; - 3068914907F8521700B7B336 = 3068914907F8521700B7B336; - 306BE29307B80208009942ED = 306BE29307B80208009942ED; 306BE2B307B803E7009942ED = 306BE2B307B803E7009942ED; 306BE2D007B80670009942ED = 306BE2D007B80670009942ED; --- 1188,1192 ---- *************** *** 1210,1219 **** 307FFAA307C7839400F1D476 = 307FFAA307C7839400F1D476; 3081C09707F7F83900C958A9 = 3081C09707F7F83900C958A9; - 3081C09807F7F83900C958A9 = 3081C09807F7F83900C958A9; - 3081C09D07F7F98800C958A9 = 3081C09D07F7F98800C958A9; - 3081C09E07F7F98800C958A9 = 3081C09E07F7F98800C958A9; - 3081C09F07F7F98800C958A9 = 3081C09F07F7F98800C958A9; - 3081C0A207F7FA1200C958A9 = 3081C0A207F7FA1200C958A9; - 308832FC07E6139F0078CE5B = 308832FC07E6139F0078CE5B; 3088330307E613DD0078CE5B = 3088330307E613DD0078CE5B; 3088330507E613DD0078CE5B = 3088330507E613DD0078CE5B; --- 1225,1228 ---- *************** *** 1254,1259 **** 30D9FFE7078DDAEF00FBB745 = 30D9FFE7078DDAEF00FBB745; 30D9FFE8078DDAEF00FBB745 = 30D9FFE8078DDAEF00FBB745; 30DE3EC607C3BC3600342677 = 30DE3EC607C3BC3600342677; - 30DE3EC707C3BC3600342677 = 30DE3EC707C3BC3600342677; 30DE3EC807C3BC3600342677 = 30DE3EC807C3BC3600342677; 30DE3EE507C3C66400342677 = 30DE3EE507C3C66400342677; --- 1263,1269 ---- 30D9FFE7078DDAEF00FBB745 = 30D9FFE7078DDAEF00FBB745; 30D9FFE8078DDAEF00FBB745 = 30D9FFE8078DDAEF00FBB745; + 30DD3C8B07F874EB00FE74BF = 30DD3C8B07F874EB00FE74BF; + 30DD3C8C07F874EB00FE74BF = 30DD3C8C07F874EB00FE74BF; 30DE3EC607C3BC3600342677 = 30DE3EC607C3BC3600342677; 30DE3EC807C3BC3600342677 = 30DE3EC807C3BC3600342677; 30DE3EE507C3C66400342677 = 30DE3EE507C3C66400342677; *************** *** 1334,1340 **** 301E3B2E064A7C1A00C88C10 = { uiCtxt = { ! sepNavIntBoundsRect = "{{0, 0}, {1099, 1189}}"; ! sepNavSelRange = "{3710, 23}"; ! sepNavVisRect = "{{0, 576}, {1099, 613}}"; sepNavWindowFrame = "{{107, 221}, {750, 522}}"; }; --- 1344,1350 ---- 301E3B2E064A7C1A00C88C10 = { uiCtxt = { ! sepNavIntBoundsRect = "{{0, 0}, {705, 1259}}"; ! sepNavSelRange = "{3138, 1}"; ! sepNavVisRect = "{{0, 704}, {705, 428}}"; sepNavWindowFrame = "{{107, 221}, {750, 522}}"; }; *************** *** 1342,1349 **** 301E3B2F064A7C1A00C88C10 = { uiCtxt = { ! sepNavIntBoundsRect = "{{0, 0}, {1406, 4409}}"; ! sepNavSelRange = "{3853, 24}"; ! sepNavVisRect = "{{0, 3785}, {606, 326}}"; ! sepNavWindowFrame = "{{102, 169}, {1087, 656}}"; }; }; --- 1352,1359 ---- 301E3B2F064A7C1A00C88C10 = { uiCtxt = { ! sepNavIntBoundsRect = "{{0, 0}, {1406, 4815}}"; ! sepNavSelRange = "{3384, 9}"; ! sepNavVisRect = "{{0, 698}, {734, 159}}"; ! sepNavWindowFrame = "{{84, 230}, {750, 534}}"; }; }; *************** *** 1789,1792 **** --- 1799,2046 ---- }; }; + 302E1B18081D6697004659AF = { + fRef = 306096370793195B00BAA4CF; + isa = PBXTextBookmark; + name = "World.m: 99"; + rLen = 0; + rLoc = 4376; + rType = 0; + vrLen = 929; + vrLoc = 3670; + }; + 302E1B1B081D6697004659AF = { + fRef = 306096370793195B00BAA4CF; + isa = PBXTextBookmark; + name = "World.m: 99"; + rLen = 0; + rLoc = 4376; + rType = 0; + vrLen = 929; + vrLoc = 3670; + }; + 302E1B1C081D6697004659AF = { + fRef = 30C863DB0646A40D0016E5B3; + isa = PBXTextBookmark; + name = "//---- license ---------------------------------------------------------------//\n// //\n// Macattrick: a Manager Assistant Tool for the online Game Hattrick.org //\n// Copyright (C) 2004 Roman Bertolami //\n// //\n// this file is part of Macattrick application //\n// http://sourceforge.net/macattrick //\n// //\n// Macattrick is free software; you can redistribute it and/or //\n// modify it under the terms of the GNU General Public License //\n// as published by the Free Software Foundation; either version 2\t\t\t //\n// of the License, or (at your option) any later version.\t\t \t // \n// //\n// Macattrick is distributed in the hope that it will be useful, //\n// but WITHOUT ANY WARRANTY; without even the implied warranty of //\n// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\t\t\t //\n// GNU General Public License for more details. //\n// //\n// You should have received a copy of the GNU General Public License //\n// along with this program; if not, write to the Free Software //\n// Foundation, Inc., 59 Temple Place - Suite 330,\t\t\t\t\t\t\t //\n// Boston, MA 02111-1307, USA. //\n// //\n// Macattrick, Copyright (C) 2004 Roman Bertolami //\n// Macattrick comes with ABSOLUTELY NO WARRANTY! //\n// //\n//---- eo licence ------------------------------------------------------------//\n\n"; + rLen = 2148; + rLoc = 0; + rType = 0; + vrLen = 1766; + vrLoc = 405; + }; + 302E1B28081D717A004659AF = { + fRef = 301E3B2F064A7C1A00C88C10; + isa = PBXTextBookmark; + rLen = 9; + rLoc = 3360; + rType = 0; + }; + 302E1B3C081D741F004659AF = { + fRef = 30C863DA0646A40D0016E5B3; + isa = PBXTextBookmark; + name = "LineUpTree.h: unusedPlayersByBestLineUp"; + rLen = 0; + rLoc = 2792; + rType = 0; + vrLen = 666; + vrLoc = 2066; + }; + 302E1B3D081D741F004659AF = { + fRef = 30D77AA206455BEF0095BAC8; + isa = PBXTextBookmark; + name = "Position.m: 120"; + rLen = 0; + rLoc = 5912; + rType = 0; + vrLen = 1111; + vrLoc = 3437; + }; + 302E1B3E081D741F004659AF = { + fRef = 30C863DA0646A40D0016E5B3; + isa = PBXTextBookmark; + name = "LineUpTree.h: unusedPlayersByBestLineUp"; + rLen = 0; + rLoc = 2792; + rType = 0; + vrLen = 666; + vrLoc = 2066; + }; + 302E1B3F081D741F004659AF = { + fRef = 30D77AA206455BEF0095BAC8; + isa = PBXTextBookmark; + name = "Position.m: 120"; + rLen = 0; + rLoc = 5912; + rType = 0; + vrLen = 1111; + vrLoc = 3437; + }; + 302E1B51081D7557004659AF = { + fRef = 30C863DA0646A40D0016E5B3; + isa = PBXTextBookmark; + name = "LineUpTree.h: 30"; + rLen = 0; + rLoc = 2209; + rType = 0; + vrLen = 502; + vrLoc = 1985; + }; + 302E1B53081D7557004659AF = { + fRef = 30C863DA0646A40D0016E5B3; + isa = PBXTextBookmark; + name = "LineUpTree.h: 30"; + rLen = 0; + rLoc = 2209; + rType = 0; + vrLen = 502; + vrLoc = 1985; + }; + 302E1B6A081D79E6004659AF = { + fRef = 30C863DB0646A40D0016E5B3; + isa = PBXTextBookmark; + name = "LineUpTree.m: 64"; + rLen = 0; + rLoc = 3364; + rType = 0; + vrLen = 369; + vrLoc = 3257; + }; + 302E1B6B081D79E6004659AF = { + fRef = 30D77AA206455BEF0095BAC8; + isa = PBXTextBookmark; + rLen = 1; + rLoc = 218; + rType = 1; + }; + 302E1B6C081D79E6004659AF = { + fRef = 30C863DB0646A40D0016E5B3; + isa = PBXTextBookmark; + name = "LineUpTree.m: 64"; + rLen = 0; + rLoc = 3364; + rType = 0; + vrLen = 369; + vrLoc = 3257; + }; + 302E1B99081D7EA9004659AF = { + fRef = 30A1800F0640E5C300D2836F; + isa = PBXTextBookmark; + name = "Player.m: setValue:forUndefinedKey:"; + rLen = 0; + rLoc = 10440; + rType = 0; + vrLen = 1089; + vrLoc = 10323; + }; + 302E1B9B081D7EA9004659AF = { + fRef = 30A1800F0640E5C300D2836F; + isa = PBXTextBookmark; + name = "Player.m: setValue:forUndefinedKey:"; + rLen = 0; + rLoc = 10440; + rType = 0; + vrLen = 1089; + vrLoc = 10323; + }; + 302E1BA0081D8004004659AF = { + fRef = 30C863FC0646AAF30016E5B3; + isa = PBXTextBookmark; + name = "LineUpTreeTest.m: 31"; + rLen = 0; + rLoc = 2200; + rType = 0; + vrLen = 1087; + vrLoc = 1437; + }; + 302E1BA1081D8004004659AF = { + fRef = 30C85EC7064647730016E5B3; + isa = PBXTextBookmark; + name = "LineUpTreeNode.m: 94"; + rLen = 0; + rLoc = 4191; + rType = 0; + vrLen = 662; + vrLoc = 2066; + }; + 302E1BA2081D8004004659AF = { + fRef = 30C863FC0646AAF30016E5B3; + isa = PBXTextBookmark; + name = "LineUpTreeTest.m: 31"; + rLen = 0; + rLoc = 2200; + rType = 0; + vrLen = 1087; + vrLoc = 1437; + }; + 302E1BA3081D8004004659AF = { + fRef = 30C85EC7064647730016E5B3; + isa = PBXTextBookmark; + name = "LineUpTreeNode.m: 94"; + rLen = 0; + rLoc = 4191; + rType = 0; + vrLen = 662; + vrLoc = 2066; + }; + 302E1BC7081D83D3004659AF = { + fRef = 30C863DB0646A40D0016E5B3; + isa = PBXTextBookmark; + name = "LineUpTree.m: 10"; + rLen = 0; + rLoc = 745; + rType = 0; + vrLen = 1904; + vrLoc = 0; + }; + 302E1BC8081D83D3004659AF = { + fRef = 301E3B2F064A7C1A00C88C10; + isa = PBXTextBookmark; + name = " = NSSelectorFromString("; + rLen = 24; + rLoc = 4332; + rType = 0; + vrLen = 1698; + vrLoc = 16626; + }; + 302E1BC9081D83D3004659AF = { + fRef = 30C863DB0646A40D0016E5B3; + isa = PBXTextBookmark; + name = "LineUpTree.m: 10"; + rLen = 0; + rLoc = 745; + rType = 0; + vrLen = 1904; + vrLoc = 0; + }; + 302E1BFB081D88CA004659AF = { + fRef = 301E3B2F064A7C1A00C88C10; + isa = PBXTextBookmark; + name = " = NSSelectorFromString("; + rLen = 24; + rLoc = 4392; + rType = 0; + vrLen = 745; + vrLoc = 6861; + }; + 302E1BFC081D88CA004659AF = { + fRef = 30D77AA206455BEF0095BAC8; + isa = PBXTextBookmark; + name = "Position.m: 406"; + rLen = 0; + rLoc = 17776; + rType = 0; + vrLen = 731; + vrLoc = 10916; + }; + 302E1BFD081D88CA004659AF = { + fRef = 301E3B2F064A7C1A00C88C10; + isa = PBXTextBookmark; + name = buildTree; + rLen = 9; + rLoc = 3384; + rType = 0; + vrLen = 205; + vrLoc = 2740; + }; 302FC30707E617FE00334603 = { fRef = 306BE2A907B803D6009942ED; *************** *** 2266,2276 **** }; }; - 3041B5D706F628830055CB6D = { - fileReference = 30C863FC0646AAF30016E5B3; - functionName = "-setUp"; - isa = PBXFileBreakpoint; - lineNumber = 38; - state = 2; - }; 304A3C52079ACC7700358038 = { fRef = 10A233D907327ECF007529F7; --- 2520,2523 ---- *************** *** 2344,2350 **** uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {1090, 909}}"; ! sepNavSelRange = "{2354, 0}"; ! sepNavVisRect = "{{0, 210}, {1090, 574}}"; ! sepNavWindowFrame = "{{38, 264}, {750, 542}}"; }; }; --- 2591,2597 ---- uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {1090, 909}}"; ! sepNavSelRange = "{2337, 0}"; ! sepNavVisRect = "{{0, 280}, {1090, 574}}"; ! sepNavWindowFrame = "{{104, 134}, {1135, 680}}"; }; }; *************** *** 2353,2357 **** sepNavIntBoundsRect = "{{0, 0}, {1148, 2099}}"; sepNavSelRange = "{3920, 0}"; ! sepNavVisRect = "{{0, 390}, {606, 326}}"; sepNavWindowFrame = "{{15, 285}, {750, 542}}"; }; --- 2600,2604 ---- sepNavIntBoundsRect = "{{0, 0}, {1148, 2099}}"; sepNavSelRange = "{3920, 0}"; ! sepNavVisRect = "{{0, 378}, {606, 326}}"; sepNavWindowFrame = "{{15, 285}, {750, 542}}"; }; *************** *** 2579,2584 **** uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {1148, 1651}}"; ! sepNavSelRange = "{4404, 5}"; ! sepNavVisRect = "{{358, 1300}, {734, 159}}"; }; }; --- 2826,2831 ---- uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {1148, 1651}}"; ! sepNavSelRange = "{4376, 0}"; ! sepNavVisRect = "{{0, 1174}, {606, 326}}"; }; }; *************** *** 2786,2819 **** }; }; - 3068913B07F8501700B7B336 = { - fRef = 30C85EC7064647730016E5B3; - isa = PBXTextBookmark; - name = "LineUpTreeNode.m: 94"; - rLen = 0; - rLoc = 4191; - rType = 0; - vrLen = 1904; - vrLoc = 0; - }; - 3068914107F8506600B7B336 = { - fRef = 30C85EC7064647730016E5B3; - isa = PBXTextBookmark; - name = "LineUpTreeNode.m: 94"; - rLen = 0; - rLoc = 4191; - rType = 0; - vrLen = 1904; - vrLoc = 0; - }; - 3068914207F8506600B7B336 = { - fRef = 3053D57007008A6D004019F7; - isa = PBXTextBookmark; - name = "Arena.m: 106"; - rLen = 0; - rLoc = 3920; - rType = 0; - vrLen = 552; - vrLoc = 2148; - }; 3068914307F8506600B7B336 = { fRef = 30C85EC7064647730016E5B3; --- 3033,3036 ---- *************** *** 2826,2889 **** vrLoc = 0; }; - 3068914407F8506600B7B336 = { - fRef = 3053D57007008A6D004019F7; - isa = PBXTextBookmark; - name = "Arena.m: 106"; - rLen = 0; - rLoc = 3920; - rType = 0; - vrLen = 553; - vrLoc = 2147; - }; - 3068914607F8507100B7B336 = { - fRef = 3053D57007008A6D004019F7; - isa = PBXTextBookmark; - name = "Arena.m: 106"; - rLen = 0; - rLoc = 3920; - rType = 0; - vrLen = 553; - vrLoc = 2147; - }; - 3068914707F850A100B7B336 = { - fRef = 3053D57007008A6D004019F7; - isa = PBXTextBookmark; - name = "Arena.m: 106"; - rLen = 0; - rLoc = 3920; - rType = 0; - vrLen = 553; - vrLoc = 2147; - }; - 3068914807F851B100B7B336 = { - fRef = 3053D57007008A6D004019F7; - isa = PBXTextBookmark; - name = "Arena.m: 110"; - rLen = 0; - rLoc = 3920; - rType = 0; - vrLen = 578; - vrLoc = 2147; - }; - 3068914907F8521700B7B336 = { - fRef = 3053D57007008A6D004019F7; - isa = PBXTextBookmark; - name = "Arena.m: 110"; - rLen = 0; - rLoc = 3920; - rType = 0; - vrLen = 578; - vrLoc = 2147; - }; - 306BE29307B80208009942ED = { - fRef = 30A1800F0640E5C300D2836F; - isa = PBXTextBookmark; - name = "Player.m: setValue:forUndefinedKey:"; - rLen = 0; - rLoc = 10440; - rType = 0; - vrLen = 1104; - vrLoc = 10304; - }; 306BE2A807B803D6009942ED = { uiCtxt = { --- 3043,3046 ---- *************** *** 3223,3227 **** sepNavSelRange = "{2550, 138}"; sepNavVisRect = "{{0, 609}, {606, 326}}"; ! sepNavWindowFrame = "{{15, 114}, {1041, 713}}"; }; }; --- 3380,3384 ---- sepNavSelRange = "{2550, 138}"; sepNavVisRect = "{{0, 609}, {606, 326}}"; ! sepNavWindowFrame = "{{72, 191}, {750, 534}}"; }; }; *************** *** 3463,3510 **** vrLoc = 2685; }; - 3081C09807F7F83900C958A9 = { - fRef = 307C355A0642738100302C60; - isa = PBXTextBookmark; - name = "\tif([[NSUserDefaults standardUserDefaults] boolForKey:@\"savePasswordInKeychain\"]) {\n\t\t[self setPassword: [self passwordFromKeychain]];\n\t}\n"; - rLen = 138; - rLoc = 2550; - rType = 0; - vrLen = 1182; - vrLoc = 2685; - }; - 3081C09D07F7F98800C958A9 = { - fRef = 301E3B2F064A7C1A00C88C10; - isa = PBXTextBookmark; - name = " = NSSelectorFromString("; - rLen = 24; - rLoc = 3853; - rType = 0; - vrLen = 1698; - vrLoc = 16626; - }; - 3081C09E07F7F98800C958A9 = { - fRef = 30C85EC7064647730016E5B3; - isa = PBXBookmark; - }; - 3081C09F07F7F98800C958A9 = { - fRef = 301E3B2F064A7C1A00C88C10; - isa = PBXTextBookmark; - name = " = NSSelectorFromString("; - rLen = 24; - rLoc = 3853; - rType = 0; - vrLen = 1698; - vrLoc = 16626; - }; - 3081C0A207F7FA1200C958A9 = { - fRef = 30C85EC7064647730016E5B3; - isa = PBXTextBookmark; - name = "LineUpTreeNode.m: 94"; - rLen = 0; - rLoc = 4191; - rType = 0; - vrLen = 1904; - vrLoc = 0; - }; 308426AA0643ABD200173CCD = { uiCtxt = { --- 3620,3623 ---- *************** *** 3600,3613 **** }; }; - 308832FC07E6139F0078CE5B = { - fRef = 306096370793195B00BAA4CF; - isa = PBXTextBookmark; - name = "World.m: 100"; - rLen = 0; - rLoc = 4459; - rType = 0; - vrLen = 1020; - vrLoc = 3440; - }; 3088330307E613DD0078CE5B = { fRef = 32CA4F630368D1EE00C91783; --- 3713,3716 ---- *************** *** 3655,3659 **** name = setPiecesSkillComparison; rLen = 24; ! rLoc = 3853; rType = 0; vrLen = 1411; --- 3758,3762 ---- name = setPiecesSkillComparison; rLen = 24; ! rLoc = 4332; rType = 0; vrLen = 1411; *************** *** 3851,3856 **** uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {950, 6229}}"; ! sepNavSelRange = "{2210, 0}"; ! sepNavVisRect = "{{0, 114}, {705, 428}}"; sepNavWindowFrame = "{{61, 251}, {750, 534}}"; }; --- 3954,3959 ---- uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {950, 6229}}"; ! sepNavSelRange = "{10440, 0}"; ! sepNavVisRect = "{{0, 4914}, {606, 326}}"; sepNavWindowFrame = "{{61, 251}, {750, 534}}"; }; *************** *** 4141,4147 **** 30C85EC6064647730016E5B3 = { uiCtxt = { ! sepNavIntBoundsRect = "{{0, 0}, {677, 825}}"; sepNavSelRange = "{2738, 47}"; ! sepNavVisRect = "{{0, 547}, {677, 265}}"; sepNavWindowFrame = "{{176, 122}, {750, 558}}"; }; --- 4244,4250 ---- 30C85EC6064647730016E5B3 = { uiCtxt = { ! sepNavIntBoundsRect = "{{0, 0}, {1110, 825}}"; sepNavSelRange = "{2738, 47}"; ! sepNavVisRect = "{{0, 345}, {1110, 480}}"; sepNavWindowFrame = "{{176, 122}, {750, 558}}"; }; *************** *** 4151,4155 **** sepNavIntBoundsRect = "{{0, 0}, {818, 1581}}"; sepNavSelRange = "{4191, 0}"; ! sepNavVisRect = "{{0, 0}, {606, 326}}"; sepNavWindowFrame = "{{522, 118}, {750, 522}}"; }; --- 4254,4258 ---- sepNavIntBoundsRect = "{{0, 0}, {818, 1581}}"; sepNavSelRange = "{4191, 0}"; ! sepNavVisRect = "{{0, 365}, {606, 326}}"; sepNavWindowFrame = "{{522, 118}, {750, 522}}"; }; *************** *** 4204,4217 **** 30C863DA0646A40D0016E5B3 = { uiCtxt = { ! sepNavIntBoundsRect = "{{0, 0}, {705, 699}}"; ! sepNavSelRange = "{2524, 0}"; ! sepNavVisRect = "{{0, 271}, {705, 428}}"; }; }; 30C863DB0646A40D0016E5B3 = { uiCtxt = { ! sepNavIntBoundsRect = "{{0, 0}, {788, 1259}}"; ! sepNavSelRange = "{0, 2148}"; ! sepNavVisRect = "{{0, 284}, {596, 238}}"; sepNavWindowFrame = "{{107, 221}, {750, 522}}"; }; --- 4307,4320 ---- 30C863DA0646A40D0016E5B3 = { uiCtxt = { ! sepNavIntBoundsRect = "{{0, 0}, {823, 825}}"; ! sepNavSelRange = "{2685, 0}"; ! sepNavVisRect = "{{0, 177}, {823, 556}}"; }; }; 30C863DB0646A40D0016E5B3 = { uiCtxt = { ! sepNavIntBoundsRect = "{{0, 0}, {788, 1483}}"; ! sepNavSelRange = "{745, 0}"; ! sepNavVisRect = "{{0, 0}, {606, 326}}"; sepNavWindowFrame = "{{107, 221}, {750, 522}}"; }; *************** *** 4226,4233 **** 30C863FC0646AAF30016E5B3 = { uiCtxt = { ! sepNavIntBoundsRect = "{{0, 0}, {705, 1119}}"; ! sepNavSelRange = "{2200, 0}"; ! sepNavVisRect = "{{0, 213}, {705, 428}}"; ! sepNavWindowFrame = "{{107, 95}, {750, 542}}"; }; }; --- 4329,4336 ---- 30C863FC0646AAF30016E5B3 = { uiCtxt = { ! sepNavIntBoundsRect = "{{0, 0}, {1110, 1189}}"; ! sepNavSelRange = "{4672, 0}"; ! sepNavVisRect = "{{0, 708}, {1110, 480}}"; ! sepNavWindowFrame = "{{38, 200}, {1155, 586}}"; }; }; *************** *** 4313,4319 **** 30D77AA106455BEF0095BAC8 = { uiCtxt = { ! sepNavIntBoundsRect = "{{0, 0}, {686, 1343}}"; ! sepNavSelRange = "{2182, 0}"; ! sepNavVisRect = "{{0, 332}, {606, 326}}"; sepNavWindowFrame = "{{465, 282}, {750, 534}}"; }; --- 4416,4422 ---- 30D77AA106455BEF0095BAC8 = { uiCtxt = { ! sepNavIntBoundsRect = "{{0, 0}, {823, 1427}}"; ! sepNavSelRange = "{4096, 46}"; ! sepNavVisRect = "{{0, 871}, {823, 556}}"; sepNavWindowFrame = "{{465, 282}, {750, 534}}"; }; *************** *** 4321,4328 **** 30D77AA206455BEF0095BAC8 = { uiCtxt = { ! sepNavIntBoundsRect = "{{0, 0}, {2036, 5179}}"; ! sepNavSelRange = "{5500, 0}"; ! sepNavVisRect = "{{0, 797}, {606, 326}}"; ! sepNavWindowFrame = "{{84, 230}, {750, 534}}"; }; }; --- 4424,4431 ---- 30D77AA206455BEF0095BAC8 = { uiCtxt = { ! sepNavIntBoundsRect = "{{0, 0}, {2036, 5683}}"; ! sepNavSelRange = "{17776, 0}"; ! sepNavVisRect = "{{0, 4025}, {618, 209}}"; ! sepNavWindowFrame = "{{212, 47}, {1064, 783}}"; }; }; *************** *** 4337,4343 **** 30D77BEC0645778B0095BAC8 = { uiCtxt = { ! sepNavIntBoundsRect = "{{0, 0}, {1100, 2071}}"; ! sepNavSelRange = "{10132, 10}"; ! sepNavVisRect = "{{0, 1643}, {705, 428}}"; sepNavWindowFrame = "{{195, 115}, {970, 675}}"; }; --- 4440,4446 ---- 30D77BEC0645778B0095BAC8 = { uiCtxt = { ! sepNavIntBoundsRect = "{{0, 0}, {1110, 2141}}"; ! sepNavSelRange = "{10998, 0}"; ! sepNavVisRect = "{{0, 1491}, {1110, 480}}"; sepNavWindowFrame = "{{195, 115}, {970, 675}}"; }; *************** *** 4410,4413 **** --- 4513,4536 ---- vrLoc = 2427; }; + 30DD3C8B07F874EB00FE74BF = { + fRef = 3053D57007008A6D004019F7; + isa = PBXTextBookmark; + name = "Arena.m: 110"; + rLen = 0; + rLoc = 3920; + rType = 0; + vrLen = 576; + vrLoc = 2147; + }; + 30DD3C8C07F874EB00FE74BF = { + fRef = 3053D57007008A6D004019F7; + isa = PBXTextBookmark; + name = "Arena.m: 110"; + rLen = 0; + rLoc = 3920; + rType = 0; + vrLen = 576; + vrLoc = 2147; + }; 30DE3EC607C3BC3600342677 = { fRef = 30D77AA106455BEF0095BAC8; *************** *** 4420,4433 **** vrLoc = 1823; }; - 30DE3EC707C3BC3600342677 = { - fRef = 30D77AA206455BEF0095BAC8; - isa = PBXTextBookmark; - name = "Position.m: 120"; - rLen = 0; - rLoc = 5500; - rType = 0; - vrLen = 1021; - vrLoc = 3116; - }; 30DE3EC807C3BC3600342677 = { fRef = 30D77AA106455BEF0095BAC8; --- 4543,4546 ---- *************** *** 4514,4518 **** name = WingerTowardsMiddle; rLen = 0; ! rLoc = 5500; rType = 0; vrLen = 1250; --- 4627,4631 ---- name = WingerTowardsMiddle; rLen = 0; ! rLoc = 5912; rType = 0; vrLen = 1250; |
|
From: Geisschaes <gei...@us...> - 2005-04-25 20:23:30
|
Update of /cvsroot/macattrick/macattrick/Test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29600/Test Modified Files: LineUpTreeTest.m PositionTest.m Log Message: some line up statistics added. but do not seem correct yet Index: PositionTest.m =================================================================== RCS file: /cvsroot/macattrick/macattrick/Test/PositionTest.m,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** PositionTest.m 7 Feb 2005 21:16:29 -0000 1.9 --- PositionTest.m 25 Apr 2005 20:23:02 -0000 1.10 *************** *** 144,147 **** --- 144,152 ---- } + -(void) testBelongsToSection { + [self assertTrue: [[[PositionHeap uniqueInstance] positionWithIdentifier:@"Keeper"] belongsToSection:@"Defense"]]; + [self assertTrue: [[[PositionHeap uniqueInstance] positionWithIdentifier:@"Inner Midfield Offensive"] belongsToSection:@"Midfield"]]; + [self assertTrue: [[[PositionHeap uniqueInstance] positionWithIdentifier:@"Forward Defensive"] belongsToSection:@"Attack"]]; + } @end Index: LineUpTreeTest.m =================================================================== RCS file: /cvsroot/macattrick/macattrick/Test/LineUpTreeTest.m,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** LineUpTreeTest.m 7 Feb 2005 21:16:28 -0000 1.10 --- LineUpTreeTest.m 25 Apr 2005 20:23:02 -0000 1.11 *************** *** 73,79 **** } ! ! - (void) buildTree { ! } @end --- 73,84 ---- } ! - (void) testStrength { ! 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]; ! } @end |
|
From: Geisschaes <gei...@us...> - 2005-04-25 20:23:17
|
Update of /cvsroot/macattrick/macattrick In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29600 Modified Files: LineUpController.h LineUpController.m LineUpTree.h LineUpTree.m Position.h Position.m Log Message: some line up statistics added. but do not seem correct yet Index: Position.m =================================================================== RCS file: /cvsroot/macattrick/macattrick/Position.m,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** Position.m 6 Feb 2005 19:36:18 -0000 1.8 --- Position.m 25 Apr 2005 20:22:37 -0000 1.9 *************** *** 32,35 **** --- 32,36 ---- static NSMutableDictionary *positionsDictionary; + @interface Position (Private) - (void) setPlayerFormRate: (double) newPlayerFormRate; *************** *** 47,50 **** --- 48,54 ---- + (void) loadDefaultPositions; + (void) loadPositions; + + (NSArray*) defenseSectionIdentifier; + + (NSArray*) midfieldSectionIdentifier; + + (NSArray*) attackSectionIdentifier; @end *************** *** 199,202 **** --- 203,221 ---- } + -(BOOL) belongsToSection: (NSString*) section { + if([section isEqualToString:@"Total"]) { + return YES; + } + if([section isEqualToString:@"Defense"] && [[Position defenseSectionIdentifier] containsObject:[self identifier]]) { + return YES; + } + else if([section isEqualToString:@"Midfield"] && [[Position midfieldSectionIdentifier] containsObject:[self identifier]]) { + return YES; + } + else if([section isEqualToString:@"Attack"] && [[Position attackSectionIdentifier] containsObject:[self identifier]]) { + return YES; + } + return NO; + } -(void) saveToUserDefaults { *************** *** 238,241 **** --- 257,261 ---- + +(Position*) positionWithIdentifier: (NSString*) positionsIdentifier { Position *pos = [positionsDictionary objectForKey:positionsIdentifier]; *************** *** 283,286 **** --- 303,322 ---- } + + + (NSArray *) defenseSectionIdentifier{ + return [NSArray arrayWithObjects: @"Keeper",@"Central Defender",@"Central Defender Towards Wing",@"Central Defender Offensive", + @"Wingback",@"Wingback Offensive",@"Wingback Defensive",@"Wingback Towards Middle",nil]; + } + + (NSArray*) midfieldSectionIdentifier { + return [NSArray arrayWithObjects:@"Inner Midfield",@"Inner Midfield Defensive",@"Inner Midfield Offensive",@"Inner Midfield Towards Wing", + @"Winger",@"Winger Defensive",@"Winger Offensive",@"Winger Towards Middle", nil ]; + } + + + (NSArray*) attackSectionIdentifier { + return [NSArray arrayWithObjects:@"Forward",@"Forward Defensive", nil]; + } + + + + (void) initialize { [Position loadPositions]; Index: LineUpController.m =================================================================== RCS file: /cvsroot/macattrick/macattrick/LineUpController.m,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** LineUpController.m 28 Mar 2005 08:40:20 -0000 1.19 --- LineUpController.m 25 Apr 2005 20:22:37 -0000 1.20 *************** *** 30,33 **** --- 30,49 ---- #import "PositionHeap.h" + @interface LineUpController (Private) + + - (NSArray*) teamFromLineUp: (NSArray*) lineUp; + -(void)setPiecesPlayer: (NSArray*) team; + -(void)teamCaptainPlayer: (NSArray*) team; + - (void) displayLineUp: (NSArray*) lineUp; + -(void) displaySubstitutes: (NSArray*) substitutes ; + - (NSArray*) substitutesPositions; + - (void) loadPositions; + - (void) loadForward; + - (void) loadWinger; + - (void) loadInnerMidfield; + - (void) loadBackWings; + - (void) loadCentralDefender; + - (void) displayStrenght: (LineUpTree*) tree; + @end @implementation LineUpController *************** *** 44,49 **** ! - (IBAction)recalculate:(id)sender ! { [self loadPositions]; LineUpTree *lineUpTree = [[LineUpTree alloc] initWithPositions:positions]; --- 60,64 ---- ! - (IBAction)recalculate:(id)sender { [self loadPositions]; LineUpTree *lineUpTree = [[LineUpTree alloc] initWithPositions:positions]; *************** *** 60,63 **** --- 75,79 ---- NSArray *substitutes = [subLineUpTree bestLineUp]; [self displaySubstitutes: substitutes]; + [self displayStrenght:lineUpTree]; [lineUpTree release]; [subLineUpTree release]; *************** *** 109,112 **** --- 125,141 ---- } + - (void) displayStrenght: (LineUpTree*) tree { + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc]init]; + NSString *totalString = [NSString stringWithFormat:@"%.2f", [tree strength:@"Total"]]; + NSString *defenseString = [NSString stringWithFormat:@"%.2f", [tree strength:@"Defense"]]; + NSString *midfieldString = [NSString stringWithFormat:@"%.2f", [tree strength:@"Midfield"]]; + NSString *attackString = [NSString stringWithFormat:@"%.2f", [tree strength:@"Attack"]]; + [totalStrength setStringValue: totalString]; + [defenseStrength setStringValue:defenseString]; + [midfieldStrength setStringValue:midfieldString]; + [attackStrength setStringValue:attackString]; + [pool release]; + } + - (void) loadPositions { positions = [NSMutableArray arrayWithCapacity:11]; Index: Position.h =================================================================== RCS file: /cvsroot/macattrick/macattrick/Position.h,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** Position.h 6 Feb 2005 19:36:18 -0000 1.7 --- Position.h 25 Apr 2005 20:22:37 -0000 1.8 *************** *** 79,82 **** --- 79,88 ---- -(BOOL) isEqual:(id) anObject; + /*! + @method belongsToSection + @abstract returns true if the position belongs to a given section. + @discussion currently supported values for sections are: Total, Defense, Midfield, Attack + */ + -(BOOL) belongsToSection: (NSString*) section; -(void) saveToUserDefaults; Index: LineUpTree.h =================================================================== RCS file: /cvsroot/macattrick/macattrick/LineUpTree.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** LineUpTree.h 19 Sep 2004 17:06:42 -0000 1.4 --- LineUpTree.h 25 Apr 2005 20:22:37 -0000 1.5 *************** *** 42,49 **** --- 42,58 ---- + /*! + @method strength + @abstract calculate the strength of a line up for a given section + @discussion section might be one of the following values: Total, Defense, Midfield, Attack + */ + - (double) strength: (NSString*) section; + - (NSArray *) positions; - (NSArray*) bestLineUp; + - (NSSet*) unusedPlayersByBestLineUp; + - (LineUpTreeLayer*) finalLayer; @end Index: LineUpTree.m =================================================================== RCS file: /cvsroot/macattrick/macattrick/LineUpTree.m,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** LineUpTree.m 30 Jun 2004 10:37:30 -0000 1.5 --- LineUpTree.m 25 Apr 2005 20:22:37 -0000 1.6 *************** *** 54,59 **** --- 54,75 ---- } + -(double) strength: (NSString*) section { + double strength = 0.0; + NSArray *lineUp = [self bestLineUp]; + if(!([lineUp count] == [[self positions] count])) { + return -1; + } + int i; + for (i=0; i<[lineUp count]; i++) { + if([[positions objectAtIndex:i] belongsToSection: section]) { + strength += [[[lineUp objectAtIndex:i] player] calculatePositionValue:[positions objectAtIndex:i]]; + } + } + return strength; + } + - (NSArray *) positions { return positions; } + - (NSArray*) bestLineUp { LineUpTreeNode *node = [[self finalLayer] bestScoringNode]; Index: LineUpController.h =================================================================== RCS file: /cvsroot/macattrick/macattrick/LineUpController.h,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** LineUpController.h 5 Dec 2004 21:50:44 -0000 1.5 --- LineUpController.h 25 Apr 2005 20:22:37 -0000 1.6 *************** *** 62,65 **** --- 62,69 ---- IBOutlet NSTextField *subWinger; IBOutlet NSTextField *teamCaptain; + IBOutlet NSTextField *totalStrength; + IBOutlet NSTextField *defenseStrength; + IBOutlet NSTextField *midfieldStrength; + IBOutlet NSTextField *attackStrength; IBOutlet NSPopUpButton *specCentralDefender1; IBOutlet NSPopUpButton *specCentralDefender2; *************** *** 73,76 **** --- 77,81 ---- IBOutlet NSPopUpButton *specRightWinger; + } |
|
From: Geisschaes <gei...@us...> - 2005-04-25 20:23:17
|
Update of /cvsroot/macattrick/macattrick/English.lproj/LineUpView.nib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29600/English.lproj/LineUpView.nib Modified Files: classes.nib info.nib keyedobjects.nib Log Message: some line up statistics added. but do not seem correct yet Index: info.nib =================================================================== RCS file: /cvsroot/macattrick/macattrick/English.lproj/LineUpView.nib/info.nib,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** info.nib 18 Feb 2005 15:40:46 -0000 1.3 --- info.nib 25 Apr 2005 20:22:37 -0000 1.4 *************** *** 4,12 **** <dict> <key>IBDocumentLocation</key> ! <string>93 76 356 240 0 0 1600 1002 </string> <key>IBEditorPositions</key> <dict> <key>5</key> ! <string>35 468 827 517 0 0 1600 1002 </string> </dict> <key>IBFramework Version</key> --- 4,12 ---- <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> *************** *** 17,21 **** </array> <key>IBSystem Version</key> ! <string>7U16</string> </dict> </plist> --- 17,21 ---- </array> <key>IBSystem Version</key> ! <string>7W98</string> </dict> </plist> Index: classes.nib =================================================================== RCS file: /cvsroot/macattrick/macattrick/English.lproj/LineUpView.nib/classes.nib,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** classes.nib 5 Dec 2004 21:47:24 -0000 1.1 --- classes.nib 25 Apr 2005 20:22:37 -0000 1.2 *************** *** 7,12 **** --- 7,14 ---- LANGUAGE = ObjC; OUTLETS = { + attackStrength = NSTextField; centralDefender1 = NSTextField; centralDefender2 = NSTextField; + defenseStrength = NSTextField; forward1 = NSTextField; forward2 = NSTextField; *************** *** 17,20 **** --- 19,23 ---- leftWinger = NSTextField; lineUpView = NSView; + midfieldStrength = NSTextField; rightBack = NSTextField; rightWinger = NSTextField; *************** *** 36,39 **** --- 39,43 ---- subWinger = NSTextField; teamCaptain = NSTextField; + totalStrength = NSTextField; }; SUPERCLASS = TeamController; Index: keyedobjects.nib =================================================================== RCS file: /cvsroot/macattrick/macattrick/English.lproj/LineUpView.nib/keyedobjects.nib,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 Binary files /tmp/cvsjGJtKC and /tmp/cvsCJVusX differ |
|
From: Geisschaes <gei...@us...> - 2005-04-25 17:49:37
|
Update of /cvsroot/macattrick/macattrick/English.lproj In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4240 Modified Files: Localizable.strings Log Message: Localizable.strings updated Index: Localizable.strings =================================================================== RCS file: /cvsroot/macattrick/macattrick/English.lproj/Localizable.strings,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Binary files /tmp/cvsUl3QNr and /tmp/cvstOiCBw differ |
|
From: Geisschaes <gei...@us...> - 2005-03-28 14:59:24
|
Update of /cvsroot/macattrick/macattrick In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8202 Modified Files: Arena.h Arena.m Log Message: arena bug with capacity fixed (expanded capacity is now ignoered) Index: Arena.m =================================================================== RCS file: /cvsroot/macattrick/macattrick/Arena.m,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Arena.m 6 Oct 2004 09:58:00 -0000 1.3 --- Arena.m 28 Mar 2005 14:58:39 -0000 1.4 *************** *** 48,51 **** --- 48,52 ---- success = [parser parse]; [parser release]; + currentCapacity = FALSE; return self; } *************** *** 104,107 **** --- 105,111 ---- [currentStringValue release]; currentStringValue = nil; + if([elementName isEqualToString:@"CurrentCapacity"]) { + currentCapacity = TRUE; + } } *************** *** 117,124 **** [self setName: currentStringValue]; } ! else if([elementName isEqualToString:@"VIP"]) { [self setVip:[currentStringValue intValue]]; } ! else { [self setValue:currentStringValue forKey:elementName]; } --- 121,131 ---- [self setName: currentStringValue]; } ! else if([elementName isEqualToString:@"CurrentCapacity"]) { ! currentCapacity = FALSE; ! } ! else if( currentCapacity && [elementName isEqualToString:@"VIP"]) { [self setVip:[currentStringValue intValue]]; } ! else if (currentCapacity) { [self setValue:currentStringValue forKey:elementName]; } Index: Arena.h =================================================================== RCS file: /cvsroot/macattrick/macattrick/Arena.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Arena.h 4 Oct 2004 20:27:32 -0000 1.2 --- Arena.h 28 Mar 2005 14:58:36 -0000 1.3 *************** *** 39,42 **** --- 39,43 ---- NSMutableString *currentStringValue; + bool currentCapacity; } /*! |
|
From: Geisschaes <gei...@us...> - 2005-03-28 14:58:56
|
Update of /cvsroot/macattrick/macattrick/Macattrick.xcode In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8202/Macattrick.xcode Modified Files: roman.mode1 roman.pbxuser Log Message: arena bug with capacity fixed (expanded capacity is now ignoered) Index: roman.mode1 =================================================================== RCS file: /cvsroot/macattrick/macattrick/Macattrick.xcode/roman.mode1,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** roman.mode1 28 Mar 2005 08:40:20 -0000 1.24 --- roman.mode1 28 Mar 2005 14:58:39 -0000 1.25 *************** *** 284,288 **** <string>1CE0B20306471E060097A5F4</string> <key>PBXProjectModuleLabel</key> ! <string>LineUpTreeNode.m</string> <key>PBXSplitModuleInNavigatorKey</key> <dict> --- 284,288 ---- <string>1CE0B20306471E060097A5F4</string> <key>PBXProjectModuleLabel</key> ! <string>Arena.m</string> <key>PBXSplitModuleInNavigatorKey</key> <dict> *************** *** 292,298 **** <string>1CE0B20406471E060097A5F4</string> <key>PBXProjectModuleLabel</key> ! <string>LineUpTreeNode.m</string> <key>bookmark</key> ! <string>3081C0A207F7FA1200C958A9</string> <key>history</key> <array> --- 292,298 ---- <string>1CE0B20406471E060097A5F4</string> <key>PBXProjectModuleLabel</key> ! <string>Arena.m</string> <key>bookmark</key> ! <string>3068914907F8521700B7B336</string> <key>history</key> <array> *************** *** 403,407 **** <string>3081C09707F7F83900C958A9</string> <string>3081C09D07F7F98800C958A9</string> ! <string>3081C09E07F7F98800C958A9</string> </array> <key>prevStack</key> --- 403,408 ---- <string>3081C09707F7F83900C958A9</string> <string>3081C09D07F7F98800C958A9</string> ! <string>3068914107F8506600B7B336</string> ! <string>3068914207F8506600B7B336</string> </array> <key>prevStack</key> *************** *** 513,518 **** <string>30272D3B07F5809800B39CEA</string> <string>30272D4607F5816400B39CEA</string> ! <string>3081C09807F7F83900C958A9</string> ! <string>3081C09F07F7F98800C958A9</string> </array> </dict> --- 514,518 ---- <string>30272D3B07F5809800B39CEA</string> <string>30272D4607F5816400B39CEA</string> ! <string>3068914307F8506600B7B336</string> </array> </dict> *************** *** 536,539 **** --- 536,541 ---- </dict> <dict> + <key>BecomeActive</key> + <true/> <key>ContentConfiguration</key> <dict> *************** *** 572,578 **** <key>TableOfContents</key> <array> ! <string>3081C09207F7F77800C958A9</string> <string>1CE0B1FE06471DED0097A5F4</string> ! <string>3081C09307F7F77800C958A9</string> <string>1CE0B20306471E060097A5F4</string> <string>1CE0B20506471E060097A5F4</string> --- 574,580 ---- <key>TableOfContents</key> <array> ! <string>3068913C07F8501700B7B336</string> <string>1CE0B1FE06471DED0097A5F4</string> ! <string>3068913D07F8501700B7B336</string> <string>1CE0B20306471E060097A5F4</string> <string>1CE0B20506471E060097A5F4</string> *************** *** 602,609 **** <key>WindowOrderList</key> <array> ! <string>3081C09507F7F77800C958A9</string> <string>1CD10A99069EF8BA00B06720</string> <string>/Users/roman/Documents/dev/macattrick/Macattrick.xcode</string> ! <string>3081C09A07F7F83900C958A9</string> </array> <key>WindowString</key> --- 604,612 ---- <key>WindowOrderList</key> <array> ! <string>3068913F07F8501700B7B336</string> <string>1CD10A99069EF8BA00B06720</string> + <string>3068914507F8506600B7B336</string> <string>/Users/roman/Documents/dev/macattrick/Macattrick.xcode</string> ! <string>1C0AD2B3069F1EA900FABCE6</string> </array> <key>WindowString</key> *************** *** 743,748 **** <key>sizes</key> <array> ! <string>{{0, 0}, {133, 242}}</string> ! <string>{{133, 0}, {756, 242}}</string> </array> </dict> --- 746,751 ---- <key>sizes</key> <array> ! <string>{{0, 0}, {124, 242}}</string> ! <string>{{124, 0}, {765, 242}}</string> </array> </dict> *************** *** 769,773 **** <string>1C162984064C10D400B95A72</string> <key>PBXProjectModuleLabel</key> ! <string>Debug - Macattrick (Devel Macattrick)</string> </dict> <key>GeometryConfiguration</key> --- 772,776 ---- <string>1C162984064C10D400B95A72</string> <key>PBXProjectModuleLabel</key> ! <string>Debug - Macattrick (Test)</string> </dict> <key>GeometryConfiguration</key> *************** *** 807,813 **** <array> <string>1CD10A99069EF8BA00B06720</string> ! <string>3081C09407F7F77800C958A9</string> <string>1C162984064C10D400B95A72</string> ! <string>3081C09507F7F77800C958A9</string> </array> <key>ToolbarConfiguration</key> --- 810,816 ---- <array> <string>1CD10A99069EF8BA00B06720</string> ! <string>3068913E07F8501700B7B336</string> <string>1C162984064C10D400B95A72</string> ! <string>3068913F07F8501700B7B336</string> </array> <key>ToolbarConfiguration</key> *************** *** 1018,1023 **** <key>sizes</key> <array> ! <string>{{0, 0}, {363, 167}}</string> ! <string>{{0, 176}, {363, 267}}</string> </array> </dict> --- 1021,1026 ---- <key>sizes</key> <array> ! <string>{{0, 0}, {491, 167}}</string> ! <string>{{0, 176}, {491, 267}}</string> </array> </dict> *************** *** 1068,1074 **** <array> <string>1C0AD2B3069F1EA900FABCE6</string> ! <string>30EFC37F07F6A53C00009D39</string> <string>1CD0528B0623707200166675</string> ! <string>30EFC38007F6A53C00009D39</string> </array> <key>ToolbarConfiguration</key> --- 1071,1077 ---- <array> <string>1C0AD2B3069F1EA900FABCE6</string> ! <string>3068914A07F8521700B7B336</string> <string>1CD0528B0623707200166675</string> ! <string>3068914B07F8521700B7B336</string> </array> <key>ToolbarConfiguration</key> *************** *** 1079,1083 **** <string>1C0AD2B3069F1EA900FABCE6</string> <key>WindowToolIsVisible</key> ! <false/> </dict> <dict> --- 1082,1086 ---- <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.89 retrieving revision 1.90 diff -C2 -d -r1.89 -r1.90 *** roman.pbxuser 28 Mar 2005 08:40:20 -0000 1.89 --- roman.pbxuser 28 Mar 2005 14:58:39 -0000 1.90 *************** *** 39,44 **** 29B97313FDCFA39411CA2CEA = { activeBuildStyle = 4A9504CDFFE6A4B311CA0CBA; ! activeExecutable = 30744BA6069560A70039B82A; ! activeTarget = 30744BA4069560A70039B82A; addToTargets = ( 30744BA4069560A70039B82A, --- 39,44 ---- 29B97313FDCFA39411CA2CEA = { activeBuildStyle = 4A9504CDFFE6A4B311CA0CBA; ! activeExecutable = 308427FB0643B8C700173CCD; ! activeTarget = 308427F90643B8C700173CCD; addToTargets = ( 30744BA4069560A70039B82A, *************** *** 198,202 **** ); }; ! PBXPerProjectTemplateStateSaveDate = 133691241; PBXPrepackagedSmartGroups_v2 = ( { --- 198,202 ---- ); }; ! PBXPerProjectTemplateStateSaveDate = 133713935; PBXPrepackagedSmartGroups_v2 = ( { *************** *** 1042,1046 **** RubberWindowFrame = "496 457 599 209 0 0 1280 832 "; }; ! PBXWorkspaceStateSaveDate = 133691241; }; perUserProjectItems = { --- 1042,1046 ---- RubberWindowFrame = "496 457 599 209 0 0 1280 832 "; }; ! PBXWorkspaceStateSaveDate = 133713935; }; perUserProjectItems = { *************** *** 1164,1167 **** --- 1164,1176 ---- 306096C5079325B700BAA4CF = 306096C5079325B700BAA4CF; 306096C6079325B700BAA4CF = 306096C6079325B700BAA4CF; + 3068913B07F8501700B7B336 = 3068913B07F8501700B7B336; + 3068914107F8506600B7B336 = 3068914107F8506600B7B336; + 3068914207F8506600B7B336 = 3068914207F8506600B7B336; + 3068914307F8506600B7B336 = 3068914307F8506600B7B336; + 3068914407F8506600B7B336 = 3068914407F8506600B7B336; + 3068914607F8507100B7B336 = 3068914607F8507100B7B336; + 3068914707F850A100B7B336 = 3068914707F850A100B7B336; + 3068914807F851B100B7B336 = 3068914807F851B100B7B336; + 3068914907F8521700B7B336 = 3068914907F8521700B7B336; 306BE29307B80208009942ED = 306BE29307B80208009942ED; 306BE2B307B803E7009942ED = 306BE2B307B803E7009942ED; *************** *** 2334,2340 **** 3053D56F07008A6D004019F7 = { uiCtxt = { ! sepNavIntBoundsRect = "{{0, 0}, {524, 895}}"; ! sepNavSelRange = "{2825, 0}"; ! sepNavVisRect = "{{0, 391}, {475, 504}}"; sepNavWindowFrame = "{{38, 264}, {750, 542}}"; }; --- 2343,2349 ---- 3053D56F07008A6D004019F7 = { uiCtxt = { ! sepNavIntBoundsRect = "{{0, 0}, {1090, 909}}"; ! sepNavSelRange = "{2354, 0}"; ! sepNavVisRect = "{{0, 210}, {1090, 574}}"; sepNavWindowFrame = "{{38, 264}, {750, 542}}"; }; *************** *** 2342,2348 **** 3053D57007008A6D004019F7 = { uiCtxt = { ! sepNavIntBoundsRect = "{{0, 0}, {1148, 2001}}"; ! sepNavSelRange = "{3809, 0}"; ! sepNavVisRect = "{{0, 399}, {718, 264}}"; sepNavWindowFrame = "{{15, 285}, {750, 542}}"; }; --- 2351,2357 ---- 3053D57007008A6D004019F7 = { uiCtxt = { ! sepNavIntBoundsRect = "{{0, 0}, {1148, 2099}}"; ! sepNavSelRange = "{3920, 0}"; ! sepNavVisRect = "{{0, 390}, {606, 326}}"; sepNavWindowFrame = "{{15, 285}, {750, 542}}"; }; *************** *** 2777,2780 **** --- 2786,2879 ---- }; }; + 3068913B07F8501700B7B336 = { + fRef = 30C85EC7064647730016E5B3; + isa = PBXTextBookmark; + name = "LineUpTreeNode.m: 94"; + rLen = 0; + rLoc = 4191; + rType = 0; + vrLen = 1904; + vrLoc = 0; + }; + 3068914107F8506600B7B336 = { + fRef = 30C85EC7064647730016E5B3; + isa = PBXTextBookmark; + name = "LineUpTreeNode.m: 94"; + rLen = 0; + rLoc = 4191; + rType = 0; + vrLen = 1904; + vrLoc = 0; + }; + 3068914207F8506600B7B336 = { + fRef = 3053D57007008A6D004019F7; + isa = PBXTextBookmark; + name = "Arena.m: 106"; + rLen = 0; + rLoc = 3920; + rType = 0; + vrLen = 552; + vrLoc = 2148; + }; + 3068914307F8506600B7B336 = { + fRef = 30C85EC7064647730016E5B3; + isa = PBXTextBookmark; + name = "LineUpTreeNode.m: 94"; + rLen = 0; + rLoc = 4191; + rType = 0; + vrLen = 1904; + vrLoc = 0; + }; + 3068914407F8506600B7B336 = { + fRef = 3053D57007008A6D004019F7; + isa = PBXTextBookmark; + name = "Arena.m: 106"; + rLen = 0; + rLoc = 3920; + rType = 0; + vrLen = 553; + vrLoc = 2147; + }; + 3068914607F8507100B7B336 = { + fRef = 3053D57007008A6D004019F7; + isa = PBXTextBookmark; + name = "Arena.m: 106"; + rLen = 0; + rLoc = 3920; + rType = 0; + vrLen = 553; + vrLoc = 2147; + }; + 3068914707F850A100B7B336 = { + fRef = 3053D57007008A6D004019F7; + isa = PBXTextBookmark; + name = "Arena.m: 106"; + rLen = 0; + rLoc = 3920; + rType = 0; + vrLen = 553; + vrLoc = 2147; + }; + 3068914807F851B100B7B336 = { + fRef = 3053D57007008A6D004019F7; + isa = PBXTextBookmark; + name = "Arena.m: 110"; + rLen = 0; + rLoc = 3920; + rType = 0; + vrLen = 578; + vrLoc = 2147; + }; + 3068914907F8521700B7B336 = { + fRef = 3053D57007008A6D004019F7; + isa = PBXTextBookmark; + name = "Arena.m: 110"; + rLen = 0; + rLoc = 3920; + rType = 0; + vrLen = 578; + vrLoc = 2147; + }; 306BE29307B80208009942ED = { fRef = 30A1800F0640E5C300D2836F; |
|
From: Geisschaes <gei...@us...> - 2005-03-28 08:40:34
|
Update of /cvsroot/macattrick/macattrick/Macattrick.xcode In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3195/Macattrick.xcode Modified Files: roman.mode1 roman.pbxuser Log Message: line up memory usage is now cleaned. once the calculation is finished all nodes are deallocated Index: roman.mode1 =================================================================== RCS file: /cvsroot/macattrick/macattrick/Macattrick.xcode/roman.mode1,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** roman.mode1 27 Mar 2005 12:23:33 -0000 1.23 --- roman.mode1 28 Mar 2005 08:40:20 -0000 1.24 *************** *** 248,252 **** <array> <array> ! <integer>4</integer> <integer>0</integer> </array> --- 248,252 ---- <array> <array> ! <integer>3</integer> <integer>0</integer> </array> *************** *** 268,272 **** </array> <key>RubberWindowFrame</key> ! <string>124 163 998 665 0 0 1280 832 </string> </dict> <key>Module</key> --- 268,272 ---- </array> <key>RubberWindowFrame</key> ! <string>123 163 998 665 0 0 1280 832 </string> </dict> <key>Module</key> *************** *** 284,288 **** <string>1CE0B20306471E060097A5F4</string> <key>PBXProjectModuleLabel</key> ! <string>LoginController.m</string> <key>PBXSplitModuleInNavigatorKey</key> <dict> --- 284,288 ---- <string>1CE0B20306471E060097A5F4</string> <key>PBXProjectModuleLabel</key> ! <string>LineUpTreeNode.m</string> <key>PBXSplitModuleInNavigatorKey</key> <dict> *************** *** 292,298 **** <string>1CE0B20406471E060097A5F4</string> <key>PBXProjectModuleLabel</key> ! <string>LoginController.m</string> <key>bookmark</key> ! <string>30EFC3EF07F6DCF200009D39</string> <key>history</key> <array> --- 292,298 ---- <string>1CE0B20406471E060097A5F4</string> <key>PBXProjectModuleLabel</key> ! <string>LineUpTreeNode.m</string> <key>bookmark</key> ! <string>3081C0A207F7FA1200C958A9</string> <key>history</key> <array> *************** *** 324,328 **** <string>3021F7FA07A590F30073597B</string> <string>30884AD707ABF924001F2ACB</string> - <string>30884B0307ABFC21001F2ACB</string> <string>3092DC1807B66D430043063E</string> <string>3092DC1C07B66D430043063E</string> --- 324,327 ---- *************** *** 402,406 **** <string>30EFC3B607F6D5F600009D39</string> <string>30EFC3D507F6DA9000009D39</string> ! <string>30EFC3D607F6DA9000009D39</string> </array> <key>prevStack</key> --- 401,407 ---- <string>30EFC3B607F6D5F600009D39</string> <string>30EFC3D507F6DA9000009D39</string> ! <string>3081C09707F7F83900C958A9</string> ! <string>3081C09D07F7F98800C958A9</string> ! <string>3081C09E07F7F98800C958A9</string> </array> <key>prevStack</key> *************** *** 512,521 **** <string>30272D3B07F5809800B39CEA</string> <string>30272D4607F5816400B39CEA</string> ! <string>30EFC37907F6A53C00009D39</string> ! <string>30EFC38E07F6CD6F00009D39</string> ! <string>30EFC39307F6CFF500009D39</string> ! <string>30EFC39407F6CFF500009D39</string> ! <string>30EFC3B707F6D5F600009D39</string> ! <string>30EFC3D707F6DA9000009D39</string> </array> </dict> --- 513,518 ---- <string>30272D3B07F5809800B39CEA</string> <string>30272D4607F5816400B39CEA</string> ! <string>3081C09807F7F83900C958A9</string> ! <string>3081C09F07F7F98800C958A9</string> </array> </dict> *************** *** 531,535 **** <string>{{0, 0}, {653, 358}}</string> <key>RubberWindowFrame</key> ! <string>124 163 998 665 0 0 1280 832 </string> </dict> <key>Module</key> --- 528,532 ---- <string>{{0, 0}, {653, 358}}</string> <key>RubberWindowFrame</key> ! <string>123 163 998 665 0 0 1280 832 </string> </dict> <key>Module</key> *************** *** 539,544 **** </dict> <dict> - <key>BecomeActive</key> - <true/> <key>ContentConfiguration</key> <dict> --- 536,539 ---- *************** *** 553,557 **** <string>{{0, 365}, {653, 258}}</string> <key>RubberWindowFrame</key> ! <string>124 163 998 665 0 0 1280 832 </string> </dict> <key>Module</key> --- 548,552 ---- <string>{{0, 365}, {653, 258}}</string> <key>RubberWindowFrame</key> ! <string>123 163 998 665 0 0 1280 832 </string> </dict> <key>Module</key> *************** *** 577,583 **** <key>TableOfContents</key> <array> ! <string>30EFC37B07F6A53C00009D39</string> <string>1CE0B1FE06471DED0097A5F4</string> ! <string>30EFC37C07F6A53C00009D39</string> <string>1CE0B20306471E060097A5F4</string> <string>1CE0B20506471E060097A5F4</string> --- 572,578 ---- <key>TableOfContents</key> <array> ! <string>3081C09207F7F77800C958A9</string> <string>1CE0B1FE06471DED0097A5F4</string> ! <string>3081C09307F7F77800C958A9</string> <string>1CE0B20306471E060097A5F4</string> <string>1CE0B20506471E060097A5F4</string> *************** *** 607,620 **** <key>WindowOrderList</key> <array> ! <string>1C530D57069F1CE1000CFCEE</string> ! <string>303B68B1075A0D24009951CC</string> ! <string>30EFC37E07F6A53C00009D39</string> ! <string>1C0AD2B3069F1EA900FABCE6</string> <string>1CD10A99069EF8BA00B06720</string> - <string>30EFC38107F6A53C00009D39</string> <string>/Users/roman/Documents/dev/macattrick/Macattrick.xcode</string> </array> <key>WindowString</key> ! <string>124 163 998 665 0 0 1280 832 </string> <key>WindowTools</key> <array> --- 602,612 ---- <key>WindowOrderList</key> <array> ! <string>3081C09507F7F77800C958A9</string> <string>1CD10A99069EF8BA00B06720</string> <string>/Users/roman/Documents/dev/macattrick/Macattrick.xcode</string> + <string>3081C09A07F7F83900C958A9</string> </array> <key>WindowString</key> ! <string>123 163 998 665 0 0 1280 832 </string> <key>WindowTools</key> <array> *************** *** 645,649 **** <string>HattrickOrg.m</string> <key>bookmark</key> ! <string>30EFC3F007F6DCF200009D39</string> <key>history</key> <array> --- 637,641 ---- <string>HattrickOrg.m</string> <key>bookmark</key> ! <string>30EFC3F807F6E34900009D39</string> <key>history</key> <array> *************** *** 751,756 **** <key>sizes</key> <array> ! <string>{{0, 0}, {142, 242}}</string> ! <string>{{142, 0}, {747, 242}}</string> </array> </dict> --- 743,748 ---- <key>sizes</key> <array> ! <string>{{0, 0}, {133, 242}}</string> ! <string>{{133, 0}, {756, 242}}</string> </array> </dict> *************** *** 815,821 **** <array> <string>1CD10A99069EF8BA00B06720</string> ! <string>30EFC37D07F6A53C00009D39</string> <string>1C162984064C10D400B95A72</string> ! <string>30EFC37E07F6A53C00009D39</string> </array> <key>ToolbarConfiguration</key> --- 807,813 ---- <array> <string>1CD10A99069EF8BA00B06720</string> ! <string>3081C09407F7F77800C958A9</string> <string>1C162984064C10D400B95A72</string> ! <string>3081C09507F7F77800C958A9</string> </array> <key>ToolbarConfiguration</key> *************** *** 857,861 **** <string>World.m</string> <key>bookmark</key> ! <string>30EFC3F107F6DCF200009D39</string> <key>history</key> <array> --- 849,853 ---- <string>World.m</string> <key>bookmark</key> ! <string>30EFC3F907F6E34900009D39</string> <key>history</key> <array> Index: roman.pbxuser =================================================================== RCS file: /cvsroot/macattrick/macattrick/Macattrick.xcode/roman.pbxuser,v retrieving revision 1.88 retrieving revision 1.89 diff -C2 -d -r1.88 -r1.89 *** roman.pbxuser 27 Mar 2005 12:23:33 -0000 1.88 --- roman.pbxuser 28 Mar 2005 08:40:20 -0000 1.89 *************** *** 198,202 **** ); }; ! PBXPerProjectTemplateStateSaveDate = 133604477; PBXPrepackagedSmartGroups_v2 = ( { --- 198,202 ---- ); }; ! PBXPerProjectTemplateStateSaveDate = 133691241; PBXPrepackagedSmartGroups_v2 = ( [...1465 lines suppressed...] - name = "HattrickOrg.m: 68"; - rLen = 0; - rLoc = 2904; - rType = 0; - vrLen = 509; - vrLoc = 3334; - }; - 30EFC3F107F6DCF200009D39 = { - fRef = 306096370793195B00BAA4CF; - isa = PBXTextBookmark; - name = range; - rLen = 5; - rLoc = 4404; - rType = 0; - vrLen = 478; - vrLoc = 4117; - }; 32CA4F630368D1EE00C91783 = { uiCtxt = { --- 4525,4528 ---- |
|
From: Geisschaes <gei...@us...> - 2005-03-28 08:40:32
|
Update of /cvsroot/macattrick/macattrick In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3195 Modified Files: LineUpController.m LineUpTreeNode.m Log Message: line up memory usage is now cleaned. once the calculation is finished all nodes are deallocated Index: LineUpController.m =================================================================== RCS file: /cvsroot/macattrick/macattrick/LineUpController.m,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** LineUpController.m 7 Feb 2005 21:15:39 -0000 1.18 --- LineUpController.m 28 Mar 2005 08:40:20 -0000 1.19 *************** *** 60,63 **** --- 60,65 ---- NSArray *substitutes = [subLineUpTree bestLineUp]; [self displaySubstitutes: substitutes]; + [lineUpTree release]; + [subLineUpTree release]; } Index: LineUpTreeNode.m =================================================================== RCS file: /cvsroot/macattrick/macattrick/LineUpTreeNode.m,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** LineUpTreeNode.m 21 Jul 2004 19:59:59 -0000 1.5 --- LineUpTreeNode.m 28 Mar 2005 08:40:20 -0000 1.6 *************** *** 82,95 **** Player *restingAvailablePlayer; while (restingAvailablePlayer = [newEnumerator nextObject]) { ! if(restingAvailablePlayer != availablePlayer) ! { [newAvailableSet addObject:restingAvailablePlayer]; } } ! [nextNodes addObject:[[LineUpTreeNode alloc] initWithPlayer: availablePlayer stillAvailablePlayers: newAvailableSet position: nextPosition score: (score + [availablePlayer calculatePositionValue: nextPosition]) ! precedingNode: self]]; } [pool release]; --- 82,96 ---- Player *restingAvailablePlayer; while (restingAvailablePlayer = [newEnumerator nextObject]) { ! if(restingAvailablePlayer != availablePlayer) { [newAvailableSet addObject:restingAvailablePlayer]; } } ! LineUpTreeNode *next = [[LineUpTreeNode alloc] initWithPlayer: availablePlayer stillAvailablePlayers: newAvailableSet position: nextPosition score: (score + [availablePlayer calculatePositionValue: nextPosition]) ! precedingNode: self]; ! [nextNodes addObject: next]; ! [next release]; } [pool release]; |
|
From: Geisschaes <gei...@us...> - 2005-03-27 12:24:14
|
Update of /cvsroot/macattrick/macattrick In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26265 Modified Files: HattrickOrg.h HattrickOrg.m LoginController.m Log Message: if login failes, a message is displayed Index: LoginController.m =================================================================== RCS file: /cvsroot/macattrick/macattrick/LoginController.m,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** LoginController.m 27 Feb 2005 15:14:44 -0000 1.13 --- LoginController.m 27 Mar 2005 12:23:33 -0000 1.14 *************** *** 62,71 **** [[HattrickOrg uniqueInstance] setServerName:serverName]; [[HattrickOrg uniqueInstance] setLoginName:loginName password:password ]; ! [[HattrickOrg uniqueInstance] loginAndDownload]; ! if ([[NSUserDefaults standardUserDefaults] boolForKey:@"savePasswordInKeychain"] && loginName && password) { ! [self savePasswordInKeychain]; ! } ! [self loadTeam]; ! [self close]; } --- 62,84 ---- [[HattrickOrg uniqueInstance] setServerName:serverName]; [[HattrickOrg uniqueInstance] setLoginName:loginName password:password ]; ! int errorCode = [[HattrickOrg uniqueInstance] loginAndDownload]; ! if(!errorCode) { // no error occured ! if ([[NSUserDefaults standardUserDefaults] boolForKey:@"savePasswordInKeychain"] && loginName && password) { ! [self savePasswordInKeychain]; ! } ! [self loadTeam]; ! [self close]; ! } ! else { ! NSString *title = NSLocalizedString(@"Login failed", @"Login failed"); ! if(errorCode == -3) { // wrong password or loginname ! NSString *wrongLogin = NSLocalizedString(@"Login to hattrick.org failed. \nWrong login or security code.", @"Login to hattrick.org failed. \nWrong login or security code."); ! NSRunAlertPanel(title,wrongLogin,@"Ok",nil,nil); ! } ! if(errorCode == -2 || errorCode == -1) { // connecting to server failed ! NSString *wrongLogin = NSLocalizedString(@"Connecting to hattrick.org failed. \nPlease check the server name and try again.", @"Connecting to hattrick.org failed. \nPlease check the server name and try again."); ! NSRunAlertPanel(title,wrongLogin,@"Ok",nil,nil); ! } ! } } Index: HattrickOrg.m =================================================================== RCS file: /cvsroot/macattrick/macattrick/HattrickOrg.m,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** HattrickOrg.m 14 Mar 2005 19:30:51 -0000 1.20 --- HattrickOrg.m 27 Mar 2005 12:23:33 -0000 1.21 *************** *** 32,36 **** @interface HattrickOrg (Private) ! -(void) download: (NSString*) urlString toFile: (NSString*) file; -(NSURLRequest*) buildRequest: (NSString*) urlString ; @end --- 32,36 ---- @interface HattrickOrg (Private) ! -(int) download: (NSString*) urlString toFile: (NSString*) file; -(NSURLRequest*) buildRequest: (NSString*) urlString ; @end *************** *** 67,71 **** - - (NSString *)loginName { return loginName; } --- 67,70 ---- *************** *** 79,169 **** } ! - (void) loginAndDownload { ! [self login]; ! [self downloadPlayers]; ! [self downloadWorldDetails]; ! [self downloadArenaDetails]; ! [self downloadClub]; ! [self downloadEconomy]; ! [self downloadLeagueDetails]; ! [self downloadTeamDetails]; ! [self downloadTraining]; ! [self logout]; } ! - (void) login { ! NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; ! NSString *urlString = [NSString stringWithFormat:@"http://%s/Common/default.asp?outputType=XML&actionType=login&loginType=CHPP&Loginname=%s&readonlypassword=%s", [serverName cString], [loginName cString], [password cString]]; ! NSError *error; ! NSURLResponse *response; ! NSData *data = [NSURLConnection sendSynchronousRequest:[self buildRequest:urlString]returningResponse:&response error:&error]; ! [[NSFileManager defaultManager] removeFileAtPath:[Properties loginFile] handler:nil]; ! [data writeToFile:[Properties loginFile] atomically:YES]; ! [pool release]; } ! - (void) logout { ! NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; ! NSString *urlString = [NSString stringWithFormat:@"http://%s/Common/default.asp?outputType=XML&actionType=logout", ! [serverName cString]]; ! NSError *error; ! NSURLResponse *response; ! NSData *data = [NSURLConnection sendSynchronousRequest:[self buildRequest:urlString]returningResponse:&response error:&error]; ! [[NSFileManager defaultManager] removeFileAtPath:[Properties logoutFile] handler:nil]; ! [data writeToFile:[Properties logoutFile] atomically:YES]; ! [pool release]; } ! -(void) downloadPlayers { ! NSString *urlString = [[NSString alloc] initWithFormat:@"http://%s/Common/players.asp?outputType=XML&actionType=view", ! [serverName cString]]; ! [self download:urlString toFile:[Properties playersFile]]; [urlString release]; } ! -(void) downloadEconomy { ! NSString *urlString = [[NSString alloc] initWithFormat:@"http://%s/Common/economy.asp?outputType=XML&actionType=view", ! [serverName cString]]; ! [self download:urlString toFile: [Properties economyFile]]; [urlString release]; } ! -(void) downloadTeamDetails { ! NSString *urlString = [[NSString alloc] initWithFormat:@"http://%s/Common/teamDetails.asp?outputType=XML&actionType=view", ! [serverName cString]]; ! [self download:urlString toFile: [Properties teamDetailsFile]]; [urlString release]; } ! -(void) downloadLeagueDetails { ! NSString *urlString = [[NSString alloc] initWithFormat:@"http://%s/Common/leagueDetails.asp?outputType=XML&actionType=view", ! [serverName cString]]; ! [self download:urlString toFile: [Properties leagueDetailsFile]]; [urlString release]; } ! -(void) downloadClub { ! NSString *urlString = [[NSString alloc] initWithFormat:@"http://%s/Common/club.asp?outputType=XML&actionType=view", ! [serverName cString]]; ! [self download:urlString toFile: [Properties clubFile]]; [urlString release]; } ! -(void) downloadArenaDetails { ! NSString *urlString = [[NSString alloc] initWithFormat:@"http://%s/Common/arenaDetails.asp?outputType=XML&actionType=view", ! [serverName cString]]; ! [self download:urlString toFile: [Properties arenaDetailsFile]]; [urlString release]; } ! -(void) downloadTraining { ! NSString *urlString = [[NSString alloc] initWithFormat:@"http://%s/Common/training.asp?outputType=XML&actionType=view", ! [serverName cString]]; ! [self download:urlString toFile: [Properties trainingFile]]; [urlString release]; } ! -(void) downloadWorldDetails { ! NSString *urlString = [[NSString alloc] initWithFormat:@"http://%s/Common/worldDetails.asp?outputType=XML&actionType=leagues", ! [serverName cString]]; ! [self download:urlString toFile: [Properties worldDetailsFile]]; [urlString release]; } --- 78,186 ---- } + - (NSString *) loginName { return loginName; } + - (void) setLoginName: (NSString *) newLoginName { + [newLoginName retain]; + [loginName release]; + loginName = newLoginName; + } ! ! - (NSString *) password { return password; } ! - (void) setPassword: (NSString *) newPassword { ! [newPassword retain]; ! [password release]; ! password = newPassword; } ! ! ! - (int) loginAndDownload { ! int errorCode = 0; ! errorCode = [self login]; if(errorCode) {return errorCode;} ! errorCode = [self downloadPlayers]; if(errorCode) {return errorCode;} ! errorCode = [self downloadWorldDetails]; if(errorCode) {return errorCode;} ! errorCode = [self downloadArenaDetails]; if(errorCode) {return errorCode;} ! errorCode = [self downloadClub]; if(errorCode) {return errorCode;} ! errorCode = [self downloadEconomy]; if(errorCode) {return errorCode;} ! errorCode = [self downloadLeagueDetails]; if(errorCode) {return errorCode;} ! errorCode = [self downloadTeamDetails]; if(errorCode) {return errorCode;} ! errorCode = [self downloadTraining]; if(errorCode) {return errorCode;} ! errorCode = [self logout]; ! return errorCode; ! } ! ! - (int) login { ! NSString *urlString = [[NSString alloc] initWithFormat:@"http://%s/Common/default.asp?outputType=XML&actionType=login&loginType=CHPP&Loginname=%s&readonlypassword=%s", [serverName cString], [loginName cString], [password cString]]; ! int error = [self download:urlString toFile:[Properties loginFile]]; ! [urlString release]; ! if(error == 0) { // download successful check if login did not failed ! NSString *successful = @"<ActionSuccessful>True</ActionSuccessful>"; ! NSString *loginFile = [[NSString alloc] initWithContentsOfFile:[Properties loginFile]]; ! NSRange range = [loginFile rangeOfString:successful]; ! if(! range.length ) { //string not found ! error = -3; ! } ! [loginFile release]; ! } ! return error; } ! - (int) logout { ! NSString *urlString = [[NSString alloc] initWithFormat:@"http://%s/Common/default.asp?outputType=XML&actionType=logout", [serverName cString]]; ! int error = [self download:urlString toFile:[Properties logoutFile]]; ! [urlString release]; ! return error; } ! -(int) downloadPlayers { ! NSString *urlString = [[NSString alloc] initWithFormat:@"http://%s/Common/players.asp?outputType=XML&actionType=view", [serverName cString]]; ! int error = [self download:urlString toFile:[Properties playersFile]]; [urlString release]; + return error; } ! -(int) downloadEconomy { ! NSString *urlString = [[NSString alloc] initWithFormat:@"http://%s/Common/economy.asp?outputType=XML&actionType=view", [serverName cString]]; ! int error = [self download:urlString toFile: [Properties economyFile]]; [urlString release]; + return error; } ! -(int) downloadTeamDetails { ! NSString *urlString = [[NSString alloc] initWithFormat:@"http://%s/Common/teamDetails.asp?outputType=XML&actionType=view", [serverName cString]]; ! int error = [self download:urlString toFile: [Properties teamDetailsFile]]; [urlString release]; + return error; } ! -(int) downloadLeagueDetails { ! NSString *urlString = [[NSString alloc] initWithFormat:@"http://%s/Common/leagueDetails.asp?outputType=XML&actionType=view", [serverName cString]]; ! int error = [self download:urlString toFile: [Properties leagueDetailsFile]]; [urlString release]; + return error; } ! -(int) downloadClub { ! NSString *urlString = [[NSString alloc] initWithFormat:@"http://%s/Common/club.asp?outputType=XML&actionType=view", [serverName cString]]; ! int error = [self download:urlString toFile: [Properties clubFile]]; [urlString release]; + return error; } ! -(int) downloadArenaDetails { ! NSString *urlString = [[NSString alloc] initWithFormat:@"http://%s/Common/arenaDetails.asp?outputType=XML&actionType=view", [serverName cString]]; ! int error = [self download:urlString toFile: [Properties arenaDetailsFile]]; [urlString release]; + return error; } ! -(int) downloadTraining { ! NSString *urlString = [[NSString alloc] initWithFormat:@"http://%s/Common/training.asp?outputType=XML&actionType=view", [serverName cString]]; ! int error = [self download:urlString toFile: [Properties trainingFile]]; [urlString release]; + return error; } ! -(int) downloadWorldDetails { ! NSString *urlString = [[NSString alloc] initWithFormat:@"http://%s/Common/worldDetails.asp?outputType=XML&actionType=leagues", [serverName cString]]; ! int error = [self download:urlString toFile: [Properties worldDetailsFile]]; [urlString release]; + return error; } *************** *** 179,190 **** // private methods ! -(void) download: (NSString*) urlString toFile: (NSString*) file { NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; NSError *error; NSURLResponse *response; NSData *data = [NSURLConnection sendSynchronousRequest:[self buildRequest:urlString]returningResponse:&response error:&error]; ! [[NSFileManager defaultManager] removeFileAtPath:file handler:nil]; ! [data writeToFile:file atomically:YES]; [pool release]; } --- 196,217 ---- // private methods ! -(int) download: (NSString*) urlString toFile: (NSString*) file { NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + int errorCode = 0; NSError *error; NSURLResponse *response; NSData *data = [NSURLConnection sendSynchronousRequest:[self buildRequest:urlString]returningResponse:&response error:&error]; ! if([error code]) { // error on sending request ! errorCode = -1; ! } ! else if(data == nil || [data length]<10){ // data not correctly fetched ! errorCode = -2; ! } ! else { ! [[NSFileManager defaultManager] removeFileAtPath:file handler:nil]; ! [data writeToFile:file atomically:YES]; ! } [pool release]; + return errorCode; } Index: HattrickOrg.h =================================================================== RCS file: /cvsroot/macattrick/macattrick/HattrickOrg.h,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** HattrickOrg.h 3 Oct 2004 19:26:55 -0000 1.12 --- HattrickOrg.h 27 Mar 2005 12:23:32 -0000 1.13 *************** *** 48,51 **** --- 48,58 ---- + (HattrickOrg*) uniqueInstance; + - (NSString *) loginName; + - (void) setLoginName: (NSString *) newLoginName; + - (NSString *) password; + - (void) setPassword: (NSString *) newPassword; + + + - (NSString *)serverName; /*! @method setServerName: *************** *** 64,68 **** @abstract login to the hattrick.org page to enable fetching data */ ! - (void) login; /*! --- 71,75 ---- @abstract login to the hattrick.org page to enable fetching data */ ! - (int) login; /*! *************** *** 70,74 **** @abstract logout of the hattrick.org page to disable fetching data */ ! - (void) logout; /*! --- 77,81 ---- @abstract logout of the hattrick.org page to disable fetching data */ ! - (int) logout; /*! *************** *** 77,81 **** @discussion first login is executed. then all download methods are called. at the end, logout is performed */ ! - (void) loginAndDownload; /*! --- 84,88 ---- @discussion first login is executed. then all download methods are called. at the end, logout is performed */ ! - (int) loginAndDownload; /*! *************** *** 85,89 **** outputType=XML&actionType=view */ ! -(void) downloadPlayers; /*! --- 92,96 ---- outputType=XML&actionType=view */ ! -(int) downloadPlayers; /*! *************** *** 93,97 **** outputType=XML&actionType=view */ ! -(void) downloadEconomy; --- 100,104 ---- outputType=XML&actionType=view */ ! -(int) downloadEconomy; *************** *** 102,106 **** outputType=XML&actionType=view */ ! -(void) downloadTeamDetails; /*! --- 109,113 ---- outputType=XML&actionType=view */ ! -(int) downloadTeamDetails; /*! *************** *** 110,114 **** outputType=XML&actionType=view */ ! -(void) downloadLeagueDetails; /*! --- 117,121 ---- outputType=XML&actionType=view */ ! -(int) downloadLeagueDetails; /*! *************** *** 118,122 **** outputType=XML&actionType=view */ ! -(void) downloadClub; /*! --- 125,129 ---- outputType=XML&actionType=view */ ! -(int) downloadClub; /*! *************** *** 126,130 **** outputType=XML&actionType=view */ ! -(void) downloadArenaDetails; /*! --- 133,137 ---- outputType=XML&actionType=view */ ! -(int) downloadArenaDetails; /*! *************** *** 134,138 **** outputType=XML&actionType=view */ ! -(void) downloadTraining; /*! --- 141,145 ---- outputType=XML&actionType=view */ ! -(int) downloadTraining; /*! *************** *** 142,146 **** outputType=XML&actionType=leagues */ ! -(void) downloadWorldDetails; @end --- 149,153 ---- outputType=XML&actionType=leagues */ ! -(int) downloadWorldDetails; @end |
|
From: Geisschaes <gei...@us...> - 2005-03-27 12:23:48
|
Update of /cvsroot/macattrick/macattrick/Macattrick.xcode In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26265/Macattrick.xcode Modified Files: project.pbxproj roman.mode1 roman.pbxuser Log Message: if login failes, a message is displayed Index: project.pbxproj =================================================================== RCS file: /cvsroot/macattrick/macattrick/Macattrick.xcode/project.pbxproj,v retrieving revision 1.67 retrieving revision 1.68 diff -C2 -d -r1.67 -r1.68 *** project.pbxproj 14 Mar 2005 19:30:53 -0000 1.67 --- project.pbxproj 27 Mar 2005 12:23:33 -0000 1.68 *************** *** 625,628 **** --- 625,772 ---- }; }; + 30272CE507F57DC200B39CEA = { + fileRef = 3013839E06AED4B2009387D7; + isa = PBXBuildFile; + settings = { + }; + }; + 30272CE607F57DC300B39CEA = { + fileRef = 3013839D06AED4B2009387D7; + isa = PBXBuildFile; + settings = { + }; + }; + 30272CE707F57DC400B39CEA = { + fileRef = 3084F85A07639DEC00DCF936; + isa = PBXBuildFile; + settings = { + }; + }; + 30272CE807F57DC500B39CEA = { + fileRef = 3084F85907639DEC00DCF936; + isa = PBXBuildFile; + settings = { + }; + }; + 30272CE907F57DC600B39CEA = { + fileRef = 306DEE780692C63E008C0937; + isa = PBXBuildFile; + settings = { + }; + }; + 30272CEA07F57DC600B39CEA = { + fileRef = 306DEE770692C63E008C0937; + isa = PBXBuildFile; + settings = { + }; + }; + 30272CEB07F57DC700B39CEA = { + fileRef = 30ADE247078B17660012CF83; + isa = PBXBuildFile; + settings = { + }; + }; + 30272CEC07F57DC800B39CEA = { + fileRef = 30ADE246078B17660012CF83; + isa = PBXBuildFile; + settings = { + }; + }; + 30272CED07F57DCA00B39CEA = { + fileRef = 30BB2131067DC1BC00B1C71A; + isa = PBXBuildFile; + settings = { + }; + }; + 30272CEE07F57DCA00B39CEA = { + fileRef = 30BB2130067DC1BC00B1C71A; + isa = PBXBuildFile; + settings = { + }; + }; + 30272CEF07F57DCB00B39CEA = { + fileRef = 3031CB0907A043B0006539CD; + isa = PBXBuildFile; + settings = { + }; + }; + 30272CF007F57DCD00B39CEA = { + fileRef = 3031CB0807A043B0006539CD; + isa = PBXBuildFile; + settings = { + }; + }; + 30272D0A07F57DEE00B39CEA = { + fileRef = 3092DC1007B66C780043063E; + isa = PBXBuildFile; + settings = { + }; + }; + 30272D0B07F57DEF00B39CEA = { + fileRef = 3092DC0F07B66C780043063E; + isa = PBXBuildFile; + settings = { + }; + }; + 30272D0C07F57DF000B39CEA = { + fileRef = 306095920793088F00BAA4CF; + isa = PBXBuildFile; + settings = { + }; + }; + 30272D0D07F57DF100B39CEA = { + fileRef = 306095910793088F00BAA4CF; + isa = PBXBuildFile; + settings = { + }; + }; + 30272D0E07F57DF100B39CEA = { + fileRef = 3060958C0793086200BAA4CF; + isa = PBXBuildFile; + settings = { + }; + }; + 30272D0F07F57DF200B39CEA = { + fileRef = 3060958B0793086200BAA4CF; + isa = PBXBuildFile; + settings = { + }; + }; + 30272D1007F57DF300B39CEA = { + fileRef = 306095A2079308C700BAA4CF; + isa = PBXBuildFile; + settings = { + }; + }; + 30272D1107F57DF300B39CEA = { + fileRef = 306095A1079308C700BAA4CF; + isa = PBXBuildFile; + settings = { + }; + }; + 30272D2307F57E0E00B39CEA = { + fileRef = 303B4FA50791C5C50056E135; + isa = PBXBuildFile; + settings = { + }; + }; + 30272D2407F57E0F00B39CEA = { + fileRef = 303B4FA60791C5C50056E135; + isa = PBXBuildFile; + settings = { + }; + }; + 30272D2507F57E1000B39CEA = { + fileRef = 3060954A0793018700BAA4CF; + isa = PBXBuildFile; + settings = { + }; + }; + 30272D2607F57E1100B39CEA = { + fileRef = 306095490793018700BAA4CF; + isa = PBXBuildFile; + settings = { + }; + }; 3028FABD06FC637D002DAE54 = { fileEncoding = 4; *************** *** 3304,3307 **** --- 3448,3463 ---- 303411A407B7FDB000B92C57, 306BE2AA07B803D6009942ED, + 30272CE607F57DC300B39CEA, + 30272CE807F57DC500B39CEA, + 30272CEA07F57DC600B39CEA, + 30272CEC07F57DC800B39CEA, + 30272CEE07F57DCA00B39CEA, + 30272CF007F57DCD00B39CEA, + 30272D0B07F57DEF00B39CEA, + 30272D0D07F57DF100B39CEA, + 30272D0F07F57DF200B39CEA, + 30272D1107F57DF300B39CEA, + 30272D2307F57E0E00B39CEA, + 30272D2607F57E1100B39CEA, ); isa = PBXHeadersBuildPhase; *************** *** 3362,3365 **** --- 3518,3533 ---- 303411A507B7FDB000B92C57, 306BE2AB07B803D6009942ED, + 30272CE507F57DC200B39CEA, + 30272CE707F57DC400B39CEA, + 30272CE907F57DC600B39CEA, + 30272CEB07F57DC700B39CEA, + 30272CED07F57DCA00B39CEA, + 30272CEF07F57DCB00B39CEA, + 30272D0A07F57DEE00B39CEA, + 30272D0C07F57DF000B39CEA, + 30272D0E07F57DF100B39CEA, + 30272D1007F57DF300B39CEA, + 30272D2407F57E0F00B39CEA, + 30272D2507F57E1000B39CEA, ); isa = PBXSourcesBuildPhase; Index: roman.mode1 =================================================================== RCS file: /cvsroot/macattrick/macattrick/Macattrick.xcode/roman.mode1,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** roman.mode1 14 Mar 2005 19:30:54 -0000 1.22 --- roman.mode1 27 Mar 2005 12:23:33 -0000 1.23 *************** *** 242,246 **** <array> <string>29B97314FDCFA39411CA2CEA</string> - <string>29B97315FDCFA39411CA2CEA</string> <string>1C37FBAC04509CD000000102</string> <string>1C37FAAC04509CD000000102</string> --- 242,245 ---- *************** *** 249,253 **** <array> <array> ! <integer>3</integer> <integer>0</integer> </array> --- 248,252 ---- <array> <array> ! <integer>4</integer> <integer>0</integer> </array> *************** *** 269,273 **** </array> <key>RubberWindowFrame</key> ! <string>199 166 998 665 0 0 1280 832 </string> </dict> <key>Module</key> --- 268,272 ---- </array> <key>RubberWindowFrame</key> ! <string>124 163 998 665 0 0 1280 832 </string> </dict> <key>Module</key> *************** *** 285,289 **** <string>1CE0B20306471E060097A5F4</string> <key>PBXProjectModuleLabel</key> ! <string>Properties.m</string> <key>PBXSplitModuleInNavigatorKey</key> <dict> --- 284,288 ---- <string>1CE0B20306471E060097A5F4</string> <key>PBXProjectModuleLabel</key> ! <string>LoginController.m</string> <key>PBXSplitModuleInNavigatorKey</key> <dict> *************** *** 293,304 **** <string>1CE0B20406471E060097A5F4</string> <key>PBXProjectModuleLabel</key> ! <string>Properties.m</string> <key>bookmark</key> ! <string>302FC33E07E61CE100334603</string> <key>history</key> <array> <string>30ADE253078B19040012CF83</string> - <string>30ADE254078B19040012CF83</string> - <string>30ADE256078B19040012CF83</string> <string>30ADE259078B19040012CF83</string> <string>30ADE271078B19D30012CF83</string> --- 292,301 ---- <string>1CE0B20406471E060097A5F4</string> <key>PBXProjectModuleLabel</key> ! <string>LoginController.m</string> <key>bookmark</key> ! <string>30EFC3EF07F6DCF200009D39</string> <key>history</key> <array> <string>30ADE253078B19040012CF83</string> <string>30ADE259078B19040012CF83</string> <string>30ADE271078B19D30012CF83</string> *************** *** 309,338 **** <string>303B4FAE0791C65D0056E135</string> <string>306095380792FF3E00BAA4CF</string> - <string>306095510793022800BAA4CF</string> - <string>306095AD07930A1200BAA4CF</string> - <string>306095FE07930FBD00BAA4CF</string> - <string>306095FF07930FBD00BAA4CF</string> - <string>306096160793106500BAA4CF</string> <string>30609625079318BE00BAA4CF</string> <string>306096300793190400BAA4CF</string> <string>3060964307931A3C00BAA4CF</string> - <string>3060964407931A3C00BAA4CF</string> <string>3060967E07931DDA00BAA4CF</string> <string>306096C4079325B700BAA4CF</string> <string>306F7F9707992C5300FC68E8</string> <string>306F7F9F07992D0F00FC68E8</string> - <string>306F81940799866E00FC68E8</string> - <string>306F81B20799875200FC68E8</string> <string>304A3C52079ACC7700358038</string> <string>304A3CA2079AD44E00358038</string> <string>304A3CB4079AD56A00358038</string> - <string>3031CB0E07A043C6006539CD</string> - <string>3031CB0F07A043C6006539CD</string> - <string>3031CB2307A04526006539CD</string> <string>3031CB3407A0495A006539CD</string> <string>3031CB4007A04A5B006539CD</string> <string>3021F78507A56FCE0073597B</string> <string>3021F79F07A575590073597B</string> - <string>3021F7A707A576490073597B</string> <string>3021F7DE07A57D510073597B</string> <string>3021F7E407A5810F0073597B</string> --- 306,323 ---- *************** *** 341,368 **** <string>30884B0307ABFC21001F2ACB</string> <string>3092DC1807B66D430043063E</string> - <string>3092DC1907B66D430043063E</string> - <string>3092DC1A07B66D430043063E</string> <string>3092DC1C07B66D430043063E</string> <string>3092DC1D07B66D430043063E</string> - <string>3092DC1F07B66D430043063E</string> <string>30CBF0FA07B693F8005A0707</string> <string>30CBF0FB07B693F8005A0707</string> - <string>30CBF0FC07B693F8005A0707</string> <string>306BE29307B80208009942ED</string> <string>306BE2D007B80670009942ED</string> <string>306BE2D207B80670009942ED</string> - <string>30BA8B4807B80958001B29F3</string> <string>30BA8B5307B80A60001B29F3</string> - <string>30BA8B6C07B80CB8001B29F3</string> - <string>30BA8B6D07B80CB8001B29F3</string> - <string>30BA8B7607B80D04001B29F3</string> - <string>30BA8B8C07B80E7A001B29F3</string> - <string>30BA8B9707B80EC9001B29F3</string> <string>30BA8BAB07B81026001B29F3</string> - <string>30DE3EB207C3B68500342677</string> <string>30DE3EC607C3BC3600342677</string> <string>30DE3EC707C3BC3600342677</string> <string>30DE3EE507C3C66400342677</string> - <string>30DE3F9D07C3F05600342677</string> <string>301CA97807C749EC00FABBCC</string> <string>307FFA9607C7839400F1D476</string> --- 326,341 ---- *************** *** 378,389 **** <string>307C1F7507D2033400CA6B3D</string> <string>3077E26307D2177A00C67D29</string> - <string>3092461807D77EA20052A124</string> <string>3092461907D77EA20052A124</string> <string>3092461B07D77EA20052A124</string> - <string>308832FB07E6139F0078CE5B</string> <string>308832FC07E6139F0078CE5B</string> <string>3088330307E613DD0078CE5B</string> - <string>302FC2E507E616FB00334603</string> - <string>302FC30607E617FE00334603</string> <string>302FC30707E617FE00334603</string> <string>302FC30807E617FE00334603</string> --- 351,358 ---- *************** *** 400,404 **** <string>302FC31307E617FE00334603</string> <string>302FC32807E6187500334603</string> ! <string>302FC32907E6187500334603</string> </array> <key>prevStack</key> --- 369,406 ---- <string>302FC31307E617FE00334603</string> <string>302FC32807E6187500334603</string> ! <string>30272CA707F5672900B39CEA</string> ! <string>30272CF107F57DD400B39CEA</string> ! <string>30272CF207F57DD400B39CEA</string> ! <string>30272CF307F57DD400B39CEA</string> ! <string>30272CF407F57DD400B39CEA</string> ! <string>30272CF507F57DD400B39CEA</string> ! <string>30272CF607F57DD400B39CEA</string> ! <string>30272CF707F57DD400B39CEA</string> ! <string>30272CF807F57DD400B39CEA</string> ! <string>30272CF907F57DD400B39CEA</string> ! <string>30272CFA07F57DD400B39CEA</string> ! <string>30272CFB07F57DD400B39CEA</string> ! <string>30272CFC07F57DD400B39CEA</string> ! <string>30272D1207F57DF900B39CEA</string> ! <string>30272D1307F57DF900B39CEA</string> ! <string>30272D1407F57DF900B39CEA</string> ! <string>30272D1507F57DF900B39CEA</string> ! <string>30272D1607F57DF900B39CEA</string> ! <string>30272D1707F57DF900B39CEA</string> ! <string>30272D1807F57DF900B39CEA</string> ! <string>30272D1907F57DF900B39CEA</string> ! <string>30272D2707F57E2100B39CEA</string> ! <string>30272D2807F57E2100B39CEA</string> ! <string>30272D2907F57E2100B39CEA</string> ! <string>30272D2A07F57E2100B39CEA</string> ! <string>30272D3507F5809800B39CEA</string> ! <string>30272D3707F5809800B39CEA</string> ! <string>30272D4207F5816400B39CEA</string> ! <string>30272D4307F5816400B39CEA</string> ! <string>30EFC39107F6CFF500009D39</string> ! <string>30EFC39207F6CFF500009D39</string> ! <string>30EFC3B607F6D5F600009D39</string> ! <string>30EFC3D507F6DA9000009D39</string> ! <string>30EFC3D607F6DA9000009D39</string> </array> <key>prevStack</key> *************** *** 440,444 **** <string>306095B907930A1200BAA4CF</string> <string>306095CA07930A3700BAA4CF</string> - <string>306095F607930F7100BAA4CF</string> <string>30609629079318BE00BAA4CF</string> <string>3060962A079318BE00BAA4CF</string> --- 442,445 ---- *************** *** 498,512 **** <string>3088330507E613DD0078CE5B</string> <string>3088330707E613DD0078CE5B</string> - <string>302FC2E707E616FB00334603</string> - <string>302FC31507E617FE00334603</string> - <string>302FC31607E617FE00334603</string> - <string>302FC31707E617FE00334603</string> <string>302FC31807E617FE00334603</string> <string>302FC31907E617FE00334603</string> <string>302FC31A07E617FE00334603</string> <string>302FC31B07E617FE00334603</string> - <string>302FC31C07E617FE00334603</string> - <string>302FC31D07E617FE00334603</string> - <string>302FC31E07E617FE00334603</string> <string>302FC31F07E617FE00334603</string> <string>302FC32007E617FE00334603</string> --- 499,506 ---- *************** *** 514,517 **** --- 508,521 ---- <string>302FC32207E617FE00334603</string> <string>302FC32A07E6187500334603</string> + <string>30272D0307F57DD400B39CEA</string> + <string>30272D3A07F5809800B39CEA</string> + <string>30272D3B07F5809800B39CEA</string> + <string>30272D4607F5816400B39CEA</string> + <string>30EFC37907F6A53C00009D39</string> + <string>30EFC38E07F6CD6F00009D39</string> + <string>30EFC39307F6CFF500009D39</string> + <string>30EFC39407F6CFF500009D39</string> + <string>30EFC3B707F6D5F600009D39</string> + <string>30EFC3D707F6DA9000009D39</string> </array> </dict> *************** *** 527,531 **** <string>{{0, 0}, {653, 358}}</string> <key>RubberWindowFrame</key> ! <string>199 166 998 665 0 0 1280 832 </string> </dict> <key>Module</key> --- 531,535 ---- <string>{{0, 0}, {653, 358}}</string> <key>RubberWindowFrame</key> ! <string>124 163 998 665 0 0 1280 832 </string> </dict> <key>Module</key> *************** *** 549,553 **** <string>{{0, 365}, {653, 258}}</string> <key>RubberWindowFrame</key> ! <string>199 166 998 665 0 0 1280 832 </string> </dict> <key>Module</key> --- 553,557 ---- <string>{{0, 365}, {653, 258}}</string> <key>RubberWindowFrame</key> ! <string>124 163 998 665 0 0 1280 832 </string> </dict> <key>Module</key> *************** *** 573,579 **** <key>TableOfContents</key> <array> ! <string>302FC2E907E616FB00334603</string> <string>1CE0B1FE06471DED0097A5F4</string> ! <string>302FC2EA07E616FB00334603</string> <string>1CE0B20306471E060097A5F4</string> <string>1CE0B20506471E060097A5F4</string> --- 577,583 ---- <key>TableOfContents</key> <array> ! <string>30EFC37B07F6A53C00009D39</string> <string>1CE0B1FE06471DED0097A5F4</string> ! <string>30EFC37C07F6A53C00009D39</string> <string>1CE0B20306471E060097A5F4</string> <string>1CE0B20506471E060097A5F4</string> *************** *** 603,613 **** <key>WindowOrderList</key> <array> ! <string>/Users/roman/Documents/dev/macattrick/Macattrick.xcode</string> <string>303B68B1075A0D24009951CC</string> <string>1C0AD2B3069F1EA900FABCE6</string> ! <string>302FC2EB07E616FB00334603</string> </array> <key>WindowString</key> ! <string>199 166 998 665 0 0 1280 832 </string> <key>WindowTools</key> <array> --- 607,620 ---- <key>WindowOrderList</key> <array> ! <string>1C530D57069F1CE1000CFCEE</string> <string>303B68B1075A0D24009951CC</string> + <string>30EFC37E07F6A53C00009D39</string> <string>1C0AD2B3069F1EA900FABCE6</string> ! <string>1CD10A99069EF8BA00B06720</string> ! <string>30EFC38107F6A53C00009D39</string> ! <string>/Users/roman/Documents/dev/macattrick/Macattrick.xcode</string> </array> <key>WindowString</key> ! <string>124 163 998 665 0 0 1280 832 </string> <key>WindowTools</key> <array> *************** *** 628,632 **** <string>1CD0528F0623707200166675</string> <key>PBXProjectModuleLabel</key> ! <string>FormulasViewController.m</string> <key>PBXSplitModuleInNavigatorKey</key> <dict> --- 635,639 ---- <string>1CD0528F0623707200166675</string> <key>PBXProjectModuleLabel</key> ! <string>HattrickOrg.m</string> <key>PBXSplitModuleInNavigatorKey</key> <dict> *************** *** 636,640 **** <string>1CD052900623707200166675</string> <key>PBXProjectModuleLabel</key> ! <string>FormulasViewController.m</string> </dict> <key>SplitCount</key> --- 643,653 ---- <string>1CD052900623707200166675</string> <key>PBXProjectModuleLabel</key> ! <string>HattrickOrg.m</string> ! <key>bookmark</key> ! <string>30EFC3F007F6DCF200009D39</string> ! <key>history</key> ! <array> ! <string>30EFC3CF07F6D80A00009D39</string> ! </array> </dict> <key>SplitCount</key> *************** *** 647,658 **** <dict> <key>Frame</key> ! <string>{{0, 0}, {539, 214}}</string> <key>RubberWindowFrame</key> ! <string>571 196 539 499 0 0 1280 832 </string> </dict> <key>Module</key> <string>PBXNavigatorGroup</string> <key>Proportion</key> ! <string>214pt</string> </dict> <dict> --- 660,671 ---- <dict> <key>Frame</key> ! <string>{{0, 0}, {665, 241}}</string> <key>RubberWindowFrame</key> ! <string>571 169 665 526 0 0 1280 832 </string> </dict> <key>Module</key> <string>PBXNavigatorGroup</string> <key>Proportion</key> ! <string>241pt</string> </dict> <dict> *************** *** 673,679 **** <dict> <key>Frame</key> ! <string>{{0, 221}, {539, 236}}</string> <key>RubberWindowFrame</key> ! <string>571 196 539 499 0 0 1280 832 </string> </dict> <key>Module</key> --- 686,692 ---- <dict> <key>Frame</key> ! <string>{{0, 248}, {665, 236}}</string> <key>RubberWindowFrame</key> ! <string>571 169 665 526 0 0 1280 832 </string> </dict> <key>Module</key> *************** *** 684,688 **** </array> <key>Proportion</key> ! <string>457pt</string> </dict> </array> --- 697,701 ---- </array> <key>Proportion</key> ! <string>484pt</string> </dict> </array> *************** *** 698,702 **** <array> <string>303B68B1075A0D24009951CC</string> ! <string>302FC32407E617FE00334603</string> <string>1CD0528F0623707200166675</string> <string>XCMainBuildResultsModuleGUID</string> --- 711,715 ---- <array> <string>303B68B1075A0D24009951CC</string> ! <string>30EFC38B07F6AB4C00009D39</string> <string>1CD0528F0623707200166675</string> <string>XCMainBuildResultsModuleGUID</string> *************** *** 705,713 **** <string>xcode.toolbar.config.build</string> <key>WindowString</key> ! <string>571 196 539 499 0 0 1280 832 </string> <key>WindowToolGUID</key> <string>303B68B1075A0D24009951CC</string> <key>WindowToolIsVisible</key> ! <true/> </dict> <dict> --- 718,726 ---- <string>xcode.toolbar.config.build</string> <key>WindowString</key> ! <string>571 169 665 526 0 0 1280 832 </string> <key>WindowToolGUID</key> <string>303B68B1075A0D24009951CC</string> <key>WindowToolIsVisible</key> ! <false/> </dict> <dict> *************** *** 738,743 **** <key>sizes</key> <array> ! <string>{{0, 0}, {168, 242}}</string> ! <string>{{168, 0}, {721, 242}}</string> </array> </dict> --- 751,756 ---- <key>sizes</key> <array> ! <string>{{0, 0}, {142, 242}}</string> ! <string>{{142, 0}, {747, 242}}</string> </array> </dict> *************** *** 764,768 **** <string>1C162984064C10D400B95A72</string> <key>PBXProjectModuleLabel</key> ! <string>Debug - Macattrick (Macattrick)</string> </dict> <key>GeometryConfiguration</key> --- 777,781 ---- <string>1C162984064C10D400B95A72</string> <key>PBXProjectModuleLabel</key> ! <string>Debug - Macattrick (Devel Macattrick)</string> </dict> <key>GeometryConfiguration</key> *************** *** 779,783 **** <string>{{0, 0}, {889, 567}}</string> <key>RubberWindowFrame</key> ! <string>86 205 889 609 0 0 1280 832 </string> </dict> <key>Module</key> --- 792,796 ---- <string>{{0, 0}, {889, 567}}</string> <key>RubberWindowFrame</key> ! <string>266 169 889 609 0 0 1280 832 </string> </dict> <key>Module</key> *************** *** 802,817 **** <array> <string>1CD10A99069EF8BA00B06720</string> ! <string>3077E25807D216BD00C67D29</string> <string>1C162984064C10D400B95A72</string> ! <string>3077E25907D216BD00C67D29</string> </array> <key>ToolbarConfiguration</key> <string>xcode.toolbar.config.debug</string> <key>WindowString</key> ! <string>86 205 889 609 0 0 1280 832 </string> <key>WindowToolGUID</key> <string>1CD10A99069EF8BA00B06720</string> <key>WindowToolIsVisible</key> ! <false/> </dict> <dict> --- 815,830 ---- <array> <string>1CD10A99069EF8BA00B06720</string> ! <string>30EFC37D07F6A53C00009D39</string> <string>1C162984064C10D400B95A72</string> ! <string>30EFC37E07F6A53C00009D39</string> </array> <key>ToolbarConfiguration</key> <string>xcode.toolbar.config.debug</string> <key>WindowString</key> ! <string>266 169 889 609 0 0 1280 832 </string> <key>WindowToolGUID</key> <string>1CD10A99069EF8BA00B06720</string> <key>WindowToolIsVisible</key> ! <true/> </dict> <dict> *************** *** 834,838 **** <string>1CDD528C0622207200134675</string> <key>PBXProjectModuleLabel</key> ! <string>FormulasViewController.m</string> <key>PBXSplitModuleInNavigatorKey</key> <dict> --- 847,851 ---- <string>1CDD528C0622207200134675</string> <key>PBXProjectModuleLabel</key> ! <string>World.m</string> <key>PBXSplitModuleInNavigatorKey</key> <dict> *************** *** 842,846 **** <string>1CD0528D0623707200166675</string> <key>PBXProjectModuleLabel</key> ! <string>FormulasViewController.m</string> </dict> <key>SplitCount</key> --- 855,865 ---- <string>1CD0528D0623707200166675</string> <key>PBXProjectModuleLabel</key> ! <string>World.m</string> ! <key>bookmark</key> ! <string>30EFC3F107F6DCF200009D39</string> ! <key>history</key> ! <array> ! <string>30EFC39A07F6D1AE00009D39</string> ! </array> </dict> <key>SplitCount</key> *************** *** 855,859 **** <string>{{0, 0}, {781, 191}}</string> <key>RubberWindowFrame</key> ! <string>229 160 781 470 0 0 1280 832 </string> </dict> <key>Module</key> --- 874,878 ---- <string>{{0, 0}, {781, 191}}</string> <key>RubberWindowFrame</key> ! <string>457 203 781 470 0 0 1280 832 </string> </dict> <key>Module</key> *************** *** 867,872 **** </dict> <dict> - <key>BecomeActive</key> - <true/> <key>ContentConfiguration</key> <dict> --- 886,889 ---- *************** *** 881,885 **** <string>{{0, 198}, {781, 230}}</string> <key>RubberWindowFrame</key> ! <string>229 160 781 470 0 0 1280 832 </string> </dict> <key>Module</key> --- 898,902 ---- <string>{{0, 198}, {781, 230}}</string> <key>RubberWindowFrame</key> ! <string>457 203 781 470 0 0 1280 832 </string> </dict> <key>Module</key> *************** *** 904,914 **** <array> <string>1C530D57069F1CE1000CFCEE</string> ! <string>308832E507E611F50078CE5B</string> ! <string>308832E607E611F50078CE5B</string> <string>1CDD528C0622207200134675</string> <string>1CD0528E0623707200166675</string> </array> <key>WindowString</key> ! <string>229 160 781 470 0 0 1280 832 </string> <key>WindowToolGUID</key> <string>1C530D57069F1CE1000CFCEE</string> --- 921,931 ---- <array> <string>1C530D57069F1CE1000CFCEE</string> ! <string>30EFC39C07F6D1AE00009D39</string> ! <string>30EFC39D07F6D1AE00009D39</string> <string>1CDD528C0622207200134675</string> <string>1CD0528E0623707200166675</string> </array> <key>WindowString</key> ! <string>457 203 781 470 0 0 1280 832 </string> <key>WindowToolGUID</key> <string>1C530D57069F1CE1000CFCEE</string> *************** *** 931,936 **** <array> <dict> - <key>BecomeActive</key> - <true/> <key>ContentConfiguration</key> <dict> --- 948,951 ---- *************** *** 968,972 **** <array> <string>303B689D075A03FF009951CC</string> ! <string>307C200907D2165A00CA6B3D</string> <string>1C78EAAC065D492600B07095</string> </array> --- 983,987 ---- <array> <string>303B689D075A03FF009951CC</string> ! <string>30272D4A07F5816400B39CEA</string> <string>1C78EAAC065D492600B07095</string> </array> *************** *** 976,980 **** <string>303B689D075A03FF009951CC</string> <key>WindowToolIsVisible</key> ! <true/> </dict> <dict> --- 991,995 ---- <string>303B689D075A03FF009951CC</string> <key>WindowToolIsVisible</key> ! <false/> </dict> <dict> *************** *** 1036,1051 **** <dict> <key>Frame</key> ! <string>{{0, 0}, {713, 227}}</string> <key>RubberWindowFrame</key> ! <string>341 230 713 269 0 0 1280 832 </string> </dict> <key>Module</key> <string>PBXRunSessionModule</string> <key>Proportion</key> ! <string>227pt</string> </dict> </array> <key>Proportion</key> ! <string>227pt</string> </dict> </array> --- 1051,1066 ---- <dict> <key>Frame</key> ! <string>{{0, 0}, {876, 463}}</string> <key>RubberWindowFrame</key> ! <string>41 283 876 505 0 0 1280 832 </string> </dict> <key>Module</key> <string>PBXRunSessionModule</string> <key>Proportion</key> ! <string>463pt</string> </dict> </array> <key>Proportion</key> ! <string>463pt</string> </dict> </array> *************** *** 1061,1076 **** <array> <string>1C0AD2B3069F1EA900FABCE6</string> ! <string>302FC32507E617FE00334603</string> <string>1CD0528B0623707200166675</string> ! <string>302FC32607E617FE00334603</string> </array> <key>ToolbarConfiguration</key> <string>xcode.toolbar.config.run</string> <key>WindowString</key> ! <string>341 230 713 269 0 0 1280 832 </string> <key>WindowToolGUID</key> <string>1C0AD2B3069F1EA900FABCE6</string> <key>WindowToolIsVisible</key> ! <true/> </dict> <dict> --- 1076,1091 ---- <array> <string>1C0AD2B3069F1EA900FABCE6</string> ! <string>30EFC37F07F6A53C00009D39</string> <string>1CD0528B0623707200166675</string> ! <string>30EFC38007F6A53C00009D39</string> </array> <key>ToolbarConfiguration</key> <string>xcode.toolbar.config.run</string> <key>WindowString</key> ! <string>41 283 876 505 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.87 retrieving revision 1.88 diff -C2 -d -r1.87 -r1.88 *** roman.pbxuser 14 Mar 2005 19:30:54 -0000 1.87 --- roman.pbxuser 27 Mar 2005 12:23:33 -0000 1.88 *************** *** 198,202 **** ); }; ! PBXPerProjectTemplateStateSaveDate = 132519625; PBXPrepackagedSmartGroups_v2 = ( { --- 198,202 ---- ); }; ! PBXPerProjectTemplateStateSaveDate = 133604477; PBXPrepackagedSmartGroups_v2 = ( [...2716 lines suppressed...] + isa = PBXTextBookmark; + name = "HattrickOrg.m: 68"; + rLen = 0; + rLoc = 2904; + rType = 0; + vrLen = 509; + vrLoc = 3334; + }; + 30EFC3F107F6DCF200009D39 = { + fRef = 306096370793195B00BAA4CF; + isa = PBXTextBookmark; + name = range; + rLen = 5; + rLoc = 4404; + rType = 0; + vrLen = 478; + vrLoc = 4117; + }; 32CA4F630368D1EE00C91783 = { uiCtxt = { |
|
From: Geisschaes <gei...@us...> - 2005-03-27 12:23:48
|
Update of /cvsroot/macattrick/macattrick/Test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26265/Test Modified Files: HattrickOrgTest.m Log Message: if login failes, a message is displayed Index: HattrickOrgTest.m =================================================================== RCS file: /cvsroot/macattrick/macattrick/Test/HattrickOrgTest.m,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** HattrickOrgTest.m 3 Oct 2004 19:26:57 -0000 1.11 --- HattrickOrgTest.m 27 Mar 2005 12:23:35 -0000 1.12 *************** *** 38,47 **** NSFileManager *fileManager = [NSFileManager defaultManager]; [fileManager removeFileAtPath:[Properties loginFile] handler:nil]; ! [[HattrickOrg uniqueInstance] login]; [[HattrickOrg uniqueInstance] logout]; [self assertTrue: [fileManager fileExistsAtPath:[Properties loginFile] isDirectory:NO]]; NSString *file = [NSString stringWithContentsOfFile:[Properties loginFile]]; ! [self assertTrue: [file length] > 1200]; ! [self assertTrue: [file length] < 1600]; } --- 38,48 ---- NSFileManager *fileManager = [NSFileManager defaultManager]; [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]; } *************** *** 167,170 **** --- 168,196 ---- + - (void) testErrorOnWrongServer { + NSString *currentServerName = [[[HattrickOrg uniqueInstance] serverName]retain]; + [[HattrickOrg uniqueInstance] setServerName:@"www.hattttrick.org"]; + int errorCode = [[HattrickOrg uniqueInstance] login]; + [self assertTrue: errorCode != 0]; + [[HattrickOrg uniqueInstance] setServerName:currentServerName]; + [currentServerName release]; + } + - (void) testWithWrongLoginname { + NSString *currentLoginname = [[[HattrickOrg uniqueInstance] loginName]retain]; + [[HattrickOrg uniqueInstance] setLoginName:@"testli"]; + int errorCode = [[HattrickOrg uniqueInstance] login]; + [self assertInt: errorCode equals: -3]; + [[HattrickOrg uniqueInstance] setLoginName:currentLoginname]; + [currentLoginname release]; + } + + - (void) testWithWrongPassword { + NSString *currentPassword = [[[HattrickOrg uniqueInstance] password]retain]; + [[HattrickOrg uniqueInstance] setPassword:@"testli"]; + int errorCode = [[HattrickOrg uniqueInstance] login]; + [self assertInt: errorCode equals: -3]; + [[HattrickOrg uniqueInstance] setPassword:currentPassword]; + [currentPassword release]; + } @end |
|
From: Geisschaes <gei...@us...> - 2005-03-21 21:02:21
|
Update of /cvsroot/macattrick/macattrick/doc/guidelines In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9938 Added Files: CVS.pdf CVS.tex DesignAndCoding.pdf DesignAndCoding.tex Localization.pdf Localization.tex floatsty.sty ieee.clo ieee.cls latex8.sty Log Message: guidelines added --- NEW FILE: CVS.pdf --- %PDF-1.4 5 0 obj << /S /GoTo /D (section.1) >> endobj 8 0 obj (Installation) endobj 9 0 obj << /S /GoTo /D (section.2) >> endobj 12 0 obj (Getting Started) endobj 13 0 obj << /S /GoTo /D (section.3) >> endobj 16 0 obj (A CVS Life-cycle) endobj 17 0 obj << /S /GoTo /D (section.4) >> endobj 20 0 obj (Challenges with Nib-Files) endobj 21 0 obj << /S /GoTo /D (section.5) >> endobj 24 0 obj (Links) endobj 25 0 obj << /S /GoTo /D [26 0 R /Fit ] >> endobj 28 0 obj << /Length 2813 /Filter /FlateDecode >> stream xÚYëoãÆÿ~ ú©ÉåK: @.×^rA® Înp@S4¹S¤Á}úï;¯]>¤³S0÷1;;;ßÌ®Á*öUèUªýU~zã¯0úã@f£]¼º:±TE4âHmjBsAèT%)4$VOÄ?ܽ¹ù |
|
From: Geisschaes <gei...@us...> - 2005-03-21 21:00:54
|
Update of /cvsroot/macattrick/macattrick/doc/guidelines In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9488/guidelines Log Message: Directory /cvsroot/macattrick/macattrick/doc/guidelines added to the repository |
|
From: Geisschaes <gei...@us...> - 2005-03-14 19:31:38
|
Update of /cvsroot/macattrick/macattrick In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17484 Modified Files: HattrickOrg.m Properties.h Properties.m World.h World.m main.m Log Message: comma in currencyrate replaced with dot, login file now xml format and seperated from logout file Index: Properties.m =================================================================== RCS file: /cvsroot/macattrick/macattrick/Properties.m,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** Properties.m 18 Jan 2005 21:05:47 -0000 1.13 --- Properties.m 14 Mar 2005 19:30:52 -0000 1.14 *************** *** 70,73 **** --- 70,77 ---- return [path stringByAppendingString:@"/login.xml"]; } + +(NSString*) logoutFile { + NSString *path = [self libraryPath]; + return [path stringByAppendingString:@"/logout.xml"]; + } +(NSString*) worldDetailsFile { NSString *path = [self libraryPath]; Index: World.h =================================================================== RCS file: /cvsroot/macattrick/macattrick/World.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** World.h 10 Jan 2005 21:43:45 -0000 1.1 --- World.h 14 Mar 2005 19:30:52 -0000 1.2 *************** *** 35,39 **** // XML Stuff ! NSString *currentStringValue; Country *currentCountry; } --- 35,39 ---- // XML Stuff ! NSMutableString *currentStringValue; Country *currentCountry; } Index: main.m =================================================================== RCS file: /cvsroot/macattrick/macattrick/main.m,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** main.m 27 Feb 2005 15:14:44 -0000 1.15 --- main.m 14 Mar 2005 19:30:52 -0000 1.16 *************** *** 34,38 **** // comment out for main build ! //#import "Test/AllTests.h" // --- 34,38 ---- // comment out for main build ! #import "Test/AllTests.h" // *************** *** 47,51 **** [Properties initializeUserDefaults]; ! /*/ comment out for main build NSArray *args = [[NSProcessInfo processInfo] arguments]; if ([args count] >= 2 && [[args objectAtIndex:1] isEqualToString: @"test"]) { --- 47,51 ---- [Properties initializeUserDefaults]; ! // comment out for main build NSArray *args = [[NSProcessInfo processInfo] arguments]; if ([args count] >= 2 && [[args objectAtIndex:1] isEqualToString: @"test"]) { *************** *** 53,57 **** return 0; } ! /*/ return NSApplicationMain(argc, argv); --- 53,57 ---- return 0; } ! // return NSApplicationMain(argc, argv); Index: HattrickOrg.m =================================================================== RCS file: /cvsroot/macattrick/macattrick/HattrickOrg.m,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** HattrickOrg.m 27 Feb 2005 15:14:44 -0000 1.19 --- HattrickOrg.m 14 Mar 2005 19:30:51 -0000 1.20 *************** *** 95,99 **** - (void) login { NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; ! NSString *urlString = [NSString stringWithFormat:@"http://%s/Common/default.asp?actionType=login&loginType=CHPP&Loginname=%s&readonlypassword=%s", [serverName cString], [loginName cString], [password cString]]; NSError *error; --- 95,99 ---- - (void) login { NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; ! NSString *urlString = [NSString stringWithFormat:@"http://%s/Common/default.asp?outputType=XML&actionType=login&loginType=CHPP&Loginname=%s&readonlypassword=%s", [serverName cString], [loginName cString], [password cString]]; NSError *error; *************** *** 108,118 **** - (void) logout { NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; ! NSString *urlString = [NSString stringWithFormat:@"http://%s/Common/default.asp?actionType=logout", [serverName cString]]; NSError *error; NSURLResponse *response; NSData *data = [NSURLConnection sendSynchronousRequest:[self buildRequest:urlString]returningResponse:&response error:&error]; ! [[NSFileManager defaultManager] removeFileAtPath:[Properties loginFile] handler:nil]; ! [data writeToFile:[Properties loginFile] atomically:YES]; [pool release]; } --- 108,118 ---- - (void) logout { NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; ! NSString *urlString = [NSString stringWithFormat:@"http://%s/Common/default.asp?outputType=XML&actionType=logout", [serverName cString]]; NSError *error; NSURLResponse *response; NSData *data = [NSURLConnection sendSynchronousRequest:[self buildRequest:urlString]returningResponse:&response error:&error]; ! [[NSFileManager defaultManager] removeFileAtPath:[Properties logoutFile] handler:nil]; ! [data writeToFile:[Properties logoutFile] atomically:YES]; [pool release]; } Index: Properties.h =================================================================== RCS file: /cvsroot/macattrick/macattrick/Properties.h,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** Properties.h 3 Oct 2004 19:26:55 -0000 1.7 --- Properties.h 14 Mar 2005 19:30:51 -0000 1.8 *************** *** 98,104 **** @method loginFile @abstract local address of the loginFile ! @discussion the login file contains information received during the login procedure and is hardly used anymore */ +(NSString*) loginFile; /*! --- 98,110 ---- @method loginFile @abstract local address of the loginFile ! @discussion the login file contains information received during the login procedure */ +(NSString*) loginFile; + /*! + @method logoutFile + @abstract local address of the logoutFile + @discussion the logout file contains information received during the logout procedure + */ + +(NSString*) logoutFile; /*! Index: World.m =================================================================== RCS file: /cvsroot/macattrick/macattrick/World.m,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** World.m 10 Jan 2005 21:43:45 -0000 1.1 --- World.m 14 Mar 2005 19:30:52 -0000 1.2 *************** *** 96,99 **** --- 96,102 ---- } else if(currentCountry) { + if([elementName isEqualToString:@"CurrencyRate"]) { + [currentStringValue replaceOccurrencesOfString:@"," withString:@"." options:NSLiteralSearch range: NSMakeRange(0, [currentStringValue length])]; + } [currentCountry setValue: currentStringValue forKey:elementName]; } |
|
From: Geisschaes <gei...@us...> - 2005-03-14 19:31:37
|
Update of /cvsroot/macattrick/macattrick/doc/localization/english In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17484/doc/localization/english Modified Files: Localizable.strings Log Message: comma in currencyrate replaced with dot, login file now xml format and seperated from logout file Index: Localizable.strings =================================================================== RCS file: /cvsroot/macattrick/macattrick/doc/localization/english/Localizable.strings,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 Binary files /tmp/cvsdMlf5E and /tmp/cvs4Q6T83 differ |
|
From: Geisschaes <gei...@us...> - 2005-03-14 19:31:35
|
Update of /cvsroot/macattrick/macattrick/Macattrick.xcode In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17484/Macattrick.xcode Modified Files: project.pbxproj roman.mode1 roman.pbxuser Log Message: comma in currencyrate replaced with dot, login file now xml format and seperated from logout file Index: project.pbxproj =================================================================== RCS file: /cvsroot/macattrick/macattrick/Macattrick.xcode/project.pbxproj,v retrieving revision 1.66 retrieving revision 1.67 diff -C2 -d -r1.66 -r1.67 *** project.pbxproj 16 Feb 2005 21:33:18 -0000 1.66 --- project.pbxproj 14 Mar 2005 19:30:53 -0000 1.67 *************** *** 705,708 **** --- 705,792 ---- }; }; + 302FC2F807E617AF00334603 = { + fileRef = 306BE2A907B803D6009942ED; + isa = PBXBuildFile; + settings = { + }; + }; + 302FC2F907E617B100334603 = { + fileRef = 306BE2A807B803D6009942ED; + isa = PBXBuildFile; + settings = { + }; + }; + 302FC2FA07E617B600334603 = { + fileRef = 30D0C7E80709DA6C00710CCA; + isa = PBXBuildFile; + settings = { + }; + }; + 302FC2FB07E617B700334603 = { + fileRef = 30D0C7E70709DA6C00710CCA; + isa = PBXBuildFile; + settings = { + }; + }; + 302FC2FC07E617BE00334603 = { + fileRef = 3028FC0106FC93F1002DAE54; + isa = PBXBuildFile; + settings = { + }; + }; + 302FC2FD07E617BF00334603 = { + fileRef = 3028FC0006FC93F1002DAE54; + isa = PBXBuildFile; + settings = { + }; + }; + 302FC2FE07E617C600334603 = { + fileRef = 30BEEB03070B3EDC00AF64D8; + isa = PBXBuildFile; + settings = { + }; + }; + 302FC2FF07E617C700334603 = { + fileRef = 30BEEB02070B3EDC00AF64D8; + isa = PBXBuildFile; + settings = { + }; + }; + 302FC30007E617CA00334603 = { + fileRef = 3053D58D07008CD0004019F7; + isa = PBXBuildFile; + settings = { + }; + }; + 302FC30107E617CC00334603 = { + fileRef = 3053D58C07008CD0004019F7; + isa = PBXBuildFile; + settings = { + }; + }; + 302FC30207E617E900334603 = { + fileRef = 30CCAFCC0700BAAC0005D3FA; + isa = PBXBuildFile; + settings = { + }; + }; + 302FC30307E617EA00334603 = { + fileRef = 30CCAFCD0700BAAC0005D3FA; + isa = PBXBuildFile; + settings = { + }; + }; + 302FC30407E617EC00334603 = { + fileRef = 309422B40706FA1100873206; + isa = PBXBuildFile; + settings = { + }; + }; + 302FC30507E617EE00334603 = { + fileRef = 309422B30706FA1100873206; + isa = PBXBuildFile; + settings = { + }; + }; 3031CB0807A043B0006539CD = { fileEncoding = 4; *************** *** 1940,1943 **** --- 2024,2034 ---- 3092DC1107B66C780043063E, 303411A207B7FDB000B92C57, + 302FC2F907E617B100334603, + 302FC2FB07E617B700334603, + 302FC2FD07E617BF00334603, + 302FC2FF07E617C700334603, + 302FC30107E617CC00334603, + 302FC30207E617E900334603, + 302FC30507E617EE00334603, ); isa = PBXHeadersBuildPhase; *************** *** 2152,2155 **** --- 2243,2253 ---- 3092DC1207B66C780043063E, 303411A307B7FDB000B92C57, + 302FC2F807E617AF00334603, + 302FC2FA07E617B600334603, + 302FC2FC07E617BE00334603, + 302FC2FE07E617C600334603, + 302FC30007E617CA00334603, + 302FC30307E617EA00334603, + 302FC30407E617EC00334603, ); isa = PBXSourcesBuildPhase; Index: roman.mode1 =================================================================== RCS file: /cvsroot/macattrick/macattrick/Macattrick.xcode/roman.mode1,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** roman.mode1 27 Feb 2005 15:14:46 -0000 1.21 --- roman.mode1 14 Mar 2005 19:30:54 -0000 1.22 *************** *** 242,245 **** --- 242,246 ---- <array> <string>29B97314FDCFA39411CA2CEA</string> + <string>29B97315FDCFA39411CA2CEA</string> <string>1C37FBAC04509CD000000102</string> <string>1C37FAAC04509CD000000102</string> *************** *** 248,252 **** <array> <array> ! <integer>4</integer> <integer>0</integer> </array> --- 249,253 ---- <array> <array> ! <integer>3</integer> <integer>0</integer> </array> *************** *** 268,272 **** </array> <key>RubberWindowFrame</key> ! <string>216 20 998 665 0 0 1280 832 </string> </dict> <key>Module</key> --- 269,273 ---- </array> <key>RubberWindowFrame</key> ! <string>199 166 998 665 0 0 1280 832 </string> </dict> <key>Module</key> *************** *** 284,288 **** <string>1CE0B20306471E060097A5F4</string> <key>PBXProjectModuleLabel</key> ! <string>LoginController.m</string> <key>PBXSplitModuleInNavigatorKey</key> <dict> --- 285,289 ---- <string>1CE0B20306471E060097A5F4</string> <key>PBXProjectModuleLabel</key> ! <string>Properties.m</string> <key>PBXSplitModuleInNavigatorKey</key> <dict> *************** *** 292,298 **** <string>1CE0B20406471E060097A5F4</string> <key>PBXProjectModuleLabel</key> ! <string>LoginController.m</string> <key>bookmark</key> ! <string>3077E28707D21ADE00C67D29</string> <key>history</key> <array> --- 293,299 ---- <string>1CE0B20406471E060097A5F4</string> <key>PBXProjectModuleLabel</key> ! <string>Properties.m</string> <key>bookmark</key> ! <string>302FC33E07E61CE100334603</string> <key>history</key> <array> *************** *** 307,311 **** <string>30D9FFE4078DDAEF00FBB745</string> <string>303B4FAE0791C65D0056E135</string> - <string>303B4FB90791C8710056E135</string> <string>306095380792FF3E00BAA4CF</string> <string>306095510793022800BAA4CF</string> --- 308,311 ---- *************** *** 314,318 **** <string>306095FF07930FBD00BAA4CF</string> <string>306096160793106500BAA4CF</string> - <string>306096170793106500BAA4CF</string> <string>30609625079318BE00BAA4CF</string> <string>306096300793190400BAA4CF</string> --- 314,317 ---- *************** *** 320,325 **** <string>3060964407931A3C00BAA4CF</string> <string>3060967E07931DDA00BAA4CF</string> - <string>306096AA0793218900BAA4CF</string> - <string>306096AB0793218900BAA4CF</string> <string>306096C4079325B700BAA4CF</string> <string>306F7F9707992C5300FC68E8</string> --- 319,322 ---- *************** *** 335,339 **** <string>3031CB3407A0495A006539CD</string> <string>3031CB4007A04A5B006539CD</string> - <string>3021F76207A56A290073597B</string> <string>3021F78507A56FCE0073597B</string> <string>3021F79F07A575590073597B</string> --- 332,335 ---- *************** *** 342,346 **** <string>3021F7E407A5810F0073597B</string> <string>3021F7FA07A590F30073597B</string> - <string>30884AD407ABF910001F2ACB</string> <string>30884AD707ABF924001F2ACB</string> <string>30884B0307ABFC21001F2ACB</string> --- 338,341 ---- *************** *** 348,352 **** <string>3092DC1907B66D430043063E</string> <string>3092DC1A07B66D430043063E</string> - <string>3092DC1B07B66D430043063E</string> <string>3092DC1C07B66D430043063E</string> <string>3092DC1D07B66D430043063E</string> --- 343,346 ---- *************** *** 357,365 **** <string>306BE29307B80208009942ED</string> <string>306BE2D007B80670009942ED</string> - <string>306BE2D107B80670009942ED</string> <string>306BE2D207B80670009942ED</string> - <string>30BA8B3107B807F0001B29F3</string> <string>30BA8B4807B80958001B29F3</string> - <string>30BA8B5207B80A60001B29F3</string> <string>30BA8B5307B80A60001B29F3</string> <string>30BA8B6C07B80CB8001B29F3</string> --- 351,356 ---- *************** *** 386,392 **** <string>307C1F5E07D200EF00CA6B3D</string> <string>307C1F7507D2033400CA6B3D</string> - <string>307C1F8D07D2092500CA6B3D</string> <string>3077E26307D2177A00C67D29</string> ! <string>30BA8B8B07B80E7A001B29F3</string> </array> <key>prevStack</key> --- 377,404 ---- <string>307C1F5E07D200EF00CA6B3D</string> <string>307C1F7507D2033400CA6B3D</string> <string>3077E26307D2177A00C67D29</string> ! <string>3092461807D77EA20052A124</string> ! <string>3092461907D77EA20052A124</string> ! <string>3092461B07D77EA20052A124</string> ! <string>308832FB07E6139F0078CE5B</string> ! <string>308832FC07E6139F0078CE5B</string> ! <string>3088330307E613DD0078CE5B</string> ! <string>302FC2E507E616FB00334603</string> ! <string>302FC30607E617FE00334603</string> ! <string>302FC30707E617FE00334603</string> ! <string>302FC30807E617FE00334603</string> ! <string>302FC30907E617FE00334603</string> ! <string>302FC30A07E617FE00334603</string> ! <string>302FC30B07E617FE00334603</string> ! <string>302FC30C07E617FE00334603</string> ! <string>302FC30D07E617FE00334603</string> ! <string>302FC30E07E617FE00334603</string> ! <string>302FC30F07E617FE00334603</string> ! <string>302FC31007E617FE00334603</string> ! <string>302FC31107E617FE00334603</string> ! <string>302FC31207E617FE00334603</string> ! <string>302FC31307E617FE00334603</string> ! <string>302FC32807E6187500334603</string> ! <string>302FC32907E6187500334603</string> </array> <key>prevStack</key> *************** *** 484,487 **** --- 496,517 ---- <string>307C1F7707D2033400CA6B3D</string> <string>3077E26407D2177A00C67D29</string> + <string>3088330507E613DD0078CE5B</string> + <string>3088330707E613DD0078CE5B</string> + <string>302FC2E707E616FB00334603</string> + <string>302FC31507E617FE00334603</string> + <string>302FC31607E617FE00334603</string> + <string>302FC31707E617FE00334603</string> + <string>302FC31807E617FE00334603</string> + <string>302FC31907E617FE00334603</string> + <string>302FC31A07E617FE00334603</string> + <string>302FC31B07E617FE00334603</string> + <string>302FC31C07E617FE00334603</string> + <string>302FC31D07E617FE00334603</string> + <string>302FC31E07E617FE00334603</string> + <string>302FC31F07E617FE00334603</string> + <string>302FC32007E617FE00334603</string> + <string>302FC32107E617FE00334603</string> + <string>302FC32207E617FE00334603</string> + <string>302FC32A07E6187500334603</string> </array> </dict> *************** *** 497,501 **** <string>{{0, 0}, {653, 358}}</string> <key>RubberWindowFrame</key> ! <string>216 20 998 665 0 0 1280 832 </string> </dict> <key>Module</key> --- 527,531 ---- <string>{{0, 0}, {653, 358}}</string> <key>RubberWindowFrame</key> ! <string>199 166 998 665 0 0 1280 832 </string> </dict> <key>Module</key> *************** *** 519,523 **** <string>{{0, 365}, {653, 258}}</string> <key>RubberWindowFrame</key> ! <string>216 20 998 665 0 0 1280 832 </string> </dict> <key>Module</key> --- 549,553 ---- <string>{{0, 365}, {653, 258}}</string> <key>RubberWindowFrame</key> ! <string>199 166 998 665 0 0 1280 832 </string> </dict> <key>Module</key> *************** *** 543,549 **** <key>TableOfContents</key> <array> ! <string>3077E25D07D216C200C67D29</string> <string>1CE0B1FE06471DED0097A5F4</string> ! <string>3077E25E07D216C200C67D29</string> <string>1CE0B20306471E060097A5F4</string> <string>1CE0B20506471E060097A5F4</string> --- 573,579 ---- <key>TableOfContents</key> <array> ! <string>302FC2E907E616FB00334603</string> <string>1CE0B1FE06471DED0097A5F4</string> ! <string>302FC2EA07E616FB00334603</string> <string>1CE0B20306471E060097A5F4</string> <string>1CE0B20506471E060097A5F4</string> *************** *** 573,584 **** <key>WindowOrderList</key> <array> - <string>3077E25907D216BD00C67D29</string> - <string>1CD10A99069EF8BA00B06720</string> <string>/Users/roman/Documents/dev/macattrick/Macattrick.xcode</string> <string>1C0AD2B3069F1EA900FABCE6</string> ! <string>3077E26607D2177A00C67D29</string> </array> <key>WindowString</key> ! <string>216 20 998 665 0 0 1280 832 </string> <key>WindowTools</key> <array> --- 603,613 ---- <key>WindowOrderList</key> <array> <string>/Users/roman/Documents/dev/macattrick/Macattrick.xcode</string> + <string>303B68B1075A0D24009951CC</string> <string>1C0AD2B3069F1EA900FABCE6</string> ! <string>302FC2EB07E616FB00334603</string> </array> <key>WindowString</key> ! <string>199 166 998 665 0 0 1280 832 </string> <key>WindowTools</key> <array> *************** *** 608,617 **** <key>PBXProjectModuleLabel</key> <string>FormulasViewController.m</string> - <key>bookmark</key> - <string>307C201407D216A100CA6B3D</string> - <key>history</key> - <array> - <string>307C1F4407D1FF4F00CA6B3D</string> - </array> </dict> <key>SplitCount</key> --- 637,640 ---- *************** *** 626,630 **** <string>{{0, 0}, {539, 214}}</string> <key>RubberWindowFrame</key> ! <string>521 155 539 499 0 0 1280 832 </string> </dict> <key>Module</key> --- 649,653 ---- <string>{{0, 0}, {539, 214}}</string> <key>RubberWindowFrame</key> ! <string>571 196 539 499 0 0 1280 832 </string> </dict> <key>Module</key> *************** *** 652,656 **** <string>{{0, 221}, {539, 236}}</string> <key>RubberWindowFrame</key> ! <string>521 155 539 499 0 0 1280 832 </string> </dict> <key>Module</key> --- 675,679 ---- <string>{{0, 221}, {539, 236}}</string> <key>RubberWindowFrame</key> ! <string>571 196 539 499 0 0 1280 832 </string> </dict> <key>Module</key> *************** *** 675,679 **** <array> <string>303B68B1075A0D24009951CC</string> ! <string>307C1F4607D1FF4F00CA6B3D</string> <string>1CD0528F0623707200166675</string> <string>XCMainBuildResultsModuleGUID</string> --- 698,702 ---- <array> <string>303B68B1075A0D24009951CC</string> ! <string>302FC32407E617FE00334603</string> <string>1CD0528F0623707200166675</string> <string>XCMainBuildResultsModuleGUID</string> *************** *** 682,690 **** <string>xcode.toolbar.config.build</string> <key>WindowString</key> ! <string>521 155 539 499 0 0 1280 832 </string> <key>WindowToolGUID</key> <string>303B68B1075A0D24009951CC</string> <key>WindowToolIsVisible</key> ! <false/> </dict> <dict> --- 705,713 ---- <string>xcode.toolbar.config.build</string> <key>WindowString</key> ! <string>571 196 539 499 0 0 1280 832 </string> <key>WindowToolGUID</key> <string>303B68B1075A0D24009951CC</string> <key>WindowToolIsVisible</key> ! <true/> </dict> <dict> *************** *** 844,847 **** --- 867,872 ---- </dict> <dict> + <key>BecomeActive</key> + <true/> <key>ContentConfiguration</key> <dict> *************** *** 879,884 **** <array> <string>1C530D57069F1CE1000CFCEE</string> ! <string>307C1F7107D2019400CA6B3D</string> ! <string>307C1F7207D2019400CA6B3D</string> <string>1CDD528C0622207200134675</string> <string>1CD0528E0623707200166675</string> --- 904,909 ---- <array> <string>1C530D57069F1CE1000CFCEE</string> ! <string>308832E507E611F50078CE5B</string> ! <string>308832E607E611F50078CE5B</string> <string>1CDD528C0622207200134675</string> <string>1CD0528E0623707200166675</string> *************** *** 889,893 **** <string>1C530D57069F1CE1000CFCEE</string> <key>WindowToolIsVisible</key> ! <true/> </dict> <dict> --- 914,918 ---- <string>1C530D57069F1CE1000CFCEE</string> <key>WindowToolIsVisible</key> ! <false/> </dict> <dict> *************** *** 986,991 **** <key>sizes</key> <array> ! <string>{{0, 0}, {365, 167}}</string> ! <string>{{0, 176}, {365, 267}}</string> </array> </dict> --- 1011,1016 ---- <key>sizes</key> <array> ! <string>{{0, 0}, {363, 167}}</string> ! <string>{{0, 176}, {363, 267}}</string> </array> </dict> *************** *** 1036,1042 **** <array> <string>1C0AD2B3069F1EA900FABCE6</string> ! <string>3077E25A07D216BD00C67D29</string> <string>1CD0528B0623707200166675</string> ! <string>3077E25B07D216BD00C67D29</string> </array> <key>ToolbarConfiguration</key> --- 1061,1067 ---- <array> <string>1C0AD2B3069F1EA900FABCE6</string> ! <string>302FC32507E617FE00334603</string> <string>1CD0528B0623707200166675</string> ! <string>302FC32607E617FE00334603</string> </array> <key>ToolbarConfiguration</key> Index: roman.pbxuser =================================================================== RCS file: /cvsroot/macattrick/macattrick/Macattrick.xcode/roman.pbxuser,v retrieving revision 1.86 retrieving revision 1.87 diff -C2 -d -r1.86 -r1.87 *** roman.pbxuser 27 Feb 2005 15:14:46 -0000 1.86 --- roman.pbxuser 14 Mar 2005 19:30:54 -0000 1.87 *************** *** 39,44 **** 29B97313FDCFA39411CA2CEA = { activeBuildStyle = 4A9504CDFFE6A4B311CA0CBA; ! activeExecutable = 30950684067C4D100077C270; ! activeTarget = 30950682067C4D100077C270; addToTargets = ( 30744BA4069560A70039B82A, --- 39,44 ---- 29B97313FDCFA39411CA2CEA = { activeBuildStyle = 4A9504CDFFE6A4B311CA0CBA; ! activeExecutable = 30744BA6069560A70039B82A; [...1724 lines suppressed...] ! sepNavVisRect = "{{0, 1112}, {1133, 611}}"; sepNavWindowFrame = "{{153, 159}, {750, 542}}"; }; *************** *** 4662,4668 **** 32CA4F630368D1EE00C91783 = { uiCtxt = { ! sepNavIntBoundsRect = "{{0, 0}, {645, 489}}"; sepNavSelRange = "{2146, 0}"; ! sepNavVisRect = "{{0, 300}, {645, 189}}"; }; }; --- 4513,4519 ---- 32CA4F630368D1EE00C91783 = { uiCtxt = { ! sepNavIntBoundsRect = "{{0, 0}, {606, 489}}"; sepNavSelRange = "{2146, 0}"; ! sepNavVisRect = "{{0, 152}, {606, 326}}"; }; }; |
|
From: Geisschaes <gei...@us...> - 2005-02-27 15:15:25
|
Update of /cvsroot/macattrick/macattrick/English.lproj/Login.nib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19953/English.lproj/Login.nib Modified Files: info.nib keyedobjects.nib Log Message: changed login to security code. password is changed in keychain Index: info.nib =================================================================== RCS file: /cvsroot/macattrick/macattrick/English.lproj/Login.nib/info.nib,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** info.nib 18 Jan 2005 12:16:38 -0000 1.8 --- info.nib 27 Feb 2005 15:14:44 -0000 1.9 *************** *** 4,8 **** <dict> <key>IBDocumentLocation</key> ! <string>225 157 356 240 0 0 1600 1002 </string> <key>IBFramework Version</key> <string>364.0</string> --- 4,8 ---- <dict> <key>IBDocumentLocation</key> ! <string>167 122 356 240 0 0 1280 832 </string> <key>IBFramework Version</key> <string>364.0</string> *************** *** 12,16 **** </array> <key>IBSystem Version</key> ! <string>7S215</string> </dict> </plist> --- 12,16 ---- </array> <key>IBSystem Version</key> ! <string>7U16</string> </dict> </plist> Index: keyedobjects.nib =================================================================== RCS file: /cvsroot/macattrick/macattrick/English.lproj/Login.nib/keyedobjects.nib,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 Binary files /tmp/cvsBYcGUZ and /tmp/cvsvuWHSz differ |
|
From: Geisschaes <gei...@us...> - 2005-02-27 15:15:24
|
Update of /cvsroot/macattrick/macattrick/English.lproj/PlayerDetails.nib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19953/English.lproj/PlayerDetails.nib Modified Files: info.nib keyedobjects.nib Log Message: changed login to security code. password is changed in keychain Index: info.nib =================================================================== RCS file: /cvsroot/macattrick/macattrick/English.lproj/PlayerDetails.nib/info.nib,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** info.nib 18 Feb 2005 15:40:50 -0000 1.8 --- info.nib 27 Feb 2005 15:14:44 -0000 1.9 *************** *** 4,8 **** <dict> <key>IBDocumentLocation</key> ! <string>43 142 356 240 0 0 1600 1002 </string> <key>IBFramework Version</key> <string>364.0</string> --- 4,8 ---- <dict> <key>IBDocumentLocation</key> ! <string>32 110 356 240 0 0 1280 832 </string> <key>IBFramework Version</key> <string>364.0</string> Index: keyedobjects.nib =================================================================== RCS file: /cvsroot/macattrick/macattrick/English.lproj/PlayerDetails.nib/keyedobjects.nib,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 Binary files /tmp/cvsVCzVfc and /tmp/cvsZ2PV6M differ |
|
From: Geisschaes <gei...@us...> - 2005-02-27 15:15:24
|
Update of /cvsroot/macattrick/macattrick In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19953 Modified Files: Devel Macattrick-Info.plist FormulasViewController.h FormulasViewController.m HattrickOrg.m Info.plist LoginController.m Macattrick-Info.plist Team.m main.m Log Message: changed login to security code. password is changed in keychain Index: Info.plist =================================================================== RCS file: /cvsroot/macattrick/macattrick/Info.plist,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Info.plist 22 Dec 2004 18:47:28 -0000 1.6 --- Info.plist 27 Feb 2005 15:14:44 -0000 1.7 *************** *** 18,22 **** <string>????</string> <key>CFBundleVersion</key> ! <string>0.4</string> <key>NSMainNibFile</key> <string>MainWindow</string> --- 18,22 ---- <string>????</string> <key>CFBundleVersion</key> ! <string>0.5</string> <key>NSMainNibFile</key> <string>MainWindow</string> Index: FormulasViewController.h =================================================================== RCS file: /cvsroot/macattrick/macattrick/FormulasViewController.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** FormulasViewController.h 16 Feb 2005 21:32:58 -0000 1.4 --- FormulasViewController.h 27 Feb 2005 15:14:44 -0000 1.5 *************** *** 36,40 **** Position *centralDefenderTowardsWing; Position *centralDefenderOffensive; - Position *centralDefenderDefensive; Position *wingback; Position *wingbackTowardsMiddle; --- 36,39 ---- *************** *** 51,55 **** Position *forward; Position *forwardDefensive; - IBOutlet NSTextField *keeperTotal; IBOutlet NSView *formulasView; } --- 50,53 ---- Index: main.m =================================================================== RCS file: /cvsroot/macattrick/macattrick/main.m,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** main.m 10 Jan 2005 19:41:09 -0000 1.14 --- main.m 27 Feb 2005 15:14:44 -0000 1.15 *************** *** 34,38 **** // comment out for main build ! #import "Test/AllTests.h" // --- 34,38 ---- // comment out for main build ! //#import "Test/AllTests.h" // *************** *** 47,51 **** [Properties initializeUserDefaults]; ! // comment out for main build NSArray *args = [[NSProcessInfo processInfo] arguments]; if ([args count] >= 2 && [[args objectAtIndex:1] isEqualToString: @"test"]) { --- 47,51 ---- [Properties initializeUserDefaults]; ! /*/ comment out for main build NSArray *args = [[NSProcessInfo processInfo] arguments]; if ([args count] >= 2 && [[args objectAtIndex:1] isEqualToString: @"test"]) { *************** *** 53,57 **** return 0; } ! // return NSApplicationMain(argc, argv); --- 53,57 ---- return 0; } ! /*/ return NSApplicationMain(argc, argv); Index: HattrickOrg.m =================================================================== RCS file: /cvsroot/macattrick/macattrick/HattrickOrg.m,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** HattrickOrg.m 7 Feb 2005 21:15:39 -0000 1.18 --- HattrickOrg.m 27 Feb 2005 15:14:44 -0000 1.19 *************** *** 75,79 **** loginName = newLoginName; [newPassword retain]; ! [password release]; password = newPassword; } --- 75,79 ---- loginName = newLoginName; [newPassword retain]; ! [password release]; password = newPassword; } *************** *** 95,99 **** - (void) login { NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; ! NSString *urlString = [NSString stringWithFormat:@"http://%s/Common/default.asp?action=login&loginName=%s&password=%s", [serverName cString], [loginName cString], [password cString]]; NSError *error; --- 95,99 ---- - (void) login { NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; ! NSString *urlString = [NSString stringWithFormat:@"http://%s/Common/default.asp?actionType=login&loginType=CHPP&Loginname=%s&readonlypassword=%s", [serverName cString], [loginName cString], [password cString]]; NSError *error; *************** *** 108,112 **** - (void) logout { NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; ! NSString *urlString = [NSString stringWithFormat:@"http://%s/Common/default.asp?action=logout", [serverName cString]]; NSError *error; --- 108,112 ---- - (void) logout { NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; ! NSString *urlString = [NSString stringWithFormat:@"http://%s/Common/default.asp?actionType=logout", [serverName cString]]; NSError *error; *************** *** 191,195 **** -(NSURLRequest*) buildRequest: (NSString*) urlString { NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:[NSURL URLWithString: urlString ]]; ! [request addValue:@"Macattrick v0.4" forHTTPHeaderField:@"User-Agent"]; return request; } --- 191,195 ---- -(NSURLRequest*) buildRequest: (NSString*) urlString { NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:[NSURL URLWithString: urlString ]]; ! [request addValue:@"Macattrick v0.5" forHTTPHeaderField:@"User-Agent"]; return request; } Index: FormulasViewController.m =================================================================== RCS file: /cvsroot/macattrick/macattrick/FormulasViewController.m,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** FormulasViewController.m 16 Feb 2005 21:33:06 -0000 1.4 --- FormulasViewController.m 27 Feb 2005 15:14:44 -0000 1.5 *************** *** 73,76 **** --- 73,93 ---- -(void) ok { [[PositionHeap uniqueInstance] setPosition: keeper]; + [[PositionHeap uniqueInstance] setPosition: centralDefender]; + [[PositionHeap uniqueInstance] setPosition: centralDefenderTowardsWing]; + [[PositionHeap uniqueInstance] setPosition: centralDefenderOffensive]; + [[PositionHeap uniqueInstance] setPosition: wingback]; + [[PositionHeap uniqueInstance] setPosition: wingbackTowardsMiddle]; + [[PositionHeap uniqueInstance] setPosition: wingbackDefensive]; + [[PositionHeap uniqueInstance] setPosition: wingbackOffensive]; + [[PositionHeap uniqueInstance] setPosition: innerMidfield]; + [[PositionHeap uniqueInstance] setPosition: innerMidfieldTowardsWing]; + [[PositionHeap uniqueInstance] setPosition: innerMidfieldOffensive]; + [[PositionHeap uniqueInstance] setPosition: innerMidfieldDefensive]; + [[PositionHeap uniqueInstance] setPosition: winger]; + [[PositionHeap uniqueInstance] setPosition: wingerTowardsMiddle]; + [[PositionHeap uniqueInstance] setPosition: wingerOffensive]; + [[PositionHeap uniqueInstance] setPosition: wingerDefensive]; + [[PositionHeap uniqueInstance] setPosition: forward]; + [[PositionHeap uniqueInstance] setPosition: forwardDefensive]; [[PositionHeap uniqueInstance] savePositionsToUserDefaults]; } *************** *** 131,140 **** - - (Position *) centralDefenderDefensive { return centralDefenderDefensive; } - - (void) setCentralDefenderDefensive: (Position *) newCentralDefenderDefensive { - [newCentralDefenderDefensive retain]; - [centralDefenderDefensive release]; - centralDefenderDefensive = newCentralDefenderDefensive; - } --- 148,151 ---- Index: LoginController.m =================================================================== RCS file: /cvsroot/macattrick/macattrick/LoginController.m,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** LoginController.m 26 Dec 2004 14:03:21 -0000 1.12 --- LoginController.m 27 Feb 2005 15:14:44 -0000 1.13 *************** *** 40,44 **** [self setLoginName:[[NSUserDefaults standardUserDefaults] stringForKey:@"loginName"]]; [self setServerName: [[NSUserDefaults standardUserDefaults] stringForKey:@"serverName"]]; ! [self setPassword: [self passwordFromKeychain]]; --- 40,46 ---- [self setLoginName:[[NSUserDefaults standardUserDefaults] stringForKey:@"loginName"]]; [self setServerName: [[NSUserDefaults standardUserDefaults] stringForKey:@"serverName"]]; ! if([[NSUserDefaults standardUserDefaults] boolForKey:@"savePasswordInKeychain"]) { ! [self setPassword: [self passwordFromKeychain]]; ! } *************** *** 84,99 **** -(OSStatus) savePasswordInKeychain{ ! OSStatus status; status = SecKeychainAddGenericPassword ( ! NULL, // default keychain ! strlen([@"Macattrick" UTF8String]), // length of service name ! [@"Macattrick" UTF8String], // service name ! strlen([loginName UTF8String]), // length of account name ! [loginName UTF8String] , // account name ! strlen([password UTF8String]), // length of password ! [password UTF8String], // pointer to password data ! NULL // the item reference ); ! return (status); } --- 86,126 ---- -(OSStatus) savePasswordInKeychain{ ! OSStatus status; ! OSStatus found; ! SecKeychainItemRef itemRef; ! found = SecKeychainFindGenericPassword( ! NULL, ! strlen([@"Macattrick" UTF8String]),// length of service name ! [@"Macattrick" UTF8String], // service name ! strlen([loginName UTF8String]), ! [loginName UTF8String] , ! 0 , ! NULL , ! &itemRef); ! // No item was found, add a new one.. ! if(found != 0) { status = SecKeychainAddGenericPassword ( ! NULL, // default keychain ! strlen([@"Macattrick" UTF8String]), // length of service name ! [@"Macattrick" UTF8String], // service name ! strlen([loginName UTF8String]), // length of account name ! [loginName UTF8String] , // account name ! strlen([password UTF8String]), // length of password ! [password UTF8String], // pointer to password data ! &itemRef // the item reference ); ! if (status != 0) { ! NSLog(@"Keychain storage failed: %d", status); ! } ! return status; ! } ! NSData* d = [password dataUsingEncoding:NSUTF8StringEncoding]; ! status = SecKeychainItemModifyAttributesAndData ( ! itemRef, // the item reference ! nil, // no change to attributes ! strlen([password UTF8String]), // length of password ! [password UTF8String] // pointer to password data ! ); ! return (status); } Index: Devel Macattrick-Info.plist =================================================================== RCS file: /cvsroot/macattrick/macattrick/Devel Macattrick-Info.plist,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Devel Macattrick-Info.plist 22 Dec 2004 18:47:28 -0000 1.4 --- Devel Macattrick-Info.plist 27 Feb 2005 15:14:43 -0000 1.5 *************** *** 22,26 **** <string>Roman Bertolami</string> <key>CFBundleVersion</key> ! <string>0.4</string> <key>NSMainNibFile</key> <string>MainMenu</string> --- 22,26 ---- <string>Roman Bertolami</string> <key>CFBundleVersion</key> ! <string>0.5</string> <key>NSMainNibFile</key> <string>MainMenu</string> Index: Team.m =================================================================== RCS file: /cvsroot/macattrick/macattrick/Team.m,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** Team.m 20 Jan 2005 20:46:01 -0000 1.20 --- Team.m 27 Feb 2005 15:14:44 -0000 1.21 *************** *** 168,172 **** [self setValue:currentStringValue forKey:elementName]; } ! else if ([elementName isEqualToString:@"HomePage"]) { NSURL *url = [[NSURL alloc]initWithString:currentStringValue]; [self setHomepage:url]; --- 168,172 ---- [self setValue:currentStringValue forKey:elementName]; } ! else if (([elementName isEqualToString:@"HomePage"]) && (![currentStringValue isEqualToString:@""])) { NSURL *url = [[NSURL alloc]initWithString:currentStringValue]; [self setHomepage:url]; Index: Macattrick-Info.plist =================================================================== RCS file: /cvsroot/macattrick/macattrick/Macattrick-Info.plist,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Macattrick-Info.plist 22 Dec 2004 18:47:28 -0000 1.4 --- Macattrick-Info.plist 27 Feb 2005 15:14:44 -0000 1.5 *************** *** 22,26 **** <string>Roman Bertolami</string> <key>CFBundleVersion</key> ! <string>0.4</string> <key>NSMainNibFile</key> <string>MainMenu</string> --- 22,26 ---- <string>Roman Bertolami</string> <key>CFBundleVersion</key> ! <string>0.5</string> <key>NSMainNibFile</key> <string>MainMenu</string> |
|
From: Geisschaes <gei...@us...> - 2005-02-27 15:15:23
|
Update of /cvsroot/macattrick/macattrick/English.lproj In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19953/English.lproj Modified Files: Credits.rtf InfoPlist.strings Log Message: changed login to security code. password is changed in keychain Index: InfoPlist.strings =================================================================== RCS file: /cvsroot/macattrick/macattrick/English.lproj/InfoPlist.strings,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 Binary files /tmp/cvsbUUdnG and /tmp/cvszAqe2f differ Index: Credits.rtf =================================================================== RCS file: /cvsroot/macattrick/macattrick/English.lproj/Credits.rtf,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Credits.rtf 22 Dec 2004 18:47:29 -0000 1.3 --- Credits.rtf 27 Feb 2005 15:14:44 -0000 1.4 *************** *** 2,6 **** {\fonttbl\f0\fswiss\fcharset77 Helvetica-Bold;\f1\fswiss\fcharset77 Helvetica;} {\colortbl;\red255\green255\blue255;} - \vieww9000\viewh9000\viewkind0 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural --- 2,5 ---- *************** *** 15,25 **** \ - \f0\b Localization: - \f1\b0 \ - Nicolas Savoini - French\ - Martijn Broeders - Dutch\ - Roman Bertolami - German\ - \ - \f0\b Website:\ --- 14,17 ---- |
