Skip to content

Commit

Permalink
fixed problem instantiating mom with array of nils
Browse files Browse the repository at this point in the history
  • Loading branch information
@reborg
reborg committed Jan 22, 2010
1 parent 364b714 commit 2c2e147
Show file tree
Hide file tree
Showing 10 changed files with 1,526 additions and 437 deletions.
252 changes: 199 additions & 53 deletions English.lproj/MainMenu.nib/designable.nib
View file

Large diffs are not rendered by default.

Binary file modified English.lproj/MainMenu.nib/keyedobjects.nib
View file
Binary file not shown.
16 changes: 12 additions & 4 deletions PomodoriXCode.xcodeproj/project.pbxproj
View file
Expand Up @@ -42,12 +42,14 @@
8F3929D410E670FB001A66EE /* Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 8F3929D310E670FB001A66EE /* Info.plist */; };
8F545BC110E7AAB6009FE4FC /* application_delegate.rb in Resources */ = {isa = PBXBuildFile; fileRef = 8F545BBD10E7AAB6009FE4FC /* application_delegate.rb */; };
8F545BC210E7AAB6009FE4FC /* menu_bar.rb in Resources */ = {isa = PBXBuildFile; fileRef = 8F545BBE10E7AAB6009FE4FC /* menu_bar.rb */; };
8F545BC310E7AAB6009FE4FC /* persistence.rb in Resources */ = {isa = PBXBuildFile; fileRef = 8F545BBF10E7AAB6009FE4FC /* persistence.rb */; };
8F545BC410E7AAB6009FE4FC /* rb_main.rb in Resources */ = {isa = PBXBuildFile; fileRef = 8F545BC010E7AAB6009FE4FC /* rb_main.rb */; };
8F545BC710E7AAC0009FE4FC /* pomodori_controller.rb in Resources */ = {isa = PBXBuildFile; fileRef = 8F545BC510E7AAC0009FE4FC /* pomodori_controller.rb */; };
8F545BC810E7AAC0009FE4FC /* timer_controller.rb in Resources */ = {isa = PBXBuildFile; fileRef = 8F545BC610E7AAC0009FE4FC /* timer_controller.rb */; };
8F545BCA10E7AACF009FE4FC /* pomodoro.rb in Resources */ = {isa = PBXBuildFile; fileRef = 8F545BC910E7AACF009FE4FC /* pomodoro.rb */; };
8F77F52F10CFA8E20098077A /* Pomodori.xcdatamodel in Sources */ = {isa = PBXBuildFile; fileRef = 8F77F52E10CFA8E20098077A /* Pomodori.xcdatamodel */; };
8FFE6F4C1109B54700E0EE8E /* persistent_object.rb in Resources */ = {isa = PBXBuildFile; fileRef = 8FFE6F4B1109B54700E0EE8E /* persistent_object.rb */; };
8FFE6F4E1109B55B00E0EE8E /* persistence.rb in Resources */ = {isa = PBXBuildFile; fileRef = 8FFE6F4D1109B55B00E0EE8E /* persistence.rb */; };
8FFE6F581109B7AE00E0EE8E /* todo.xib in Resources */ = {isa = PBXBuildFile; fileRef = 8FFE6F571109B7AE00E0EE8E /* todo.xib */; };
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
Expand All @@ -74,12 +76,14 @@
8F3929D310E670FB001A66EE /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
8F545BBD10E7AAB6009FE4FC /* application_delegate.rb */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.ruby; name = application_delegate.rb; path = app/application_delegate.rb; sourceTree = "<group>"; };
8F545BBE10E7AAB6009FE4FC /* menu_bar.rb */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.ruby; name = menu_bar.rb; path = app/menu_bar.rb; sourceTree = "<group>"; };
8F545BBF10E7AAB6009FE4FC /* persistence.rb */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.ruby; name = persistence.rb; path = app/persistence.rb; sourceTree = "<group>"; };
8F545BC010E7AAB6009FE4FC /* rb_main.rb */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.ruby; name = rb_main.rb; path = app/rb_main.rb; sourceTree = "<group>"; };
8F545BC510E7AAC0009FE4FC /* pomodori_controller.rb */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.ruby; name = pomodori_controller.rb; path = app/controllers/pomodori_controller.rb; sourceTree = "<group>"; };
8F545BC610E7AAC0009FE4FC /* timer_controller.rb */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.ruby; name = timer_controller.rb; path = app/controllers/timer_controller.rb; sourceTree = "<group>"; };
8F545BC910E7AACF009FE4FC /* pomodoro.rb */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.ruby; name = pomodoro.rb; path = app/models/pomodoro.rb; sourceTree = "<group>"; };
8F77F52E10CFA8E20098077A /* Pomodori.xcdatamodel */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = wrapper.xcdatamodel; path = Pomodori.xcdatamodel; sourceTree = "<group>"; };
8FFE6F4B1109B54700E0EE8E /* persistent_object.rb */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.ruby; name = persistent_object.rb; path = app/models/persistent_object.rb; sourceTree = "<group>"; };
8FFE6F4D1109B55B00E0EE8E /* persistence.rb */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.ruby; name = persistence.rb; path = app/models/persistence.rb; sourceTree = "<group>"; };
8FFE6F571109B7AE00E0EE8E /* todo.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = todo.xib; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand Down Expand Up @@ -133,6 +137,7 @@
29B97323FDCFA39411CA2CEA /* Frameworks */,
19C28FACFE9D520D11CA2CBB /* Products */,
8F77F52E10CFA8E20098077A /* Pomodori.xcdatamodel */,
8FFE6F571109B7AE00E0EE8E /* todo.xib */,
);
name = PomodoriXCode;
sourceTree = "<group>";
Expand Down Expand Up @@ -160,7 +165,6 @@
children = (
8F545BBD10E7AAB6009FE4FC /* application_delegate.rb */,
8F545BBE10E7AAB6009FE4FC /* menu_bar.rb */,
8F545BBF10E7AAB6009FE4FC /* persistence.rb */,
8F545BC010E7AAB6009FE4FC /* rb_main.rb */,
8F39299310E66C1D001A66EE /* views */,
8F39299210E66C0C001A66EE /* controllers */,
Expand All @@ -172,6 +176,8 @@
8F39299110E66C07001A66EE /* models */ = {
isa = PBXGroup;
children = (
8FFE6F4D1109B55B00E0EE8E /* persistence.rb */,
8FFE6F4B1109B54700E0EE8E /* persistent_object.rb */,
8F545BC910E7AACF009FE4FC /* pomodoro.rb */,
);
name = models;
Expand Down Expand Up @@ -252,11 +258,13 @@
8F3929D410E670FB001A66EE /* Info.plist in Resources */,
8F545BC110E7AAB6009FE4FC /* application_delegate.rb in Resources */,
8F545BC210E7AAB6009FE4FC /* menu_bar.rb in Resources */,
8F545BC310E7AAB6009FE4FC /* persistence.rb in Resources */,
8F545BC410E7AAB6009FE4FC /* rb_main.rb in Resources */,
8F545BC710E7AAC0009FE4FC /* pomodori_controller.rb in Resources */,
8F545BC810E7AAC0009FE4FC /* timer_controller.rb in Resources */,
8F545BCA10E7AACF009FE4FC /* pomodoro.rb in Resources */,
8FFE6F4C1109B54700E0EE8E /* persistent_object.rb in Resources */,
8FFE6F4E1109B55B00E0EE8E /* persistence.rb in Resources */,
8FFE6F581109B7AE00E0EE8E /* todo.xib in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down
95 changes: 56 additions & 39 deletions PomodoriXCode.xcodeproj/reborg.mode1v3
View file
Expand Up @@ -229,8 +229,6 @@
<key>Layout</key>
<array>
<dict>
<key>BecomeActive</key>
<true/>
<key>ContentConfiguration</key>
<dict>
<key>PBXBottomSmartGroupGIDs</key>
Expand Down Expand Up @@ -266,12 +264,15 @@
<key>PBXSmartGroupTreeModuleOutlineStateExpansionKey</key>
<array>
<string>29B97314FDCFA39411CA2CEA</string>
<string>8F39299010E66BFF001A66EE</string>
<string>8F39299210E66C0C001A66EE</string>
<string>8F39299110E66C07001A66EE</string>
<string>1C37FABC05509CD000000102</string>
<string>1CC0EA4004350EF90041110B</string>
</array>
<key>PBXSmartGroupTreeModuleOutlineStateSelectionKey</key>
<array>
<array>
<integer>8</integer>
<integer>0</integer>
</array>
</array>
Expand Down Expand Up @@ -323,15 +324,20 @@
<key>_historyCapacity</key>
<integer>0</integer>
<key>bookmark</key>
<string>8F02B3A910F7548900571353</string>
<string>8FFE6FA31109C0FC00E0EE8E</string>
<key>history</key>
<array>
<string>8F5E838310CD1582007D0DF1</string>
<string>8F545BB210E7A0B4009FE4FC</string>
<string>8F545BF110E7AC34009FE4FC</string>
<string>8F545BF210E7AC34009FE4FC</string>
<string>8F61F30010F34DA800443913</string>
<string>8F02B3A810F7548900571353</string>
<string>8FFE6F9C1109C0FC00E0EE8E</string>
<string>8FFE6F9D1109C0FC00E0EE8E</string>
<string>8FFE6F9E1109C0FC00E0EE8E</string>
<string>8FFE6F9F1109C0FC00E0EE8E</string>
<string>8FFE6FA01109C0FC00E0EE8E</string>
<string>8FFE6FA11109C0FC00E0EE8E</string>
<string>8FFE6FA21109C0FC00E0EE8E</string>
</array>
</dict>
<key>SplitCount</key>
Expand All @@ -343,16 +349,18 @@
<key>GeometryConfiguration</key>
<dict>
<key>Frame</key>
<string>{{0, 0}, {721, 157}}</string>
<string>{{0, 0}, {721, 259}}</string>
<key>RubberWindowFrame</key>
<string>323 157 1003 637 0 0 1440 878 </string>
</dict>
<key>Module</key>
<string>PBXNavigatorGroup</string>
<key>Proportion</key>
<string>157pt</string>
<string>259pt</string>
</dict>
<dict>
<key>BecomeActive</key>
<true/>
<key>ContentConfiguration</key>
<dict>
<key>PBXProjectModuleGUID</key>
Expand All @@ -363,14 +371,14 @@
<key>GeometryConfiguration</key>
<dict>
<key>Frame</key>
<string>{{0, 162}, {721, 434}}</string>
<string>{{0, 264}, {721, 332}}</string>
<key>RubberWindowFrame</key>
<string>323 157 1003 637 0 0 1440 878 </string>
</dict>
<key>Module</key>
<string>XCDetailModule</string>
<key>Proportion</key>
<string>434pt</string>
<string>332pt</string>
</dict>
</array>
<key>Proportion</key>
Expand All @@ -389,9 +397,9 @@
</array>
<key>TableOfContents</key>
<array>
<string>8F02B3AA10F7548900571353</string>
<string>8FFE6FA41109C0FC00E0EE8E</string>
<string>1CE0B1FE06471DED0097A5F4</string>
<string>8F02B3AB10F7548900571353</string>
<string>8FFE6FA51109C0FC00E0EE8E</string>
<string>1CE0B20306471E060097A5F4</string>
<string>1CE0B20506471E060097A5F4</string>
</array>
Expand Down Expand Up @@ -529,8 +537,13 @@
<integer>5</integer>
<key>WindowOrderList</key>
<array>
<string>8F02B3AD10F7548900571353</string>
<string>8FFE6FA61109C0FC00E0EE8E</string>
<string>8FFE6F6F1109BEBD00E0EE8E</string>
<string>8FFE6FA71109C0FC00E0EE8E</string>
<string>8FFE6FA81109C0FC00E0EE8E</string>
<string>1CD10A99069EF8BA00B06720</string>
<string>8FF139A9109A86DB00D5E494</string>
<string>1C78EAAD065D492600B07095</string>
<string>/Users/reborg/Documents/projects/my/pomodori/PomodoriXCode.xcodeproj</string>
</array>
<key>WindowString</key>
Expand Down Expand Up @@ -572,6 +585,8 @@
<string>198pt</string>
</dict>
<dict>
<key>BecomeActive</key>
<true/>
<key>ContentConfiguration</key>
<dict>
<key>PBXProjectModuleGUID</key>
Expand Down Expand Up @@ -611,7 +626,7 @@
<key>TableOfContents</key>
<array>
<string>8FF139A9109A86DB00D5E494</string>
<string>8F02B3AC10F7548900571353</string>
<string>8FFE6F3A1109B45500E0EE8E</string>
<string>1CD0528F0623707200166675</string>
<string>XCMainBuildResultsModuleGUID</string>
</array>
Expand Down Expand Up @@ -733,13 +748,13 @@
<key>TableOfContents</key>
<array>
<string>1CD10A99069EF8BA00B06720</string>
<string>8F61F2F910F34DA600443913</string>
<string>8FFE6F681109BEBD00E0EE8E</string>
<string>1C162984064C10D400B95A72</string>
<string>8F61F2FA10F34DA600443913</string>
<string>8F61F2FB10F34DA600443913</string>
<string>8F61F2FC10F34DA600443913</string>
<string>8F61F2FD10F34DA600443913</string>
<string>8F61F2FE10F34DA600443913</string>
<string>8FFE6F691109BEBD00E0EE8E</string>
<string>8FFE6F6A1109BEBD00E0EE8E</string>
<string>8FFE6F6B1109BEBD00E0EE8E</string>
<string>8FFE6F6C1109BEBD00E0EE8E</string>
<string>8FFE6F6D1109BEBD00E0EE8E</string>
</array>
<key>ToolbarConfiguration</key>
<string>xcode.toolbar.config.debugV3</string>
Expand Down Expand Up @@ -878,18 +893,18 @@
<key>GeometryConfiguration</key>
<dict>
<key>Frame</key>
<string>{{0, 0}, {876, 207}}</string>
<string>{{0, 0}, {1331, 230}}</string>
<key>RubberWindowFrame</key>
<string>20 593 876 248 0 0 1440 878 </string>
<string>44 72 1331 271 0 0 1440 878 </string>
</dict>
<key>Module</key>
<string>PBXDebugCLIModule</string>
<key>Proportion</key>
<string>207pt</string>
<string>230pt</string>
</dict>
</array>
<key>Proportion</key>
<string>207pt</string>
<string>230pt</string>
</dict>
</array>
<key>Name</key>
Expand All @@ -903,17 +918,17 @@
<key>TableOfContents</key>
<array>
<string>1C78EAAD065D492600B07095</string>
<string>8F61F2FF10F34DA600443913</string>
<string>8FFE6F6E1109BEBD00E0EE8E</string>
<string>1C78EAAC065D492600B07095</string>
</array>
<key>ToolbarConfiguration</key>
<string>xcode.toolbar.config.consoleV3</string>
<key>WindowString</key>
<string>20 593 876 248 0 0 1440 878 </string>
<string>44 72 1331 271 0 0 1440 878 </string>
<key>WindowToolGUID</key>
<string>1C78EAAD065D492600B07095</string>
<key>WindowToolIsVisible</key>
<false/>
<true/>
</dict>
<dict>
<key>Identifier</key>
Expand Down Expand Up @@ -1050,18 +1065,18 @@
<string>743 379 452 308 0 0 1280 1002 </string>
</dict>
<dict>
<key>FirstTimeWindowDisplayed</key>
<false/>
<key>Identifier</key>
<string>windowTool.breakpoints</string>
<key>IsVertical</key>
<integer>0</integer>
<false/>
<key>Layout</key>
<array>
<dict>
<key>Dock</key>
<array>
<dict>
<key>BecomeActive</key>
<integer>1</integer>
<key>ContentConfiguration</key>
<dict>
<key>PBXBottomSmartGroupGIDs</key>
Expand Down Expand Up @@ -1103,7 +1118,7 @@
<key>PBXTopSmartGroupGIDs</key>
<array/>
<key>XCIncludePerspectivesSwitch</key>
<integer>0</integer>
<false/>
</dict>
<key>GeometryConfiguration</key>
<dict>
Expand All @@ -1115,14 +1130,16 @@
<real>168</real>
</array>
<key>RubberWindowFrame</key>
<string>315 424 744 409 0 0 1440 878 </string>
<string>368 344 744 409 0 0 1440 878 </string>
</dict>
<key>Module</key>
<string>PBXSmartGroupTreeModule</string>
<key>Proportion</key>
<string>185pt</string>
</dict>
<dict>
<key>BecomeActive</key>
<true/>
<key>ContentConfiguration</key>
<dict>
<key>PBXProjectModuleGUID</key>
Expand All @@ -1135,7 +1152,7 @@
<key>Frame</key>
<string>{{190, 0}, {554, 368}}</string>
<key>RubberWindowFrame</key>
<string>315 424 744 409 0 0 1440 878 </string>
<string>368 344 744 409 0 0 1440 878 </string>
</dict>
<key>Module</key>
<string>XCDetailModule</string>
Expand All @@ -1159,22 +1176,22 @@
<string>XCDetailModule</string>
</array>
<key>StatusbarIsVisible</key>
<integer>1</integer>
<true/>
<key>TableOfContents</key>
<array>
<string>1CDDB66807F98D9800BB5817</string>
<string>1CDDB66907F98D9800BB5817</string>
<string>8FFE6F6F1109BEBD00E0EE8E</string>
<string>8FFE6F701109BEBD00E0EE8E</string>
<string>1CE0B1FE06471DED0097A5F4</string>
<string>1CA1AED706398EBD00589147</string>
</array>
<key>ToolbarConfiguration</key>
<string>xcode.toolbar.config.breakpointsV3</string>
<key>WindowString</key>
<string>315 424 744 409 0 0 1440 878 </string>
<string>368 344 744 409 0 0 1440 878 </string>
<key>WindowToolGUID</key>
<string>1CDDB66807F98D9800BB5817</string>
<string>8FFE6F6F1109BEBD00E0EE8E</string>
<key>WindowToolIsVisible</key>
<integer>1</integer>
<false/>
</dict>
<dict>
<key>Identifier</key>
Expand Down

0 comments on commit 2c2e147

Please sign in to comment.