You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by to...@apache.org on 2006/08/27 23:56:06 UTC
svn commit: r437466 [1/3] - in
/incubator/cayenne/sandbox/CocoaCayenne/CAYClient: ./ CAYClient.xcodeproj/
English.lproj/MainMenu.nib/
Author: torehalset
Date: Sun Aug 27 14:56:04 2006
New Revision: 437466
URL: http://svn.apache.org/viewvc?rev=437466&view=rev
Log:
faults (at least toMany) are working :)
gui updated to list paintings for an artist
Modified:
incubator/cayenne/sandbox/CocoaCayenne/CAYClient/Artist.m
incubator/cayenne/sandbox/CocoaCayenne/CAYClient/CAYClient.xcodeproj/halset.mode1
incubator/cayenne/sandbox/CocoaCayenne/CAYClient/CAYClient.xcodeproj/halset.pbxuser
incubator/cayenne/sandbox/CocoaCayenne/CAYClient/CAYClientObjRelationship.h
incubator/cayenne/sandbox/CocoaCayenne/CAYClient/CAYClientObjRelationship.m
incubator/cayenne/sandbox/CocoaCayenne/CAYClient/CAYDataMap.m
incubator/cayenne/sandbox/CocoaCayenne/CAYClient/CAYEntityResolver.h
incubator/cayenne/sandbox/CocoaCayenne/CAYClient/CAYEntityResolver.m
incubator/cayenne/sandbox/CocoaCayenne/CAYClient/CAYFault.h
incubator/cayenne/sandbox/CocoaCayenne/CAYClient/CAYFault.m
incubator/cayenne/sandbox/CocoaCayenne/CAYClient/CAYHessianConnection.m
incubator/cayenne/sandbox/CocoaCayenne/CAYClient/CAYObjEntity.h
incubator/cayenne/sandbox/CocoaCayenne/CAYClient/CAYObjEntity.m
incubator/cayenne/sandbox/CocoaCayenne/CAYClient/CAYObjectContext.m
incubator/cayenne/sandbox/CocoaCayenne/CAYClient/CAYPersistentObject.h
incubator/cayenne/sandbox/CocoaCayenne/CAYClient/CAYPersistentObject.m
incubator/cayenne/sandbox/CocoaCayenne/CAYClient/CAYQueryMessage.h
incubator/cayenne/sandbox/CocoaCayenne/CAYClient/CAYQueryMessage.m
incubator/cayenne/sandbox/CocoaCayenne/CAYClient/CAYToManyFault.m
incubator/cayenne/sandbox/CocoaCayenne/CAYClient/CAYToOneFault.m
incubator/cayenne/sandbox/CocoaCayenne/CAYClient/English.lproj/MainMenu.nib/keyedobjects.nib
incubator/cayenne/sandbox/CocoaCayenne/CAYClient/Painting.h
incubator/cayenne/sandbox/CocoaCayenne/CAYClient/Painting.m
Modified: incubator/cayenne/sandbox/CocoaCayenne/CAYClient/Artist.m
URL: http://svn.apache.org/viewvc/incubator/cayenne/sandbox/CocoaCayenne/CAYClient/Artist.m?rev=437466&r1=437465&r2=437466&view=diff
==============================================================================
--- incubator/cayenne/sandbox/CocoaCayenne/CAYClient/Artist.m (original)
+++ incubator/cayenne/sandbox/CocoaCayenne/CAYClient/Artist.m Sun Aug 27 14:56:04 2006
@@ -7,7 +7,7 @@
//
#import "Artist.h"
-
+#import "CAYFault.h"
@implementation Artist
@@ -50,7 +50,14 @@
-(NSArray *)paintings
{
- // TODO: create a fault here? or resolve it?
+ id val = [values objectForKey:@"paintings"];
+ if([val isKindOfClass:[CAYFault class]])
+ {
+ CAYFault *fault = (CAYFault *)val;
+ NSLog(@"resolve fault %@", fault);
+ val = [fault resolveFault];
+ [values setValue:val forKey:@"paintings"];
+ }
return [values objectForKey:@"paintings"];
}
Modified: incubator/cayenne/sandbox/CocoaCayenne/CAYClient/CAYClient.xcodeproj/halset.mode1
URL: http://svn.apache.org/viewvc/incubator/cayenne/sandbox/CocoaCayenne/CAYClient/CAYClient.xcodeproj/halset.mode1?rev=437466&r1=437465&r2=437466&view=diff
==============================================================================
--- incubator/cayenne/sandbox/CocoaCayenne/CAYClient/CAYClient.xcodeproj/halset.mode1 (original)
+++ incubator/cayenne/sandbox/CocoaCayenne/CAYClient/CAYClient.xcodeproj/halset.mode1 Sun Aug 27 14:56:04 2006
@@ -269,14 +269,15 @@
<key>PBXSmartGroupTreeModuleOutlineStateSelectionKey</key>
<array>
<array>
- <integer>54</integer>
+ <integer>14</integer>
+ <integer>10</integer>
<integer>9</integer>
<integer>1</integer>
<integer>0</integer>
</array>
</array>
<key>PBXSmartGroupTreeModuleOutlineStateVisibleRectKey</key>
- <string>{{0, 366}, {271, 789}}</string>
+ <string>{{0, 98}, {271, 789}}</string>
</dict>
<key>PBXTopSmartGroupGIDs</key>
<array/>
@@ -313,7 +314,7 @@
<key>PBXProjectModuleGUID</key>
<string>1CE0B20306471E060097A5F4</string>
<key>PBXProjectModuleLabel</key>
- <string>CAYEntityResolver.m</string>
+ <string>CAYToManyFault.m</string>
<key>PBXSplitModuleInNavigatorKey</key>
<dict>
<key>Split0</key>
@@ -321,24 +322,21 @@
<key>PBXProjectModuleGUID</key>
<string>1CE0B20406471E060097A5F4</string>
<key>PBXProjectModuleLabel</key>
- <string>CAYEntityResolver.m</string>
+ <string>CAYToManyFault.m</string>
<key>_historyCapacity</key>
<integer>0</integer>
<key>bookmark</key>
- <string>44CFE74D0AA2368E00E28EA8</string>
+ <string>44CFE8DC0AA249A000E28EA8</string>
<key>history</key>
<array>
<string>4417E2F50A908F5D000FE4DB</string>
<string>4417E2F60A908F5D000FE4DB</string>
- <string>44A6F9180A98ECB300E04AE1</string>
<string>44A6FA160A98F94100E04AE1</string>
<string>44DA7B100A9A48030073B37F</string>
<string>44DA7B5E0A9A4EB20073B37F</string>
<string>44DA7B600A9A4EB20073B37F</string>
<string>44DA7B610A9A4EB20073B37F</string>
- <string>44DA7CCB0A9B9E150073B37F</string>
<string>44DA7D100A9BA1B50073B37F</string>
- <string>44DA7D620A9BA78A0073B37F</string>
<string>44DA7D710A9D016B0073B37F</string>
<string>44DA7D720A9D016B0073B37F</string>
<string>44DA7D780A9D016B0073B37F</string>
@@ -359,35 +357,38 @@
<string>44DA80EF0A9E5F9D0073B37F</string>
<string>44DA80F00A9E5F9D0073B37F</string>
<string>44FD35AC0A9FAC6300E07E44</string>
- <string>446E1D3C0A9FBCF700E47FB0</string>
<string>446E1D3D0A9FBCF700E47FB0</string>
- <string>446E1D5D0A9FBFCC00E47FB0</string>
- <string>446E1D6E0A9FC15400E47FB0</string>
- <string>446E1D740A9FC15400E47FB0</string>
- <string>446E1DFC0A9FC6B300E47FB0</string>
- <string>443D286A0AA235320082552A</string>
<string>443D286B0AA235320082552A</string>
- <string>443D286C0AA235320082552A</string>
- <string>443D286D0AA235320082552A</string>
- <string>443D286E0AA235320082552A</string>
- <string>443D286F0AA235320082552A</string>
- <string>443D28700AA235320082552A</string>
- <string>443D28710AA235320082552A</string>
<string>443D28720AA235320082552A</string>
<string>443D28730AA235320082552A</string>
- <string>443D28740AA235320082552A</string>
- <string>443D28750AA235320082552A</string>
- <string>443D28760AA235320082552A</string>
<string>443D28770AA235320082552A</string>
- <string>443D28780AA235320082552A</string>
<string>443D28790AA235320082552A</string>
- <string>443D287A0AA235320082552A</string>
- <string>443D287B0AA235320082552A</string>
<string>443D287D0AA235320082552A</string>
- <string>443D28FE0AA2358F0082552A</string>
- <string>44CFE7490AA2368E00E28EA8</string>
- <string>44CFE74A0AA2368E00E28EA8</string>
- <string>443D29060AA235EC0082552A</string>
+ <string>44CFE7650AA2385600E28EA8</string>
+ <string>44CFE7930AA23BD400E28EA8</string>
+ <string>44CFE7950AA23BD400E28EA8</string>
+ <string>44CFE7960AA23BD400E28EA8</string>
+ <string>44CFE7C10AA23E2300E28EA8</string>
+ <string>44CFE7C20AA23E2300E28EA8</string>
+ <string>44CFE7DB0AA23E9600E28EA8</string>
+ <string>44CFE7E80AA23EB900E28EA8</string>
+ <string>44CFE7EE0AA23F2100E28EA8</string>
+ <string>44CFE7FF0AA23F9600E28EA8</string>
+ <string>44CFE8220AA2420200E28EA8</string>
+ <string>44CFE8230AA2420200E28EA8</string>
+ <string>44CFE82B0AA2420200E28EA8</string>
+ <string>44CFE8460AA2430600E28EA8</string>
+ <string>44CFE86E0AA245FC00E28EA8</string>
+ <string>44CFE86F0AA245FC00E28EA8</string>
+ <string>44CFE8700AA245FC00E28EA8</string>
+ <string>44CFE8710AA245FC00E28EA8</string>
+ <string>44CFE8BB0AA249A000E28EA8</string>
+ <string>44CFE8BC0AA249A000E28EA8</string>
+ <string>44CFE8BD0AA249A000E28EA8</string>
+ <string>44CFE8BE0AA249A000E28EA8</string>
+ <string>44CFE8BF0AA249A000E28EA8</string>
+ <string>44CFE8C00AA249A000E28EA8</string>
+ <string>44CFE8C10AA249A000E28EA8</string>
</array>
<key>prevStack</key>
<array>
@@ -453,6 +454,113 @@
<string>443D28D50AA235320082552A</string>
<string>44CFE74B0AA2368E00E28EA8</string>
<string>44CFE74C0AA2368E00E28EA8</string>
+ <string>44CFE76C0AA2385600E28EA8</string>
+ <string>44CFE76D0AA2385600E28EA8</string>
+ <string>44CFE76E0AA2385600E28EA8</string>
+ <string>44CFE76F0AA2385600E28EA8</string>
+ <string>44CFE7700AA2385600E28EA8</string>
+ <string>44CFE7710AA2385600E28EA8</string>
+ <string>44CFE7720AA2385600E28EA8</string>
+ <string>44CFE7730AA2385600E28EA8</string>
+ <string>44CFE7740AA2385600E28EA8</string>
+ <string>44CFE7750AA2385600E28EA8</string>
+ <string>44CFE7760AA2385600E28EA8</string>
+ <string>44CFE7770AA2385600E28EA8</string>
+ <string>44CFE7780AA2385600E28EA8</string>
+ <string>44CFE7790AA2385600E28EA8</string>
+ <string>44CFE77A0AA2385600E28EA8</string>
+ <string>44CFE77B0AA2385600E28EA8</string>
+ <string>44CFE7980AA23BD400E28EA8</string>
+ <string>44CFE7990AA23BD400E28EA8</string>
+ <string>44CFE79A0AA23BD400E28EA8</string>
+ <string>44CFE79B0AA23BD400E28EA8</string>
+ <string>44CFE79C0AA23BD400E28EA8</string>
+ <string>44CFE79D0AA23BD400E28EA8</string>
+ <string>44CFE79E0AA23BD400E28EA8</string>
+ <string>44CFE79F0AA23BD400E28EA8</string>
+ <string>44CFE7C70AA23E2300E28EA8</string>
+ <string>44CFE7C80AA23E2300E28EA8</string>
+ <string>44CFE7C90AA23E2300E28EA8</string>
+ <string>44CFE7CA0AA23E2300E28EA8</string>
+ <string>44CFE7CB0AA23E2300E28EA8</string>
+ <string>44CFE7CC0AA23E2300E28EA8</string>
+ <string>44CFE7CD0AA23E2300E28EA8</string>
+ <string>44CFE7CE0AA23E2300E28EA8</string>
+ <string>44CFE7CF0AA23E2300E28EA8</string>
+ <string>44CFE7D00AA23E2300E28EA8</string>
+ <string>44CFE7D10AA23E2300E28EA8</string>
+ <string>44CFE7D20AA23E2300E28EA8</string>
+ <string>44CFE7D30AA23E2300E28EA8</string>
+ <string>44CFE7DD0AA23E9600E28EA8</string>
+ <string>44CFE7DE0AA23E9600E28EA8</string>
+ <string>44CFE7DF0AA23E9600E28EA8</string>
+ <string>44CFE7E00AA23E9600E28EA8</string>
+ <string>44CFE7EA0AA23EB900E28EA8</string>
+ <string>44CFE7F10AA23F2100E28EA8</string>
+ <string>44CFE7F20AA23F2100E28EA8</string>
+ <string>44CFE7F30AA23F2100E28EA8</string>
+ <string>44CFE8010AA23F9600E28EA8</string>
+ <string>44CFE82D0AA2420200E28EA8</string>
+ <string>44CFE82E0AA2420200E28EA8</string>
+ <string>44CFE82F0AA2420200E28EA8</string>
+ <string>44CFE8300AA2420200E28EA8</string>
+ <string>44CFE8310AA2420200E28EA8</string>
+ <string>44CFE8320AA2420200E28EA8</string>
+ <string>44CFE8330AA2420200E28EA8</string>
+ <string>44CFE8340AA2420200E28EA8</string>
+ <string>44CFE8350AA2420200E28EA8</string>
+ <string>44CFE8360AA2420200E28EA8</string>
+ <string>44CFE8370AA2420200E28EA8</string>
+ <string>44CFE8380AA2420200E28EA8</string>
+ <string>44CFE8390AA2420200E28EA8</string>
+ <string>44CFE83A0AA2420200E28EA8</string>
+ <string>44CFE83B0AA2420200E28EA8</string>
+ <string>44CFE83C0AA2420200E28EA8</string>
+ <string>44CFE8480AA2430600E28EA8</string>
+ <string>44CFE8770AA245FC00E28EA8</string>
+ <string>44CFE8780AA245FC00E28EA8</string>
+ <string>44CFE8790AA245FC00E28EA8</string>
+ <string>44CFE87A0AA245FC00E28EA8</string>
+ <string>44CFE87B0AA245FC00E28EA8</string>
+ <string>44CFE87C0AA245FC00E28EA8</string>
+ <string>44CFE87D0AA245FC00E28EA8</string>
+ <string>44CFE87E0AA245FC00E28EA8</string>
+ <string>44CFE87F0AA245FC00E28EA8</string>
+ <string>44CFE8800AA245FC00E28EA8</string>
+ <string>44CFE8810AA245FC00E28EA8</string>
+ <string>44CFE8820AA245FC00E28EA8</string>
+ <string>44CFE8830AA245FC00E28EA8</string>
+ <string>44CFE8840AA245FC00E28EA8</string>
+ <string>44CFE8850AA245FC00E28EA8</string>
+ <string>44CFE8860AA245FC00E28EA8</string>
+ <string>44CFE8870AA245FC00E28EA8</string>
+ <string>44CFE8880AA245FC00E28EA8</string>
+ <string>44CFE8C20AA249A000E28EA8</string>
+ <string>44CFE8C30AA249A000E28EA8</string>
+ <string>44CFE8C40AA249A000E28EA8</string>
+ <string>44CFE8C50AA249A000E28EA8</string>
+ <string>44CFE8C60AA249A000E28EA8</string>
+ <string>44CFE8C70AA249A000E28EA8</string>
+ <string>44CFE8C80AA249A000E28EA8</string>
+ <string>44CFE8C90AA249A000E28EA8</string>
+ <string>44CFE8CA0AA249A000E28EA8</string>
+ <string>44CFE8CB0AA249A000E28EA8</string>
+ <string>44CFE8CC0AA249A000E28EA8</string>
+ <string>44CFE8CD0AA249A000E28EA8</string>
+ <string>44CFE8CE0AA249A000E28EA8</string>
+ <string>44CFE8CF0AA249A000E28EA8</string>
+ <string>44CFE8D00AA249A000E28EA8</string>
+ <string>44CFE8D10AA249A000E28EA8</string>
+ <string>44CFE8D20AA249A000E28EA8</string>
+ <string>44CFE8D30AA249A000E28EA8</string>
+ <string>44CFE8D40AA249A000E28EA8</string>
+ <string>44CFE8D50AA249A000E28EA8</string>
+ <string>44CFE8D60AA249A000E28EA8</string>
+ <string>44CFE8D70AA249A000E28EA8</string>
+ <string>44CFE8D80AA249A000E28EA8</string>
+ <string>44CFE8D90AA249A000E28EA8</string>
+ <string>44CFE8DA0AA249A000E28EA8</string>
+ <string>44CFE8DB0AA249A000E28EA8</string>
</array>
</dict>
<key>SplitCount</key>
@@ -464,14 +572,14 @@
<key>GeometryConfiguration</key>
<dict>
<key>Frame</key>
- <string>{{0, 0}, {915, 688}}</string>
+ <string>{{0, 0}, {915, 651}}</string>
<key>RubberWindowFrame</key>
<string>451 160 1208 848 0 0 1680 1028 </string>
</dict>
<key>Module</key>
<string>PBXNavigatorGroup</string>
<key>Proportion</key>
- <string>688pt</string>
+ <string>651pt</string>
</dict>
<dict>
<key>ContentConfiguration</key>
@@ -484,14 +592,14 @@
<key>GeometryConfiguration</key>
<dict>
<key>Frame</key>
- <string>{{0, 693}, {915, 114}}</string>
+ <string>{{0, 656}, {915, 151}}</string>
<key>RubberWindowFrame</key>
<string>451 160 1208 848 0 0 1680 1028 </string>
</dict>
<key>Module</key>
<string>XCDetailModule</string>
<key>Proportion</key>
- <string>114pt</string>
+ <string>151pt</string>
</dict>
</array>
<key>Proportion</key>
@@ -646,9 +754,15 @@
<integer>5</integer>
<key>WindowOrderList</key>
<array>
+ <string>44CFE8500AA2441200E28EA8</string>
+ <string>1C530D57069F1CE1000CFCEE</string>
+ <string>44CFE7F80AA23F3300E28EA8</string>
+ <string>44CFE7F90AA23F3300E28EA8</string>
+ <string>1CD10A99069EF8BA00B06720</string>
<string>44CFE7560AA2368E00E28EA8</string>
+ <string>4417DEC40A8E6D11000FE4DB</string>
<string>1C0AD2B3069F1EA900FABCE6</string>
- <string>1CD10A99069EF8BA00B06720</string>
+ <string>4417DB580A8D2FCE000FE4DB</string>
<string>/Users/halset/projects/CAYClient/CAYClient.xcodeproj</string>
</array>
<key>WindowString</key>
@@ -668,12 +782,14 @@
<key>Dock</key>
<array>
<dict>
+ <key>BecomeActive</key>
+ <true/>
<key>ContentConfiguration</key>
<dict>
<key>PBXProjectModuleGUID</key>
<string>1CD0528F0623707200166675</string>
<key>PBXProjectModuleLabel</key>
- <string>CAYEntityResolver.m</string>
+ <string>CAYToOneFault.m</string>
<key>StatusBarVisibility</key>
<true/>
</dict>
@@ -690,8 +806,6 @@
<string>416pt</string>
</dict>
<dict>
- <key>BecomeActive</key>
- <true/>
<key>ContentConfiguration</key>
<dict>
<key>PBXBuildLogShowsTranscriptDefaultKey</key>
@@ -733,7 +847,7 @@
<key>TableOfContents</key>
<array>
<string>4417DB580A8D2FCE000FE4DB</string>
- <string>443D284B0AA234190082552A</string>
+ <string>44CFE77D0AA2385600E28EA8</string>
<string>1CD0528F0623707200166675</string>
<string>XCMainBuildResultsModuleGUID</string>
</array>
@@ -816,7 +930,7 @@
<key>Frame</key>
<string>{{0, 0}, {935, 509}}</string>
<key>RubberWindowFrame</key>
- <string>514 309 935 550 0 0 1680 1028 </string>
+ <string>214 410 935 550 0 0 1680 1028 </string>
</dict>
<key>Module</key>
<string>PBXDebugSessionModule</string>
@@ -851,11 +965,11 @@
<key>ToolbarConfiguration</key>
<string>xcode.toolbar.config.debug</string>
<key>WindowString</key>
- <string>514 309 935 550 0 0 1680 1028 </string>
+ <string>214 410 935 550 0 0 1680 1028 </string>
<key>WindowToolGUID</key>
<string>1CD10A99069EF8BA00B06720</string>
<key>WindowToolIsVisible</key>
- <true/>
+ <false/>
</dict>
<dict>
<key>FirstTimeWindowDisplayed</key>
@@ -878,7 +992,7 @@
<key>PBXProjectModuleGUID</key>
<string>1CDD528C0622207200134675</string>
<key>PBXProjectModuleLabel</key>
- <string></string>
+ <string>CAYObjectId.m</string>
<key>StatusBarVisibility</key>
<true/>
</dict>
@@ -936,8 +1050,8 @@
<key>TableOfContents</key>
<array>
<string>1C530D57069F1CE1000CFCEE</string>
- <string>443968160A909794005BD842</string>
- <string>443968170A909794005BD842</string>
+ <string>44CFE8440AA2430500E28EA8</string>
+ <string>44CFE8450AA2430500E28EA8</string>
<string>1CDD528C0622207200134675</string>
<string>1CD0528E0623707200166675</string>
</array>
@@ -965,6 +1079,8 @@
<key>Dock</key>
<array>
<dict>
+ <key>BecomeActive</key>
+ <true/>
<key>ContentConfiguration</key>
<dict>
<key>PBXProjectModuleGUID</key>
@@ -977,7 +1093,7 @@
<key>Frame</key>
<string>{{0, 0}, {709, 626}}</string>
<key>RubberWindowFrame</key>
- <string>535 169 709 667 0 0 1680 1028 </string>
+ <string>911 145 709 667 0 0 1680 1028 </string>
</dict>
<key>Module</key>
<string>PBXDebugCLIModule</string>
@@ -1000,15 +1116,15 @@
<key>TableOfContents</key>
<array>
<string>4417DEC40A8E6D11000FE4DB</string>
- <string>443D29110AA235EC0082552A</string>
+ <string>44CFE7F70AA23F3300E28EA8</string>
<string>1C78EAAC065D492600B07095</string>
</array>
<key>WindowString</key>
- <string>535 169 709 667 0 0 1680 1028 </string>
+ <string>911 145 709 667 0 0 1680 1028 </string>
<key>WindowToolGUID</key>
<string>4417DEC40A8E6D11000FE4DB</string>
<key>WindowToolIsVisible</key>
- <false/>
+ <true/>
</dict>
<dict>
<key>FirstTimeWindowDisplayed</key>