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-09-14 16:20:29
|
Update of /cvsroot/macattrick/macattrick/Macattrick.xcodeproj In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30199/Macattrick.xcodeproj Modified Files: project.pbxproj roman.mode1 roman.pbxuser Log Message: player images added Index: project.pbxproj =================================================================== RCS file: /cvsroot/macattrick/macattrick/Macattrick.xcodeproj/project.pbxproj,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** project.pbxproj 20 Jul 2005 19:31:01 -0000 1.4 --- project.pbxproj 14 Sep 2005 16:20:08 -0000 1.5 *************** *** 130,133 **** --- 130,137 ---- 306796E606BED27F00161E78 /* PropertiesTest.h in Headers */ = {isa = PBXBuildFile; fileRef = 306796E406BED27F00161E78 /* PropertiesTest.h */; }; 306796E706BED27F00161E78 /* PropertiesTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 306796E506BED27F00161E78 /* PropertiesTest.m */; }; + 3069618808D8823C0056662D /* alllist.icns in Resources */ = {isa = PBXBuildFile; fileRef = 3069618708D8823C0056662D /* alllist.icns */; }; + 3069618908D8823C0056662D /* alllist.icns in Resources */ = {isa = PBXBuildFile; fileRef = 3069618708D8823C0056662D /* alllist.icns */; }; + 3069618B08D882450056662D /* customlist.icns in Resources */ = {isa = PBXBuildFile; fileRef = 3069618A08D882450056662D /* customlist.icns */; }; + 3069618C08D882450056662D /* customlist.icns in Resources */ = {isa = PBXBuildFile; fileRef = 3069618A08D882450056662D /* customlist.icns */; }; 306D2F7B068AC8EB00CB623F /* MainWindowController.h in Headers */ = {isa = PBXBuildFile; fileRef = 306D2F79068AC8EB00CB623F /* MainWindowController.h */; }; 306D2F7C068AC8EB00CB623F /* MainWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 306D2F7A068AC8EB00CB623F /* MainWindowController.m */; }; *************** *** 836,839 **** --- 840,845 ---- 306796E406BED27F00161E78 /* PropertiesTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PropertiesTest.h; sourceTree = "<group>"; }; 306796E506BED27F00161E78 /* PropertiesTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PropertiesTest.m; sourceTree = "<group>"; }; + 3069618708D8823C0056662D /* alllist.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = alllist.icns; sourceTree = "<group>"; }; + 3069618A08D882450056662D /* customlist.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = customlist.icns; sourceTree = "<group>"; }; 306BE2A807B803D6009942ED /* PositionHeapTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PositionHeapTest.h; sourceTree = "<group>"; }; 306BE2A907B803D6009942ED /* PositionHeapTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PositionHeapTest.m; sourceTree = "<group>"; }; *************** *** 1273,1276 **** --- 1279,1284 ---- isa = PBXGroup; children = ( + 3069618A08D882450056662D /* customlist.icns */, + 3069618708D8823C0056662D /* alllist.icns */, 30DE3F8C07C3F00700342677 /* formulas.tiff */, 30E8346D078DAD9700274608 /* flags */, *************** *** 2398,2401 **** --- 2406,2411 ---- 10079FFE085730D700ECDC11 /* HistoryView.nib in Resources */, 30BFF6530878495B00CC3E0E /* PlayerListsView.nib in Resources */, + 3069618908D8823C0056662D /* alllist.icns in Resources */, + 3069618C08D882450056662D /* customlist.icns in Resources */, ); runOnlyForDeploymentPostprocessing = 0; *************** *** 2549,2552 **** --- 2559,2564 ---- 10079FFD085730D700ECDC11 /* HistoryView.nib in Resources */, 30BFF6520878495B00CC3E0E /* PlayerListsView.nib in Resources */, + 3069618808D8823C0056662D /* alllist.icns in Resources */, + 3069618B08D882450056662D /* customlist.icns in Resources */, ); runOnlyForDeploymentPostprocessing = 0; Index: roman.mode1 =================================================================== RCS file: /cvsroot/macattrick/macattrick/Macattrick.xcodeproj/roman.mode1,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** roman.mode1 14 Sep 2005 15:32:06 -0000 1.9 --- roman.mode1 14 Sep 2005 16:20:08 -0000 1.10 *************** *** 205,209 **** <integer>0</integer> <key>bookmark</key> ! <string>30424BE408D878FC0078B25B</string> <key>history</key> <array> --- 205,209 ---- <integer>0</integer> <key>bookmark</key> ! <string>3069617E08D8819C0056662D</string> <key>history</key> <array> *************** *** 212,216 **** <string>3062F17908B2820600CB7FF1</string> <string>3062F17A08B2820600CB7FF1</string> ! <string>3062F17F08B2820600CB7FF1</string> </array> <key>prevStack</key> --- 212,218 ---- <string>3062F17908B2820600CB7FF1</string> <string>3062F17A08B2820600CB7FF1</string> ! <string>3069617708D8819C0056662D</string> ! <string>3069617808D8819C0056662D</string> ! <string>3069617908D8819C0056662D</string> </array> <key>prevStack</key> *************** *** 220,223 **** --- 222,229 ---- <string>3062F17D08B2820600CB7FF1</string> <string>3062F17E08B2820600CB7FF1</string> + <string>3069617A08D8819C0056662D</string> + <string>3069617B08D8819C0056662D</string> + <string>3069617C08D8819C0056662D</string> + <string>3069617D08D8819C0056662D</string> </array> </dict> *************** *** 272,277 **** <array> <dict> - <key>BecomeActive</key> - <true/> <key>ContentConfiguration</key> <dict> --- 278,281 ---- *************** *** 312,316 **** <string>080E96DDFE201D6D7F000001</string> <string>30BB2140067DC1CA00B1C71A</string> - <string>307D956A063D9208008E2586</string> <string>30B355F80690131C00571DE8</string> <string>1C37FBAC04509CD000000102</string> --- 316,319 ---- *************** *** 321,325 **** <array> <array> ! <integer>2</integer> <integer>0</integer> </array> --- 324,329 ---- <array> <array> ! <integer>13</integer> ! <integer>8</integer> <integer>0</integer> </array> *************** *** 356,359 **** --- 360,365 ---- <array> <dict> + <key>BecomeActive</key> + <true/> <key>ContentConfiguration</key> <dict> *************** *** 361,365 **** <string>1CE0B20306471E060097A5F4</string> <key>PBXProjectModuleLabel</key> ! <string>Team.m</string> <key>PBXSplitModuleInNavigatorKey</key> <dict> --- 367,371 ---- <string>1CE0B20306471E060097A5F4</string> <key>PBXProjectModuleLabel</key> ! <string>PlayerListsViewController.h</string> <key>PBXSplitModuleInNavigatorKey</key> <dict> *************** *** 369,377 **** <string>1CE0B20406471E060097A5F4</string> <key>PBXProjectModuleLabel</key> ! <string>Team.m</string> <key>_historyCapacity</key> <integer>0</integer> <key>bookmark</key> ! <string>30424BE308D878FC0078B25B</string> <key>history</key> <array> --- 375,383 ---- <string>1CE0B20406471E060097A5F4</string> <key>PBXProjectModuleLabel</key> ! <string>PlayerListsViewController.h</string> <key>_historyCapacity</key> <integer>0</integer> <key>bookmark</key> ! <string>3069617608D8819C0056662D</string> <key>history</key> <array> *************** *** 447,456 **** <string>30963210086ED54100970F48</string> <string>30BFF6010878402700CC3E0E</string> - <string>30BFF73C0878752F00CC3E0E</string> <string>30BFF766087876DD00CC3E0E</string> <string>305EB2670888261A007A6071</string> <string>305EB2680888261A007A6071</string> <string>306949DE08891194009C98DE</string> - <string>30D323FE088C364C0010BC3F</string> <string>30D323FF088C364C0010BC3F</string> <string>30D32403088C364C0010BC3F</string> --- 453,460 ---- *************** *** 471,479 **** <string>30294094088EDB4100C9C2BC</string> <string>30294097088EDB4100C9C2BC</string> - <string>302940C0088EE2E600C9C2BC</string> <string>3062F16608B279E700CB7FF1</string> <string>3062F17308B2820600CB7FF1</string> <string>30424BE108D878FC0078B25B</string> ! <string>3029404F088ED60900C9C2BC</string> </array> <key>prevStack</key> --- 475,485 ---- <string>30294094088EDB4100C9C2BC</string> <string>30294097088EDB4100C9C2BC</string> <string>3062F16608B279E700CB7FF1</string> <string>3062F17308B2820600CB7FF1</string> <string>30424BE108D878FC0078B25B</string> ! <string>3069617008D8819C0056662D</string> ! <string>3069617108D8819C0056662D</string> ! <string>3069617208D8819C0056662D</string> ! <string>30BFF73C0878752F00CC3E0E</string> </array> <key>prevStack</key> *************** *** 579,583 **** <string>3029409B088EDB4100C9C2BC</string> <string>3029409E088EDB4100C9C2BC</string> ! <string>30424BE208D878FC0078B25B</string> </array> </dict> --- 585,591 ---- <string>3029409B088EDB4100C9C2BC</string> <string>3029409E088EDB4100C9C2BC</string> ! <string>3069617308D8819C0056662D</string> ! <string>3069617408D8819C0056662D</string> ! <string>3069617508D8819C0056662D</string> </array> </dict> *************** *** 637,643 **** <key>TableOfContents</key> <array> ! <string>30424BC608D875180078B25B</string> <string>1CE0B1FE06471DED0097A5F4</string> ! <string>30424BC708D875180078B25B</string> <string>1CE0B20306471E060097A5F4</string> <string>1CE0B20506471E060097A5F4</string> --- 645,651 ---- <key>TableOfContents</key> <array> ! <string>3069616408D87AD70056662D</string> <string>1CE0B1FE06471DED0097A5F4</string> ! <string>3069616508D87AD70056662D</string> <string>1CE0B20306471E060097A5F4</string> <string>1CE0B20506471E060097A5F4</string> *************** *** 775,787 **** <key>WindowOrderList</key> <array> ! <string>30424BE808D878FC0078B25B</string> ! <string>30424BE908D878FC0078B25B</string> ! <string>30BE4823082FED6F00826659</string> ! <string>30424BCF08D875180078B25B</string> ! <string>/Users/roman/Documents/dev/macattrick/Macattrick.xcodeproj</string> <string>1C0AD2B3069F1EA900FABCE6</string> ! <string>1C530D57069F1CE1000CFCEE</string> <string>3062F15C08B2798A00CB7FF1</string> - <string>1CD10A99069EF8BA00B06720</string> </array> <key>WindowString</key> --- 783,791 ---- <key>WindowOrderList</key> <array> ! <string>1CD10A99069EF8BA00B06720</string> ! <string>3069616008D87AD10056662D</string> <string>1C0AD2B3069F1EA900FABCE6</string> ! <string>/Users/roman/Documents/dev/macattrick/Macattrick.xcodeproj</string> <string>3062F15C08B2798A00CB7FF1</string> </array> <key>WindowString</key> *************** *** 909,914 **** <key>sizes</key> <array> ! <string>{{0, 0}, {281, 182}}</string> ! <string>{{281, 0}, {999, 182}}</string> </array> </dict> --- 913,918 ---- <key>sizes</key> <array> ! <string>{{0, 0}, {256, 178}}</string> ! <string>{{256, 0}, {1024, 178}}</string> </array> </dict> *************** *** 925,930 **** <key>sizes</key> <array> ! <string>{{0, 0}, {1280, 182}}</string> ! <string>{{0, 182}, {1280, 504}}</string> </array> </dict> --- 929,934 ---- <key>sizes</key> <array> ! <string>{{0, 0}, {1280, 178}}</string> ! <string>{{0, 178}, {1280, 508}}</string> </array> </dict> *************** *** 973,984 **** <array> <string>1CD10A99069EF8BA00B06720</string> ! <string>30424BC908D875180078B25B</string> <string>1C162984064C10D400B95A72</string> ! <string>30424BCA08D875180078B25B</string> ! <string>30424BCB08D875180078B25B</string> ! <string>30424BCC08D875180078B25B</string> ! <string>30424BCD08D875180078B25B</string> ! <string>30424BCE08D875180078B25B</string> ! <string>30424BCF08D875180078B25B</string> </array> <key>ToolbarConfiguration</key> --- 977,988 ---- <array> <string>1CD10A99069EF8BA00B06720</string> ! <string>3069615A08D87AD10056662D</string> <string>1C162984064C10D400B95A72</string> ! <string>3069615B08D87AD10056662D</string> ! <string>3069615C08D87AD10056662D</string> ! <string>3069615D08D87AD10056662D</string> ! <string>3069615E08D87AD10056662D</string> ! <string>3069615F08D87AD10056662D</string> ! <string>3069616008D87AD10056662D</string> </array> <key>ToolbarConfiguration</key> *************** *** 989,993 **** <string>1CD10A99069EF8BA00B06720</string> <key>WindowToolIsVisible</key> ! <true/> </dict> <dict> --- 993,997 ---- <string>1CD10A99069EF8BA00B06720</string> <key>WindowToolIsVisible</key> ! <false/> </dict> <dict> *************** *** 1179,1184 **** <key>sizes</key> <array> ! <string>{{0, 0}, {367, 168}}</string> ! <string>{{0, 173}, {367, 270}}</string> </array> </dict> --- 1183,1188 ---- <key>sizes</key> <array> ! <string>{{0, 0}, {493, 168}}</string> ! <string>{{0, 173}, {493, 270}}</string> </array> </dict> *************** *** 1229,1235 **** <array> <string>1C0AD2B3069F1EA900FABCE6</string> ! <string>30424BD008D875180078B25B</string> <string>1CD0528B0623707200166675</string> ! <string>30424BD108D875180078B25B</string> </array> <key>ToolbarConfiguration</key> --- 1233,1239 ---- <array> <string>1C0AD2B3069F1EA900FABCE6</string> ! <string>3069616108D87AD10056662D</string> <string>1CD0528B0623707200166675</string> ! <string>3069616208D87AD10056662D</string> </array> <key>ToolbarConfiguration</key> *************** *** 1240,1244 **** <string>1C0AD2B3069F1EA900FABCE6</string> <key>WindowToolIsVisible</key> ! <true/> </dict> <dict> --- 1244,1248 ---- <string>1C0AD2B3069F1EA900FABCE6</string> <key>WindowToolIsVisible</key> ! <false/> </dict> <dict> Index: roman.pbxuser =================================================================== RCS file: /cvsroot/macattrick/macattrick/Macattrick.xcodeproj/roman.pbxuser,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** roman.pbxuser 14 Sep 2005 15:32:06 -0000 1.9 --- roman.pbxuser 14 Sep 2005 16:20:08 -0000 1.10 *************** *** 52,58 **** 30BFF66108784AE900CC3E0E /* PlayerListsViewController.m:35 */, 30E3011C088D5853003395B7 /* TeamTest.m:58 */, ! 30294043088ED45E00C9C2BC /* PlayerList.m:131 */, ! 3062F14208B276DF00CB7FF1 /* PlayerListsViewController.m:84 */, ! 3062F15608B2793300CB7FF1 /* PlayerList.m:178 */, 3062F16108B279C800CB7FF1 /* PlayerTableView.m:37 */, 3062F16308B279C900CB7FF1 /* PlayerTableView.m:38 */, --- 52,57 ---- 30BFF66108784AE900CC3E0E /* PlayerListsViewController.m:35 */, 30E3011C088D5853003395B7 /* TeamTest.m:58 */, ! 30294043088ED45E00C9C2BC /* PlayerList.m:143 */, ! 3062F15608B2793300CB7FF1 /* PlayerList.m:190 */, 3062F16108B279C800CB7FF1 /* PlayerTableView.m:37 */, 3062F16308B279C900CB7FF1 /* PlayerTableView.m:38 */, *************** *** 109,113 **** }; PBXConfiguration.PBXFileTableDataSource3.PBXFileTableDataSource = { ! PBXFileTableDataSourceColumnSortingDirectionKey = "-1"; PBXFileTableDataSourceColumnSortingKey = PBXFileDataSource_Filename_ColumnID; PBXFileTableDataSourceColumnWidthsKey = ( --- 108,112 ---- }; PBXConfiguration.PBXFileTableDataSource3.PBXFileTableDataSource = { ! PBXFileTableDataSourceColumnSortingDirectionKey = 1; PBXFileTableDataSourceColumnSortingKey = PBXFileDataSource_Filename_ColumnID; PBXFileTableDataSourceColumnWidthsKey = ( *************** *** 206,210 **** ); }; ! PBXPerProjectTemplateStateSaveDate = 148403460; PBXPrepackagedSmartGroups_v2 = ( { --- 205,209 ---- ); }; ! PBXPerProjectTemplateStateSaveDate = 148404936; PBXPrepackagedSmartGroups_v2 = ( { *************** *** 1050,1054 **** RubberWindowFrame = "496 457 599 209 0 0 1280 832 "; }; ! PBXWorkspaceStateSaveDate = 148403460; }; perUserProjectItems = { --- 1049,1053 ---- RubberWindowFrame = "496 457 599 209 0 0 1280 832 "; }; ! PBXWorkspaceStateSaveDate = 148404936; }; perUserProjectItems = { *************** *** 1070,1079 **** 304131D8085B750300E5F9C0 = 304131D8085B750300E5F9C0 /* PBXTextBookmark */; 304131F2085B752100E5F9C0 = 304131F2085B752100E5F9C0 /* PBXTextBookmark */; ! 30424BC508D875180078B25B /* PBXTextBookmark */ = 30424BC508D875180078B25B /* PBXTextBookmark */; ! 30424BC808D875180078B25B /* PBXTextBookmark */ = 30424BC808D875180078B25B /* PBXTextBookmark */; ! 30424BE108D878FC0078B25B /* PBXTextBookmark */ = 30424BE108D878FC0078B25B /* PBXTextBookmark */; ! 30424BE208D878FC0078B25B /* PBXTextBookmark */ = 30424BE208D878FC0078B25B /* PBXTextBookmark */; ! 30424BE308D878FC0078B25B /* PBXTextBookmark */ = 30424BE308D878FC0078B25B /* PBXTextBookmark */; ! 30424BE408D878FC0078B25B /* PBXTextBookmark */ = 30424BE408D878FC0078B25B /* PBXTextBookmark */; 304255860837E2BB00DDF612 = 304255860837E2BB00DDF612 /* PBXTextBookmark */; 304A29C8085B30700097D886 = 304A29C8085B30700097D886 /* PBXTextBookmark */; --- 1069,1076 ---- 304131D8085B750300E5F9C0 = 304131D8085B750300E5F9C0 /* PBXTextBookmark */; 304131F2085B752100E5F9C0 = 304131F2085B752100E5F9C0 /* PBXTextBookmark */; ! 30424BE108D878FC0078B25B = 30424BE108D878FC0078B25B /* PBXTextBookmark */; ! 30424BE208D878FC0078B25B = 30424BE208D878FC0078B25B /* PBXTextBookmark */; ! 30424BEC08D87ABA0078B25B = 30424BEC08D87ABA0078B25B /* PBXTextBookmark */; ! 30424BED08D87ABA0078B25B = 30424BED08D87ABA0078B25B /* PBXTextBookmark */; 304255860837E2BB00DDF612 = 304255860837E2BB00DDF612 /* PBXTextBookmark */; 304A29C8085B30700097D886 = 304A29C8085B30700097D886 /* PBXTextBookmark */; *************** *** 1089,1107 **** 305EB2680888261A007A6071 = 305EB2680888261A007A6071 /* PBXTextBookmark */; 3062F16608B279E700CB7FF1 = 3062F16608B279E700CB7FF1 /* PBXTextBookmark */; - 3062F16808B279E700CB7FF1 = 3062F16808B279E700CB7FF1 /* PBXTextBookmark */; - 3062F16908B279E700CB7FF1 = 3062F16908B279E700CB7FF1 /* PBXTextBookmark */; 3062F16E08B279E700CB7FF1 = 3062F16E08B279E700CB7FF1 /* PBXTextBookmark */; 3062F16F08B279E700CB7FF1 = 3062F16F08B279E700CB7FF1 /* PBXTextBookmark */; - 3062F17208B2814300CB7FF1 = 3062F17208B2814300CB7FF1 /* PBXBookmark */; 3062F17308B2820600CB7FF1 = 3062F17308B2820600CB7FF1 /* PBXTextBookmark */; - 3062F17408B2820600CB7FF1 = 3062F17408B2820600CB7FF1 /* PBXTextBookmark */; - 3062F17508B2820600CB7FF1 = 3062F17508B2820600CB7FF1 /* PBXTextBookmark */; - 3062F17608B2820600CB7FF1 = 3062F17608B2820600CB7FF1 /* PBXTextBookmark */; 3062F17708B2820600CB7FF1 = 3062F17708B2820600CB7FF1 /* PBXTextBookmark */; 3062F17808B2820600CB7FF1 = 3062F17808B2820600CB7FF1 /* PBXTextBookmark */; 3062F17908B2820600CB7FF1 = 3062F17908B2820600CB7FF1 /* PBXTextBookmark */; 3062F17A08B2820600CB7FF1 = 3062F17A08B2820600CB7FF1 /* PBXTextBookmark */; - 3062F17B08B2820600CB7FF1 = 3062F17B08B2820600CB7FF1 /* PBXTextBookmark */; - 3062F17C08B2820600CB7FF1 = 3062F17C08B2820600CB7FF1 /* PBXTextBookmark */; 3062F17D08B2820600CB7FF1 = 3062F17D08B2820600CB7FF1 /* PBXTextBookmark */; 3062F17E08B2820600CB7FF1 = 3062F17E08B2820600CB7FF1 /* PBXTextBookmark */; --- 1086,1096 ---- *************** *** 1110,1113 **** --- 1099,1121 ---- 306949DE08891194009C98DE = 306949DE08891194009C98DE /* PBXTextBookmark */; 306949DF08891194009C98DE = 306949DF08891194009C98DE /* PBXTextBookmark */; + 3069616308D87AD70056662D /* PBXTextBookmark */ = 3069616308D87AD70056662D /* PBXTextBookmark */; + 3069616608D87AD70056662D /* PBXTextBookmark */ = 3069616608D87AD70056662D /* PBXTextBookmark */; + 3069617008D8819C0056662D /* PBXTextBookmark */ = 3069617008D8819C0056662D /* PBXTextBookmark */; + 3069617108D8819C0056662D /* PBXTextBookmark */ = 3069617108D8819C0056662D /* PBXTextBookmark */; + 3069617208D8819C0056662D /* PBXTextBookmark */ = 3069617208D8819C0056662D /* PBXTextBookmark */; + 3069617308D8819C0056662D /* PBXTextBookmark */ = 3069617308D8819C0056662D /* PBXTextBookmark */; + 3069617408D8819C0056662D /* PBXTextBookmark */ = 3069617408D8819C0056662D /* PBXTextBookmark */; + 3069617508D8819C0056662D /* PBXTextBookmark */ = 3069617508D8819C0056662D /* PBXTextBookmark */; + 3069617608D8819C0056662D /* PBXTextBookmark */ = 3069617608D8819C0056662D /* PBXTextBookmark */; + 3069617708D8819C0056662D /* PBXTextBookmark */ = 3069617708D8819C0056662D /* PBXTextBookmark */; + 3069617808D8819C0056662D /* PBXTextBookmark */ = 3069617808D8819C0056662D /* PBXTextBookmark */; + 3069617908D8819C0056662D /* PBXTextBookmark */ = 3069617908D8819C0056662D /* PBXTextBookmark */; + 3069617A08D8819C0056662D /* PBXTextBookmark */ = 3069617A08D8819C0056662D /* PBXTextBookmark */; + 3069617B08D8819C0056662D /* PBXTextBookmark */ = 3069617B08D8819C0056662D /* PBXTextBookmark */; + 3069617C08D8819C0056662D /* PBXTextBookmark */ = 3069617C08D8819C0056662D /* PBXTextBookmark */; + 3069617D08D8819C0056662D /* PBXTextBookmark */ = 3069617D08D8819C0056662D /* PBXTextBookmark */; + 3069617E08D8819C0056662D /* PBXTextBookmark */ = 3069617E08D8819C0056662D /* PBXTextBookmark */; + 3069619E08D882700056662D /* PBXTextBookmark */ = 3069619E08D882700056662D /* PBXTextBookmark */; + 306961A108D882E90056662D /* PBXTextBookmark */ = 306961A108D882E90056662D /* PBXTextBookmark */; 3083EF22085C81F30006D9C5 = 3083EF22085C81F30006D9C5 /* PBXTextBookmark */; 3083EF9A085C98F60006D9C5 = 3083EF9A085C98F60006D9C5 /* PBXTextBookmark */; *************** *** 1376,1380 **** }; }; ! 30294043088ED45E00C9C2BC /* PlayerList.m:131 */ = { isa = PBXFileBreakpoint; actions = ( --- 1384,1388 ---- }; }; ! 30294043088ED45E00C9C2BC /* PlayerList.m:143 */ = { isa = PBXFileBreakpoint; actions = ( *************** *** 1385,1389 **** functionName = "-removePlayerWithID:"; hitCount = 0; ! lineNumber = 131; modificationTime = 148404450.637213; state = 2; --- 1393,1397 ---- functionName = "-removePlayerWithID:"; hitCount = 0; ! lineNumber = 143; modificationTime = 148404450.637213; state = 2; *************** *** 1689,1703 **** 3041B58A06F623640055CB6D /* PlayerList.h */ = { uiCtxt = { ! sepNavIntBoundsRect = "{{0, 0}, {1006, 1932}}"; ! sepNavSelRange = "{4743, 0}"; ! sepNavVisRect = "{{0, 1301}, {1006, 603}}"; }; }; 3041B58B06F623640055CB6D /* PlayerList.m */ = { uiCtxt = { ! sepNavIntBoundsRect = "{{0, 0}, {1148, 4900}}"; ! sepNavSelRange = "{2466, 0}"; ! sepNavVisRect = "{{0, 545}, {1112, 499}}"; ! sepNavWindowFrame = "{{15, 293}, {750, 534}}"; }; }; --- 1697,1711 ---- 3041B58A06F623640055CB6D /* PlayerList.h */ = { uiCtxt = { ! sepNavIntBoundsRect = "{{0, 0}, {1112, 2002}}"; ! sepNavSelRange = "{3243, 0}"; ! sepNavVisRect = "{{0, 810}, {1112, 499}}"; }; }; 3041B58B06F623640055CB6D /* PlayerList.m */ = { uiCtxt = { ! sepNavIntBoundsRect = "{{0, 0}, {1148, 5040}}"; ! sepNavSelRange = "{5155, 0}"; ! sepNavVisRect = "{{0, 429}, {1112, 499}}"; ! sepNavWindowFrame = "{{68, 216}, {1157, 604}}"; }; }; *************** *** 1717,1740 **** }; }; - 30424BC508D875180078B25B /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 3041B58B06F623640055CB6D /* PlayerList.m */; - name = "- (BOOL) removePlayers: (NSArray*) players"; - rLen = 42; - rLoc = 6731; - rType = 0; - vrLen = 696; - vrLoc = 6560; - }; - 30424BC808D875180078B25B /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 3041B58B06F623640055CB6D /* PlayerList.m */; - name = "PlayerList.m: 156"; - rLen = 0; - rLoc = 5757; - rType = 0; - vrLen = 1024; - vrLoc = 4796; - }; 30424BE008D878D40078B25B /* Team.m:50 */ = { isa = PBXFileBreakpoint; --- 1725,1728 ---- *************** *** 1755,1759 **** name = "- (BOOL) removePlayers: (NSArray*) players"; rLen = 42; ! rLoc = 6731; rType = 0; vrLen = 667; --- 1743,1747 ---- name = "- (BOOL) removePlayers: (NSArray*) players"; rLen = 42; ! rLoc = 7204; rType = 0; vrLen = 667; *************** *** 1765,1774 **** name = "- (BOOL) removePlayers: (NSArray*) players"; rLen = 42; ! rLoc = 6731; rType = 0; vrLen = 667; vrLoc = 6496; }; ! 30424BE308D878FC0078B25B /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 30A1800E0640E5C300D2836F /* Team.m */; --- 1753,1762 ---- name = "- (BOOL) removePlayers: (NSArray*) players"; rLen = 42; ! rLoc = 7204; rType = 0; vrLen = 667; vrLoc = 6496; }; ! 30424BEC08D87ABA0078B25B /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 30A1800E0640E5C300D2836F /* Team.m */; *************** *** 1780,1789 **** vrLoc = 5355; }; ! 30424BE408D878FC0078B25B /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 3041B58B06F623640055CB6D /* PlayerList.m */; name = "PlayerList.m: 44"; rLen = 0; ! rLoc = 2466; rType = 0; vrLen = 996; --- 1768,1777 ---- vrLoc = 5355; }; ! 30424BED08D87ABA0078B25B /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 3041B58B06F623640055CB6D /* PlayerList.m */; name = "PlayerList.m: 44"; rLen = 0; ! rLoc = 2502; rType = 0; vrLen = 996; *************** *** 2112,2129 **** }; }; ! 3062F14208B276DF00CB7FF1 /* PlayerListsViewController.m:84 */ = { ! isa = PBXFileBreakpoint; ! actions = ( ! ); ! continueAfterActions = 0; ! delayBeforeContinue = 0; ! fileReference = 30BFF65508784A2300CC3E0E /* PlayerListsViewController.m */; ! functionName = "-tableView:acceptDrop:row:dropOperation:"; ! hitCount = 0; ! lineNumber = 84; ! modificationTime = 148404473.185265; ! state = 1; ! }; ! 3062F15608B2793300CB7FF1 /* PlayerList.m:178 */ = { isa = PBXFileBreakpoint; actions = ( --- 2100,2104 ---- }; }; ! 3062F15608B2793300CB7FF1 /* PlayerList.m:190 */ = { isa = PBXFileBreakpoint; actions = ( *************** *** 2134,2138 **** functionName = "-removePlayersWithIDs:"; hitCount = 0; ! lineNumber = 178; modificationTime = 148404544.445187; state = 1; --- 2109,2113 ---- functionName = "-removePlayersWithIDs:"; hitCount = 0; ! lineNumber = 190; modificationTime = 148404544.445187; state = 1; *************** *** 2174,2197 **** vrLoc = 1202; }; - 3062F16808B279E700CB7FF1 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 308426AB0643ABD200173CCD /* PlayerTableController.m */; - name = "PlayerTableController.m: 115"; - rLen = 0; - rLoc = 4633; - rType = 0; - vrLen = 829; - vrLoc = 3834; - }; - 3062F16908B279E700CB7FF1 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 30294066088ED7B500C9C2BC /* PlayerTableView.m */; - name = "PlayerTableView.m: 39"; - rLen = 0; - rLoc = 2521; - rType = 0; - vrLen = 1328; - vrLoc = 1202; - }; 3062F16E08B279E700CB7FF1 /* PBXTextBookmark */ = { isa = PBXTextBookmark; --- 2149,2152 ---- *************** *** 2214,2221 **** vrLoc = 243; }; - 3062F17208B2814300CB7FF1 /* PBXBookmark */ = { - isa = PBXBookmark; - fRef = 3041B58B06F623640055CB6D /* PlayerList.m */; - }; 3062F17308B2820600CB7FF1 /* PBXTextBookmark */ = { isa = PBXTextBookmark; --- 2169,2172 ---- *************** *** 2228,2261 **** vrLoc = 2540; }; - 3062F17408B2820600CB7FF1 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 3041B58B06F623640055CB6D /* PlayerList.m */; - name = "- (BOOL) removePlayers: (NSArray*) players"; - rLen = 42; - rLoc = 6731; - rType = 0; - vrLen = 696; - vrLoc = 6560; - }; - 3062F17508B2820600CB7FF1 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 308426AB0643ABD200173CCD /* PlayerTableController.m */; - name = removeSelectedPlayers; - rLen = 21; - rLoc = 2865; - rType = 0; - vrLen = 715; - vrLoc = 2540; - }; - 3062F17608B2820600CB7FF1 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 3041B58B06F623640055CB6D /* PlayerList.m */; - name = "- (BOOL) removePlayers: (NSArray*) players"; - rLen = 42; - rLoc = 6731; - rType = 0; - vrLen = 696; - vrLoc = 6560; - }; 3062F17708B2820600CB7FF1 /* PBXTextBookmark */ = { isa = PBXTextBookmark; --- 2179,2182 ---- *************** *** 2298,2321 **** vrLoc = 1437; }; - 3062F17B08B2820600CB7FF1 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 30294066088ED7B500C9C2BC /* PlayerTableView.m */; - name = "PlayerTableView.m: 40"; - rLen = 0; - rLoc = 2527; - rType = 0; - vrLen = 1357; - vrLoc = 1356; - }; - 3062F17C08B2820600CB7FF1 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 30294065088ED7B500C9C2BC /* PlayerTableView.h */; - name = "PlayerTableView.h: 37"; - rLen = 0; - rLoc = 2301; - rType = 0; - vrLen = 2064; - vrLoc = 243; - }; 3062F17D08B2820600CB7FF1 /* PBXTextBookmark */ = { isa = PBXTextBookmark; --- 2219,2222 ---- *************** *** 2343,2347 **** name = "PlayerList.m: 156"; rLen = 0; ! rLoc = 5757; rType = 0; vrLen = 1024; --- 2244,2248 ---- name = "PlayerList.m: 156"; rLen = 0; ! rLoc = 6230; rType = 0; vrLen = 1024; *************** *** 2388,2396 **** name = "PlayerList.m: 49"; rLen = 0; ! rLoc = 2642; rType = 0; vrLen = 796; vrLoc = 2444; }; 306BE2A807B803D6009942ED /* PositionHeapTest.h */ = { uiCtxt = { --- 2289,2484 ---- name = "PlayerList.m: 49"; rLen = 0; ! rLoc = 2502; rType = 0; vrLen = 796; vrLoc = 2444; }; + 3069616308D87AD70056662D /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 30A1800E0640E5C300D2836F /* Team.m */; + name = "Team.m: 170"; + rLen = 0; + rLoc = 5980; + rType = 0; + vrLen = 1030; + vrLoc = 5355; + }; + 3069616608D87AD70056662D /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 3041B58B06F623640055CB6D /* PlayerList.m */; + name = "PlayerList.m: 44"; + rLen = 0; + rLoc = 2502; + rType = 0; + vrLen = 965; + vrLoc = 2405; + }; + 3069617008D8819C0056662D /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 30A1800E0640E5C300D2836F /* Team.m */; + name = "Team.m: 170"; + rLen = 0; + rLoc = 5980; + rType = 0; + vrLen = 1030; + vrLoc = 5355; + }; + 3069617108D8819C0056662D /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 30A180100640E5C300D2836F /* Team.h */; + name = allPlayersList; + rLen = 14; + rLoc = 2683; + rType = 0; + vrLen = 443; + vrLoc = 2454; + }; + 3069617208D8819C0056662D /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 30BFF65508784A2300CC3E0E /* PlayerListsViewController.m */; + name = "PlayerListsViewController.m: 84"; + rLen = 0; + rLoc = 3879; + rType = 0; + vrLen = 898; + vrLoc = 3106; + }; + 3069617308D8819C0056662D /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 30A1800E0640E5C300D2836F /* Team.m */; + name = "Team.m: 170"; + rLen = 0; + rLoc = 5980; + rType = 0; + vrLen = 1030; + vrLoc = 5355; + }; + 3069617408D8819C0056662D /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 30A180100640E5C300D2836F /* Team.h */; + name = allPlayersList; + rLen = 14; + rLoc = 2683; + rType = 0; + vrLen = 443; + vrLoc = 2454; + }; + 3069617508D8819C0056662D /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 30BFF65508784A2300CC3E0E /* PlayerListsViewController.m */; + name = "PlayerListsViewController.m: 84"; + rLen = 0; + rLoc = 3879; + rType = 0; + vrLen = 898; + vrLoc = 3106; + }; + 3069617608D8819C0056662D /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 30BFF65408784A2300CC3E0E /* PlayerListsViewController.h */; + name = "PlayerListsViewController.h: 32"; + rLen = 0; + rLoc = 2270; + rType = 0; + vrLen = 965; + vrLoc = 1742; + }; + 3069617708D8819C0056662D /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 30BFF65508784A2300CC3E0E /* PlayerListsViewController.m */; + name = "PlayerListsViewController.m: 84"; + rLen = 0; + rLoc = 3879; + rType = 0; + vrLen = 1034; + vrLoc = 2148; + }; + 3069617808D8819C0056662D /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 3041B58A06F623640055CB6D /* PlayerList.h */; + name = "PlayerList.h: 76"; + rLen = 0; + rLoc = 3243; + rType = 0; + vrLen = 855; + vrLoc = 2953; + }; + 3069617908D8819C0056662D /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 3041B58B06F623640055CB6D /* PlayerList.m */; + name = "PlayerList.m: 88"; + rLen = 0; + rLoc = 3911; + rType = 0; + vrLen = 916; + vrLoc = 3058; + }; + 3069617A08D8819C0056662D /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 3041B58B06F623640055CB6D /* PlayerList.m */; + name = "PlayerList.m: 44"; + rLen = 0; + rLoc = 2502; + rType = 0; + vrLen = 965; + vrLoc = 2405; + }; + 3069617B08D8819C0056662D /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 30BFF65508784A2300CC3E0E /* PlayerListsViewController.m */; + name = "PlayerListsViewController.m: 84"; + rLen = 0; + rLoc = 3879; + rType = 0; + vrLen = 1034; + vrLoc = 2148; + }; + 3069617C08D8819C0056662D /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 3041B58B06F623640055CB6D /* PlayerList.m */; + name = "PlayerList.m: 88"; + rLen = 0; + rLoc = 3911; + rType = 0; + vrLen = 916; + vrLoc = 3058; + }; + 3069617D08D8819C0056662D /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 3041B58A06F623640055CB6D /* PlayerList.h */; + name = "PlayerList.h: 76"; + rLen = 0; + rLoc = 3243; + rType = 0; + vrLen = 855; + vrLoc = 2953; + }; + 3069617E08D8819C0056662D /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 3041B58B06F623640055CB6D /* PlayerList.m */; + name = "PlayerList.m: 140"; + rLen = 0; + rLoc = 5444; + rType = 0; + vrLen = 947; + vrLoc = 2188; + }; + 3069619E08D882700056662D /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 30A1800E0640E5C300D2836F /* Team.m */; + rLen = 5; + rLoc = 8553; + rType = 0; + }; + 306961A108D882E90056662D /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 30A1800E0640E5C300D2836F /* Team.m */; + name = image; + rLen = 5; + rLoc = 8553; + rType = 0; + vrLen = 1116; + vrLoc = 7767; + }; 306BE2A807B803D6009942ED /* PositionHeapTest.h */ = { uiCtxt = { *************** *** 2894,2897 **** --- 2982,2990 ---- 30BFF66108784AE900CC3E0E /* PlayerListsViewController.m:35 */, 30E3011C088D5853003395B7 /* TeamTest.m:58 */, + 30294043088ED45E00C9C2BC /* PlayerList.m:143 */, + 3062F15608B2793300CB7FF1 /* PlayerList.m:190 */, + 3062F16108B279C800CB7FF1 /* PlayerTableView.m:37 */, + 3062F16308B279C900CB7FF1 /* PlayerTableView.m:38 */, + 30424BE008D878D40078B25B /* Team.m:50 */, ); }; *************** *** 3127,3133 **** 30A1800D0640E5C300D2836F /* Player.h */ = { uiCtxt = { ! sepNavIntBoundsRect = "{{0, 0}, {876, 1960}}"; ! sepNavSelRange = "{4285, 16}"; ! sepNavVisRect = "{{0, 1317}, {876, 551}}"; sepNavWindowFrame = "{{164, 95}, {927, 685}}"; }; --- 3220,3226 ---- 30A1800D0640E5C300D2836F /* Player.h */ = { uiCtxt = { ! sepNavIntBoundsRect = "{{0, 0}, {1112, 1960}}"; ! sepNavSelRange = "{2874, 5}"; ! sepNavVisRect = "{{0, 682}, {1112, 499}}"; sepNavWindowFrame = "{{164, 95}, {927, 685}}"; }; *************** *** 3136,3141 **** uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {1233, 3906}}"; ! sepNavSelRange = "{2653, 0}"; ! sepNavVisRect = "{{0, 457}, {1233, 472}}"; sepNavWindowFrame = "{{61, 243}, {750, 542}}"; }; --- 3229,3234 ---- uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {1233, 3906}}"; ! sepNavSelRange = "{8553, 5}"; ! sepNavVisRect = "{{0, 3258}, {1233, 377}}"; sepNavWindowFrame = "{{61, 243}, {750, 542}}"; }; *************** *** 3144,3149 **** uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {1112, 5992}}"; ! sepNavSelRange = "{3382, 45}"; ! sepNavVisRect = "{{0, 1277}, {1112, 499}}"; sepNavWindowFrame = "{{61, 251}, {750, 534}}"; }; --- 3237,3242 ---- uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {1112, 5992}}"; ! sepNavSelRange = "{7284, 0}"; ! sepNavVisRect = "{{0, 2914}, {1112, 499}}"; sepNavWindowFrame = "{{61, 251}, {750, 534}}"; }; *************** *** 3151,3157 **** 30A180100640E5C300D2836F /* Team.h */ = { uiCtxt = { ! sepNavIntBoundsRect = "{{0, 0}, {1006, 2338}}"; ! sepNavSelRange = "{4309, 21}"; ! sepNavVisRect = "{{0, 546}, {1006, 603}}"; sepNavWindowFrame = "{{534, 124}, {1051, 708}}"; }; --- 3244,3250 ---- 30A180100640E5C300D2836F /* Team.h */ = { uiCtxt = { ! sepNavIntBoundsRect = "{{0, 0}, {728, 2338}}"; ! sepNavSelRange = "{2683, 14}"; ! sepNavVisRect = "{{0, 629}, {728, 348}}"; sepNavWindowFrame = "{{534, 124}, {1051, 708}}"; }; *************** *** 3265,3270 **** uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {1233, 2828}}"; ! sepNavSelRange = "{3505, 0}"; ! sepNavVisRect = "{{0, 869}, {1233, 377}}"; sepNavWindowFrame = "{{15, 293}, {750, 534}}"; }; --- 3358,3363 ---- uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {1233, 2828}}"; ! sepNavSelRange = "{8952, 0}"; ! sepNavVisRect = "{{0, 2356}, {1233, 472}}"; sepNavWindowFrame = "{{15, 293}, {750, 534}}"; }; *************** *** 3333,3346 **** 30BFF65408784A2300CC3E0E /* PlayerListsViewController.h */ = { uiCtxt = { ! sepNavIntBoundsRect = "{{0, 0}, {1006, 658}}"; ! sepNavSelRange = "{2225, 0}"; ! sepNavVisRect = "{{0, 55}, {1006, 603}}"; }; }; 30BFF65508784A2300CC3E0E /* PlayerListsViewController.m */ = { uiCtxt = { ! sepNavIntBoundsRect = "{{0, 0}, {1233, 1274}}"; ! sepNavSelRange = "{2734, 0}"; ! sepNavVisRect = "{{0, 499}, {1233, 472}}"; sepNavWindowFrame = "{{96, 112}, {1051, 708}}"; }; --- 3426,3439 ---- 30BFF65408784A2300CC3E0E /* PlayerListsViewController.h */ = { uiCtxt = { ! sepNavIntBoundsRect = "{{0, 0}, {728, 658}}"; ! sepNavSelRange = "{2270, 0}"; ! sepNavVisRect = "{{0, 310}, {728, 348}}"; }; }; 30BFF65508784A2300CC3E0E /* PlayerListsViewController.m */ = { uiCtxt = { ! sepNavIntBoundsRect = "{{0, 0}, {1112, 1274}}"; ! sepNavSelRange = "{3879, 0}"; ! sepNavVisRect = "{{0, 399}, {1112, 499}}"; sepNavWindowFrame = "{{96, 112}, {1051, 708}}"; }; *************** *** 3414,3418 **** name = "PlayerListsViewController.h: clicked:"; rLen = 0; ! rLoc = 2418; rType = 0; vrLen = 1246; --- 3507,3511 ---- name = "PlayerListsViewController.h: clicked:"; rLen = 0; ! rLoc = 2434; rType = 0; vrLen = 1246; *************** *** 3812,3816 **** name = averageAge; rLen = 10; ! rLoc = 4509; rType = 0; vrLen = 780; --- 3905,3909 ---- name = averageAge; rLen = 10; ! rLoc = 4608; rType = 0; vrLen = 780; *************** *** 4636,4640 **** name = "PlayerList.h: playerIDsAsString"; rLen = 0; ! rLoc = 3070; rType = 0; vrLen = 601; --- 4729,4733 ---- name = "PlayerList.h: playerIDsAsString"; rLen = 0; ! rLoc = 3094; rType = 0; vrLen = 601; |
|
From: Geisschaes <gei...@us...> - 2005-09-14 16:20:29
|
Update of /cvsroot/macattrick/macattrick In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30199 Modified Files: PlayerList.h PlayerList.m PlayerListsViewController.h Log Message: player images added Index: PlayerList.m =================================================================== RCS file: /cvsroot/macattrick/macattrick/PlayerList.m,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** PlayerList.m 20 Jul 2005 19:30:58 -0000 1.14 --- PlayerList.m 14 Sep 2005 16:20:08 -0000 1.15 *************** *** 41,51 **** -(PlayerList*) init { ! self = [super init]; ! if(self) { ! playerList = [[NSMutableArray alloc] init]; ! formerDates = [[NSMutableArray alloc] init]; ! [self setListName:NSLocalizedString(@"New List", @"New List")]; ! } ! return self; } -(PlayerList*) initWithListName:(NSString*) aListName { --- 41,46 ---- -(PlayerList*) init { ! self = [[PlayerList alloc] initWithListName:@"New List"]; ! return self; } -(PlayerList*) initWithListName:(NSString*) aListName { *************** *** 55,58 **** --- 50,56 ---- formerDates = [[NSMutableArray alloc] init]; [self setListName:aListName]; + NSImage *img = [[NSImage alloc] initByReferencingFile: [NSString stringWithFormat: @"%@/customlist.icns",[[NSBundle mainBundle] resourcePath]]]; + [self setListImage:img]; + [img release]; } return self; *************** *** 82,85 **** --- 80,87 ---- } [self setListName:NSLocalizedString(@"Team", @"Team")]; + NSImage *img = [[NSImage alloc] initByReferencingFile: [NSString stringWithFormat: @"%@/alllist.icns",[[NSBundle mainBundle] resourcePath]]]; + [self setListImage:img]; + [img release]; + } return self; *************** *** 87,90 **** --- 89,93 ---- + -(NSString*) playerIDsAsString { NSMutableString *str = [[NSMutableString alloc] init]; *************** *** 130,133 **** --- 133,145 ---- } + + - (NSImage *) listImage { return listImage; } + - (void) setListImage: (NSImage *) newListImage { + [newListImage retain]; + [listImage release]; + listImage = newListImage; + } + + - (BOOL) addPlayersWithIDs: (NSArray*) ids { PlayerList *mainList = [[Team currentTeam] allPlayersList]; Index: PlayerListsViewController.h =================================================================== RCS file: /cvsroot/macattrick/macattrick/PlayerListsViewController.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** PlayerListsViewController.h 19 Jul 2005 17:58:57 -0000 1.2 --- PlayerListsViewController.h 14 Sep 2005 16:20:08 -0000 1.3 *************** *** 30,34 **** @interface PlayerListsViewController : NSObject { ! // NSMutableArray *playerLists; IBOutlet NSView *playerListsView; IBOutlet NSTableView *tableView; --- 30,34 ---- @interface PlayerListsViewController : NSObject { ! // NSMutableArray *playerLists; managed by team IBOutlet NSView *playerListsView; IBOutlet NSTableView *tableView; Index: PlayerList.h =================================================================== RCS file: /cvsroot/macattrick/macattrick/PlayerList.h,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** PlayerList.h 20 Jul 2005 19:30:57 -0000 1.12 --- PlayerList.h 14 Sep 2005 16:20:08 -0000 1.13 *************** *** 38,41 **** --- 38,42 ---- @interface PlayerList : NSObject { NSString *listName; + NSImage *listImage; NSMutableArray* playerList; *************** *** 71,74 **** --- 72,78 ---- - (NSString *) listName; - (void) setListName: (NSString *) newListName; + - (NSImage *) listImage; + - (void) setListImage: (NSImage *) newListImage; + /*! *************** *** 135,137 **** --- 139,142 ---- - (BOOL) removePlayerWithID: (int) aPlayerID; - (BOOL) removePlayers: (NSArray*) players; + @end |
|
From: Geisschaes <gei...@us...> - 2005-09-14 16:20:29
|
Update of /cvsroot/macattrick/macattrick/English.lproj/PlayerListsView.nib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30199/English.lproj/PlayerListsView.nib Modified Files: keyedobjects.nib Log Message: player images added Index: keyedobjects.nib =================================================================== RCS file: /cvsroot/macattrick/macattrick/English.lproj/PlayerListsView.nib/keyedobjects.nib,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 Binary files /tmp/cvs4PxqdR and /tmp/cvswFCHwJ differ |
|
From: Geisschaes <gei...@us...> - 2005-09-14 16:20:29
|
Update of /cvsroot/macattrick/macattrick/images In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30199/images Added Files: alllist.icns customlist.icns Log Message: player images added --- NEW FILE: alllist.icns --- (This appears to be a binary file; contents omitted.) --- NEW FILE: customlist.icns --- (This appears to be a binary file; contents omitted.) |
|
From: Geisschaes <gei...@us...> - 2005-09-14 15:32:15
|
Update of /cvsroot/macattrick/macattrick/Macattrick.xcodeproj In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16097/Macattrick.xcodeproj Modified Files: roman.mode1 roman.pbxuser Log Message: double team init bug fixed Index: roman.mode1 =================================================================== RCS file: /cvsroot/macattrick/macattrick/Macattrick.xcodeproj/roman.mode1,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** roman.mode1 20 Jul 2005 19:31:02 -0000 1.8 --- roman.mode1 14 Sep 2005 15:32:06 -0000 1.9 *************** *** 191,197 **** <dict> <key>PBXProjectModuleGUID</key> ! <string>30E30135088D5B69003395B7</string> <key>PBXProjectModuleLabel</key> ! <string>PlayerTableController.m</string> <key>PBXSplitModuleInNavigatorKey</key> <dict> --- 191,197 ---- <dict> <key>PBXProjectModuleGUID</key> ! <string>3062F15C08B2798A00CB7FF1</string> <key>PBXProjectModuleLabel</key> ! <string>PlayerList.m</string> <key>PBXSplitModuleInNavigatorKey</key> <dict> *************** *** 199,250 **** <dict> <key>PBXProjectModuleGUID</key> ! <string>30E30139088D5B7B003395B7</string> <key>PBXProjectModuleLabel</key> ! <string>PlayerTableController.m</string> <key>_historyCapacity</key> <integer>0</integer> <key>bookmark</key> ! <string>302940B2088EDB4100C9C2BC</string> <key>history</key> <array> ! <string>30E30176088D6A25003395B7</string> ! <string>30E30177088D6A25003395B7</string> ! <string>30E301A7088D6FFB003395B7</string> ! <string>30E30201088D768A003395B7</string> ! <string>30E30202088D768A003395B7</string> ! <string>30E30203088D768A003395B7</string> ! <string>30E30204088D768A003395B7</string> ! <string>30E30205088D768A003395B7</string> ! <string>30294059088ED60900C9C2BC</string> ! <string>3029405A088ED60900C9C2BC</string> ! <string>302940A5088EDB4100C9C2BC</string> ! <string>302940A6088EDB4100C9C2BC</string> ! <string>302940A7088EDB4100C9C2BC</string> ! <string>302940A8088EDB4100C9C2BC</string> ! <string>302940A9088EDB4100C9C2BC</string> </array> <key>prevStack</key> <array> ! <string>30E30179088D6A25003395B7</string> ! <string>30E3017B088D6A25003395B7</string> ! <string>30E30193088D6D03003395B7</string> ! <string>30E301A9088D6FFB003395B7</string> ! <string>30E301AB088D6FFB003395B7</string> ! <string>30E30208088D768A003395B7</string> ! <string>30E30209088D768A003395B7</string> ! <string>30E3020C088D768A003395B7</string> ! <string>30E3020D088D768A003395B7</string> ! <string>30E30216088D768A003395B7</string> ! <string>3029405B088ED60900C9C2BC</string> ! <string>3029405C088ED60900C9C2BC</string> ! <string>3029405D088ED60900C9C2BC</string> ! <string>302940AA088EDB4100C9C2BC</string> ! <string>302940AB088EDB4100C9C2BC</string> ! <string>302940AC088EDB4100C9C2BC</string> ! <string>302940AD088EDB4100C9C2BC</string> ! <string>302940AE088EDB4100C9C2BC</string> ! <string>302940AF088EDB4100C9C2BC</string> ! <string>302940B0088EDB4100C9C2BC</string> ! <string>302940B1088EDB4100C9C2BC</string> </array> </dict> --- 199,223 ---- <dict> <key>PBXProjectModuleGUID</key> ! <string>3062F16B08B279E700CB7FF1</string> <key>PBXProjectModuleLabel</key> ! <string>PlayerList.m</string> <key>_historyCapacity</key> <integer>0</integer> <key>bookmark</key> ! <string>30424BE408D878FC0078B25B</string> <key>history</key> <array> ! <string>3062F17708B2820600CB7FF1</string> ! <string>3062F17808B2820600CB7FF1</string> ! <string>3062F17908B2820600CB7FF1</string> ! <string>3062F17A08B2820600CB7FF1</string> ! <string>3062F17F08B2820600CB7FF1</string> </array> <key>prevStack</key> <array> ! <string>3062F16E08B279E700CB7FF1</string> ! <string>3062F16F08B279E700CB7FF1</string> ! <string>3062F17D08B2820600CB7FF1</string> ! <string>3062F17E08B2820600CB7FF1</string> </array> </dict> *************** *** 258,266 **** <dict> <key>Frame</key> ! <string>{{0, 20}, {1051, 635}}</string> <key>PBXModuleWindowStatusBarHidden2</key> <false/> <key>RubberWindowFrame</key> ! <string>96 144 1051 676 0 0 1280 832 </string> </dict> </dict> --- 231,239 ---- <dict> <key>Frame</key> ! <string>{{0, 20}, {1157, 531}}</string> <key>PBXModuleWindowStatusBarHidden2</key> <false/> <key>RubberWindowFrame</key> ! <string>68 248 1157 572 0 0 1280 832 </string> </dict> </dict> *************** *** 299,302 **** --- 272,277 ---- <array> <dict> + <key>BecomeActive</key> + <true/> <key>ContentConfiguration</key> <dict> *************** *** 337,341 **** <string>080E96DDFE201D6D7F000001</string> <string>30BB2140067DC1CA00B1C71A</string> - <string>30D78B690849D41400112C09</string> <string>307D956A063D9208008E2586</string> <string>30B355F80690131C00571DE8</string> --- 312,315 ---- *************** *** 347,351 **** <array> <array> - <integer>6</integer> <integer>2</integer> <integer>0</integer> --- 321,324 ---- *************** *** 372,376 **** </array> <key>RubberWindowFrame</key> ! <string>118 157 1041 675 0 0 1280 832 </string> </dict> <key>Module</key> --- 345,349 ---- </array> <key>RubberWindowFrame</key> ! <string>186 157 1041 675 0 0 1280 832 </string> </dict> <key>Module</key> *************** *** 383,388 **** <array> <dict> - <key>BecomeActive</key> - <true/> <key>ContentConfiguration</key> <dict> --- 356,359 ---- *************** *** 390,394 **** <string>1CE0B20306471E060097A5F4</string> <key>PBXProjectModuleLabel</key> ! <string>PlayerList.m</string> <key>PBXSplitModuleInNavigatorKey</key> <dict> --- 361,365 ---- <string>1CE0B20306471E060097A5F4</string> <key>PBXProjectModuleLabel</key> ! <string>Team.m</string> <key>PBXSplitModuleInNavigatorKey</key> <dict> *************** *** 398,406 **** <string>1CE0B20406471E060097A5F4</string> <key>PBXProjectModuleLabel</key> ! <string>PlayerList.m</string> <key>_historyCapacity</key> <integer>0</integer> <key>bookmark</key> ! <string>302940A4088EDB4100C9C2BC</string> <key>history</key> <array> --- 369,377 ---- <string>1CE0B20406471E060097A5F4</string> <key>PBXProjectModuleLabel</key> ! <string>Team.m</string> <key>_historyCapacity</key> <integer>0</integer> <key>bookmark</key> ! <string>30424BE308D878FC0078B25B</string> <key>history</key> <array> *************** *** 480,484 **** <string>305EB2670888261A007A6071</string> <string>305EB2680888261A007A6071</string> - <string>305EB2950888376F007A6071</string> <string>306949DE08891194009C98DE</string> <string>30D323FE088C364C0010BC3F</string> --- 451,454 ---- *************** *** 496,508 **** <string>30E301F7088D768A003395B7</string> <string>30E301F8088D768A003395B7</string> - <string>3029404F088ED60900C9C2BC</string> <string>30294050088ED60900C9C2BC</string> <string>30294092088EDB4100C9C2BC</string> <string>30294093088EDB4100C9C2BC</string> <string>30294094088EDB4100C9C2BC</string> - <string>30294095088EDB4100C9C2BC</string> - <string>30294096088EDB4100C9C2BC</string> <string>30294097088EDB4100C9C2BC</string> ! <string>30294098088EDB4100C9C2BC</string> </array> <key>prevStack</key> --- 466,479 ---- <string>30E301F7088D768A003395B7</string> <string>30E301F8088D768A003395B7</string> <string>30294050088ED60900C9C2BC</string> <string>30294092088EDB4100C9C2BC</string> <string>30294093088EDB4100C9C2BC</string> <string>30294094088EDB4100C9C2BC</string> <string>30294097088EDB4100C9C2BC</string> ! <string>302940C0088EE2E600C9C2BC</string> ! <string>3062F16608B279E700CB7FF1</string> ! <string>3062F17308B2820600CB7FF1</string> ! <string>30424BE108D878FC0078B25B</string> ! <string>3029404F088ED60900C9C2BC</string> </array> <key>prevStack</key> *************** *** 606,623 **** <string>30E3012A088D5A51003395B7</string> <string>30E30150088D5D33003395B7</string> - <string>30294053088ED60900C9C2BC</string> - <string>30294054088ED60900C9C2BC</string> - <string>30294055088ED60900C9C2BC</string> - <string>30294099088EDB4100C9C2BC</string> - <string>3029409A088EDB4100C9C2BC</string> <string>3029409B088EDB4100C9C2BC</string> - <string>3029409C088EDB4100C9C2BC</string> - <string>3029409D088EDB4100C9C2BC</string> <string>3029409E088EDB4100C9C2BC</string> ! <string>3029409F088EDB4100C9C2BC</string> ! <string>302940A0088EDB4100C9C2BC</string> ! <string>302940A1088EDB4100C9C2BC</string> ! <string>302940A2088EDB4100C9C2BC</string> ! <string>302940A3088EDB4100C9C2BC</string> </array> </dict> --- 577,583 ---- <string>30E3012A088D5A51003395B7</string> <string>30E30150088D5D33003395B7</string> <string>3029409B088EDB4100C9C2BC</string> <string>3029409E088EDB4100C9C2BC</string> ! <string>30424BE208D878FC0078B25B</string> </array> </dict> *************** *** 633,637 **** <string>{{0, 0}, {775, 380}}</string> <key>RubberWindowFrame</key> ! <string>118 157 1041 675 0 0 1280 832 </string> </dict> <key>Module</key> --- 593,597 ---- <string>{{0, 0}, {775, 380}}</string> <key>RubberWindowFrame</key> ! <string>186 157 1041 675 0 0 1280 832 </string> </dict> <key>Module</key> *************** *** 653,657 **** <string>{{0, 385}, {775, 249}}</string> <key>RubberWindowFrame</key> ! <string>118 157 1041 675 0 0 1280 832 </string> </dict> <key>Module</key> --- 613,617 ---- <string>{{0, 385}, {775, 249}}</string> <key>RubberWindowFrame</key> ! <string>186 157 1041 675 0 0 1280 832 </string> </dict> <key>Module</key> *************** *** 677,683 **** <key>TableOfContents</key> <array> ! <string>30294057088ED60900C9C2BC</string> <string>1CE0B1FE06471DED0097A5F4</string> ! <string>30294058088ED60900C9C2BC</string> <string>1CE0B20306471E060097A5F4</string> <string>1CE0B20506471E060097A5F4</string> --- 637,643 ---- <key>TableOfContents</key> <array> ! <string>30424BC608D875180078B25B</string> <string>1CE0B1FE06471DED0097A5F4</string> ! <string>30424BC708D875180078B25B</string> <string>1CE0B20306471E060097A5F4</string> <string>1CE0B20506471E060097A5F4</string> *************** *** 792,796 **** <false/> <key>PinnedNavigatorIdentifier</key> ! <string>30E30135088D5B69003395B7</string> <key>ShelfIsVisible</key> <false/> --- 752,756 ---- <false/> <key>PinnedNavigatorIdentifier</key> ! <string>3062F15C08B2798A00CB7FF1</string> <key>ShelfIsVisible</key> <false/> *************** *** 815,825 **** <key>WindowOrderList</key> <array> ! <string>30A82A48082E9E83003C97DB</string> ! <string>1C0AD2B3069F1EA900FABCE6</string> ! <string>30E30135088D5B69003395B7</string> <string>/Users/roman/Documents/dev/macattrick/Macattrick.xcodeproj</string> </array> <key>WindowString</key> ! <string>118 157 1041 675 0 0 1280 832 </string> <key>WindowTools</key> <array> --- 775,790 ---- <key>WindowOrderList</key> <array> ! <string>30424BE808D878FC0078B25B</string> ! <string>30424BE908D878FC0078B25B</string> ! <string>30BE4823082FED6F00826659</string> ! <string>30424BCF08D875180078B25B</string> <string>/Users/roman/Documents/dev/macattrick/Macattrick.xcodeproj</string> + <string>1C0AD2B3069F1EA900FABCE6</string> + <string>1C530D57069F1CE1000CFCEE</string> + <string>3062F15C08B2798A00CB7FF1</string> + <string>1CD10A99069EF8BA00B06720</string> </array> <key>WindowString</key> ! <string>186 157 1041 675 0 0 1280 832 </string> <key>WindowTools</key> <array> *************** *** 837,842 **** <array> <dict> - <key>BecomeActive</key> - <true/> <key>ContentConfiguration</key> <dict> --- 802,805 ---- *************** *** 844,848 **** <string>1CD0528F0623707200166675</string> <key>PBXProjectModuleLabel</key> ! <string>TeamTest.m</string> <key>StatusBarVisibility</key> <true/> --- 807,811 ---- <string>1CD0528F0623707200166675</string> <key>PBXProjectModuleLabel</key> ! <string></string> <key>StatusBarVisibility</key> <true/> *************** *** 861,868 **** </dict> <dict> <key>ContentConfiguration</key> <dict> <key>PBXBuildLogShowsTranscriptDefaultKey</key> ! <string>{{0, 91}, {787, 219}}</string> <key>PBXProjectModuleGUID</key> <string>XCMainBuildResultsModuleGUID</string> --- 824,833 ---- </dict> <dict> + <key>BecomeActive</key> + <true/> <key>ContentConfiguration</key> <dict> <key>PBXBuildLogShowsTranscriptDefaultKey</key> ! <string>{{0, 215}, {787, 95}}</string> <key>PBXProjectModuleGUID</key> <string>XCMainBuildResultsModuleGUID</string> *************** *** 902,906 **** <array> <string>30A82A48082E9E83003C97DB</string> ! <string>3029405F088ED60900C9C2BC</string> <string>1CD0528F0623707200166675</string> <string>XCMainBuildResultsModuleGUID</string> --- 867,871 ---- <array> <string>30A82A48082E9E83003C97DB</string> ! <string>3062F12808B2703B00CB7FF1</string> <string>1CD0528F0623707200166675</string> <string>XCMainBuildResultsModuleGUID</string> *************** *** 944,949 **** <key>sizes</key> <array> ! <string>{{0, 0}, {316, 191}}</string> ! <string>{{316, 0}, {964, 191}}</string> </array> </dict> --- 909,914 ---- <key>sizes</key> <array> ! <string>{{0, 0}, {281, 182}}</string> ! <string>{{281, 0}, {999, 182}}</string> </array> </dict> *************** *** 960,965 **** <key>sizes</key> <array> ! <string>{{0, 0}, {1280, 191}}</string> ! <string>{{0, 191}, {1280, 495}}</string> </array> </dict> --- 925,930 ---- <key>sizes</key> <array> ! <string>{{0, 0}, {1280, 182}}</string> ! <string>{{0, 182}, {1280, 504}}</string> </array> </dict> *************** *** 985,989 **** <string>{{0, 0}, {1280, 686}}</string> <key>RubberWindowFrame</key> ! <string>13 102 1280 727 0 0 1280 832 </string> </dict> <key>Module</key> --- 950,954 ---- <string>{{0, 0}, {1280, 686}}</string> <key>RubberWindowFrame</key> ! <string>-16 105 1280 727 0 0 1280 832 </string> </dict> <key>Module</key> *************** *** 1008,1028 **** <array> <string>1CD10A99069EF8BA00B06720</string> ! <string>30E30112088D5702003395B7</string> <string>1C162984064C10D400B95A72</string> ! <string>30E30113088D5702003395B7</string> ! <string>30E30114088D5702003395B7</string> ! <string>30E30115088D5702003395B7</string> ! <string>30E30116088D5702003395B7</string> ! <string>30E30117088D5702003395B7</string> ! <string>30E30118088D5702003395B7</string> </array> <key>ToolbarConfiguration</key> <string>xcode.toolbar.config.debug</string> <key>WindowString</key> ! <string>13 102 1280 727 0 0 1280 832 </string> <key>WindowToolGUID</key> <string>1CD10A99069EF8BA00B06720</string> <key>WindowToolIsVisible</key> ! <false/> </dict> <dict> --- 973,993 ---- <array> <string>1CD10A99069EF8BA00B06720</string> ! <string>30424BC908D875180078B25B</string> <string>1C162984064C10D400B95A72</string> ! <string>30424BCA08D875180078B25B</string> ! <string>30424BCB08D875180078B25B</string> ! <string>30424BCC08D875180078B25B</string> ! <string>30424BCD08D875180078B25B</string> ! <string>30424BCE08D875180078B25B</string> ! <string>30424BCF08D875180078B25B</string> </array> <key>ToolbarConfiguration</key> <string>xcode.toolbar.config.debug</string> <key>WindowString</key> ! <string>-16 105 1280 727 0 0 1280 832 </string> <key>WindowToolGUID</key> <string>1CD10A99069EF8BA00B06720</string> <key>WindowToolIsVisible</key> ! <true/> </dict> <dict> *************** *** 1042,1047 **** <array> <dict> - <key>BecomeActive</key> - <true/> <key>ContentConfiguration</key> <dict> --- 1007,1010 ---- *************** *** 1049,1053 **** <string>1CDD528C0622207200134675</string> <key>PBXProjectModuleLabel</key> ! <string>MainController.m</string> <key>StatusBarVisibility</key> <true/> --- 1012,1016 ---- <string>1CDD528C0622207200134675</string> <key>PBXProjectModuleLabel</key> ! <string>Team.m</string> <key>StatusBarVisibility</key> <true/> *************** *** 1058,1062 **** <string>{{0, 0}, {1280, 409}}</string> <key>RubberWindowFrame</key> ! <string>382 49 1280 783 0 0 1280 832 </string> </dict> <key>Module</key> --- 1021,1025 ---- <string>{{0, 0}, {1280, 409}}</string> <key>RubberWindowFrame</key> ! <string>239 49 1280 783 0 0 1280 832 </string> </dict> <key>Module</key> *************** *** 1070,1073 **** --- 1033,1038 ---- </dict> <dict> + <key>BecomeActive</key> + <true/> <key>ContentConfiguration</key> <dict> *************** *** 1082,1086 **** <string>{{0, 414}, {1280, 328}}</string> <key>RubberWindowFrame</key> ! <string>382 49 1280 783 0 0 1280 832 </string> </dict> <key>Module</key> --- 1047,1051 ---- <string>{{0, 414}, {1280, 328}}</string> <key>RubberWindowFrame</key> ! <string>239 49 1280 783 0 0 1280 832 </string> </dict> <key>Module</key> *************** *** 1105,1115 **** <array> <string>1C530D57069F1CE1000CFCEE</string> ! <string>30E30218088D768A003395B7</string> ! <string>30E30219088D768A003395B7</string> <string>1CDD528C0622207200134675</string> <string>1CD0528E0623707200166675</string> </array> <key>WindowString</key> ! <string>382 49 1280 783 0 0 1280 832 </string> <key>WindowToolGUID</key> <string>1C530D57069F1CE1000CFCEE</string> --- 1070,1080 ---- <array> <string>1C530D57069F1CE1000CFCEE</string> ! <string>30424BE508D878FC0078B25B</string> ! <string>30424BE608D878FC0078B25B</string> <string>1CDD528C0622207200134675</string> <string>1CD0528E0623707200166675</string> </array> <key>WindowString</key> ! <string>239 49 1280 783 0 0 1280 832 </string> <key>WindowToolGUID</key> <string>1C530D57069F1CE1000CFCEE</string> *************** *** 1169,1173 **** <array> <string>30BE4823082FED6F00826659</string> ! <string>30E30121088D599E003395B7</string> <string>1C78EAAC065D492600B07095</string> </array> --- 1134,1138 ---- <array> <string>30BE4823082FED6F00826659</string> ! <string>30424BE708D878FC0078B25B</string> <string>1C78EAAC065D492600B07095</string> </array> *************** *** 1214,1219 **** <key>sizes</key> <array> ! <string>{{0, 0}, {491, 168}}</string> ! <string>{{0, 173}, {491, 270}}</string> </array> </dict> --- 1179,1184 ---- <key>sizes</key> <array> ! <string>{{0, 0}, {367, 168}}</string> ! <string>{{0, 173}, {367, 270}}</string> </array> </dict> *************** *** 1241,1245 **** <string>{{0, 0}, {1095, 323}}</string> <key>RubberWindowFrame</key> ! <string>67 455 1095 364 0 0 1280 832 </string> </dict> <key>Module</key> --- 1206,1210 ---- <string>{{0, 0}, {1095, 323}}</string> <key>RubberWindowFrame</key> ! <string>232 123 1095 364 0 0 1280 832 </string> </dict> <key>Module</key> *************** *** 1264,1275 **** <array> <string>1C0AD2B3069F1EA900FABCE6</string> ! <string>30294060088ED60900C9C2BC</string> <string>1CD0528B0623707200166675</string> ! <string>30294061088ED60900C9C2BC</string> </array> <key>ToolbarConfiguration</key> <string>xcode.toolbar.config.run</string> <key>WindowString</key> ! <string>67 455 1095 364 0 0 1280 832 </string> <key>WindowToolGUID</key> <string>1C0AD2B3069F1EA900FABCE6</string> --- 1229,1240 ---- <array> <string>1C0AD2B3069F1EA900FABCE6</string> ! <string>30424BD008D875180078B25B</string> <string>1CD0528B0623707200166675</string> ! <string>30424BD108D875180078B25B</string> </array> <key>ToolbarConfiguration</key> <string>xcode.toolbar.config.run</string> <key>WindowString</key> ! <string>232 123 1095 364 0 0 1280 832 </string> <key>WindowToolGUID</key> <string>1C0AD2B3069F1EA900FABCE6</string> Index: roman.pbxuser =================================================================== RCS file: /cvsroot/macattrick/macattrick/Macattrick.xcodeproj/roman.pbxuser,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** roman.pbxuser 20 Jul 2005 19:31:02 -0000 1.8 --- roman.pbxuser 14 Sep 2005 15:32:06 -0000 1.9 *************** *** 40,45 **** activeBuildConfigurationName = Development; activeBuildStyle = 4A9504CCFFE6A4B311CA0CBA /* Development */; ! activeExecutable = 30744BA6069560A70039B82A /* Devel Macattrick */; ! activeTarget = 30744BA4069560A70039B82A /* Devel Macattrick */; addToTargets = ( 30950682067C4D100077C270 /* Macattrick */, --- 40,45 ---- activeBuildConfigurationName = Development; activeBuildStyle = 4A9504CCFFE6A4B311CA0CBA /* Development */; ! activeExecutable = 30950684067C4D100077C270 /* Macattrick */; [...1930 lines suppressed...] - rType = 0; - vrLen = 1655; - vrLoc = 1356; - }; 30E66334066DF49000D9A3DD /* icon.icns */ = { uiCtxt = { --- 4641,4644 ---- *************** *** 5614,5618 **** name = "Team *temp ="; rLen = 12; ! rLoc = 7145; rType = 0; vrLen = 712; --- 4876,4880 ---- name = "Team *temp ="; rLen = 12; ! rLoc = 7148; rType = 0; vrLen = 712; |
|
From: Geisschaes <gei...@us...> - 2005-09-14 15:32:14
|
Update of /cvsroot/macattrick/macattrick In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16097 Modified Files: MainController.m PlayerListsViewController.m Team.m Log Message: double team init bug fixed Index: MainController.m =================================================================== RCS file: /cvsroot/macattrick/macattrick/MainController.m,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** MainController.m 19 Jul 2005 17:58:57 -0000 1.18 --- MainController.m 14 Sep 2005 15:32:06 -0000 1.19 *************** *** 193,197 **** } [mainWindowController showWindow:self]; ! Team *team = [[Team alloc] init]; if(![mainWindowController team]) { [mainWindowController setTeam:team]; --- 193,197 ---- } [mainWindowController showWindow:self]; ! Team *team = [Team currentTeam]; if(![mainWindowController team]) { [mainWindowController setTeam:team]; Index: PlayerListsViewController.m =================================================================== RCS file: /cvsroot/macattrick/macattrick/PlayerListsViewController.m,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** PlayerListsViewController.m 19 Jul 2005 17:58:57 -0000 1.3 --- PlayerListsViewController.m 14 Sep 2005 15:32:06 -0000 1.4 *************** *** 76,79 **** --- 76,82 ---- - (NSDragOperation)tableView:(NSTableView*)tv validateDrop:(id <NSDraggingInfo>)info proposedRow:(int)row proposedDropOperation:(NSTableViewDropOperation)op { + if(op == NSTableViewDropAbove) { + return NSDragOperationNone; + } return NSDragOperationCopy; } Index: Team.m =================================================================== RCS file: /cvsroot/macattrick/macattrick/Team.m,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** Team.m 20 Jul 2005 19:30:58 -0000 1.29 --- Team.m 14 Sep 2005 15:32:06 -0000 1.30 *************** *** 48,52 **** // Constructor - (Team*) init { ! self = [super init]; if(self) { BOOL success; --- 48,52 ---- // Constructor - (Team*) init { ! self = [super init]; if(self) { BOOL success; |
|
From: Geisschaes <gei...@us...> - 2005-07-20 19:31:45
|
Update of /cvsroot/macattrick/macattrick In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19864 Modified Files: PlayerList.h PlayerList.m PlayerTableController.h PlayerTableController.m Team.m Added Files: PlayerTableView.h PlayerTableView.m Log Message: removing players using backspace is working. but everything is still rather instable --- NEW FILE: PlayerTableView.m --- //---- license ---------------------------------------------------------------// // // // Macattrick: a Manager Assistant Tool for the online Game Hattrick.org // // Copyright (C) 2004 Roman Bertolami // // // // this file is part of Macattrick application // // http://sourceforge.net/macattrick // // // // Macattrick is free software; you can redistribute it and/or // // modify it under the terms of the GNU General Public License // // as published by the Free Software Foundation; either version 2 // // of the License, or (at your option) any later version. // // // // Macattrick is distributed in the hope that it will be useful, // // but WITHOUT ANY WARRANTY; without even the implied warranty of // // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // // GNU General Public License for more details. // // // // You should have received a copy of the GNU General Public License // // along with this program; if not, write to the Free Software // // Foundation, Inc., 59 Temple Place - Suite 330, // // Boston, MA 02111-1307, USA. // // // // Macattrick, Copyright (C) 2004 Roman Bertolami // // Macattrick comes with ABSOLUTELY NO WARRANTY! // // // //---- eo licence ------------------------------------------------------------// #import "PlayerTableView.h" @implementation PlayerTableView - (void)keyDown:(NSEvent*)event { unichar key = [[event charactersIgnoringModifiers] characterAtIndex:0]; if (key == NSDeleteCharacter) { if(controller && [controller respondsToSelector:NSSelectorFromString(@"removeSelectedPlayers")]) { [controller removeSelectedPlayers]; } } } - (id) controller { return controller; } - (void) setController: (id) newController { [newController retain]; [controller release]; controller = newController; } @end --- NEW FILE: PlayerTableView.h --- //---- license ---------------------------------------------------------------// // // // Macattrick: a Manager Assistant Tool for the online Game Hattrick.org // // Copyright (C) 2004 Roman Bertolami // // // // this file is part of Macattrick application // // http://sourceforge.net/macattrick // // // // Macattrick is free software; you can redistribute it and/or // // modify it under the terms of the GNU General Public License // // as published by the Free Software Foundation; either version 2 // // of the License, or (at your option) any later version. // // // // Macattrick is distributed in the hope that it will be useful, // // but WITHOUT ANY WARRANTY; without even the implied warranty of // // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // // GNU General Public License for more details. // // // // You should have received a copy of the GNU General Public License // // along with this program; if not, write to the Free Software // // Foundation, Inc., 59 Temple Place - Suite 330, // // Boston, MA 02111-1307, USA. // // // // Macattrick, Copyright (C) 2004 Roman Bertolami // // Macattrick comes with ABSOLUTELY NO WARRANTY! // // // //---- eo licence ------------------------------------------------------------// #import <Cocoa/Cocoa.h> @interface PlayerTableView : NSTableView { id controller; } - (id) controller; - (void) setController: (id) newController; @end Index: PlayerList.h =================================================================== RCS file: /cvsroot/macattrick/macattrick/PlayerList.h,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** PlayerList.h 19 Jul 2005 17:58:57 -0000 1.11 --- PlayerList.h 20 Jul 2005 19:30:57 -0000 1.12 *************** *** 133,135 **** --- 133,137 ---- - (BOOL) addPlayersWithIDs: (NSArray*) ids; - (BOOL) removePlayersWithIDs: (NSArray*) ids; + - (BOOL) removePlayerWithID: (int) aPlayerID; + - (BOOL) removePlayers: (NSArray*) players; @end Index: PlayerTableController.h =================================================================== RCS file: /cvsroot/macattrick/macattrick/PlayerTableController.h,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** PlayerTableController.h 4 Jun 2005 10:26:27 -0000 1.5 --- PlayerTableController.h 20 Jul 2005 19:30:58 -0000 1.6 *************** *** 29,32 **** --- 29,33 ---- #import <Cocoa/Cocoa.h> #import "Player.h" + #import "PlayerTableView.h" #import "TeamController.h" *************** *** 34,38 **** NSString* selectedDate; IBOutlet NSView *playerTableView; ! IBOutlet NSTableView *playerTable; IBOutlet NSArrayController *playerListController; NSColor *positiveDifferenceColor; --- 35,39 ---- NSString* selectedDate; IBOutlet NSView *playerTableView; ! IBOutlet PlayerTableView *playerTable; IBOutlet NSArrayController *playerListController; NSColor *positiveDifferenceColor; *************** *** 49,52 **** -(int) differenceFontSize; ! @end --- 50,53 ---- -(int) differenceFontSize; ! -(void) removeSelectedPlayers; @end Index: PlayerList.m =================================================================== RCS file: /cvsroot/macattrick/macattrick/PlayerList.m,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** PlayerList.m 19 Jul 2005 17:58:57 -0000 1.13 --- PlayerList.m 20 Jul 2005 19:30:58 -0000 1.14 *************** *** 155,163 **** Player *p = [[[Team currentTeam] allPlayersList] playerWithID:aPlayerID]; if(p) { ! [playerList addObject:p] ; } } ! } - (BOOL) removePlayersWithIDs: (NSArray*) ids { PlayerList *mainList = [[Team currentTeam] allPlayersList]; --- 155,179 ---- Player *p = [[[Team currentTeam] allPlayersList] playerWithID:aPlayerID]; if(p) { ! [playerList addObject:p]; ! return YES; } } ! return NO; ! } ! - (BOOL) removePlayerWithID: (int) aPlayerID { ! PlayerList *mainList = [[Team currentTeam] allPlayersList]; ! if(self !=mainList) { ! Player *p = [mainList playerWithID:aPlayerID]; ! if(p) { ! [playerList removeObject:p]; ! return YES; ! } ! else { ! return NO; ! } ! } ! return NO; } + - (BOOL) removePlayersWithIDs: (NSArray*) ids { PlayerList *mainList = [[Team currentTeam] allPlayersList]; *************** *** 178,181 **** --- 194,211 ---- return YES; } + - (BOOL) removePlayers: (NSArray*) players { + PlayerList *mainList = [[Team currentTeam] allPlayersList]; + if(self == mainList) { + return NO; + } + else { + NSEnumerator *en = [players objectEnumerator]; + NSNumber *p = nil; + while(p = [en nextObject]) { + [playerList removeObject:p] ; + } + } + return YES; + } - (void) loadStatesFromFormerPlayerList: (PlayerList*) formerPlayerList date: (NSString*) date{ Index: PlayerTableController.m =================================================================== RCS file: /cvsroot/macattrick/macattrick/PlayerTableController.m,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** PlayerTableController.m 18 Jul 2005 19:12:37 -0000 1.9 --- PlayerTableController.m 20 Jul 2005 19:30:58 -0000 1.10 *************** *** 47,50 **** --- 47,51 ---- [playerTable setDoubleAction:@selector(doubleClicked)]; [playerTable registerForDraggedTypes:[NSArray arrayWithObject:NSDragPboard]]; + [playerTable setController: self]; positiveDifferenceColor = [NSColor greenColor]; differenceFontSize = 9; *************** *** 55,58 **** --- 56,64 ---- + -(void) removeSelectedPlayers { + NSArray *selected = [playerListController selectedObjects]; + [[team playerList] removePlayers:selected]; + [playerTable setNeedsDisplay:YES]; + } - (NSView *) playerTableView { return playerTableView; } Index: Team.m =================================================================== RCS file: /cvsroot/macattrick/macattrick/Team.m,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** Team.m 19 Jul 2005 17:58:57 -0000 1.28 --- Team.m 20 Jul 2005 19:30:58 -0000 1.29 *************** *** 168,172 **** NSEnumerator *en2 = [items objectEnumerator]; NSString *currentID = [en2 nextObject]; - NSLog(currentID); PlayerList *l = [[PlayerList alloc] initWithListName:currentID]; while(currentID = [en2 nextObject]) { --- 168,171 ---- |
|
From: Geisschaes <gei...@us...> - 2005-07-20 19:31:45
|
Update of /cvsroot/macattrick/macattrick/English.lproj/PlayerTableView.nib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19864/English.lproj/PlayerTableView.nib Modified Files: classes.nib keyedobjects.nib Log Message: removing players using backspace is working. but everything is still rather instable Index: classes.nib =================================================================== RCS file: /cvsroot/macattrick/macattrick/English.lproj/PlayerTableView.nib/classes.nib,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** classes.nib 16 Jan 2005 18:04:03 -0000 1.2 --- classes.nib 20 Jul 2005 19:30:59 -0000 1.3 *************** *** 12,15 **** --- 12,16 ---- SUPERCLASS = TeamController; }, + {CLASS = PlayerTableView; LANGUAGE = ObjC; SUPERCLASS = NSTableView; }, {CLASS = TeamController; LANGUAGE = ObjC; SUPERCLASS = NSObject; } ); Index: keyedobjects.nib =================================================================== RCS file: /cvsroot/macattrick/macattrick/English.lproj/PlayerTableView.nib/keyedobjects.nib,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 Binary files /tmp/cvsQArQIk and /tmp/cvshKWOl0 differ |
|
From: Geisschaes <gei...@us...> - 2005-07-20 19:31:14
|
Update of /cvsroot/macattrick/macattrick/Macattrick.xcodeproj In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19864/Macattrick.xcodeproj Modified Files: project.pbxproj roman.mode1 roman.pbxuser Log Message: removing players using backspace is working. but everything is still rather instable Index: project.pbxproj =================================================================== RCS file: /cvsroot/macattrick/macattrick/Macattrick.xcodeproj/project.pbxproj,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** project.pbxproj 18 Jul 2005 19:12:39 -0000 1.3 --- project.pbxproj 20 Jul 2005 19:31:01 -0000 1.4 *************** *** 32,35 **** --- 32,39 ---- 3028FAC106FC637D002DAE54 /* Economy.h in Headers */ = {isa = PBXBuildFile; fileRef = 3028FABD06FC637D002DAE54 /* Economy.h */; }; 3028FAC206FC637D002DAE54 /* Economy.m in Sources */ = {isa = PBXBuildFile; fileRef = 3028FABE06FC637D002DAE54 /* Economy.m */; }; + 30294067088ED7B500C9C2BC /* PlayerTableView.h in Headers */ = {isa = PBXBuildFile; fileRef = 30294065088ED7B500C9C2BC /* PlayerTableView.h */; }; + 30294068088ED7B500C9C2BC /* PlayerTableView.m in Sources */ = {isa = PBXBuildFile; fileRef = 30294066088ED7B500C9C2BC /* PlayerTableView.m */; }; + 30294069088ED7B500C9C2BC /* PlayerTableView.h in Headers */ = {isa = PBXBuildFile; fileRef = 30294065088ED7B500C9C2BC /* PlayerTableView.h */; }; + 3029406A088ED7B500C9C2BC /* PlayerTableView.m in Sources */ = {isa = PBXBuildFile; fileRef = 30294066088ED7B500C9C2BC /* PlayerTableView.m */; }; 302FC2F807E617AF00334603 /* PositionHeapTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 306BE2A907B803D6009942ED /* PositionHeapTest.m */; }; 302FC2F907E617B100334603 /* PositionHeapTest.h in Headers */ = {isa = PBXBuildFile; fileRef = 306BE2A807B803D6009942ED /* PositionHeapTest.h */; }; *************** *** 791,794 **** --- 795,800 ---- 3028FC0006FC93F1002DAE54 /* EconomyTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EconomyTest.h; sourceTree = "<group>"; }; 3028FC0106FC93F1002DAE54 /* EconomyTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EconomyTest.m; sourceTree = "<group>"; }; + 30294065088ED7B500C9C2BC /* PlayerTableView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PlayerTableView.h; sourceTree = "<group>"; }; + 30294066088ED7B500C9C2BC /* PlayerTableView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PlayerTableView.m; sourceTree = "<group>"; }; 3031CB0807A043B0006539CD /* FormulasViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FormulasViewController.h; sourceTree = "<group>"; }; 3031CB0907A043B0006539CD /* FormulasViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FormulasViewController.m; sourceTree = "<group>"; }; *************** *** 1383,1386 **** --- 1389,1394 ---- 306D2F79068AC8EB00CB623F /* MainWindowController.h */, 306D2F7A068AC8EB00CB623F /* MainWindowController.m */, + 30294065088ED7B500C9C2BC /* PlayerTableView.h */, + 30294066088ED7B500C9C2BC /* PlayerTableView.m */, ); name = MainWIndow; *************** *** 1777,1780 **** --- 1785,1789 ---- 3083EF71085C8C7A0006D9C5 /* ValueToColorTransformer.h in Headers */, 30BFF65808784A2300CC3E0E /* PlayerListsViewController.h in Headers */, + 30294069088ED7B500C9C2BC /* PlayerTableView.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; *************** *** 1835,1838 **** --- 1844,1848 ---- 3083EF6F085C8C7A0006D9C5 /* ValueToColorTransformer.h in Headers */, 30BFF65608784A2300CC3E0E /* PlayerListsViewController.h in Headers */, + 30294067088ED7B500C9C2BC /* PlayerTableView.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; *************** *** 2663,2666 **** --- 2673,2677 ---- 3083EF72085C8C7A0006D9C5 /* ValueToColorTransformer.m in Sources */, 30BFF65908784A2300CC3E0E /* PlayerListsViewController.m in Sources */, + 3029406A088ED7B500C9C2BC /* PlayerTableView.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; *************** *** 2722,2725 **** --- 2733,2737 ---- 3083EF70085C8C7A0006D9C5 /* ValueToColorTransformer.m in Sources */, 30BFF65708784A2300CC3E0E /* PlayerListsViewController.m in Sources */, + 30294068088ED7B500C9C2BC /* PlayerTableView.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; Index: roman.mode1 =================================================================== RCS file: /cvsroot/macattrick/macattrick/Macattrick.xcodeproj/roman.mode1,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** roman.mode1 19 Jul 2005 17:58:58 -0000 1.7 --- roman.mode1 20 Jul 2005 19:31:02 -0000 1.8 *************** *** 193,197 **** <string>30E30135088D5B69003395B7</string> <key>PBXProjectModuleLabel</key> ! <string>PlayerList.m</string> <key>PBXSplitModuleInNavigatorKey</key> <dict> --- 193,197 ---- <string>30E30135088D5B69003395B7</string> <key>PBXProjectModuleLabel</key> ! <string>PlayerTableController.m</string> <key>PBXSplitModuleInNavigatorKey</key> <dict> *************** *** 201,209 **** <string>30E30139088D5B7B003395B7</string> <key>PBXProjectModuleLabel</key> ! <string>PlayerList.m</string> <key>_historyCapacity</key> <integer>0</integer> <key>bookmark</key> ! <string>30E30217088D768A003395B7</string> <key>history</key> <array> --- 201,209 ---- <string>30E30139088D5B7B003395B7</string> <key>PBXProjectModuleLabel</key> ! <string>PlayerTableController.m</string> <key>_historyCapacity</key> <integer>0</integer> <key>bookmark</key> ! <string>302940B2088EDB4100C9C2BC</string> <key>history</key> <array> *************** *** 216,221 **** <string>30E30204088D768A003395B7</string> <string>30E30205088D768A003395B7</string> ! <string>30E30206088D768A003395B7</string> ! <string>30E301A6088D6FFB003395B7</string> </array> <key>prevStack</key> --- 216,226 ---- <string>30E30204088D768A003395B7</string> <string>30E30205088D768A003395B7</string> ! <string>30294059088ED60900C9C2BC</string> ! <string>3029405A088ED60900C9C2BC</string> ! <string>302940A5088EDB4100C9C2BC</string> ! <string>302940A6088EDB4100C9C2BC</string> ! <string>302940A7088EDB4100C9C2BC</string> ! <string>302940A8088EDB4100C9C2BC</string> ! <string>302940A9088EDB4100C9C2BC</string> </array> <key>prevStack</key> *************** *** 225,246 **** <string>30E30193088D6D03003395B7</string> <string>30E301A9088D6FFB003395B7</string> - <string>30E301AA088D6FFB003395B7</string> <string>30E301AB088D6FFB003395B7</string> - <string>30E30207088D768A003395B7</string> <string>30E30208088D768A003395B7</string> <string>30E30209088D768A003395B7</string> - <string>30E3020A088D768A003395B7</string> - <string>30E3020B088D768A003395B7</string> <string>30E3020C088D768A003395B7</string> <string>30E3020D088D768A003395B7</string> - <string>30E3020E088D768A003395B7</string> - <string>30E3020F088D768A003395B7</string> - <string>30E30210088D768A003395B7</string> - <string>30E30211088D768A003395B7</string> - <string>30E30212088D768A003395B7</string> - <string>30E30213088D768A003395B7</string> - <string>30E30214088D768A003395B7</string> - <string>30E30215088D768A003395B7</string> <string>30E30216088D768A003395B7</string> </array> </dict> --- 230,250 ---- <string>30E30193088D6D03003395B7</string> <string>30E301A9088D6FFB003395B7</string> <string>30E301AB088D6FFB003395B7</string> <string>30E30208088D768A003395B7</string> <string>30E30209088D768A003395B7</string> <string>30E3020C088D768A003395B7</string> <string>30E3020D088D768A003395B7</string> <string>30E30216088D768A003395B7</string> + <string>3029405B088ED60900C9C2BC</string> + <string>3029405C088ED60900C9C2BC</string> + <string>3029405D088ED60900C9C2BC</string> + <string>302940AA088EDB4100C9C2BC</string> + <string>302940AB088EDB4100C9C2BC</string> + <string>302940AC088EDB4100C9C2BC</string> + <string>302940AD088EDB4100C9C2BC</string> + <string>302940AE088EDB4100C9C2BC</string> + <string>302940AF088EDB4100C9C2BC</string> + <string>302940B0088EDB4100C9C2BC</string> + <string>302940B1088EDB4100C9C2BC</string> </array> </dict> *************** *** 258,262 **** <false/> <key>RubberWindowFrame</key> ! <string>206 93 1051 676 0 0 1280 832 </string> </dict> </dict> --- 262,266 ---- <false/> <key>RubberWindowFrame</key> ! <string>96 144 1051 676 0 0 1280 832 </string> </dict> </dict> *************** *** 333,336 **** --- 337,342 ---- <string>080E96DDFE201D6D7F000001</string> <string>30BB2140067DC1CA00B1C71A</string> + <string>30D78B690849D41400112C09</string> + <string>307D956A063D9208008E2586</string> <string>30B355F80690131C00571DE8</string> <string>1C37FBAC04509CD000000102</string> *************** *** 347,351 **** </array> <key>PBXSmartGroupTreeModuleOutlineStateVisibleRectKey</key> ! <string>{{0, 34}, {244, 616}}</string> </dict> <key>PBXTopSmartGroupGIDs</key> --- 353,357 ---- </array> <key>PBXSmartGroupTreeModuleOutlineStateVisibleRectKey</key> ! <string>{{0, 0}, {244, 616}}</string> </dict> <key>PBXTopSmartGroupGIDs</key> *************** *** 366,370 **** </array> <key>RubberWindowFrame</key> ! <string>158 157 1041 675 0 0 1280 832 </string> </dict> <key>Module</key> --- 372,376 ---- </array> <key>RubberWindowFrame</key> ! <string>118 157 1041 675 0 0 1280 832 </string> </dict> <key>Module</key> *************** *** 384,388 **** <string>1CE0B20306471E060097A5F4</string> <key>PBXProjectModuleLabel</key> ! <string>Team.m</string> <key>PBXSplitModuleInNavigatorKey</key> <dict> --- 390,394 ---- <string>1CE0B20306471E060097A5F4</string> <key>PBXProjectModuleLabel</key> ! <string>PlayerList.m</string> <key>PBXSplitModuleInNavigatorKey</key> <dict> *************** *** 392,400 **** <string>1CE0B20406471E060097A5F4</string> <key>PBXProjectModuleLabel</key> ! <string>Team.m</string> <key>_historyCapacity</key> <integer>0</integer> <key>bookmark</key> ! <string>30E30200088D768A003395B7</string> <key>history</key> <array> --- 398,406 ---- <string>1CE0B20406471E060097A5F4</string> <key>PBXProjectModuleLabel</key> ! <string>PlayerList.m</string> <key>_historyCapacity</key> <integer>0</integer> <key>bookmark</key> ! <string>302940A4088EDB4100C9C2BC</string> <key>history</key> <array> *************** *** 421,425 **** <string>30D78C540849EA3B00112C09</string> <string>30D78C8F0849ED0500112C09</string> - <string>30D78C900849ED0500112C09</string> <string>30D78C910849ED0500112C09</string> <string>30D78CE1084A00C100112C09</string> --- 427,430 ---- *************** *** 471,476 **** <string>30963210086ED54100970F48</string> <string>30BFF6010878402700CC3E0E</string> - <string>30BFF6C208786F5500CC3E0E</string> - <string>30BFF71C087872E000CC3E0E</string> <string>30BFF73C0878752F00CC3E0E</string> <string>30BFF766087876DD00CC3E0E</string> --- 476,479 ---- *************** *** 479,483 **** <string>305EB2950888376F007A6071</string> <string>306949DE08891194009C98DE</string> - <string>30D323B3088C26360010BC3F</string> <string>30D323FE088C364C0010BC3F</string> <string>30D323FF088C364C0010BC3F</string> --- 482,485 ---- *************** *** 490,500 **** <string>30E30149088D5D33003395B7</string> <string>30E3014A088D5D33003395B7</string> - <string>30E30171088D6A25003395B7</string> <string>30E301F5088D768A003395B7</string> <string>30E301F6088D768A003395B7</string> <string>30E301F7088D768A003395B7</string> <string>30E301F8088D768A003395B7</string> ! <string>30E301F9088D768A003395B7</string> ! <string>30E301FA088D768A003395B7</string> </array> <key>prevStack</key> --- 492,508 ---- <string>30E30149088D5D33003395B7</string> <string>30E3014A088D5D33003395B7</string> <string>30E301F5088D768A003395B7</string> <string>30E301F6088D768A003395B7</string> <string>30E301F7088D768A003395B7</string> <string>30E301F8088D768A003395B7</string> ! <string>3029404F088ED60900C9C2BC</string> ! <string>30294050088ED60900C9C2BC</string> ! <string>30294092088EDB4100C9C2BC</string> ! <string>30294093088EDB4100C9C2BC</string> ! <string>30294094088EDB4100C9C2BC</string> ! <string>30294095088EDB4100C9C2BC</string> ! <string>30294096088EDB4100C9C2BC</string> ! <string>30294097088EDB4100C9C2BC</string> ! <string>30294098088EDB4100C9C2BC</string> </array> <key>prevStack</key> *************** *** 597,619 **** <string>306949DF08891194009C98DE</string> <string>30E3012A088D5A51003395B7</string> - <string>30E3012B088D5A51003395B7</string> - <string>30E3014C088D5D33003395B7</string> - <string>30E3014D088D5D33003395B7</string> - <string>30E3014E088D5D33003395B7</string> - <string>30E3014F088D5D33003395B7</string> <string>30E30150088D5D33003395B7</string> ! <string>30E30151088D5D33003395B7</string> ! <string>30E30152088D5D33003395B7</string> ! <string>30E30153088D5D33003395B7</string> ! <string>30E30154088D5D33003395B7</string> ! <string>30E30173088D6A25003395B7</string> ! <string>30E30174088D6A25003395B7</string> ! <string>30E3018F088D6D03003395B7</string> ! <string>30E301A4088D6FFB003395B7</string> ! <string>30E301FB088D768A003395B7</string> ! <string>30E301FC088D768A003395B7</string> ! <string>30E301FD088D768A003395B7</string> ! <string>30E301FE088D768A003395B7</string> ! <string>30E301FF088D768A003395B7</string> </array> </dict> --- 605,623 ---- <string>306949DF08891194009C98DE</string> <string>30E3012A088D5A51003395B7</string> <string>30E30150088D5D33003395B7</string> ! <string>30294053088ED60900C9C2BC</string> ! <string>30294054088ED60900C9C2BC</string> ! <string>30294055088ED60900C9C2BC</string> ! <string>30294099088EDB4100C9C2BC</string> ! <string>3029409A088EDB4100C9C2BC</string> ! <string>3029409B088EDB4100C9C2BC</string> ! <string>3029409C088EDB4100C9C2BC</string> ! <string>3029409D088EDB4100C9C2BC</string> ! <string>3029409E088EDB4100C9C2BC</string> ! <string>3029409F088EDB4100C9C2BC</string> ! <string>302940A0088EDB4100C9C2BC</string> ! <string>302940A1088EDB4100C9C2BC</string> ! <string>302940A2088EDB4100C9C2BC</string> ! <string>302940A3088EDB4100C9C2BC</string> </array> </dict> *************** *** 629,633 **** <string>{{0, 0}, {775, 380}}</string> <key>RubberWindowFrame</key> ! <string>158 157 1041 675 0 0 1280 832 </string> </dict> <key>Module</key> --- 633,637 ---- <string>{{0, 0}, {775, 380}}</string> <key>RubberWindowFrame</key> ! <string>118 157 1041 675 0 0 1280 832 </string> </dict> <key>Module</key> *************** *** 649,653 **** <string>{{0, 385}, {775, 249}}</string> <key>RubberWindowFrame</key> ! <string>158 157 1041 675 0 0 1280 832 </string> </dict> <key>Module</key> --- 653,657 ---- <string>{{0, 385}, {775, 249}}</string> <key>RubberWindowFrame</key> ! <string>118 157 1041 675 0 0 1280 832 </string> </dict> <key>Module</key> *************** *** 673,679 **** <key>TableOfContents</key> <array> ! <string>30E3010F088D5702003395B7</string> <string>1CE0B1FE06471DED0097A5F4</string> ! <string>30E30110088D5702003395B7</string> <string>1CE0B20306471E060097A5F4</string> <string>1CE0B20506471E060097A5F4</string> --- 677,683 ---- <key>TableOfContents</key> <array> ! <string>30294057088ED60900C9C2BC</string> <string>1CE0B1FE06471DED0097A5F4</string> ! <string>30294058088ED60900C9C2BC</string> <string>1CE0B20306471E060097A5F4</string> <string>1CE0B20506471E060097A5F4</string> *************** *** 811,827 **** <key>WindowOrderList</key> <array> - <string>30E301AD088D6FFB003395B7</string> - <string>30E301AE088D6FFB003395B7</string> - <string>30BE4823082FED6F00826659</string> - <string>1CD10A99069EF8BA00B06720</string> - <string>30E30118088D5702003395B7</string> <string>30A82A48082E9E83003C97DB</string> - <string>/Users/roman/Documents/dev/macattrick/Macattrick.xcodeproj</string> <string>1C0AD2B3069F1EA900FABCE6</string> <string>30E30135088D5B69003395B7</string> ! <string>1C530D57069F1CE1000CFCEE</string> </array> <key>WindowString</key> ! <string>158 157 1041 675 0 0 1280 832 </string> <key>WindowTools</key> <array> --- 815,825 ---- <key>WindowOrderList</key> <array> <string>30A82A48082E9E83003C97DB</string> <string>1C0AD2B3069F1EA900FABCE6</string> <string>30E30135088D5B69003395B7</string> ! <string>/Users/roman/Documents/dev/macattrick/Macattrick.xcodeproj</string> </array> <key>WindowString</key> ! <string>118 157 1041 675 0 0 1280 832 </string> <key>WindowTools</key> <array> *************** *** 839,842 **** --- 837,842 ---- <array> <dict> + <key>BecomeActive</key> + <true/> <key>ContentConfiguration</key> <dict> *************** *** 844,848 **** <string>1CD0528F0623707200166675</string> <key>PBXProjectModuleLabel</key> ! <string>PlayerListsViewController.m</string> <key>StatusBarVisibility</key> <true/> --- 844,848 ---- <string>1CD0528F0623707200166675</string> <key>PBXProjectModuleLabel</key> ! <string>TeamTest.m</string> <key>StatusBarVisibility</key> <true/> *************** *** 851,855 **** <dict> <key>Frame</key> ! <string>{{0, 0}, {787, 290}}</string> <key>RubberWindowFrame</key> <string>369 127 787 699 0 0 1280 832 </string> --- 851,855 ---- <dict> <key>Frame</key> ! <string>{{0, 0}, {787, 343}}</string> <key>RubberWindowFrame</key> <string>369 127 787 699 0 0 1280 832 </string> *************** *** 858,870 **** <string>PBXNavigatorGroup</string> <key>Proportion</key> ! <string>290pt</string> </dict> <dict> - <key>BecomeActive</key> - <true/> <key>ContentConfiguration</key> <dict> <key>PBXBuildLogShowsTranscriptDefaultKey</key> ! <string>{{0, 116}, {787, 247}}</string> <key>PBXProjectModuleGUID</key> <string>XCMainBuildResultsModuleGUID</string> --- 858,868 ---- <string>PBXNavigatorGroup</string> <key>Proportion</key> ! <string>343pt</string> </dict> <dict> <key>ContentConfiguration</key> <dict> <key>PBXBuildLogShowsTranscriptDefaultKey</key> ! <string>{{0, 91}, {787, 219}}</string> <key>PBXProjectModuleGUID</key> <string>XCMainBuildResultsModuleGUID</string> *************** *** 879,883 **** <dict> <key>Frame</key> ! <string>{{0, 295}, {787, 363}}</string> <key>RubberWindowFrame</key> <string>369 127 787 699 0 0 1280 832 </string> --- 877,881 ---- <dict> <key>Frame</key> ! <string>{{0, 348}, {787, 310}}</string> <key>RubberWindowFrame</key> <string>369 127 787 699 0 0 1280 832 </string> *************** *** 886,890 **** <string>PBXBuildResultsModule</string> <key>Proportion</key> ! <string>363pt</string> </dict> </array> --- 884,888 ---- <string>PBXBuildResultsModule</string> <key>Proportion</key> ! <string>310pt</string> </dict> </array> *************** *** 904,908 **** <array> <string>30A82A48082E9E83003C97DB</string> ! <string>30E30120088D599E003395B7</string> <string>1CD0528F0623707200166675</string> <string>XCMainBuildResultsModuleGUID</string> --- 902,906 ---- <array> <string>30A82A48082E9E83003C97DB</string> ! <string>3029405F088ED60900C9C2BC</string> <string>1CD0528F0623707200166675</string> <string>XCMainBuildResultsModuleGUID</string> *************** *** 1216,1221 **** <key>sizes</key> <array> ! <string>{{0, 0}, {493, 168}}</string> ! <string>{{0, 173}, {493, 270}}</string> </array> </dict> --- 1214,1219 ---- <key>sizes</key> <array> ! <string>{{0, 0}, {491, 168}}</string> ! <string>{{0, 173}, {491, 270}}</string> </array> </dict> *************** *** 1243,1247 **** <string>{{0, 0}, {1095, 323}}</string> <key>RubberWindowFrame</key> ! <string>168 110 1095 364 0 0 1280 832 </string> </dict> <key>Module</key> --- 1241,1245 ---- <string>{{0, 0}, {1095, 323}}</string> <key>RubberWindowFrame</key> ! <string>67 455 1095 364 0 0 1280 832 </string> </dict> <key>Module</key> *************** *** 1266,1277 **** <array> <string>1C0AD2B3069F1EA900FABCE6</string> ! <string>30E30119088D5702003395B7</string> <string>1CD0528B0623707200166675</string> ! <string>30E3011A088D5702003395B7</string> </array> <key>ToolbarConfiguration</key> <string>xcode.toolbar.config.run</string> <key>WindowString</key> ! <string>168 110 1095 364 0 0 1280 832 </string> <key>WindowToolGUID</key> <string>1C0AD2B3069F1EA900FABCE6</string> --- 1264,1275 ---- <array> <string>1C0AD2B3069F1EA900FABCE6</string> ! <string>30294060088ED60900C9C2BC</string> <string>1CD0528B0623707200166675</string> ! <string>30294061088ED60900C9C2BC</string> </array> <key>ToolbarConfiguration</key> <string>xcode.toolbar.config.run</string> <key>WindowString</key> ! <string>67 455 1095 364 0 0 1280 832 </string> <key>WindowToolGUID</key> <string>1C0AD2B3069F1EA900FABCE6</string> Index: roman.pbxuser =================================================================== RCS file: /cvsroot/macattrick/macattrick/Macattrick.xcodeproj/roman.pbxuser,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** roman.pbxuser 19 Jul 2005 17:58:58 -0000 1.7 --- roman.pbxuser 20 Jul 2005 19:31:02 -0000 1.8 *************** *** 51,55 **** 3084F848076390A300DCF936 /* _NSKVODeallocateLog */, 30BFF66108784AE900CC3E0E /* PlayerListsViewController.m:35 */, ! 30E3011C088D5853003395B7 /* TeamTest.m:59 */, ); breakpointsGroup = 309631DF086EC5BD00970F48 /* XCBreakpointsBucket */; --- 51,56 ---- 3084F848076390A300DCF936 /* _NSKVODeallocateLog */, 30BFF66108784AE900CC3E0E /* PlayerListsViewController.m:35 */, ! 30E3011C088D5853003395B7 /* TeamTest.m:58 */, ! 30294043088ED45E00C9C2BC /* PlayerList.m:131 */, [...2857 lines suppressed...] ! rType = 0; ! vrLen = 1030; ! vrLoc = 5352; ! }; ! 30E3021B088D9BD9003395B7 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 3041B58B06F623640055CB6D /* PlayerList.m */; *************** *** 6406,6410 **** name = "Team *temp ="; rLen = 12; ! rLoc = 7175; rType = 0; vrLen = 712; --- 5614,5618 ---- name = "Team *temp ="; rLen = 12; ! rLoc = 7145; rType = 0; vrLen = 712; |
|
From: Geisschaes <gei...@us...> - 2005-07-20 19:31:13
|
Update of /cvsroot/macattrick/macattrick/Test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19864/Test Modified Files: PlayerListTest.m TeamTest.m Log Message: removing players using backspace is working. but everything is still rather instable Index: PlayerListTest.m =================================================================== RCS file: /cvsroot/macattrick/macattrick/Test/PlayerListTest.m,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** PlayerListTest.m 18 Jul 2005 19:12:40 -0000 1.8 --- PlayerListTest.m 20 Jul 2005 19:31:03 -0000 1.9 *************** *** 72,75 **** --- 72,76 ---- } + - (void)testDownload { playerListDownload = [[PlayerList alloc] initFromLocalFile]; Index: TeamTest.m =================================================================== RCS file: /cvsroot/macattrick/macattrick/Test/TeamTest.m,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** TeamTest.m 19 Jul 2005 17:58:58 -0000 1.21 --- TeamTest.m 20 Jul 2005 19:31:04 -0000 1.22 *************** *** 52,55 **** --- 52,56 ---- } + /* -(void) testSaveCustomPlayerLists { PlayerList *list = [[PlayerList alloc] initFromLocalFile]; *************** *** 60,64 **** NSString *result = [NSString stringWithContentsOfFile:[AllTests getProperty:@"playerlistsfile"]]; UKStringContains(result, @"45310798|30230725|35943807|39096684|17108669|26936041|39622518|30319524|43813604|14507913|52720672|30337052|12166130|37100886|38929636|17108667|39509026|25598654|26465447|65767699|61079326|65492569|27200732|70305460|7520002"); ! } -(void) testCurrentTeam { --- 61,65 ---- NSString *result = [NSString stringWithContentsOfFile:[AllTests getProperty:@"playerlistsfile"]]; UKStringContains(result, @"45310798|30230725|35943807|39096684|17108669|26936041|39622518|30319524|43813604|14507913|52720672|30337052|12166130|37100886|38929636|17108667|39509026|25598654|26465447|65767699|61079326|65492569|27200732|70305460|7520002"); ! }*/ -(void) testCurrentTeam { |
|
From: Geisschaes <gei...@us...> - 2005-07-19 17:59:10
|
Update of /cvsroot/macattrick/macattrick/Macattrick.xcodeproj In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2071/Macattrick.xcodeproj Modified Files: roman.mode1 roman.pbxuser Log Message: user defined lists are now saved in userDefinedPlayerLists.xml and loaded at startup Index: roman.mode1 =================================================================== RCS file: /cvsroot/macattrick/macattrick/Macattrick.xcodeproj/roman.mode1,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** roman.mode1 19 Jul 2005 16:12:10 -0000 1.6 --- roman.mode1 19 Jul 2005 17:58:58 -0000 1.7 *************** *** 193,197 **** <string>30E30135088D5B69003395B7</string> <key>PBXProjectModuleLabel</key> ! <string>Team.h</string> <key>PBXSplitModuleInNavigatorKey</key> <dict> --- 193,197 ---- <string>30E30135088D5B69003395B7</string> <key>PBXProjectModuleLabel</key> ! <string>PlayerList.m</string> <key>PBXSplitModuleInNavigatorKey</key> <dict> *************** *** 201,217 **** <string>30E30139088D5B7B003395B7</string> <key>PBXProjectModuleLabel</key> ! <string>Team.h</string> <key>_historyCapacity</key> <integer>0</integer> <key>bookmark</key> ! <string>30E30159088D5D33003395B7</string> <key>history</key> <array> ! <string>30E30156088D5D33003395B7</string> ! <string>30E30157088D5D33003395B7</string> </array> ! <key>nextStack</key> <array> ! <string>30E30158088D5D33003395B7</string> </array> </dict> --- 201,246 ---- <string>30E30139088D5B7B003395B7</string> <key>PBXProjectModuleLabel</key> ! <string>PlayerList.m</string> <key>_historyCapacity</key> <integer>0</integer> <key>bookmark</key> ! <string>30E30217088D768A003395B7</string> <key>history</key> <array> ! <string>30E30176088D6A25003395B7</string> ! <string>30E30177088D6A25003395B7</string> ! <string>30E301A7088D6FFB003395B7</string> ! <string>30E30201088D768A003395B7</string> ! <string>30E30202088D768A003395B7</string> ! <string>30E30203088D768A003395B7</string> ! <string>30E30204088D768A003395B7</string> ! <string>30E30205088D768A003395B7</string> ! <string>30E30206088D768A003395B7</string> ! <string>30E301A6088D6FFB003395B7</string> </array> ! <key>prevStack</key> <array> ! <string>30E30179088D6A25003395B7</string> ! <string>30E3017B088D6A25003395B7</string> ! <string>30E30193088D6D03003395B7</string> ! <string>30E301A9088D6FFB003395B7</string> ! <string>30E301AA088D6FFB003395B7</string> ! <string>30E301AB088D6FFB003395B7</string> ! <string>30E30207088D768A003395B7</string> ! <string>30E30208088D768A003395B7</string> ! <string>30E30209088D768A003395B7</string> ! <string>30E3020A088D768A003395B7</string> ! <string>30E3020B088D768A003395B7</string> ! <string>30E3020C088D768A003395B7</string> ! <string>30E3020D088D768A003395B7</string> ! <string>30E3020E088D768A003395B7</string> ! <string>30E3020F088D768A003395B7</string> ! <string>30E30210088D768A003395B7</string> ! <string>30E30211088D768A003395B7</string> ! <string>30E30212088D768A003395B7</string> ! <string>30E30213088D768A003395B7</string> ! <string>30E30214088D768A003395B7</string> ! <string>30E30215088D768A003395B7</string> ! <string>30E30216088D768A003395B7</string> </array> </dict> *************** *** 229,233 **** <false/> <key>RubberWindowFrame</key> ! <string>344 156 1051 676 0 0 1280 832 </string> </dict> </dict> --- 258,262 ---- <false/> <key>RubberWindowFrame</key> ! <string>206 93 1051 676 0 0 1280 832 </string> </dict> </dict> *************** *** 304,309 **** <string>080E96DDFE201D6D7F000001</string> <string>30BB2140067DC1CA00B1C71A</string> - <string>307D956A063D9208008E2586</string> - <string>30D78C0E0849E4A300112C09</string> <string>30B355F80690131C00571DE8</string> <string>1C37FBAC04509CD000000102</string> --- 333,336 ---- *************** *** 314,318 **** <array> <array> ! <integer>3</integer> <integer>2</integer> <integer>0</integer> --- 341,345 ---- <array> <array> ! <integer>6</integer> <integer>2</integer> <integer>0</integer> *************** *** 320,324 **** </array> <key>PBXSmartGroupTreeModuleOutlineStateVisibleRectKey</key> ! <string>{{0, 0}, {244, 616}}</string> </dict> <key>PBXTopSmartGroupGIDs</key> --- 347,351 ---- </array> <key>PBXSmartGroupTreeModuleOutlineStateVisibleRectKey</key> ! <string>{{0, 34}, {244, 616}}</string> </dict> <key>PBXTopSmartGroupGIDs</key> *************** *** 339,343 **** </array> <key>RubberWindowFrame</key> ! <string>167 140 1041 675 0 0 1280 832 </string> </dict> <key>Module</key> --- 366,370 ---- </array> <key>RubberWindowFrame</key> ! <string>158 157 1041 675 0 0 1280 832 </string> </dict> <key>Module</key> *************** *** 357,361 **** <string>1CE0B20306471E060097A5F4</string> <key>PBXProjectModuleLabel</key> ! <string>TeamTest.m</string> <key>PBXSplitModuleInNavigatorKey</key> <dict> --- 384,388 ---- <string>1CE0B20306471E060097A5F4</string> <key>PBXProjectModuleLabel</key> ! <string>Team.m</string> <key>PBXSplitModuleInNavigatorKey</key> <dict> *************** *** 365,373 **** <string>1CE0B20406471E060097A5F4</string> <key>PBXProjectModuleLabel</key> ! <string>TeamTest.m</string> <key>_historyCapacity</key> <integer>0</integer> <key>bookmark</key> ! <string>30E30155088D5D33003395B7</string> <key>history</key> <array> --- 392,400 ---- <string>1CE0B20406471E060097A5F4</string> <key>PBXProjectModuleLabel</key> ! <string>Team.m</string> <key>_historyCapacity</key> <integer>0</integer> <key>bookmark</key> ! <string>30E30200088D768A003395B7</string> <key>history</key> <array> *************** *** 437,446 **** <string>3083EF9F085C98F60006D9C5</string> <string>3083EFA0085C98F60006D9C5</string> - <string>3083EFA1085C98F60006D9C5</string> <string>309229060868898900C1568B</string> <string>3096320A086ED54100970F48</string> <string>3096320B086ED54100970F48</string> - <string>3096320C086ED54100970F48</string> - <string>3096320D086ED54100970F48</string> <string>3096320E086ED54100970F48</string> <string>3096320F086ED54100970F48</string> --- 464,470 ---- *************** *** 458,467 **** <string>30D323FE088C364C0010BC3F</string> <string>30D323FF088C364C0010BC3F</string> - <string>30D32400088C364C0010BC3F</string> - <string>30D32401088C364C0010BC3F</string> <string>30D32403088C364C0010BC3F</string> <string>30D32404088C364C0010BC3F</string> <string>30E30128088D5A51003395B7</string> - <string>30E30145088D5D33003395B7</string> <string>30E30146088D5D33003395B7</string> <string>30E30147088D5D33003395B7</string> --- 482,488 ---- *************** *** 469,473 **** <string>30E30149088D5D33003395B7</string> <string>30E3014A088D5D33003395B7</string> ! <string>30E3014B088D5D33003395B7</string> </array> <key>prevStack</key> --- 490,500 ---- <string>30E30149088D5D33003395B7</string> <string>30E3014A088D5D33003395B7</string> ! <string>30E30171088D6A25003395B7</string> ! <string>30E301F5088D768A003395B7</string> ! <string>30E301F6088D768A003395B7</string> ! <string>30E301F7088D768A003395B7</string> ! <string>30E301F8088D768A003395B7</string> ! <string>30E301F9088D768A003395B7</string> ! <string>30E301FA088D768A003395B7</string> </array> <key>prevStack</key> *************** *** 580,583 **** --- 607,619 ---- <string>30E30153088D5D33003395B7</string> <string>30E30154088D5D33003395B7</string> + <string>30E30173088D6A25003395B7</string> + <string>30E30174088D6A25003395B7</string> + <string>30E3018F088D6D03003395B7</string> + <string>30E301A4088D6FFB003395B7</string> + <string>30E301FB088D768A003395B7</string> + <string>30E301FC088D768A003395B7</string> + <string>30E301FD088D768A003395B7</string> + <string>30E301FE088D768A003395B7</string> + <string>30E301FF088D768A003395B7</string> </array> </dict> *************** *** 593,597 **** <string>{{0, 0}, {775, 380}}</string> <key>RubberWindowFrame</key> ! <string>167 140 1041 675 0 0 1280 832 </string> </dict> <key>Module</key> --- 629,633 ---- <string>{{0, 0}, {775, 380}}</string> <key>RubberWindowFrame</key> ! <string>158 157 1041 675 0 0 1280 832 </string> </dict> <key>Module</key> *************** *** 613,617 **** <string>{{0, 385}, {775, 249}}</string> <key>RubberWindowFrame</key> ! <string>167 140 1041 675 0 0 1280 832 </string> </dict> <key>Module</key> --- 649,653 ---- <string>{{0, 385}, {775, 249}}</string> <key>RubberWindowFrame</key> ! <string>158 157 1041 675 0 0 1280 832 </string> </dict> <key>Module</key> *************** *** 775,788 **** <key>WindowOrderList</key> <array> <string>30BE4823082FED6F00826659</string> <string>1CD10A99069EF8BA00B06720</string> <string>30E30118088D5702003395B7</string> - <string>1C0AD2B3069F1EA900FABCE6</string> <string>30A82A48082E9E83003C97DB</string> - <string>30E30135088D5B69003395B7</string> <string>/Users/roman/Documents/dev/macattrick/Macattrick.xcodeproj</string> </array> <key>WindowString</key> ! <string>167 140 1041 675 0 0 1280 832 </string> <key>WindowTools</key> <array> --- 811,827 ---- <key>WindowOrderList</key> <array> + <string>30E301AD088D6FFB003395B7</string> + <string>30E301AE088D6FFB003395B7</string> <string>30BE4823082FED6F00826659</string> <string>1CD10A99069EF8BA00B06720</string> <string>30E30118088D5702003395B7</string> <string>30A82A48082E9E83003C97DB</string> <string>/Users/roman/Documents/dev/macattrick/Macattrick.xcodeproj</string> + <string>1C0AD2B3069F1EA900FABCE6</string> + <string>30E30135088D5B69003395B7</string> + <string>1C530D57069F1CE1000CFCEE</string> </array> <key>WindowString</key> ! <string>158 157 1041 675 0 0 1280 832 </string> <key>WindowTools</key> <array> *************** *** 805,809 **** <string>1CD0528F0623707200166675</string> <key>PBXProjectModuleLabel</key> ! <string>TeamTest.m</string> <key>StatusBarVisibility</key> <true/> --- 844,848 ---- <string>1CD0528F0623707200166675</string> <key>PBXProjectModuleLabel</key> ! <string>PlayerListsViewController.m</string> <key>StatusBarVisibility</key> <true/> *************** *** 814,818 **** <string>{{0, 0}, {787, 290}}</string> <key>RubberWindowFrame</key> ! <string>369 126 787 699 0 0 1280 832 </string> </dict> <key>Module</key> --- 853,857 ---- <string>{{0, 0}, {787, 290}}</string> <key>RubberWindowFrame</key> ! <string>369 127 787 699 0 0 1280 832 </string> </dict> <key>Module</key> *************** *** 842,846 **** <string>{{0, 295}, {787, 363}}</string> <key>RubberWindowFrame</key> ! <string>369 126 787 699 0 0 1280 832 </string> </dict> <key>Module</key> --- 881,885 ---- <string>{{0, 295}, {787, 363}}</string> <key>RubberWindowFrame</key> ! <string>369 127 787 699 0 0 1280 832 </string> </dict> <key>Module</key> *************** *** 872,876 **** <string>xcode.toolbar.config.build</string> <key>WindowString</key> ! <string>369 126 787 699 0 0 1280 832 </string> <key>WindowToolGUID</key> <string>30A82A48082E9E83003C97DB</string> --- 911,915 ---- <string>xcode.toolbar.config.build</string> <key>WindowString</key> ! <string>369 127 787 699 0 0 1280 832 </string> <key>WindowToolGUID</key> <string>30A82A48082E9E83003C97DB</string> *************** *** 907,912 **** <key>sizes</key> <array> ! <string>{{0, 0}, {128, 214}}</string> ! <string>{{128, 0}, {1152, 214}}</string> </array> </dict> --- 946,951 ---- <key>sizes</key> <array> ! <string>{{0, 0}, {316, 191}}</string> ! <string>{{316, 0}, {964, 191}}</string> </array> </dict> *************** *** 923,928 **** <key>sizes</key> <array> ! <string>{{0, 0}, {1280, 214}}</string> ! <string>{{0, 214}, {1280, 472}}</string> </array> </dict> --- 962,967 ---- <key>sizes</key> <array> ! <string>{{0, 0}, {1280, 191}}</string> ! <string>{{0, 191}, {1280, 495}}</string> </array> </dict> *************** *** 948,952 **** <string>{{0, 0}, {1280, 686}}</string> <key>RubberWindowFrame</key> ! <string>0 105 1280 727 0 0 1280 832 </string> </dict> <key>Module</key> --- 987,991 ---- <string>{{0, 0}, {1280, 686}}</string> <key>RubberWindowFrame</key> ! <string>13 102 1280 727 0 0 1280 832 </string> </dict> <key>Module</key> *************** *** 983,987 **** <string>xcode.toolbar.config.debug</string> <key>WindowString</key> ! <string>0 105 1280 727 0 0 1280 832 </string> <key>WindowToolGUID</key> <string>1CD10A99069EF8BA00B06720</string> --- 1022,1026 ---- <string>xcode.toolbar.config.debug</string> <key>WindowString</key> ! <string>13 102 1280 727 0 0 1280 832 </string> <key>WindowToolGUID</key> <string>1CD10A99069EF8BA00B06720</string> *************** *** 1005,1008 **** --- 1044,1049 ---- <array> <dict> + <key>BecomeActive</key> + <true/> <key>ContentConfiguration</key> <dict> *************** *** 1010,1014 **** <string>1CDD528C0622207200134675</string> <key>PBXProjectModuleLabel</key> ! <string>PlayerListsViewController.m</string> <key>StatusBarVisibility</key> <true/> --- 1051,1055 ---- <string>1CDD528C0622207200134675</string> <key>PBXProjectModuleLabel</key> ! <string>MainController.m</string> <key>StatusBarVisibility</key> <true/> *************** *** 1019,1023 **** <string>{{0, 0}, {1280, 409}}</string> <key>RubberWindowFrame</key> ! <string>382 43 1280 783 0 0 1280 832 </string> </dict> <key>Module</key> --- 1060,1064 ---- <string>{{0, 0}, {1280, 409}}</string> <key>RubberWindowFrame</key> ! <string>382 49 1280 783 0 0 1280 832 </string> </dict> <key>Module</key> *************** *** 1031,1036 **** </dict> <dict> - <key>BecomeActive</key> - <true/> <key>ContentConfiguration</key> <dict> --- 1072,1075 ---- *************** *** 1045,1049 **** <string>{{0, 414}, {1280, 328}}</string> <key>RubberWindowFrame</key> ! <string>382 43 1280 783 0 0 1280 832 </string> </dict> <key>Module</key> --- 1084,1088 ---- <string>{{0, 414}, {1280, 328}}</string> <key>RubberWindowFrame</key> ! <string>382 49 1280 783 0 0 1280 832 </string> </dict> <key>Module</key> *************** *** 1068,1078 **** <array> <string>1C530D57069F1CE1000CFCEE</string> ! <string>30BFF63E0878449400CC3E0E</string> ! <string>30BFF63F0878449400CC3E0E</string> <string>1CDD528C0622207200134675</string> <string>1CD0528E0623707200166675</string> </array> <key>WindowString</key> ! <string>382 43 1280 783 0 0 1280 832 </string> <key>WindowToolGUID</key> <string>1C530D57069F1CE1000CFCEE</string> --- 1107,1117 ---- <array> <string>1C530D57069F1CE1000CFCEE</string> ! <string>30E30218088D768A003395B7</string> ! <string>30E30219088D768A003395B7</string> <string>1CDD528C0622207200134675</string> <string>1CD0528E0623707200166675</string> </array> <key>WindowString</key> ! <string>382 49 1280 783 0 0 1280 832 </string> <key>WindowToolGUID</key> <string>1C530D57069F1CE1000CFCEE</string> Index: roman.pbxuser =================================================================== RCS file: /cvsroot/macattrick/macattrick/Macattrick.xcodeproj/roman.pbxuser,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** roman.pbxuser 19 Jul 2005 16:12:10 -0000 1.6 --- roman.pbxuser 19 Jul 2005 17:58:58 -0000 1.7 *************** *** 40,45 **** activeBuildConfigurationName = Development; activeBuildStyle = 4A9504CCFFE6A4B311CA0CBA /* Development */; ! activeExecutable = 30425557083763A600DDF612 /* Ukrun */; ! activeTarget = 30DFA496082018F2000CE74D /* FastTests */; addToTargets = ( 30950682067C4D100077C270 /* Macattrick */, --- 40,45 ---- activeBuildConfigurationName = Development; activeBuildStyle = 4A9504CCFFE6A4B311CA0CBA /* Development */; ! activeExecutable = 30744BA6069560A70039B82A /* Devel Macattrick */; [...1745 lines suppressed...] vrLen = 712; --- 6406,6410 ---- name = "Team *temp ="; rLen = 12; ! rLoc = 7175; rType = 0; vrLen = 712; *************** *** 5510,5514 **** name = "main.m: 46"; rLen = 0; ! rLoc = 2660; rType = 0; vrLen = 1185; --- 6466,6470 ---- name = "main.m: 46"; rLen = 0; ! rLoc = 2676; rType = 0; vrLen = 1185; |
|
From: Geisschaes <gei...@us...> - 2005-07-19 17:59:10
|
Update of /cvsroot/macattrick/macattrick/Test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2071/Test Modified Files: TeamTest.m Log Message: user defined lists are now saved in userDefinedPlayerLists.xml and loaded at startup Index: TeamTest.m =================================================================== RCS file: /cvsroot/macattrick/macattrick/Test/TeamTest.m,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** TeamTest.m 19 Jul 2005 16:12:11 -0000 1.20 --- TeamTest.m 19 Jul 2005 17:58:58 -0000 1.21 *************** *** 59,63 **** [team saveUserDefinedPlayerLists:[AllTests getProperty:@"playerlistsfile"]]; NSString *result = [NSString stringWithContentsOfFile:[AllTests getProperty:@"playerlistsfile"]]; ! UKStringContains(result, @"<string>45310798|30230725|35943807|39096684|17108669|26936041|39622518|30319524|43813604|14507913|52720672|30337052|12166130|37100886|38929636|17108667|39509026|25598654|26465447|65767699|61079326|65492569|27200732|70305460|7520002"); } --- 59,63 ---- [team saveUserDefinedPlayerLists:[AllTests getProperty:@"playerlistsfile"]]; NSString *result = [NSString stringWithContentsOfFile:[AllTests getProperty:@"playerlistsfile"]]; ! UKStringContains(result, @"45310798|30230725|35943807|39096684|17108669|26936041|39622518|30319524|43813604|14507913|52720672|30337052|12166130|37100886|38929636|17108667|39509026|25598654|26465447|65767699|61079326|65492569|27200732|70305460|7520002"); } |
|
From: Geisschaes <gei...@us...> - 2005-07-19 17:59:09
|
Update of /cvsroot/macattrick/macattrick In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2071 Modified Files: MainController.m PlayerList.h PlayerList.m PlayerListsViewController.h PlayerListsViewController.m Properties.h Properties.m Team.m main.m Log Message: user defined lists are now saved in userDefinedPlayerLists.xml and loaded at startup Index: Properties.m =================================================================== RCS file: /cvsroot/macattrick/macattrick/Properties.m,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** Properties.m 30 May 2005 17:46:31 -0000 1.17 --- Properties.m 19 Jul 2005 17:58:57 -0000 1.18 *************** *** 63,66 **** --- 63,70 ---- } + +(NSString*) userDefinedPlayerListsFile { + NSString *path = [self libraryPath]; + return [path stringByAppendingString:@"/userDefinedPlayerLists.xml"]; + } +(NSString*) playersFile { NSString *path = [self libraryPath]; *************** *** 129,132 **** --- 133,137 ---- } + +(NSString*) file:(NSString*) file withPath: (NSString*)path { return [NSString stringWithFormat: @"%@/%@", path, file]; Index: main.m =================================================================== RCS file: /cvsroot/macattrick/macattrick/main.m,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** main.m 27 Apr 2005 19:36:38 -0000 1.17 --- main.m 19 Jul 2005 17:58:57 -0000 1.18 *************** *** 32,36 **** #include <Security/Security.h> #include <CoreServices/CoreServices.h> ! int main(int argc, char *argv[]) --- 32,36 ---- #include <Security/Security.h> #include <CoreServices/CoreServices.h> ! #import "Team.h" int main(int argc, char *argv[]) *************** *** 45,48 **** return NSApplicationMain(argc, argv); - } --- 45,47 ---- Index: Properties.h =================================================================== RCS file: /cvsroot/macattrick/macattrick/Properties.h,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** Properties.h 29 May 2005 19:15:59 -0000 1.10 --- Properties.h 19 Jul 2005 17:58:57 -0000 1.11 *************** *** 45,49 **** */ +(NSString*) libraryPath; ! /*! @method currentEnvironmentPath --- 45,49 ---- */ +(NSString*) libraryPath; ! +(NSString*) userDefinedPlayerListsFile; /*! @method currentEnvironmentPath Index: PlayerList.h =================================================================== RCS file: /cvsroot/macattrick/macattrick/PlayerList.h,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** PlayerList.h 18 Jul 2005 19:12:37 -0000 1.10 --- PlayerList.h 19 Jul 2005 17:58:57 -0000 1.11 *************** *** 130,134 **** */ - (double) averageAge; ! - (BOOL) addPlayersWithIDs: (NSArray*) ids; - (BOOL) removePlayersWithIDs: (NSArray*) ids; --- 130,134 ---- */ - (double) averageAge; ! -(BOOL) addPlayerWithID: (int) aPlayerID; - (BOOL) addPlayersWithIDs: (NSArray*) ids; - (BOOL) removePlayersWithIDs: (NSArray*) ids; Index: MainController.m =================================================================== RCS file: /cvsroot/macattrick/macattrick/MainController.m,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** MainController.m 12 Jun 2005 16:01:13 -0000 1.17 --- MainController.m 19 Jul 2005 17:58:57 -0000 1.18 *************** *** 72,75 **** --- 72,81 ---- } + + - (NSApplicationTerminateReply)applicationShouldTerminate:(NSApplication *)sender { + [[Team currentTeam] saveUserDefinedPlayerLists:[Properties userDefinedPlayerListsFile]]; + return 1; + } + - (IBAction) showPreferenceWindow:(id)sender { if(preferenceController == nil) { *************** *** 179,182 **** --- 185,189 ---- -(void) awakeFromNib { + [[NSApplication sharedApplication] setDelegate: self]; [self loadTransformers]; mainController = self; Index: PlayerListsViewController.m =================================================================== RCS file: /cvsroot/macattrick/macattrick/PlayerListsViewController.m,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** PlayerListsViewController.m 15 Jul 2005 18:29:31 -0000 1.2 --- PlayerListsViewController.m 19 Jul 2005 17:58:57 -0000 1.3 *************** *** 36,40 **** self = [super init]; if(self) { ! [self setPlayerLists: [[Team currentTeam] userDefinedPlayerLists]]; [NSBundle loadNibNamed:@"PlayerListsView" owner: self]; [tableView registerForDraggedTypes:[NSArray arrayWithObject:NSDragPboard]]; --- 36,40 ---- self = [super init]; if(self) { ! // [self setPlayerLists: [[Team currentTeam] userDefinedPlayerLists]]; [NSBundle loadNibNamed:@"PlayerListsView" owner: self]; [tableView registerForDraggedTypes:[NSArray arrayWithObject:NSDragPboard]]; *************** *** 51,59 **** } ! - (NSMutableArray *) playerLists { return playerLists; } - (void) setPlayerLists: (NSMutableArray *) newPlayerLists { ! [newPlayerLists retain]; ! [playerLists release]; ! playerLists = newPlayerLists; } --- 51,57 ---- } ! - (NSMutableArray *) playerLists { return [[Team currentTeam] userDefinedPlayerLists]; } - (void) setPlayerLists: (NSMutableArray *) newPlayerLists { ! [[Team currentTeam] setUserDefinedPlayerLists:newPlayerLists]; } *************** *** 82,86 **** - (BOOL)tableView:(NSTableView*)tv acceptDrop:(id <NSDraggingInfo>)info row:(int)row dropOperation:(NSTableViewDropOperation)op { NSArray *playerIDs = [[info draggingPasteboard] propertyListForType:NSDragPboard]; ! PlayerList *toDrop = [playerLists objectAtIndex:row]; [toDrop addPlayersWithIDs: playerIDs]; return YES; --- 80,84 ---- - (BOOL)tableView:(NSTableView*)tv acceptDrop:(id <NSDraggingInfo>)info row:(int)row dropOperation:(NSTableViewDropOperation)op { NSArray *playerIDs = [[info draggingPasteboard] propertyListForType:NSDragPboard]; ! PlayerList *toDrop = [[self playerLists] objectAtIndex:row]; [toDrop addPlayersWithIDs: playerIDs]; return YES; Index: PlayerList.m =================================================================== RCS file: /cvsroot/macattrick/macattrick/PlayerList.m,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** PlayerList.m 18 Jul 2005 19:12:37 -0000 1.12 --- PlayerList.m 19 Jul 2005 17:58:57 -0000 1.13 *************** *** 49,52 **** --- 49,61 ---- return self; } + -(PlayerList*) initWithListName:(NSString*) aListName { + self = [super init]; + if(self) { + playerList = [[NSMutableArray alloc] init]; + formerDates = [[NSMutableArray alloc] init]; + [self setListName:aListName]; + } + return self; + } - (PlayerList*) initFromLocalFile;{ NSURL *url = [[NSURL alloc] initFileURLWithPath: [Properties playersFile]]; *************** *** 142,145 **** --- 151,163 ---- } + -(BOOL) addPlayerWithID: (int) aPlayerID { + if([self playerWithID:aPlayerID] == nil) { + Player *p = [[[Team currentTeam] allPlayersList] playerWithID:aPlayerID]; + if(p) { + [playerList addObject:p] ; + } + } + + } - (BOOL) removePlayersWithIDs: (NSArray*) ids { PlayerList *mainList = [[Team currentTeam] allPlayersList]; Index: PlayerListsViewController.h =================================================================== RCS file: /cvsroot/macattrick/macattrick/PlayerListsViewController.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** PlayerListsViewController.h 3 Jul 2005 19:52:13 -0000 1.1 --- PlayerListsViewController.h 19 Jul 2005 17:58:57 -0000 1.2 *************** *** 30,34 **** @interface PlayerListsViewController : NSObject { ! NSMutableArray *playerLists; IBOutlet NSView *playerListsView; IBOutlet NSTableView *tableView; --- 30,34 ---- @interface PlayerListsViewController : NSObject { ! // NSMutableArray *playerLists; IBOutlet NSView *playerListsView; IBOutlet NSTableView *tableView; Index: Team.m =================================================================== RCS file: /cvsroot/macattrick/macattrick/Team.m,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** Team.m 19 Jul 2005 16:12:09 -0000 1.27 --- Team.m 19 Jul 2005 17:58:57 -0000 1.28 *************** *** 74,80 **** } [url release]; ! userDefinedPlayerLists = [[NSMutableArray alloc] init]; ! [userDefinedPlayerLists addObject: playerList]; ! [self setAllPlayersList:playerList]; } return self; --- 74,81 ---- } [url release]; ! ! [self setAllPlayersList:playerList]; ! [self loadUserDefinedPlayerLists: [Properties userDefinedPlayerListsFile]]; ! } return self; *************** *** 155,161 **** } - (BOOL) saveUserDefinedPlayerLists: (NSString*) filename { ! NSMutableDictionary *dic = [[NSMutableDictionary alloc] init]; NSEnumerator *en = [userDefinedPlayerLists objectEnumerator]; PlayerList *current = nil; --- 156,187 ---- } + - (BOOL) loadUserDefinedPlayerLists: (NSString*) filename { + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + NSMutableArray *lists = [NSMutableArray array]; + [lists addObject:allPlayersList]; + if([[NSFileManager defaultManager] fileExistsAtPath:filename]) { + NSArray *savedLists = [NSArray arrayWithContentsOfFile:filename]; + NSEnumerator *en = [savedLists objectEnumerator]; + NSString *current = nil; + while(current = [en nextObject]) { + NSArray *items = [current componentsSeparatedByString:@"|"]; + NSEnumerator *en2 = [items objectEnumerator]; + NSString *currentID = [en2 nextObject]; + NSLog(currentID); + PlayerList *l = [[PlayerList alloc] initWithListName:currentID]; + while(currentID = [en2 nextObject]) { + [l addPlayerWithID:[currentID intValue]]; + } + [lists addObject:l]; + [l release]; + } + } + [self setUserDefinedPlayerLists:lists]; + [pool release]; + return YES; + } - (BOOL) saveUserDefinedPlayerLists: (NSString*) filename { ! NSMutableArray *array = [[NSMutableArray alloc] init]; NSEnumerator *en = [userDefinedPlayerLists objectEnumerator]; PlayerList *current = nil; *************** *** 163,174 **** while(current = [en nextObject]) { if(! (current == allPlayersList)) { ! NSString *ids = [current playerIDsAsString]; ! [dic setObject:ids forKey:[current listName]]; } } ! return ([dic writeToFile:filename atomically:YES] == 0); } - (Economy *) economy { return economy; } --- 189,202 ---- while(current = [en nextObject]) { if(! (current == allPlayersList)) { ! NSString *ids = [[NSString alloc] initWithFormat:@"%@|%@", [current listName], [current playerIDsAsString]]; ! [array addObject:ids]; ! [ids release]; } } ! return ([array writeToFile:filename atomically:YES] == 0); } + - (Economy *) economy { return economy; } |
|
From: Geisschaes <gei...@us...> - 2005-07-19 16:12:26
|
Update of /cvsroot/macattrick/macattrick/Macattrick.xcodeproj In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9992/Macattrick.xcodeproj Modified Files: roman.mode1 roman.pbxuser Log Message: save user defined player lists fixed Index: roman.mode1 =================================================================== RCS file: /cvsroot/macattrick/macattrick/Macattrick.xcodeproj/roman.mode1,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** roman.mode1 18 Jul 2005 19:12:39 -0000 1.5 --- roman.mode1 19 Jul 2005 16:12:10 -0000 1.6 *************** *** 191,197 **** <dict> <key>PBXProjectModuleGUID</key> ! <string>30BFF5F50878005900CC3E0E</string> <key>PBXProjectModuleLabel</key> ! <string>Team.m</string> <key>PBXSplitModuleInNavigatorKey</key> <dict> --- 191,197 ---- <dict> <key>PBXProjectModuleGUID</key> ! <string>30E30135088D5B69003395B7</string> <key>PBXProjectModuleLabel</key> ! <string>Team.h</string> <key>PBXSplitModuleInNavigatorKey</key> <dict> *************** *** 199,249 **** <dict> <key>PBXProjectModuleGUID</key> ! <string>30BFF6050878402700CC3E0E</string> <key>PBXProjectModuleLabel</key> ! <string>Team.m</string> <key>_historyCapacity</key> <integer>0</integer> <key>bookmark</key> ! <string>30D32419088C364C0010BC3F</string> <key>history</key> <array> ! <string>30BFF69D08784E1000CC3E0E</string> ! <string>30BFF6CC08786F5500CC3E0E</string> ! <string>30BFF6D008786F5500CC3E0E</string> ! <string>30BFF7460878752F00CC3E0E</string> ! <string>30BFF76C087876DD00CC3E0E</string> ! <string>305EB26E0888261A007A6071</string> ! <string>305EB26F0888261A007A6071</string> ! <string>305EB29D0888376F007A6071</string> ! <string>305EB29E0888376F007A6071</string> ! <string>30D323BD088C26360010BC3F</string> ! <string>30D323BE088C26360010BC3F</string> ! <string>30D32411088C364C0010BC3F</string> ! <string>30D32412088C364C0010BC3F</string> ! <string>30D32413088C364C0010BC3F</string> ! <string>30D32414088C364C0010BC3F</string> </array> ! <key>prevStack</key> <array> ! <string>30BFF6080878402700CC3E0E</string> ! <string>30BFF62D087843A400CC3E0E</string> ! <string>30BFF62E087843A400CC3E0E</string> ! <string>30BFF62F087843A400CC3E0E</string> ! <string>30BFF66C08784B0000CC3E0E</string> ! <string>30BFF66D08784B0000CC3E0E</string> ! <string>30BFF6A008784E1000CC3E0E</string> ! <string>30BFF6A108784E1000CC3E0E</string> ! <string>30BFF6DC08786F5500CC3E0E</string> ! <string>30BFF7530878752F00CC3E0E</string> ! <string>30BFF76D087876DD00CC3E0E</string> ! <string>305EB2720888261A007A6071</string> ! <string>306949D508890EC0009C98DE</string> ! <string>30D323C0088C26360010BC3F</string> ! <string>30D323C1088C26360010BC3F</string> ! <string>30D323C2088C26360010BC3F</string> ! <string>30D32415088C364C0010BC3F</string> ! <string>30D32416088C364C0010BC3F</string> ! <string>30D32417088C364C0010BC3F</string> ! <string>30D32418088C364C0010BC3F</string> </array> </dict> --- 199,217 ---- <dict> <key>PBXProjectModuleGUID</key> ! <string>30E30139088D5B7B003395B7</string> <key>PBXProjectModuleLabel</key> ! <string>Team.h</string> <key>_historyCapacity</key> <integer>0</integer> <key>bookmark</key> ! <string>30E30159088D5D33003395B7</string> <key>history</key> <array> ! <string>30E30156088D5D33003395B7</string> ! <string>30E30157088D5D33003395B7</string> </array> ! <key>nextStack</key> <array> ! <string>30E30158088D5D33003395B7</string> </array> </dict> *************** *** 257,265 **** <dict> <key>Frame</key> ! <string>{{0, 20}, {1157, 531}}</string> <key>PBXModuleWindowStatusBarHidden2</key> <false/> <key>RubberWindowFrame</key> ! <string>106 171 1157 572 0 0 1280 832 </string> </dict> </dict> --- 225,233 ---- <dict> <key>Frame</key> ! <string>{{0, 20}, {1051, 635}}</string> <key>PBXModuleWindowStatusBarHidden2</key> <false/> <key>RubberWindowFrame</key> ! <string>344 156 1051 676 0 0 1280 832 </string> </dict> </dict> *************** *** 346,352 **** <array> <array> ! <integer>26</integer> ! <integer>16</integer> ! <integer>15</integer> <integer>0</integer> </array> --- 314,319 ---- <array> <array> ! <integer>3</integer> ! <integer>2</integer> <integer>0</integer> </array> *************** *** 372,376 **** </array> <key>RubberWindowFrame</key> ! <string>161 134 1041 675 0 0 1280 832 </string> </dict> <key>Module</key> --- 339,343 ---- </array> <key>RubberWindowFrame</key> ! <string>167 140 1041 675 0 0 1280 832 </string> </dict> <key>Module</key> *************** *** 402,406 **** <integer>0</integer> <key>bookmark</key> ! <string>30D32410088C364C0010BC3F</string> <key>history</key> <array> --- 369,373 ---- <integer>0</integer> <key>bookmark</key> ! <string>30E30155088D5D33003395B7</string> <key>history</key> <array> *************** *** 415,427 **** <string>30D78B8F0849D50F00112C09</string> <string>30D78C100849E51200112C09</string> - <string>30D78C110849E51200112C09</string> <string>30D78C120849E51200112C09</string> <string>30D78C130849E51200112C09</string> - <string>30D78C140849E51200112C09</string> <string>30D78C150849E51200112C09</string> <string>30D78C160849E51200112C09</string> <string>30D78C170849E51200112C09</string> <string>30D78C180849E51200112C09</string> - <string>30D78C1C0849E51200112C09</string> <string>30D78C1D0849E51200112C09</string> <string>30D78C1E0849E51200112C09</string> --- 382,391 ---- *************** *** 459,465 **** <string>30F2FA310851B8E9009A965F</string> <string>304A29C8085B30700097D886</string> - <string>304A2A0A085B39FE0097D886</string> <string>304A2A0C085B39FE0097D886</string> - <string>304A2A0D085B39FE0097D886</string> <string>304A2A10085B39FE0097D886</string> <string>304131AA085B69B300E5F9C0</string> --- 423,427 ---- *************** *** 498,509 **** <string>30D32400088C364C0010BC3F</string> <string>30D32401088C364C0010BC3F</string> - <string>30D32402088C364C0010BC3F</string> <string>30D32403088C364C0010BC3F</string> <string>30D32404088C364C0010BC3F</string> ! <string>30D32405088C364C0010BC3F</string> ! </array> ! <key>nextStack</key> ! <array> ! <string>30D3240F088C364C0010BC3F</string> </array> <key>prevStack</key> --- 460,473 ---- <string>30D32400088C364C0010BC3F</string> <string>30D32401088C364C0010BC3F</string> <string>30D32403088C364C0010BC3F</string> <string>30D32404088C364C0010BC3F</string> ! <string>30E30128088D5A51003395B7</string> ! <string>30E30145088D5D33003395B7</string> ! <string>30E30146088D5D33003395B7</string> ! <string>30E30147088D5D33003395B7</string> ! <string>30E30148088D5D33003395B7</string> ! <string>30E30149088D5D33003395B7</string> ! <string>30E3014A088D5D33003395B7</string> ! <string>30E3014B088D5D33003395B7</string> </array> <key>prevStack</key> *************** *** 605,622 **** <string>30BFF769087876DD00CC3E0E</string> <string>306949DF08891194009C98DE</string> ! <string>30D323B7088C26360010BC3F</string> ! <string>30D323B8088C26360010BC3F</string> ! <string>30D323B9088C26360010BC3F</string> ! <string>30D323BA088C26360010BC3F</string> ! <string>30D323BB088C26360010BC3F</string> ! <string>30D32406088C364C0010BC3F</string> ! <string>30D32407088C364C0010BC3F</string> ! <string>30D32408088C364C0010BC3F</string> ! <string>30D32409088C364C0010BC3F</string> ! <string>30D3240A088C364C0010BC3F</string> ! <string>30D3240B088C364C0010BC3F</string> ! <string>30D3240C088C364C0010BC3F</string> ! <string>30D3240D088C364C0010BC3F</string> ! <string>30D3240E088C364C0010BC3F</string> </array> </dict> --- 569,583 ---- <string>30BFF769087876DD00CC3E0E</string> <string>306949DF08891194009C98DE</string> ! <string>30E3012A088D5A51003395B7</string> ! <string>30E3012B088D5A51003395B7</string> ! <string>30E3014C088D5D33003395B7</string> ! <string>30E3014D088D5D33003395B7</string> ! <string>30E3014E088D5D33003395B7</string> ! <string>30E3014F088D5D33003395B7</string> ! <string>30E30150088D5D33003395B7</string> ! <string>30E30151088D5D33003395B7</string> ! <string>30E30152088D5D33003395B7</string> ! <string>30E30153088D5D33003395B7</string> ! <string>30E30154088D5D33003395B7</string> </array> </dict> *************** *** 632,636 **** <string>{{0, 0}, {775, 380}}</string> <key>RubberWindowFrame</key> ! <string>161 134 1041 675 0 0 1280 832 </string> </dict> <key>Module</key> --- 593,597 ---- <string>{{0, 0}, {775, 380}}</string> <key>RubberWindowFrame</key> ! <string>167 140 1041 675 0 0 1280 832 </string> </dict> <key>Module</key> *************** *** 652,656 **** <string>{{0, 385}, {775, 249}}</string> <key>RubberWindowFrame</key> ! <string>161 134 1041 675 0 0 1280 832 </string> </dict> <key>Module</key> --- 613,617 ---- <string>{{0, 385}, {775, 249}}</string> <key>RubberWindowFrame</key> ! <string>167 140 1041 675 0 0 1280 832 </string> </dict> <key>Module</key> *************** *** 676,682 **** <key>TableOfContents</key> <array> ! <string>30D3239C088C1B880010BC3F</string> <string>1CE0B1FE06471DED0097A5F4</string> ! <string>30D3239D088C1B880010BC3F</string> <string>1CE0B20306471E060097A5F4</string> <string>1CE0B20506471E060097A5F4</string> --- 637,643 ---- <key>TableOfContents</key> <array> ! <string>30E3010F088D5702003395B7</string> <string>1CE0B1FE06471DED0097A5F4</string> ! <string>30E30110088D5702003395B7</string> <string>1CE0B20306471E060097A5F4</string> <string>1CE0B20506471E060097A5F4</string> *************** *** 791,795 **** <false/> <key>PinnedNavigatorIdentifier</key> ! <string>30BFF5F50878005900CC3E0E</string> <key>ShelfIsVisible</key> <false/> --- 752,756 ---- <false/> <key>PinnedNavigatorIdentifier</key> ! <string>30E30135088D5B69003395B7</string> <key>ShelfIsVisible</key> <false/> *************** *** 815,827 **** <array> <string>30BE4823082FED6F00826659</string> ! <string>30D32420088C364C0010BC3F</string> <string>1C0AD2B3069F1EA900FABCE6</string> - <string>30BFF5F50878005900CC3E0E</string> - <string>/Users/roman/Documents/dev/macattrick/Macattrick.xcodeproj</string> <string>30A82A48082E9E83003C97DB</string> ! <string>1CD10A99069EF8BA00B06720</string> </array> <key>WindowString</key> ! <string>161 134 1041 675 0 0 1280 832 </string> <key>WindowTools</key> <array> --- 776,788 ---- <array> <string>30BE4823082FED6F00826659</string> ! <string>1CD10A99069EF8BA00B06720</string> ! <string>30E30118088D5702003395B7</string> <string>1C0AD2B3069F1EA900FABCE6</string> <string>30A82A48082E9E83003C97DB</string> ! <string>30E30135088D5B69003395B7</string> ! <string>/Users/roman/Documents/dev/macattrick/Macattrick.xcodeproj</string> </array> <key>WindowString</key> ! <string>167 140 1041 675 0 0 1280 832 </string> <key>WindowTools</key> <array> *************** *** 844,848 **** <string>1CD0528F0623707200166675</string> <key>PBXProjectModuleLabel</key> ! <string>Team.m</string> <key>StatusBarVisibility</key> <true/> --- 805,809 ---- <string>1CD0528F0623707200166675</string> <key>PBXProjectModuleLabel</key> ! <string>TeamTest.m</string> <key>StatusBarVisibility</key> <true/> *************** *** 866,870 **** <dict> <key>PBXBuildLogShowsTranscriptDefaultKey</key> ! <string>{{0, 124}, {787, 239}}</string> <key>PBXProjectModuleGUID</key> <string>XCMainBuildResultsModuleGUID</string> --- 827,831 ---- <dict> <key>PBXBuildLogShowsTranscriptDefaultKey</key> ! <string>{{0, 116}, {787, 247}}</string> <key>PBXProjectModuleGUID</key> <string>XCMainBuildResultsModuleGUID</string> *************** *** 904,908 **** <array> <string>30A82A48082E9E83003C97DB</string> ! <string>30D323C4088C26360010BC3F</string> <string>1CD0528F0623707200166675</string> <string>XCMainBuildResultsModuleGUID</string> --- 865,869 ---- <array> <string>30A82A48082E9E83003C97DB</string> ! <string>30E30120088D599E003395B7</string> <string>1CD0528F0623707200166675</string> <string>XCMainBuildResultsModuleGUID</string> *************** *** 946,951 **** <key>sizes</key> <array> ! <string>{{0, 0}, {128, 219}}</string> ! <string>{{128, 0}, {1152, 219}}</string> </array> </dict> --- 907,912 ---- <key>sizes</key> <array> ! <string>{{0, 0}, {128, 214}}</string> ! <string>{{128, 0}, {1152, 214}}</string> </array> </dict> *************** *** 962,967 **** <key>sizes</key> <array> ! <string>{{0, 0}, {1280, 219}}</string> ! <string>{{0, 219}, {1280, 467}}</string> </array> </dict> --- 923,928 ---- <key>sizes</key> <array> ! <string>{{0, 0}, {1280, 214}}</string> ! <string>{{0, 214}, {1280, 472}}</string> </array> </dict> *************** *** 1010,1021 **** <array> <string>1CD10A99069EF8BA00B06720</string> ! <string>30D3241A088C364C0010BC3F</string> <string>1C162984064C10D400B95A72</string> ! <string>30D3241B088C364C0010BC3F</string> ! <string>30D3241C088C364C0010BC3F</string> ! <string>30D3241D088C364C0010BC3F</string> ! <string>30D3241E088C364C0010BC3F</string> ! <string>30D3241F088C364C0010BC3F</string> ! <string>30D32420088C364C0010BC3F</string> </array> <key>ToolbarConfiguration</key> --- 971,982 ---- <array> <string>1CD10A99069EF8BA00B06720</string> ! <string>30E30112088D5702003395B7</string> <string>1C162984064C10D400B95A72</string> ! <string>30E30113088D5702003395B7</string> ! <string>30E30114088D5702003395B7</string> ! <string>30E30115088D5702003395B7</string> ! <string>30E30116088D5702003395B7</string> ! <string>30E30117088D5702003395B7</string> ! <string>30E30118088D5702003395B7</string> </array> <key>ToolbarConfiguration</key> *************** *** 1026,1030 **** <string>1CD10A99069EF8BA00B06720</string> <key>WindowToolIsVisible</key> ! <true/> </dict> <dict> --- 987,991 ---- <string>1CD10A99069EF8BA00B06720</string> <key>WindowToolIsVisible</key> ! <false/> </dict> <dict> *************** *** 1171,1175 **** <array> <string>30BE4823082FED6F00826659</string> ! <string>30D32421088C364C0010BC3F</string> <string>1C78EAAC065D492600B07095</string> </array> --- 1132,1136 ---- <array> <string>30BE4823082FED6F00826659</string> ! <string>30E30121088D599E003395B7</string> <string>1C78EAAC065D492600B07095</string> </array> *************** *** 1216,1221 **** <key>sizes</key> <array> ! <string>{{0, 0}, {367, 168}}</string> ! <string>{{0, 173}, {367, 270}}</string> </array> </dict> --- 1177,1182 ---- <key>sizes</key> <array> ! <string>{{0, 0}, {493, 168}}</string> ! <string>{{0, 173}, {493, 270}}</string> </array> </dict> *************** *** 1243,1247 **** <string>{{0, 0}, {1095, 323}}</string> <key>RubberWindowFrame</key> ! <string>168 64 1095 364 0 0 1280 832 </string> </dict> <key>Module</key> --- 1204,1208 ---- <string>{{0, 0}, {1095, 323}}</string> <key>RubberWindowFrame</key> ! <string>168 110 1095 364 0 0 1280 832 </string> </dict> <key>Module</key> *************** *** 1266,1277 **** <array> <string>1C0AD2B3069F1EA900FABCE6</string> ! <string>30D323C5088C26360010BC3F</string> <string>1CD0528B0623707200166675</string> ! <string>30D323C6088C26360010BC3F</string> </array> <key>ToolbarConfiguration</key> <string>xcode.toolbar.config.run</string> <key>WindowString</key> ! <string>168 64 1095 364 0 0 1280 832 </string> <key>WindowToolGUID</key> <string>1C0AD2B3069F1EA900FABCE6</string> --- 1227,1238 ---- <array> <string>1C0AD2B3069F1EA900FABCE6</string> ! <string>30E30119088D5702003395B7</string> <string>1CD0528B0623707200166675</string> ! <string>30E3011A088D5702003395B7</string> </array> <key>ToolbarConfiguration</key> <string>xcode.toolbar.config.run</string> <key>WindowString</key> ! <string>168 110 1095 364 0 0 1280 832 </string> <key>WindowToolGUID</key> <string>1C0AD2B3069F1EA900FABCE6</string> Index: roman.pbxuser =================================================================== RCS file: /cvsroot/macattrick/macattrick/Macattrick.xcodeproj/roman.pbxuser,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** roman.pbxuser 18 Jul 2005 19:12:39 -0000 1.5 --- roman.pbxuser 19 Jul 2005 16:12:10 -0000 1.6 *************** *** 52,55 **** --- 52,56 ---- 30BFF66108784AE900CC3E0E /* PlayerListsViewController.m:35 */, 30D323FD088C36240010BC3F /* Team.m:159 */, + 30E3011C088D5853003395B7 /* TeamTest.m:59 */, ); breakpointsGroup = 309631DF086EC5BD00970F48 /* XCBreakpointsBucket */; *************** *** 200,204 **** ); }; [...1161 lines suppressed...] + rLoc = 4309; + rType = 0; + vrLen = 755; + vrLoc = 2328; + }; 30E66334066DF49000D9A3DD /* icon.icns */ = { uiCtxt = { *************** *** 5034,5038 **** name = "Team *temp ="; rLen = 12; ! rLoc = 6099; rType = 0; vrLen = 712; --- 5450,5454 ---- name = "Team *temp ="; rLen = 12; ! rLoc = 6060; rType = 0; vrLen = 712; |
|
From: Geisschaes <gei...@us...> - 2005-07-19 16:12:26
|
Update of /cvsroot/macattrick/macattrick In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9992 Modified Files: Team.m Log Message: save user defined player lists fixed Index: Team.m =================================================================== RCS file: /cvsroot/macattrick/macattrick/Team.m,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** Team.m 18 Jul 2005 19:12:37 -0000 1.26 --- Team.m 19 Jul 2005 16:12:09 -0000 1.27 *************** *** 160,171 **** NSEnumerator *en = [userDefinedPlayerLists objectEnumerator]; PlayerList *current = nil; while(current = [en nextObject]) { ! if([dic objectForKey:[current listName]]) { ! return NO; } - NSString *ids = [current playerIDsAsString]; - [dic setObject:ids forKey:[current listName]]; } - NSLog(filename); return ([dic writeToFile:filename atomically:YES] == 0); --- 160,170 ---- NSEnumerator *en = [userDefinedPlayerLists objectEnumerator]; PlayerList *current = nil; + while(current = [en nextObject]) { ! if(! (current == allPlayersList)) { ! NSString *ids = [current playerIDsAsString]; ! [dic setObject:ids forKey:[current listName]]; } } return ([dic writeToFile:filename atomically:YES] == 0); |
|
From: Geisschaes <gei...@us...> - 2005-07-19 16:12:26
|
Update of /cvsroot/macattrick/macattrick/Test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9992/Test Modified Files: TeamTest.m Log Message: save user defined player lists fixed Index: TeamTest.m =================================================================== RCS file: /cvsroot/macattrick/macattrick/Test/TeamTest.m,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** TeamTest.m 18 Jul 2005 19:12:40 -0000 1.19 --- TeamTest.m 19 Jul 2005 16:12:11 -0000 1.20 *************** *** 55,60 **** PlayerList *list = [[PlayerList alloc] initFromLocalFile]; [[team userDefinedPlayerLists] addObject:list]; ! NSLog([AllTests getProperty:@"playerlistsfile"]); [team saveUserDefinedPlayerLists:[AllTests getProperty:@"playerlistsfile"]]; } --- 55,63 ---- PlayerList *list = [[PlayerList alloc] initFromLocalFile]; [[team userDefinedPlayerLists] addObject:list]; ! UKIntsEqual([[team userDefinedPlayerLists] count], 2); ! UKObjectsNotSame([[team userDefinedPlayerLists] objectAtIndex:0], [[team userDefinedPlayerLists] objectAtIndex:1]); [team saveUserDefinedPlayerLists:[AllTests getProperty:@"playerlistsfile"]]; + NSString *result = [NSString stringWithContentsOfFile:[AllTests getProperty:@"playerlistsfile"]]; + UKStringContains(result, @"<string>45310798|30230725|35943807|39096684|17108669|26936041|39622518|30319524|43813604|14507913|52720672|30337052|12166130|37100886|38929636|17108667|39509026|25598654|26465447|65767699|61079326|65492569|27200732|70305460|7520002"); } |
|
From: Geisschaes <gei...@us...> - 2005-07-18 19:13:23
|
Update of /cvsroot/macattrick/macattrick In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11790 Modified Files: PlayerList.h PlayerList.m PlayerTableController.m Team.h Team.m Log Message: started saving userdefinedplayerlists Index: PlayerList.h =================================================================== RCS file: /cvsroot/macattrick/macattrick/PlayerList.h,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** PlayerList.h 15 Jul 2005 18:29:31 -0000 1.9 --- PlayerList.h 18 Jul 2005 19:12:37 -0000 1.10 *************** *** 63,66 **** --- 63,72 ---- - (void) loadFormerPlayerStates; + /*! + @method playerIDsAsString + @abstract ids separated by | + */ + -(NSString*) playerIDsAsString; + - (NSString *) listName; - (void) setListName: (NSString *) newListName; *************** *** 126,128 **** --- 132,135 ---- - (BOOL) addPlayersWithIDs: (NSArray*) ids; + - (BOOL) removePlayersWithIDs: (NSArray*) ids; @end Index: Team.h =================================================================== RCS file: /cvsroot/macattrick/macattrick/Team.h,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** Team.h 3 Jul 2005 19:52:13 -0000 1.15 --- Team.h 18 Jul 2005 19:12:37 -0000 1.16 *************** *** 82,85 **** --- 82,86 ---- - (NSString *) teamName; + - (BOOL) saveUserDefinedPlayerLists: (NSString*) filename; - (NSMutableArray *) userDefinedPlayerLists; Index: PlayerList.m =================================================================== RCS file: /cvsroot/macattrick/macattrick/PlayerList.m,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** PlayerList.m 15 Jul 2005 18:29:31 -0000 1.11 --- PlayerList.m 18 Jul 2005 19:12:37 -0000 1.12 *************** *** 77,80 **** --- 77,94 ---- } + + -(NSString*) playerIDsAsString { + NSMutableString *str = [[NSMutableString alloc] init]; + NSEnumerator *en = [playerList objectEnumerator]; + Player *current = nil; + while(current = [en nextObject]) { + if([str length] > 0) { + [str appendString:@"|"]; + } + [str appendFormat:@"%d", [current playerID]]; + } + return str; + } + - (void) loadFormerPlayerStates { NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; *************** *** 125,128 **** --- 139,162 ---- } } + return YES; + } + + - (BOOL) removePlayersWithIDs: (NSArray*) ids { + PlayerList *mainList = [[Team currentTeam] allPlayersList]; + if(self == mainList) { + return NO; + } + else { + NSEnumerator *en = [ids objectEnumerator]; + NSNumber *currentID = nil; + while(currentID = [en nextObject]) { + int curId = [currentID intValue]; + Player *p = [self playerWithID:curId]; + if(p) { + [playerList removeObject:p] ; + } + } + } + return YES; } Index: PlayerTableController.m =================================================================== RCS file: /cvsroot/macattrick/macattrick/PlayerTableController.m,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** PlayerTableController.m 15 Jul 2005 18:29:31 -0000 1.8 --- PlayerTableController.m 18 Jul 2005 19:12:37 -0000 1.9 *************** *** 55,58 **** --- 55,59 ---- + - (NSView *) playerTableView { return playerTableView; } Index: Team.m =================================================================== RCS file: /cvsroot/macattrick/macattrick/Team.m,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** Team.m 3 Jul 2005 19:52:13 -0000 1.25 --- Team.m 18 Jul 2005 19:12:37 -0000 1.26 *************** *** 156,159 **** --- 156,174 ---- + - (BOOL) saveUserDefinedPlayerLists: (NSString*) filename { + NSMutableDictionary *dic = [[NSMutableDictionary alloc] init]; + NSEnumerator *en = [userDefinedPlayerLists objectEnumerator]; + PlayerList *current = nil; + while(current = [en nextObject]) { + if([dic objectForKey:[current listName]]) { + return NO; + } + NSString *ids = [current playerIDsAsString]; + [dic setObject:ids forKey:[current listName]]; + } + NSLog(filename); + return ([dic writeToFile:filename atomically:YES] == 0); + + } - (Economy *) economy { return economy; } |
|
From: Geisschaes <gei...@us...> - 2005-07-18 19:12:52
|
Update of /cvsroot/macattrick/macattrick/Macattrick.xcodeproj In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11790/Macattrick.xcodeproj Modified Files: project.pbxproj roman.mode1 roman.pbxuser Log Message: started saving userdefinedplayerlists Index: project.pbxproj =================================================================== RCS file: /cvsroot/macattrick/macattrick/Macattrick.xcodeproj/project.pbxproj,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** project.pbxproj 3 Jul 2005 19:52:16 -0000 1.2 --- project.pbxproj 18 Jul 2005 19:12:39 -0000 1.3 *************** *** 1517,1522 **** 3028FC0006FC93F1002DAE54 /* EconomyTest.h */, 3028FC0106FC93F1002DAE54 /* EconomyTest.m */, - 307D961E063DA831008E2586 /* TeamTest.h */, - 307D961F063DA831008E2586 /* TeamTest.m */, ); name = Club; --- 1517,1520 ---- *************** *** 1526,1529 **** --- 1524,1529 ---- isa = PBXGroup; children = ( + 307D961E063DA831008E2586 /* TeamTest.h */, + 307D961F063DA831008E2586 /* TeamTest.m */, 30609695079320AC00BAA4CF /* WorldTest.h */, 30609696079320AC00BAA4CF /* WorldTest.m */, *************** *** 3219,3223 **** PRODUCT_NAME = FastTests; SECTORDER_FLAGS = ""; ! SYMROOT = build/Development; WARNING_CFLAGS = "-Wmost"; ZERO_LINK = YES; --- 3219,3223 ---- PRODUCT_NAME = FastTests; SECTORDER_FLAGS = ""; ! SYMROOT = build; WARNING_CFLAGS = "-Wmost"; ZERO_LINK = YES; *************** *** 3244,3248 **** PRODUCT_NAME = FastTests; SECTORDER_FLAGS = ""; ! SYMROOT = build/Development; WARNING_CFLAGS = "-Wmost"; ZERO_LINK = NO; --- 3244,3248 ---- PRODUCT_NAME = FastTests; SECTORDER_FLAGS = ""; ! SYMROOT = build; WARNING_CFLAGS = "-Wmost"; ZERO_LINK = NO; *************** *** 3267,3271 **** PRODUCT_NAME = FastTests; SECTORDER_FLAGS = ""; ! SYMROOT = build/Development; WARNING_CFLAGS = "-Wmost"; }; --- 3267,3271 ---- PRODUCT_NAME = FastTests; SECTORDER_FLAGS = ""; ! SYMROOT = build; WARNING_CFLAGS = "-Wmost"; }; Index: roman.mode1 =================================================================== RCS file: /cvsroot/macattrick/macattrick/Macattrick.xcodeproj/roman.mode1,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** roman.mode1 15 Jul 2005 18:29:32 -0000 1.4 --- roman.mode1 18 Jul 2005 19:12:39 -0000 1.5 *************** *** 193,197 **** <string>30BFF5F50878005900CC3E0E</string> <key>PBXProjectModuleLabel</key> ! <string>PlayerList.m</string> <key>PBXSplitModuleInNavigatorKey</key> <dict> --- 193,197 ---- <string>30BFF5F50878005900CC3E0E</string> <key>PBXProjectModuleLabel</key> ! <string>Team.m</string> <key>PBXSplitModuleInNavigatorKey</key> <dict> *************** *** 201,229 **** <string>30BFF6050878402700CC3E0E</string> <key>PBXProjectModuleLabel</key> ! <string>PlayerList.m</string> <key>_historyCapacity</key> <integer>0</integer> <key>bookmark</key> ! <string>305EB2A808883770007A6071</string> <key>history</key> <array> <string>30BFF69D08784E1000CC3E0E</string> <string>30BFF6CC08786F5500CC3E0E</string> - <string>30BFF6CF08786F5500CC3E0E</string> <string>30BFF6D008786F5500CC3E0E</string> <string>30BFF7460878752F00CC3E0E</string> <string>30BFF76C087876DD00CC3E0E</string> - <string>305EB23E08881D1E007A6071</string> <string>305EB26E0888261A007A6071</string> <string>305EB26F0888261A007A6071</string> <string>305EB29D0888376F007A6071</string> <string>305EB29E0888376F007A6071</string> ! <string>305EB29F0888376F007A6071</string> ! <string>305EB2A00888376F007A6071</string> ! <string>305EB2A10888376F007A6071</string> ! </array> ! <key>nextStack</key> ! <array> ! <string>305EB2A50888376F007A6071</string> </array> <key>prevStack</key> --- 201,226 ---- <string>30BFF6050878402700CC3E0E</string> <key>PBXProjectModuleLabel</key> ! <string>Team.m</string> <key>_historyCapacity</key> <integer>0</integer> <key>bookmark</key> ! <string>30D32419088C364C0010BC3F</string> <key>history</key> <array> <string>30BFF69D08784E1000CC3E0E</string> <string>30BFF6CC08786F5500CC3E0E</string> <string>30BFF6D008786F5500CC3E0E</string> <string>30BFF7460878752F00CC3E0E</string> <string>30BFF76C087876DD00CC3E0E</string> <string>305EB26E0888261A007A6071</string> <string>305EB26F0888261A007A6071</string> <string>305EB29D0888376F007A6071</string> <string>305EB29E0888376F007A6071</string> ! <string>30D323BD088C26360010BC3F</string> ! <string>30D323BE088C26360010BC3F</string> ! <string>30D32411088C364C0010BC3F</string> ! <string>30D32412088C364C0010BC3F</string> ! <string>30D32413088C364C0010BC3F</string> ! <string>30D32414088C364C0010BC3F</string> </array> <key>prevStack</key> *************** *** 240,250 **** <string>30BFF7530878752F00CC3E0E</string> <string>30BFF76D087876DD00CC3E0E</string> - <string>305EB23F08881D1E007A6071</string> <string>305EB2720888261A007A6071</string> ! <string>305EB2730888261A007A6071</string> ! <string>305EB2740888261A007A6071</string> ! <string>305EB2A20888376F007A6071</string> ! <string>305EB2A30888376F007A6071</string> ! <string>305EB2A40888376F007A6071</string> </array> </dict> --- 237,249 ---- <string>30BFF7530878752F00CC3E0E</string> <string>30BFF76D087876DD00CC3E0E</string> <string>305EB2720888261A007A6071</string> ! <string>306949D508890EC0009C98DE</string> ! <string>30D323C0088C26360010BC3F</string> ! <string>30D323C1088C26360010BC3F</string> ! <string>30D323C2088C26360010BC3F</string> ! <string>30D32415088C364C0010BC3F</string> ! <string>30D32416088C364C0010BC3F</string> ! <string>30D32417088C364C0010BC3F</string> ! <string>30D32418088C364C0010BC3F</string> </array> </dict> *************** *** 258,266 **** <dict> <key>Frame</key> ! <string>{{0, 20}, {953, 710}}</string> <key>PBXModuleWindowStatusBarHidden2</key> <false/> <key>RubberWindowFrame</key> ! <string>308 81 953 751 0 0 1280 832 </string> </dict> </dict> --- 257,265 ---- <dict> <key>Frame</key> ! <string>{{0, 20}, {1157, 531}}</string> <key>PBXModuleWindowStatusBarHidden2</key> <false/> <key>RubberWindowFrame</key> ! <string>106 171 1157 572 0 0 1280 832 </string> </dict> </dict> *************** *** 335,339 **** --- 334,341 ---- <array> <string>29B97314FDCFA39411CA2CEA</string> + <string>080E96DDFE201D6D7F000001</string> <string>30BB2140067DC1CA00B1C71A</string> + <string>307D956A063D9208008E2586</string> + <string>30D78C0E0849E4A300112C09</string> <string>30B355F80690131C00571DE8</string> <string>1C37FBAC04509CD000000102</string> *************** *** 344,348 **** <array> <array> ! <integer>2</integer> <integer>0</integer> </array> --- 346,352 ---- <array> <array> ! <integer>26</integer> ! <integer>16</integer> ! <integer>15</integer> <integer>0</integer> </array> *************** *** 386,390 **** <string>1CE0B20306471E060097A5F4</string> <key>PBXProjectModuleLabel</key> ! <string>PlayerList.m</string> <key>PBXSplitModuleInNavigatorKey</key> <dict> --- 390,394 ---- <string>1CE0B20306471E060097A5F4</string> <key>PBXProjectModuleLabel</key> ! <string>TeamTest.m</string> <key>PBXSplitModuleInNavigatorKey</key> <dict> *************** *** 394,406 **** <string>1CE0B20406471E060097A5F4</string> <key>PBXProjectModuleLabel</key> ! <string>PlayerList.m</string> <key>_historyCapacity</key> <integer>0</integer> <key>bookmark</key> ! <string>305EB2A708883770007A6071</string> <key>history</key> <array> <string>30A82A69082EA48F003C97DB</string> - <string>30BE4841082FF1B600826659</string> <string>3067AFF10838D3E00063180D</string> <string>30D0C99C083915F700AFB5E5</string> --- 398,409 ---- <string>1CE0B20406471E060097A5F4</string> <key>PBXProjectModuleLabel</key> ! <string>TeamTest.m</string> <key>_historyCapacity</key> <integer>0</integer> <key>bookmark</key> ! <string>30D32410088C364C0010BC3F</string> <key>history</key> <array> <string>30A82A69082EA48F003C97DB</string> <string>3067AFF10838D3E00063180D</string> <string>30D0C99C083915F700AFB5E5</string> *************** *** 424,428 **** <string>30D78C1E0849E51200112C09</string> <string>30D78C1F0849E51200112C09</string> - <string>30D78C520849EA3B00112C09</string> <string>30D78C530849EA3B00112C09</string> <string>30D78C540849EA3B00112C09</string> --- 427,430 ---- *************** *** 483,504 **** <string>30963210086ED54100970F48</string> <string>30BFF6010878402700CC3E0E</string> - <string>30BFF69708784E1000CC3E0E</string> <string>30BFF6C208786F5500CC3E0E</string> - <string>30BFF6C308786F5500CC3E0E</string> - <string>30BFF6C508786F5500CC3E0E</string> <string>30BFF71C087872E000CC3E0E</string> <string>30BFF73C0878752F00CC3E0E</string> <string>30BFF766087876DD00CC3E0E</string> - <string>30BFF7820878786D00CC3E0E</string> <string>305EB2670888261A007A6071</string> <string>305EB2680888261A007A6071</string> - <string>305EB2940888376F007A6071</string> <string>305EB2950888376F007A6071</string> ! <string>305EB2960888376F007A6071</string> ! <string>305EB2970888376F007A6071</string> </array> <key>nextStack</key> <array> ! <string>305EB29B0888376F007A6071</string> </array> <key>prevStack</key> --- 485,509 ---- <string>30963210086ED54100970F48</string> <string>30BFF6010878402700CC3E0E</string> <string>30BFF6C208786F5500CC3E0E</string> <string>30BFF71C087872E000CC3E0E</string> <string>30BFF73C0878752F00CC3E0E</string> <string>30BFF766087876DD00CC3E0E</string> <string>305EB2670888261A007A6071</string> <string>305EB2680888261A007A6071</string> <string>305EB2950888376F007A6071</string> ! <string>306949DE08891194009C98DE</string> ! <string>30D323B3088C26360010BC3F</string> ! <string>30D323FE088C364C0010BC3F</string> ! <string>30D323FF088C364C0010BC3F</string> ! <string>30D32400088C364C0010BC3F</string> ! <string>30D32401088C364C0010BC3F</string> ! <string>30D32402088C364C0010BC3F</string> ! <string>30D32403088C364C0010BC3F</string> ! <string>30D32404088C364C0010BC3F</string> ! <string>30D32405088C364C0010BC3F</string> </array> <key>nextStack</key> <array> ! <string>30D3240F088C364C0010BC3F</string> </array> <key>prevStack</key> *************** *** 599,608 **** <string>30BFF709087871B300CC3E0E</string> <string>30BFF769087876DD00CC3E0E</string> ! <string>305EB26A0888261A007A6071</string> ! <string>305EB26B0888261A007A6071</string> ! <string>305EB26C0888261A007A6071</string> ! <string>305EB2980888376F007A6071</string> ! <string>305EB2990888376F007A6071</string> ! <string>305EB29A0888376F007A6071</string> </array> </dict> --- 604,622 ---- <string>30BFF709087871B300CC3E0E</string> <string>30BFF769087876DD00CC3E0E</string> ! <string>306949DF08891194009C98DE</string> ! <string>30D323B7088C26360010BC3F</string> ! <string>30D323B8088C26360010BC3F</string> ! <string>30D323B9088C26360010BC3F</string> ! <string>30D323BA088C26360010BC3F</string> ! <string>30D323BB088C26360010BC3F</string> ! <string>30D32406088C364C0010BC3F</string> ! <string>30D32407088C364C0010BC3F</string> ! <string>30D32408088C364C0010BC3F</string> ! <string>30D32409088C364C0010BC3F</string> ! <string>30D3240A088C364C0010BC3F</string> ! <string>30D3240B088C364C0010BC3F</string> ! <string>30D3240C088C364C0010BC3F</string> ! <string>30D3240D088C364C0010BC3F</string> ! <string>30D3240E088C364C0010BC3F</string> </array> </dict> *************** *** 662,668 **** <key>TableOfContents</key> <array> ! <string>305EB1F708881562007A6071</string> <string>1CE0B1FE06471DED0097A5F4</string> ! <string>305EB1F808881562007A6071</string> <string>1CE0B20306471E060097A5F4</string> <string>1CE0B20506471E060097A5F4</string> --- 676,682 ---- <key>TableOfContents</key> <array> ! <string>30D3239C088C1B880010BC3F</string> <string>1CE0B1FE06471DED0097A5F4</string> ! <string>30D3239D088C1B880010BC3F</string> <string>1CE0B20306471E060097A5F4</string> <string>1CE0B20506471E060097A5F4</string> *************** *** 800,807 **** <key>WindowOrderList</key> <array> <string>1C0AD2B3069F1EA900FABCE6</string> <string>/Users/roman/Documents/dev/macattrick/Macattrick.xcodeproj</string> <string>30A82A48082E9E83003C97DB</string> ! <string>30BFF5F50878005900CC3E0E</string> </array> <key>WindowString</key> --- 814,824 ---- <key>WindowOrderList</key> <array> + <string>30BE4823082FED6F00826659</string> + <string>30D32420088C364C0010BC3F</string> <string>1C0AD2B3069F1EA900FABCE6</string> + <string>30BFF5F50878005900CC3E0E</string> <string>/Users/roman/Documents/dev/macattrick/Macattrick.xcodeproj</string> <string>30A82A48082E9E83003C97DB</string> ! <string>1CD10A99069EF8BA00B06720</string> </array> <key>WindowString</key> *************** *** 827,831 **** <string>1CD0528F0623707200166675</string> <key>PBXProjectModuleLabel</key> ! <string>PlayerList.m</string> <key>StatusBarVisibility</key> <true/> --- 844,848 ---- <string>1CD0528F0623707200166675</string> <key>PBXProjectModuleLabel</key> ! <string>Team.m</string> <key>StatusBarVisibility</key> <true/> *************** *** 836,840 **** <string>{{0, 0}, {787, 290}}</string> <key>RubberWindowFrame</key> ! <string>402 120 787 699 0 0 1280 832 </string> </dict> <key>Module</key> --- 853,857 ---- <string>{{0, 0}, {787, 290}}</string> <key>RubberWindowFrame</key> ! <string>369 126 787 699 0 0 1280 832 </string> </dict> <key>Module</key> *************** *** 849,853 **** <dict> <key>PBXBuildLogShowsTranscriptDefaultKey</key> ! <string>{{0, 132}, {787, 231}}</string> <key>PBXProjectModuleGUID</key> <string>XCMainBuildResultsModuleGUID</string> --- 866,870 ---- <dict> <key>PBXBuildLogShowsTranscriptDefaultKey</key> ! <string>{{0, 124}, {787, 239}}</string> <key>PBXProjectModuleGUID</key> <string>XCMainBuildResultsModuleGUID</string> *************** *** 864,868 **** <string>{{0, 295}, {787, 363}}</string> <key>RubberWindowFrame</key> ! <string>402 120 787 699 0 0 1280 832 </string> </dict> <key>Module</key> --- 881,885 ---- <string>{{0, 295}, {787, 363}}</string> <key>RubberWindowFrame</key> ! <string>369 126 787 699 0 0 1280 832 </string> </dict> <key>Module</key> *************** *** 887,891 **** <array> <string>30A82A48082E9E83003C97DB</string> ! <string>305EB257088823E9007A6071</string> <string>1CD0528F0623707200166675</string> <string>XCMainBuildResultsModuleGUID</string> --- 904,908 ---- <array> <string>30A82A48082E9E83003C97DB</string> ! <string>30D323C4088C26360010BC3F</string> <string>1CD0528F0623707200166675</string> <string>XCMainBuildResultsModuleGUID</string> *************** *** 894,898 **** <string>xcode.toolbar.config.build</string> <key>WindowString</key> ! <string>402 120 787 699 0 0 1280 832 </string> <key>WindowToolGUID</key> <string>30A82A48082E9E83003C97DB</string> --- 911,915 ---- <string>xcode.toolbar.config.build</string> <key>WindowString</key> ! <string>369 126 787 699 0 0 1280 832 </string> <key>WindowToolGUID</key> <string>30A82A48082E9E83003C97DB</string> *************** *** 929,934 **** <key>sizes</key> <array> ! <string>{{0, 0}, {148, 224}}</string> ! <string>{{148, 0}, {1132, 224}}</string> </array> </dict> --- 946,951 ---- <key>sizes</key> <array> ! <string>{{0, 0}, {128, 219}}</string> ! <string>{{128, 0}, {1152, 219}}</string> </array> </dict> *************** *** 945,950 **** <key>sizes</key> <array> ! <string>{{0, 0}, {1280, 224}}</string> ! <string>{{0, 224}, {1280, 462}}</string> </array> </dict> --- 962,967 ---- <key>sizes</key> <array> ! <string>{{0, 0}, {1280, 219}}</string> ! <string>{{0, 219}, {1280, 467}}</string> </array> </dict> *************** *** 993,1004 **** <array> <string>1CD10A99069EF8BA00B06720</string> ! <string>30BFF7550878752F00CC3E0E</string> <string>1C162984064C10D400B95A72</string> ! <string>30BFF7560878752F00CC3E0E</string> ! <string>30BFF7570878752F00CC3E0E</string> ! <string>30BFF7580878752F00CC3E0E</string> ! <string>30BFF7590878752F00CC3E0E</string> ! <string>30BFF75A0878752F00CC3E0E</string> ! <string>30BFF75B0878752F00CC3E0E</string> </array> <key>ToolbarConfiguration</key> --- 1010,1021 ---- <array> <string>1CD10A99069EF8BA00B06720</string> ! <string>30D3241A088C364C0010BC3F</string> <string>1C162984064C10D400B95A72</string> ! <string>30D3241B088C364C0010BC3F</string> ! <string>30D3241C088C364C0010BC3F</string> ! <string>30D3241D088C364C0010BC3F</string> ! <string>30D3241E088C364C0010BC3F</string> ! <string>30D3241F088C364C0010BC3F</string> ! <string>30D32420088C364C0010BC3F</string> </array> <key>ToolbarConfiguration</key> *************** *** 1009,1013 **** <string>1CD10A99069EF8BA00B06720</string> <key>WindowToolIsVisible</key> ! <false/> </dict> <dict> --- 1026,1030 ---- <string>1CD10A99069EF8BA00B06720</string> <key>WindowToolIsVisible</key> ! <true/> </dict> <dict> *************** *** 1154,1158 **** <array> <string>30BE4823082FED6F00826659</string> ! <string>30BFF75C0878752F00CC3E0E</string> <string>1C78EAAC065D492600B07095</string> </array> --- 1171,1175 ---- <array> <string>30BE4823082FED6F00826659</string> ! <string>30D32421088C364C0010BC3F</string> <string>1C78EAAC065D492600B07095</string> </array> *************** *** 1199,1204 **** <key>sizes</key> <array> ! <string>{{0, 0}, {491, 168}}</string> ! <string>{{0, 173}, {491, 270}}</string> </array> </dict> --- 1216,1221 ---- <key>sizes</key> <array> ! <string>{{0, 0}, {367, 168}}</string> ! <string>{{0, 173}, {367, 270}}</string> </array> </dict> *************** *** 1226,1230 **** <string>{{0, 0}, {1095, 323}}</string> <key>RubberWindowFrame</key> ! <string>155 114 1095 364 0 0 1280 832 </string> </dict> <key>Module</key> --- 1243,1247 ---- <string>{{0, 0}, {1095, 323}}</string> <key>RubberWindowFrame</key> ! <string>168 64 1095 364 0 0 1280 832 </string> </dict> <key>Module</key> *************** *** 1249,1264 **** <array> <string>1C0AD2B3069F1EA900FABCE6</string> ! <string>305EB1FA08881562007A6071</string> <string>1CD0528B0623707200166675</string> ! <string>305EB1FB08881562007A6071</string> </array> <key>ToolbarConfiguration</key> <string>xcode.toolbar.config.run</string> <key>WindowString</key> ! <string>155 114 1095 364 0 0 1280 832 </string> <key>WindowToolGUID</key> <string>1C0AD2B3069F1EA900FABCE6</string> <key>WindowToolIsVisible</key> ! <false/> </dict> <dict> --- 1266,1281 ---- <array> <string>1C0AD2B3069F1EA900FABCE6</string> ! <string>30D323C5088C26360010BC3F</string> <string>1CD0528B0623707200166675</string> ! <string>30D323C6088C26360010BC3F</string> </array> <key>ToolbarConfiguration</key> <string>xcode.toolbar.config.run</string> <key>WindowString</key> ! <string>168 64 1095 364 0 0 1280 832 </string> <key>WindowToolGUID</key> <string>1C0AD2B3069F1EA900FABCE6</string> <key>WindowToolIsVisible</key> ! <true/> </dict> <dict> Index: roman.pbxuser =================================================================== RCS file: /cvsroot/macattrick/macattrick/Macattrick.xcodeproj/roman.pbxuser,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** roman.pbxuser 15 Jul 2005 18:29:33 -0000 1.4 --- roman.pbxuser 18 Jul 2005 19:12:39 -0000 1.5 *************** *** 40,45 **** activeBuildConfigurationName = Development; activeBuildStyle = 4A9504CCFFE6A4B311CA0CBA /* Development */; ! activeExecutable = 30744BA6069560A70039B82A /* Devel Macattrick */; ! activeTarget = 30744BA4069560A70039B82A /* Devel Macattrick */; addToTargets = ( 30950682067C4D100077C270 /* Macattrick */, --- 40,45 ---- activeBuildConfigurationName = Development; activeBuildStyle = 4A9504CCFFE6A4B311CA0CBA /* Development */; ! activeExecutable = 30425557083763A600DDF612 /* Ukrun */; [...1311 lines suppressed...] vrLen = 807; --- 4537,4541 ---- name = NS; rLen = 2; ! rLoc = 3824; rType = 0; vrLen = 807; *************** *** 4876,4880 **** name = "Team *temp ="; rLen = 12; ! rLoc = 5548; rType = 0; vrLen = 712; --- 5034,5038 ---- name = "Team *temp ="; rLen = 12; ! rLoc = 6099; rType = 0; vrLen = 712; |
|
From: Geisschaes <gei...@us...> - 2005-07-18 19:12:50
|
Update of /cvsroot/macattrick/macattrick/Test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11790/Test Modified Files: AllTests.m PlayerListTest.m TeamTest.m Log Message: started saving userdefinedplayerlists Index: PlayerListTest.m =================================================================== RCS file: /cvsroot/macattrick/macattrick/Test/PlayerListTest.m,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** PlayerListTest.m 3 Jul 2005 19:52:17 -0000 1.7 --- PlayerListTest.m 18 Jul 2005 19:12:40 -0000 1.8 *************** *** 47,51 **** - (void) testPlayerIDs { ! int ids[26]; int i; ids[0] = 16610740; ids[1] = 17108671;ids[2] = 17108672; ids[3] = 16418534; --- 47,51 ---- - (void) testPlayerIDs { ! int ids[26]; int i; ids[0] = 16610740; ids[1] = 17108671;ids[2] = 17108672; ids[3] = 16418534; *************** *** 67,71 **** } ! - (void)testDownload { --- 67,74 ---- } ! - (void) testPlayerIDsAsString { ! NSString *ids = [playerListLocal playerIDsAsString]; ! UKStringsEqual(ids, @"16610740|17108671|17108672|16418534|17108669|17108670|17108674|17108666|17108667|14507913|17108665|17108658|17108673|17108668|17108663|17108662|28283038|17108664|29021769|27332997|27200732|17108661|14417745|26936041|26465447|10589359"); ! } - (void)testDownload { Index: AllTests.m =================================================================== RCS file: /cvsroot/macattrick/macattrick/Test/AllTests.m,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** AllTests.m 9 May 2005 19:49:02 -0000 1.22 --- AllTests.m 18 Jul 2005 19:12:40 -0000 1.23 *************** *** 94,97 **** --- 94,98 ---- [[HattrickOrg uniqueInstance] setLoginName: [AllTests getProperty:@"login"] password:[AllTests getProperty:@"password"]]; [properties setObject:[NSString stringWithFormat:@"%@/Test/players.xml", [Properties libraryPath]] forKey:@"playersfile"]; + [properties setObject:[NSString stringWithFormat:@"%@/Test/playerlists.xml", [Properties libraryPath]] forKey:@"playerlistsfile"]; [properties setObject:[NSString stringWithFormat:@"%@/Test/positionsFile.xml", [Properties libraryPath]] forKey:@"positionsfile"]; [properties setObject:[NSString stringWithFormat:@"%@/Test/positionsFile1.xml", [Properties libraryPath]] forKey:@"positionsfile1"]; Index: TeamTest.m =================================================================== RCS file: /cvsroot/macattrick/macattrick/Test/TeamTest.m,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** TeamTest.m 27 Apr 2005 19:36:45 -0000 1.18 --- TeamTest.m 18 Jul 2005 19:12:40 -0000 1.19 *************** *** 52,55 **** --- 52,61 ---- } + -(void) testSaveCustomPlayerLists { + PlayerList *list = [[PlayerList alloc] initFromLocalFile]; + [[team userDefinedPlayerLists] addObject:list]; + NSLog([AllTests getProperty:@"playerlistsfile"]); + [team saveUserDefinedPlayerLists:[AllTests getProperty:@"playerlistsfile"]]; + } -(void) testCurrentTeam { |
|
From: Geisschaes <gei...@us...> - 2005-07-18 19:12:49
|
Update of /cvsroot/macattrick/macattrick/English.lproj/PlayerTableView.nib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11790/English.lproj/PlayerTableView.nib Modified Files: keyedobjects.nib Log Message: started saving userdefinedplayerlists Index: keyedobjects.nib =================================================================== RCS file: /cvsroot/macattrick/macattrick/English.lproj/PlayerTableView.nib/keyedobjects.nib,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 Binary files /tmp/cvsL09Ucr and /tmp/cvs800j2U differ |
|
From: Geisschaes <gei...@us...> - 2005-07-15 18:30:14
|
Update of /cvsroot/macattrick/macattrick/Macattrick.xcodeproj In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28554/Macattrick.xcodeproj Modified Files: roman.mode1 roman.pbxuser Log Message: dragging player into another list works for player table Index: roman.mode1 =================================================================== RCS file: /cvsroot/macattrick/macattrick/Macattrick.xcodeproj/roman.mode1,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** roman.mode1 3 Jul 2005 19:52:16 -0000 1.3 --- roman.mode1 15 Jul 2005 18:29:32 -0000 1.4 *************** *** 193,197 **** <string>30BFF5F50878005900CC3E0E</string> <key>PBXProjectModuleLabel</key> ! <string>Team.m</string> <key>PBXSplitModuleInNavigatorKey</key> <dict> --- 193,197 ---- <string>30BFF5F50878005900CC3E0E</string> <key>PBXProjectModuleLabel</key> ! <string>PlayerList.m</string> <key>PBXSplitModuleInNavigatorKey</key> <dict> *************** *** 201,284 **** <string>30BFF6050878402700CC3E0E</string> <key>PBXProjectModuleLabel</key> ! <string>Team.m</string> <key>_historyCapacity</key> <integer>0</integer> <key>bookmark</key> ! <string>30BFF7900878786E00CC3E0E</string> <key>history</key> <array> <string>30BFF69D08784E1000CC3E0E</string> <string>30BFF6CC08786F5500CC3E0E</string> - <string>30BFF6CE08786F5500CC3E0E</string> <string>30BFF6CF08786F5500CC3E0E</string> <string>30BFF6D008786F5500CC3E0E</string> - <string>30BFF7440878752F00CC3E0E</string> <string>30BFF7460878752F00CC3E0E</string> <string>30BFF76C087876DD00CC3E0E</string> ! <string>30BFF7870878786D00CC3E0E</string> ! <string>30BFF7880878786D00CC3E0E</string> ! <string>30BFF7890878786D00CC3E0E</string> ! <string>30BFF77E0878785E00CC3E0E</string> </array> <key>prevStack</key> <array> <string>30BFF6080878402700CC3E0E</string> - <string>30BFF60A0878402700CC3E0E</string> - <string>30BFF60C0878402700CC3E0E</string> - <string>30BFF60E0878402700CC3E0E</string> - <string>30BFF6100878402700CC3E0E</string> <string>30BFF62D087843A400CC3E0E</string> <string>30BFF62E087843A400CC3E0E</string> <string>30BFF62F087843A400CC3E0E</string> - <string>30BFF648087844D100CC3E0E</string> - <string>30BFF649087844D100CC3E0E</string> - <string>30BFF64A087844D100CC3E0E</string> - <string>30BFF66B08784B0000CC3E0E</string> <string>30BFF66C08784B0000CC3E0E</string> <string>30BFF66D08784B0000CC3E0E</string> - <string>30BFF66E08784B0000CC3E0E</string> - <string>30BFF66F08784B0000CC3E0E</string> - <string>30BFF67908784B1400CC3E0E</string> - <string>30BFF69F08784E1000CC3E0E</string> <string>30BFF6A008784E1000CC3E0E</string> <string>30BFF6A108784E1000CC3E0E</string> - <string>30BFF6A208784E1000CC3E0E</string> - <string>30BFF6A308784E1000CC3E0E</string> - <string>30BFF6D308786F5500CC3E0E</string> - <string>30BFF6D408786F5500CC3E0E</string> - <string>30BFF6D508786F5500CC3E0E</string> - <string>30BFF6D608786F5500CC3E0E</string> - <string>30BFF6D708786F5500CC3E0E</string> - <string>30BFF6D808786F5500CC3E0E</string> - <string>30BFF6D908786F5500CC3E0E</string> - <string>30BFF6DA08786F5500CC3E0E</string> - <string>30BFF6DB08786F5500CC3E0E</string> <string>30BFF6DC08786F5500CC3E0E</string> - <string>30BFF6DD08786F5500CC3E0E</string> - <string>30BFF6DE08786F5500CC3E0E</string> - <string>30BFF6DF08786F5500CC3E0E</string> - <string>30BFF6E008786F5500CC3E0E</string> - <string>30BFF6F00878704D00CC3E0E</string> - <string>30BFF6F10878704D00CC3E0E</string> - <string>30BFF6F20878704D00CC3E0E</string> - <string>30BFF6F8087870AF00CC3E0E</string> - <string>30BFF7100878722300CC3E0E</string> - <string>30BFF7480878752F00CC3E0E</string> - <string>30BFF7490878752F00CC3E0E</string> - <string>30BFF74A0878752F00CC3E0E</string> - <string>30BFF74B0878752F00CC3E0E</string> - <string>30BFF74C0878752F00CC3E0E</string> - <string>30BFF74D0878752F00CC3E0E</string> - <string>30BFF74E0878752F00CC3E0E</string> - <string>30BFF74F0878752F00CC3E0E</string> - <string>30BFF7500878752F00CC3E0E</string> - <string>30BFF7510878752F00CC3E0E</string> - <string>30BFF7520878752F00CC3E0E</string> <string>30BFF7530878752F00CC3E0E</string> <string>30BFF76D087876DD00CC3E0E</string> ! <string>30BFF78A0878786D00CC3E0E</string> ! <string>30BFF78B0878786D00CC3E0E</string> ! <string>30BFF78C0878786D00CC3E0E</string> ! <string>30BFF78D0878786D00CC3E0E</string> </array> </dict> --- 201,250 ---- <string>30BFF6050878402700CC3E0E</string> <key>PBXProjectModuleLabel</key> ! <string>PlayerList.m</string> <key>_historyCapacity</key> <integer>0</integer> <key>bookmark</key> ! <string>305EB2A808883770007A6071</string> <key>history</key> <array> <string>30BFF69D08784E1000CC3E0E</string> <string>30BFF6CC08786F5500CC3E0E</string> <string>30BFF6CF08786F5500CC3E0E</string> <string>30BFF6D008786F5500CC3E0E</string> <string>30BFF7460878752F00CC3E0E</string> <string>30BFF76C087876DD00CC3E0E</string> ! <string>305EB23E08881D1E007A6071</string> ! <string>305EB26E0888261A007A6071</string> ! <string>305EB26F0888261A007A6071</string> ! <string>305EB29D0888376F007A6071</string> ! <string>305EB29E0888376F007A6071</string> ! <string>305EB29F0888376F007A6071</string> ! <string>305EB2A00888376F007A6071</string> ! <string>305EB2A10888376F007A6071</string> ! </array> ! <key>nextStack</key> ! <array> ! <string>305EB2A50888376F007A6071</string> </array> <key>prevStack</key> <array> <string>30BFF6080878402700CC3E0E</string> <string>30BFF62D087843A400CC3E0E</string> <string>30BFF62E087843A400CC3E0E</string> <string>30BFF62F087843A400CC3E0E</string> <string>30BFF66C08784B0000CC3E0E</string> <string>30BFF66D08784B0000CC3E0E</string> <string>30BFF6A008784E1000CC3E0E</string> <string>30BFF6A108784E1000CC3E0E</string> <string>30BFF6DC08786F5500CC3E0E</string> <string>30BFF7530878752F00CC3E0E</string> <string>30BFF76D087876DD00CC3E0E</string> ! <string>305EB23F08881D1E007A6071</string> ! <string>305EB2720888261A007A6071</string> ! <string>305EB2730888261A007A6071</string> ! <string>305EB2740888261A007A6071</string> ! <string>305EB2A20888376F007A6071</string> ! <string>305EB2A30888376F007A6071</string> ! <string>305EB2A40888376F007A6071</string> </array> </dict> *************** *** 296,300 **** <false/> <key>RubberWindowFrame</key> ! <string>95 43 953 751 0 0 1280 832 </string> </dict> </dict> --- 262,266 ---- <false/> <key>RubberWindowFrame</key> ! <string>308 81 953 751 0 0 1280 832 </string> </dict> </dict> *************** *** 369,373 **** <array> <string>29B97314FDCFA39411CA2CEA</string> - <string>080E96DDFE201D6D7F000001</string> <string>30BB2140067DC1CA00B1C71A</string> <string>30B355F80690131C00571DE8</string> --- 335,338 ---- *************** *** 379,384 **** <array> <array> ! <integer>13</integer> ! <integer>8</integer> <integer>0</integer> </array> --- 344,348 ---- <array> <array> ! <integer>2</integer> <integer>0</integer> </array> *************** *** 404,408 **** </array> <key>RubberWindowFrame</key> ! <string>162 133 1041 675 0 0 1280 832 </string> </dict> <key>Module</key> --- 368,372 ---- </array> <key>RubberWindowFrame</key> ! <string>161 134 1041 675 0 0 1280 832 </string> </dict> <key>Module</key> *************** *** 422,426 **** <string>1CE0B20306471E060097A5F4</string> <key>PBXProjectModuleLabel</key> ! <string>PlayerTableController.m</string> <key>PBXSplitModuleInNavigatorKey</key> <dict> --- 386,390 ---- <string>1CE0B20306471E060097A5F4</string> <key>PBXProjectModuleLabel</key> ! <string>PlayerList.m</string> <key>PBXSplitModuleInNavigatorKey</key> <dict> *************** *** 430,442 **** <string>1CE0B20406471E060097A5F4</string> <key>PBXProjectModuleLabel</key> ! <string>PlayerTableController.m</string> <key>_historyCapacity</key> <integer>0</integer> <key>bookmark</key> ! <string>30BFF78F0878786E00CC3E0E</string> <key>history</key> <array> <string>30A82A69082EA48F003C97DB</string> - <string>30BE47FB082FED0200826659</string> <string>30BE4841082FF1B600826659</string> <string>3067AFF10838D3E00063180D</string> --- 394,405 ---- <string>1CE0B20406471E060097A5F4</string> <key>PBXProjectModuleLabel</key> ! <string>PlayerList.m</string> <key>_historyCapacity</key> <integer>0</integer> <key>bookmark</key> ! <string>305EB2A708883770007A6071</string> <key>history</key> <array> <string>30A82A69082EA48F003C97DB</string> <string>30BE4841082FF1B600826659</string> <string>3067AFF10838D3E00063180D</string> *************** *** 483,487 **** <string>30F01DEA084BA0B0009C068B</string> <string>309D54C9084E1FB80035A2BA</string> - <string>309D54CB084E1FB80035A2BA</string> <string>309D54F8084E21970035A2BA</string> <string>309D5578084E512B0035A2BA</string> --- 446,449 ---- *************** *** 526,536 **** <string>30BFF6C508786F5500CC3E0E</string> <string>30BFF71C087872E000CC3E0E</string> - <string>30BFF71E087872E000CC3E0E</string> <string>30BFF73C0878752F00CC3E0E</string> - <string>30BFF73D0878752F00CC3E0E</string> <string>30BFF766087876DD00CC3E0E</string> - <string>30BFF7810878786D00CC3E0E</string> <string>30BFF7820878786D00CC3E0E</string> ! <string>30BFF7830878786D00CC3E0E</string> </array> <key>prevStack</key> --- 488,504 ---- <string>30BFF6C508786F5500CC3E0E</string> <string>30BFF71C087872E000CC3E0E</string> <string>30BFF73C0878752F00CC3E0E</string> <string>30BFF766087876DD00CC3E0E</string> <string>30BFF7820878786D00CC3E0E</string> ! <string>305EB2670888261A007A6071</string> ! <string>305EB2680888261A007A6071</string> ! <string>305EB2940888376F007A6071</string> ! <string>305EB2950888376F007A6071</string> ! <string>305EB2960888376F007A6071</string> ! <string>305EB2970888376F007A6071</string> ! </array> ! <key>nextStack</key> ! <array> ! <string>305EB29B0888376F007A6071</string> </array> <key>prevStack</key> *************** *** 593,597 **** <string>30FA0568084A119F0005E57E</string> <string>30FA05AF084A17FF0005E57E</string> - <string>30FA05B1084A17FF0005E57E</string> <string>30FA05B3084A17FF0005E57E</string> <string>30FA05B7084A17FF0005E57E</string> --- 561,564 ---- *************** *** 626,653 **** <string>309229080868898900C1568B</string> <string>30BFF6030878402700CC3E0E</string> - <string>30BFF626087843A400CC3E0E</string> - <string>30BFF627087843A400CC3E0E</string> - <string>30BFF66608784B0000CC3E0E</string> <string>30BFF69908784E1000CC3E0E</string> <string>30BFF69A08784E1000CC3E0E</string> <string>30BFF6C708786F5500CC3E0E</string> - <string>30BFF6C808786F5500CC3E0E</string> - <string>30BFF6C908786F5500CC3E0E</string> - <string>30BFF6CA08786F5500CC3E0E</string> - <string>30BFF6EA0878704D00CC3E0E</string> <string>30BFF6EB0878704D00CC3E0E</string> - <string>30BFF707087871B300CC3E0E</string> - <string>30BFF708087871B300CC3E0E</string> <string>30BFF709087871B300CC3E0E</string> - <string>30BFF71F087872E000CC3E0E</string> - <string>30BFF720087872E000CC3E0E</string> - <string>30BFF721087872E000CC3E0E</string> - <string>30BFF722087872E000CC3E0E</string> - <string>30BFF73F0878752F00CC3E0E</string> - <string>30BFF7400878752F00CC3E0E</string> <string>30BFF769087876DD00CC3E0E</string> ! <string>30BFF76A087876DD00CC3E0E</string> ! <string>30BFF7840878786D00CC3E0E</string> ! <string>30BFF7850878786D00CC3E0E</string> </array> </dict> --- 593,608 ---- <string>309229080868898900C1568B</string> <string>30BFF6030878402700CC3E0E</string> <string>30BFF69908784E1000CC3E0E</string> <string>30BFF69A08784E1000CC3E0E</string> <string>30BFF6C708786F5500CC3E0E</string> <string>30BFF6EB0878704D00CC3E0E</string> <string>30BFF709087871B300CC3E0E</string> <string>30BFF769087876DD00CC3E0E</string> ! <string>305EB26A0888261A007A6071</string> ! <string>305EB26B0888261A007A6071</string> ! <string>305EB26C0888261A007A6071</string> ! <string>305EB2980888376F007A6071</string> ! <string>305EB2990888376F007A6071</string> ! <string>305EB29A0888376F007A6071</string> </array> </dict> *************** *** 663,667 **** <string>{{0, 0}, {775, 380}}</string> <key>RubberWindowFrame</key> ! <string>162 133 1041 675 0 0 1280 832 </string> </dict> <key>Module</key> --- 618,622 ---- <string>{{0, 0}, {775, 380}}</string> <key>RubberWindowFrame</key> ! <string>161 134 1041 675 0 0 1280 832 </string> </dict> <key>Module</key> *************** *** 683,687 **** <string>{{0, 385}, {775, 249}}</string> <key>RubberWindowFrame</key> ! <string>162 133 1041 675 0 0 1280 832 </string> </dict> <key>Module</key> --- 638,642 ---- <string>{{0, 385}, {775, 249}}</string> <key>RubberWindowFrame</key> ! <string>161 134 1041 675 0 0 1280 832 </string> </dict> <key>Module</key> *************** *** 707,713 **** <key>TableOfContents</key> <array> ! <string>30BFF5E50877FFC900CC3E0E</string> <string>1CE0B1FE06471DED0097A5F4</string> ! <string>30BFF5E60877FFC900CC3E0E</string> <string>1CE0B20306471E060097A5F4</string> <string>1CE0B20506471E060097A5F4</string> --- 662,668 ---- <key>TableOfContents</key> <array> ! <string>305EB1F708881562007A6071</string> <string>1CE0B1FE06471DED0097A5F4</string> ! <string>305EB1F808881562007A6071</string> <string>1CE0B20306471E060097A5F4</string> <string>1CE0B20506471E060097A5F4</string> *************** *** 845,862 **** <key>WindowOrderList</key> <array> - <string>30BFF75D0878752F00CC3E0E</string> - <string>30BFF75E0878752F00CC3E0E</string> - <string>30BE4823082FED6F00826659</string> - <string>1CD10A99069EF8BA00B06720</string> - <string>30BFF75B0878752F00CC3E0E</string> - <string>1C0AD2AF069F1E9B00FABCE6</string> - <string>30A82A48082E9E83003C97DB</string> - <string>/Users/roman/Documents/dev/macattrick/Macattrick.xcodeproj</string> <string>1C0AD2B3069F1EA900FABCE6</string> ! <string>1C530D57069F1CE1000CFCEE</string> <string>30BFF5F50878005900CC3E0E</string> </array> <key>WindowString</key> ! <string>162 133 1041 675 0 0 1280 832 </string> <key>WindowTools</key> <array> --- 800,810 ---- <key>WindowOrderList</key> <array> <string>1C0AD2B3069F1EA900FABCE6</string> ! <string>/Users/roman/Documents/dev/macattrick/Macattrick.xcodeproj</string> ! <string>30A82A48082E9E83003C97DB</string> <string>30BFF5F50878005900CC3E0E</string> </array> <key>WindowString</key> ! <string>161 134 1041 675 0 0 1280 832 </string> <key>WindowTools</key> <array> *************** *** 879,883 **** <string>1CD0528F0623707200166675</string> <key>PBXProjectModuleLabel</key> ! <string>Team.m</string> <key>StatusBarVisibility</key> <true/> --- 827,831 ---- <string>1CD0528F0623707200166675</string> <key>PBXProjectModuleLabel</key> ! <string>PlayerList.m</string> <key>StatusBarVisibility</key> <true/> *************** *** 888,892 **** <string>{{0, 0}, {787, 290}}</string> <key>RubberWindowFrame</key> ! <string>402 97 787 699 0 0 1280 832 </string> </dict> <key>Module</key> --- 836,840 ---- <string>{{0, 0}, {787, 290}}</string> <key>RubberWindowFrame</key> ! <string>402 120 787 699 0 0 1280 832 </string> </dict> <key>Module</key> *************** *** 901,905 **** <dict> <key>PBXBuildLogShowsTranscriptDefaultKey</key> ! <string>{{0, 140}, {787, 223}}</string> <key>PBXProjectModuleGUID</key> <string>XCMainBuildResultsModuleGUID</string> --- 849,853 ---- <dict> <key>PBXBuildLogShowsTranscriptDefaultKey</key> ! <string>{{0, 132}, {787, 231}}</string> <key>PBXProjectModuleGUID</key> <string>XCMainBuildResultsModuleGUID</string> *************** *** 916,920 **** <string>{{0, 295}, {787, 363}}</string> <key>RubberWindowFrame</key> ! <string>402 97 787 699 0 0 1280 832 </string> </dict> <key>Module</key> --- 864,868 ---- <string>{{0, 295}, {787, 363}}</string> <key>RubberWindowFrame</key> ! <string>402 120 787 699 0 0 1280 832 </string> </dict> <key>Module</key> *************** *** 939,943 **** <array> <string>30A82A48082E9E83003C97DB</string> ! <string>30BFF5FF08783F1100CC3E0E</string> <string>1CD0528F0623707200166675</string> <string>XCMainBuildResultsModuleGUID</string> --- 887,891 ---- <array> <string>30A82A48082E9E83003C97DB</string> ! <string>305EB257088823E9007A6071</string> <string>1CD0528F0623707200166675</string> <string>XCMainBuildResultsModuleGUID</string> *************** *** 946,954 **** <string>xcode.toolbar.config.build</string> <key>WindowString</key> ! <string>402 97 787 699 0 0 1280 832 </string> <key>WindowToolGUID</key> <string>30A82A48082E9E83003C97DB</string> <key>WindowToolIsVisible</key> ! <false/> </dict> <dict> --- 894,902 ---- <string>xcode.toolbar.config.build</string> <key>WindowString</key> ! <string>402 120 787 699 0 0 1280 832 </string> <key>WindowToolGUID</key> <string>30A82A48082E9E83003C97DB</string> <key>WindowToolIsVisible</key> ! <true/> </dict> <dict> *************** *** 1251,1256 **** <key>sizes</key> <array> ! <string>{{0, 0}, {367, 168}}</string> ! <string>{{0, 173}, {367, 270}}</string> </array> </dict> --- 1199,1204 ---- <key>sizes</key> <array> ! <string>{{0, 0}, {491, 168}}</string> ! <string>{{0, 173}, {491, 270}}</string> </array> </dict> *************** *** 1301,1307 **** <array> <string>1C0AD2B3069F1EA900FABCE6</string> ! <string>30BFF5E70877FFC900CC3E0E</string> <string>1CD0528B0623707200166675</string> ! <string>30BFF5E80877FFC900CC3E0E</string> </array> <key>ToolbarConfiguration</key> --- 1249,1255 ---- <array> <string>1C0AD2B3069F1EA900FABCE6</string> ! <string>305EB1FA08881562007A6071</string> <string>1CD0528B0623707200166675</string> ! <string>305EB1FB08881562007A6071</string> </array> <key>ToolbarConfiguration</key> *************** *** 1312,1316 **** <string>1C0AD2B3069F1EA900FABCE6</string> <key>WindowToolIsVisible</key> ! <true/> </dict> <dict> --- 1260,1264 ---- <string>1C0AD2B3069F1EA900FABCE6</string> <key>WindowToolIsVisible</key> ! <false/> </dict> <dict> Index: roman.pbxuser =================================================================== RCS file: /cvsroot/macattrick/macattrick/Macattrick.xcodeproj/roman.pbxuser,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** roman.pbxuser 3 Jul 2005 19:52:16 -0000 1.3 --- roman.pbxuser 15 Jul 2005 18:29:33 -0000 1.4 *************** *** 199,203 **** ); }; ! PBXPerProjectTemplateStateSaveDate = 142081983; PBXPrepackagedSmartGroups_v2 = ( { --- 199,203 ---- ); }; ! PBXPerProjectTemplateStateSaveDate = 143136086; PBXPrepackagedSmartGroups_v2 = ( [...1569 lines suppressed...] ! sepNavVisRect = "{{0, 281}, {728, 348}}"; sepNavWindowFrame = "{{53, 139}, {750, 534}}"; }; *************** *** 5397,5410 **** vrLoc = 4701; }; - 30FA05B1084A17FF0005E57E /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 3041B58B06F623640055CB6D /* PlayerList.m */; - name = "PlayerList.m: 145"; - rLen = 61; - rLoc = 7268; - rType = 0; - vrLen = 808; - vrLoc = 2200; - }; 30FA05B3084A17FF0005E57E /* PBXTextBookmark */ = { isa = PBXTextBookmark; --- 4871,4874 ---- |
|
From: Geisschaes <gei...@us...> - 2005-07-15 18:30:13
|
Update of /cvsroot/macattrick/macattrick In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28554 Modified Files: PlayerList.h PlayerList.m PlayerListsViewController.m PlayerTableController.m Log Message: dragging player into another list works for player table Index: PlayerListsViewController.m =================================================================== RCS file: /cvsroot/macattrick/macattrick/PlayerListsViewController.m,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** PlayerListsViewController.m 3 Jul 2005 19:52:13 -0000 1.1 --- PlayerListsViewController.m 15 Jul 2005 18:29:31 -0000 1.2 *************** *** 38,41 **** --- 38,42 ---- [self setPlayerLists: [[Team currentTeam] userDefinedPlayerLists]]; [NSBundle loadNibNamed:@"PlayerListsView" owner: self]; + [tableView registerForDraggedTypes:[NSArray arrayWithObject:NSDragPboard]]; } return self; *************** *** 73,76 **** --- 74,89 ---- } + // drag & drop + + + - (NSDragOperation)tableView:(NSTableView*)tv validateDrop:(id <NSDraggingInfo>)info proposedRow:(int)row proposedDropOperation:(NSTableViewDropOperation)op { + return NSDragOperationCopy; + } + - (BOOL)tableView:(NSTableView*)tv acceptDrop:(id <NSDraggingInfo>)info row:(int)row dropOperation:(NSTableViewDropOperation)op { + NSArray *playerIDs = [[info draggingPasteboard] propertyListForType:NSDragPboard]; + PlayerList *toDrop = [playerLists objectAtIndex:row]; + [toDrop addPlayersWithIDs: playerIDs]; + return YES; + } @end Index: PlayerList.m =================================================================== RCS file: /cvsroot/macattrick/macattrick/PlayerList.m,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** PlayerList.m 3 Jul 2005 19:52:13 -0000 1.10 --- PlayerList.m 15 Jul 2005 18:29:31 -0000 1.11 *************** *** 28,31 **** --- 28,32 ---- #import "PlayerList.h" + #import "Team.h" @interface PlayerList (Private) *************** *** 106,110 **** } ! - (void) loadStatesFromFormerPlayerList: (PlayerList*) formerPlayerList date: (NSString*) date{ --- 107,129 ---- } ! - (BOOL) addPlayersWithIDs: (NSArray*) ids { ! PlayerList *mainList = [[Team currentTeam] allPlayersList]; ! if(self == mainList) { ! return NO; ! } ! else { ! NSEnumerator *en = [ids objectEnumerator]; ! NSNumber *currentID = nil; ! while(currentID = [en nextObject]) { ! int curId = [currentID intValue]; ! if([self playerWithID:curId] == nil) { ! Player *p = [mainList playerWithID:curId]; ! if(p) { ! [playerList addObject:p] ; ! } ! } ! } ! } ! } - (void) loadStatesFromFormerPlayerList: (PlayerList*) formerPlayerList date: (NSString*) date{ Index: PlayerTableController.m =================================================================== RCS file: /cvsroot/macattrick/macattrick/PlayerTableController.m,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** PlayerTableController.m 12 Jun 2005 16:01:13 -0000 1.7 --- PlayerTableController.m 15 Jul 2005 18:29:31 -0000 1.8 *************** *** 46,49 **** --- 46,50 ---- [playerTable setTarget:self]; [playerTable setDoubleAction:@selector(doubleClicked)]; + [playerTable registerForDraggedTypes:[NSArray arrayWithObject:NSDragPboard]]; positiveDifferenceColor = [NSColor greenColor]; differenceFontSize = 9; *************** *** 94,97 **** --- 95,113 ---- } + // drag and drop + - (BOOL)tableView:(NSTableView *)tv writeRows:(NSArray*)row toPasteboard:(NSPasteboard*)pboard { + [pboard declareTypes:[NSArray arrayWithObject:NSDragPboard] owner:self]; + NSArray *draggedPlayers = [playerListController selectedObjects]; + NSMutableArray *playerIDs = [NSMutableArray arrayWithCapacity:[draggedPlayers count]]; + Player *current = nil; + NSEnumerator *en = [draggedPlayers objectEnumerator]; + while(current = [en nextObject]) { + [playerIDs addObject:[NSNumber numberWithInt:[current playerID]]]; + } + + [pboard setPropertyList:playerIDs forType:NSDragPboard]; + return YES; + } + @end Index: PlayerList.h =================================================================== RCS file: /cvsroot/macattrick/macattrick/PlayerList.h,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** PlayerList.h 3 Jul 2005 19:52:13 -0000 1.8 --- PlayerList.h 15 Jul 2005 18:29:31 -0000 1.9 *************** *** 125,128 **** - (double) averageAge; ! @end --- 125,128 ---- - (double) averageAge; ! - (BOOL) addPlayersWithIDs: (NSArray*) ids; @end |
|
From: Geisschaes <gei...@us...> - 2005-07-15 18:30:12
|
Update of /cvsroot/macattrick/macattrick/English.lproj/PlayerTableView.nib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28554/English.lproj/PlayerTableView.nib Modified Files: info.nib keyedobjects.nib Log Message: dragging player into another list works for player table Index: info.nib =================================================================== RCS file: /cvsroot/macattrick/macattrick/English.lproj/PlayerTableView.nib/info.nib,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** info.nib 3 Jul 2005 19:52:15 -0000 1.13 --- info.nib 15 Jul 2005 18:29:32 -0000 1.14 *************** *** 17,21 **** </array> <key>IBSystem Version</key> ! <string>8B15</string> </dict> </plist> --- 17,21 ---- </array> <key>IBSystem Version</key> ! <string>8C46</string> </dict> </plist> Index: keyedobjects.nib =================================================================== RCS file: /cvsroot/macattrick/macattrick/English.lproj/PlayerTableView.nib/keyedobjects.nib,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 Binary files /tmp/cvsq3mC4w and /tmp/cvsuYZxoQ differ |
|
From: Geisschaes <gei...@us...> - 2005-07-15 18:29:42
|
Update of /cvsroot/macattrick/macattrick/English.lproj/PlayerListsView.nib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28554/English.lproj/PlayerListsView.nib Modified Files: info.nib keyedobjects.nib Log Message: dragging player into another list works for player table Index: info.nib =================================================================== RCS file: /cvsroot/macattrick/macattrick/English.lproj/PlayerListsView.nib/info.nib,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** info.nib 3 Jul 2005 19:52:15 -0000 1.1 --- info.nib 15 Jul 2005 18:29:32 -0000 1.2 *************** *** 8,12 **** <dict> <key>6</key> ! <string>555 283 182 509 0 0 1280 832 </string> </dict> <key>IBFramework Version</key> --- 8,12 ---- <dict> <key>6</key> ! <string>549 313 182 509 0 0 1280 832 </string> </dict> <key>IBFramework Version</key> *************** *** 17,21 **** </array> <key>IBSystem Version</key> ! <string>8B15</string> </dict> </plist> --- 17,21 ---- </array> <key>IBSystem Version</key> ! <string>8C46</string> </dict> </plist> Index: keyedobjects.nib =================================================================== RCS file: /cvsroot/macattrick/macattrick/English.lproj/PlayerListsView.nib/keyedobjects.nib,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Binary files /tmp/cvsGYMvpZ and /tmp/cvs8N8BCh differ |
Update of /cvsroot/macattrick/macattrick In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21944 Modified Files: MainWindowController.h MainWindowController.m PlayerList.h PlayerList.m Team.h Team.m Added Files: PlayerListsViewController.h PlayerListsViewController.m Log Message: started to implement user defined player lists, currently in a drawer --- NEW FILE: PlayerListsViewController.h --- //---- license ---------------------------------------------------------------// // // // Macattrick: a Manager Assistant Tool for the online Game Hattrick.org // // Copyright (C) 2004 Roman Bertolami // // // // this file is part of Macattrick application // // http://sourceforge.net/macattrick // // // // Macattrick is free software; you can redistribute it and/or // // modify it under the terms of the GNU General Public License // // as published by the Free Software Foundation; either version 2 // // of the License, or (at your option) any later version. // // // // Macattrick is distributed in the hope that it will be useful, // // but WITHOUT ANY WARRANTY; without even the implied warranty of // // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // // GNU General Public License for more details. // // // // You should have received a copy of the GNU General Public License // // along with this program; if not, write to the Free Software // // Foundation, Inc., 59 Temple Place - Suite 330, // // Boston, MA 02111-1307, USA. // // // // Macattrick, Copyright (C) 2004 Roman Bertolami // // Macattrick comes with ABSOLUTELY NO WARRANTY! // // // //---- eo licence ------------------------------------------------------------// #import <Cocoa/Cocoa.h> @interface PlayerListsViewController : NSObject { NSMutableArray *playerLists; IBOutlet NSView *playerListsView; IBOutlet NSTableView *tableView; IBOutlet NSArrayController *playerListsArrayController; } - (IBAction) clicked: (id) sender; - (NSMutableArray *) playerLists; - (void) setPlayerLists: (NSMutableArray *) newPlayerLists; - (NSView *) playerListsView; - (void) setPlayerListsView: (NSView *) newPlayerListsView; - (NSTableView *) tableView; - (void) setTableView: (NSTableView *) newTableView; @end Index: MainWindowController.m =================================================================== RCS file: /cvsroot/macattrick/macattrick/MainWindowController.m,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** MainWindowController.m 18 Jan 2005 21:05:45 -0000 1.8 --- MainWindowController.m 3 Jul 2005 19:52:13 -0000 1.9 *************** *** 46,49 **** --- 46,57 ---- - (Team *) team { return team; } + - (NSDrawer *) playerListsDrawer { return playerListsDrawer; } + - (void) setPlayerListsDrawer: (NSDrawer *) newPlayerListsDrawer { + [newPlayerListsDrawer retain]; + [playerListsDrawer release]; + playerListsDrawer = newPlayerListsDrawer; + } + + //Toolbar *************** *** 92,96 **** --- 100,108 ---- positionsController = [[PositionsController alloc] init]; lineUpController = [[LineUpController alloc] init]; + playerListsViewController = [[PlayerListsViewController alloc] init]; + [playerListsDrawer setContentView:[playerListsViewController playerListsView]]; + [playerListsDrawer open]; [self setupToolbar]; + int startPanel = [[NSUserDefaults standardUserDefaults] integerForKey:@"startPanel"]; if(startPanel == 0) {[self showTeamInfo];} Index: PlayerList.h =================================================================== RCS file: /cvsroot/macattrick/macattrick/PlayerList.h,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** PlayerList.h 30 May 2005 19:59:59 -0000 1.7 --- PlayerList.h 3 Jul 2005 19:52:13 -0000 1.8 *************** *** 37,40 **** --- 37,41 ---- */ @interface PlayerList : NSObject { + NSString *listName; NSMutableArray* playerList; *************** *** 46,49 **** --- 47,51 ---- } + -(PlayerList*) initWithListName:(NSString*) aListName; /*! *************** *** 57,64 **** @abstract init a new PlayerList using the playerFile of Properties */ ! - (PlayerList*) init; - (void) loadFormerPlayerStates; /*! @method playerList --- 59,69 ---- @abstract init a new PlayerList using the playerFile of Properties */ ! - (PlayerList*) initFromLocalFile; - (void) loadFormerPlayerStates; + - (NSString *) listName; + - (void) setListName: (NSString *) newListName; + /*! @method playerList Index: MainWindowController.h =================================================================== RCS file: /cvsroot/macattrick/macattrick/MainWindowController.h,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** MainWindowController.h 4 Jan 2005 18:23:29 -0000 1.5 --- MainWindowController.h 3 Jul 2005 19:52:13 -0000 1.6 *************** *** 33,36 **** --- 33,37 ---- #import "TeamInfoController.h" #import "Team.h" + #import "PlayerListsViewController.h" @interface MainWindowController : NSWindowController *************** *** 41,45 **** --- 42,50 ---- PositionsController *positionsController; PlayerTableController *playerTableController; + PlayerListsViewController *playerListsViewController; + IBOutlet NSDrawer *playerListsDrawer; } + - (NSDrawer *) playerListsDrawer; + - (void) setPlayerListsDrawer: (NSDrawer *) newPlayerListsDrawer; -(void)setTeam: (Team*) team; --- NEW FILE: PlayerListsViewController.m --- //---- license ---------------------------------------------------------------// // // // Macattrick: a Manager Assistant Tool for the online Game Hattrick.org // // Copyright (C) 2004 Roman Bertolami // // // // this file is part of Macattrick application // // http://sourceforge.net/macattrick // // // // Macattrick is free software; you can redistribute it and/or // // modify it under the terms of the GNU General Public License // // as published by the Free Software Foundation; either version 2 // // of the License, or (at your option) any later version. // // // // Macattrick is distributed in the hope that it will be useful, // // but WITHOUT ANY WARRANTY; without even the implied warranty of // // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // // GNU General Public License for more details. // // // // You should have received a copy of the GNU General Public License // // along with this program; if not, write to the Free Software // // Foundation, Inc., 59 Temple Place - Suite 330, // // Boston, MA 02111-1307, USA. // // // // Macattrick, Copyright (C) 2004 Roman Bertolami // // Macattrick comes with ABSOLUTELY NO WARRANTY! // // // //---- eo licence ------------------------------------------------------------// #import "PlayerListsViewController.h" #import "Team.h" @implementation PlayerListsViewController - (id) init { self = [super init]; if(self) { [self setPlayerLists: [[Team currentTeam] userDefinedPlayerLists]]; [NSBundle loadNibNamed:@"PlayerListsView" owner: self]; } return self; } - (IBAction) clicked: (id) sender { NSArray *selected = [playerListsArrayController selectedObjects]; if([selected count]>0) { [[Team currentTeam] setPlayerList: [selected objectAtIndex:0]]; } } - (NSMutableArray *) playerLists { return playerLists; } - (void) setPlayerLists: (NSMutableArray *) newPlayerLists { [newPlayerLists retain]; [playerLists release]; playerLists = newPlayerLists; } - (NSView *) playerListsView { return playerListsView; } - (void) setPlayerListsView: (NSView *) newPlayerListsView { [newPlayerListsView retain]; [playerListsView release]; playerListsView = newPlayerListsView; } - (NSTableView *) tableView { return tableView; } - (void) setTableView: (NSTableView *) newTableView { [newTableView retain]; [tableView release]; tableView = newTableView; } @end Index: Team.h =================================================================== RCS file: /cvsroot/macattrick/macattrick/Team.h,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** Team.h 20 Jan 2005 20:46:01 -0000 1.14 --- Team.h 3 Jul 2005 19:52:13 -0000 1.15 *************** *** 53,56 **** --- 53,58 ---- League* league; PlayerList* playerList; + NSMutableArray *userDefinedPlayerLists; + PlayerList *allPlayersList; Economy* economy; Arena* arena; *************** *** 62,66 **** } - /*! @method init --- 64,67 ---- *************** *** 81,84 **** --- 82,92 ---- - (NSString *) teamName; + + - (NSMutableArray *) userDefinedPlayerLists; + + - (PlayerList *) allPlayersList; + - (void) setAllPlayersList: (PlayerList *) newAllPlayersList; + + /*! @method homepage *************** *** 111,119 **** - (User *) user; ! /*! ! @method playerList ! @abstract accessor to the the player list ! */ ! - (PlayerList *)playerList; --- 119,125 ---- - (User *) user; ! - (PlayerList *) playerList; ! - (void) setPlayerList: (PlayerList *) newPlayerList; ! Index: PlayerList.m =================================================================== RCS file: /cvsroot/macattrick/macattrick/PlayerList.m,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** PlayerList.m 21 Jun 2005 17:44:50 -0000 1.9 --- PlayerList.m 3 Jul 2005 19:52:13 -0000 1.10 *************** *** 39,42 **** --- 39,57 ---- // Constructor + -(PlayerList*) init { + self = [super init]; + if(self) { + playerList = [[NSMutableArray alloc] init]; + formerDates = [[NSMutableArray alloc] init]; + [self setListName:NSLocalizedString(@"New List", @"New List")]; + } + return self; + } + - (PlayerList*) initFromLocalFile;{ + NSURL *url = [[NSURL alloc] initFileURLWithPath: [Properties playersFile]]; + self = [[PlayerList alloc] initFromXML: url]; + [url release]; + return self; + } - (PlayerList*) initFromXML: (NSURL*) url { *************** *** 56,59 **** --- 71,75 ---- } } + [self setListName:NSLocalizedString(@"Team", @"Team")]; } return self; *************** *** 83,86 **** --- 99,111 ---- + - (NSString *) listName { return listName; } + - (void) setListName: (NSString *) newListName { + [newListName retain]; + [listName release]; + listName = newListName; + } + + + - (void) loadStatesFromFormerPlayerList: (PlayerList*) formerPlayerList date: (NSString*) date{ NSEnumerator *en = [[self playerList] objectEnumerator]; *************** *** 95,104 **** } ! - (PlayerList*) init{ ! NSURL *url = [[NSURL alloc] initFileURLWithPath: [Properties playersFile]]; ! self = [[PlayerList alloc] initFromXML: url]; ! [url release]; ! return self; ! } - (NSArray *)playersWithInjured: (BOOL) injured diqualified: (BOOL) disqualified { --- 120,124 ---- } ! - (NSArray *)playersWithInjured: (BOOL) injured diqualified: (BOOL) disqualified { Index: Team.m =================================================================== RCS file: /cvsroot/macattrick/macattrick/Team.m,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** Team.m 21 Jun 2005 17:44:50 -0000 1.24 --- Team.m 3 Jul 2005 19:52:13 -0000 1.25 *************** *** 39,42 **** --- 39,43 ---- - (void) setNumberOfUndefeated: (int) newNumberOfUndefeated; - (void) setLogo: (NSImage *) newLogo; + - (void) setUserDefinedPlayerLists: (NSMutableArray *) newUserDefinedPlayerLists; @end *************** *** 64,68 **** return nil; } ! playerList = [[PlayerList alloc] init]; [playerList loadFormerPlayerStates]; arena = [[Arena alloc] init]; --- 65,69 ---- return nil; } ! playerList = [[PlayerList alloc] initFromLocalFile]; [playerList loadFormerPlayerStates]; arena = [[Arena alloc] init]; *************** *** 73,76 **** --- 74,80 ---- } [url release]; + userDefinedPlayerLists = [[NSMutableArray alloc] init]; + [userDefinedPlayerLists addObject: playerList]; + [self setAllPlayersList:playerList]; } return self; *************** *** 79,82 **** --- 83,92 ---- // Accessors + - (PlayerList *) allPlayersList { return allPlayersList; } + - (void) setAllPlayersList: (PlayerList *) newAllPlayersList{ + [newAllPlayersList retain]; + [allPlayersList release]; + allPlayersList = newAllPlayersList; + } *************** *** 97,100 **** --- 107,118 ---- } + - (NSMutableArray *) userDefinedPlayerLists { return userDefinedPlayerLists; } + - (void) setUserDefinedPlayerLists: (NSMutableArray *) newUserDefinedPlayerLists { + [newUserDefinedPlayerLists retain]; + [userDefinedPlayerLists release]; + userDefinedPlayerLists = newUserDefinedPlayerLists; + } + + - (NSURL *) homepage { return homepage; } *************** *** 130,134 **** ! - (PlayerList *)playerList { return playerList; } - (Economy *) economy { return economy; } --- 148,159 ---- ! - (PlayerList *) playerList { return playerList; } ! - (void) setPlayerList: (PlayerList *) newPlayerList { ! [newPlayerList retain]; ! [playerList release]; ! playerList = newPlayerList; ! } ! ! - (Economy *) economy { return economy; } *************** *** 142,153 **** - (Club *) club { return club; } ! - (void) dealloc { ! [playerList release]; ! [economy release]; ! [arena release]; ! [training release]; ! [league release]; ! [super dealloc]; ! } + (Team*) currentTeam { --- 167,171 ---- - (Club *) club { return club; } ! + (Team*) currentTeam { *************** *** 200,203 **** --- 218,236 ---- currentStringValue = nil; } + - (void) dealloc { + [teamName release]; + [homepage release]; + [logo release]; + [user release]; + [league release]; + [playerList release]; + [userDefinedPlayerLists release]; + [economy release]; + [arena release]; + [training release]; + [club release]; + [super dealloc]; + } + |
