Author: torehalset
Date: Wed Sep 20 13:06:42 2006
New Revision: 448321
URL: http://svn.apache.org/viewvc?view=rev&rev=448321
Log:
use CAYArrayController
Modified:
incubator/cayenne/sandbox/CocoaCayenne/CAYClient/AppController.h
incubator/cayenne/sandbox/CocoaCayenne/CAYClient/AppController.m
incubator/cayenne/sandbox/CocoaCayenne/CAYClient/English.lproj/MainMenu.nib/classes.nib
incubator/cayenne/sandbox/CocoaCayenne/CAYClient/English.lproj/MainMenu.nib/info.nib
incubator/cayenne/sandbox/CocoaCayenne/CAYClient/English.lproj/MainMenu.nib/keyedobjects.nib
Modified: incubator/cayenne/sandbox/CocoaCayenne/CAYClient/AppController.h
URL:
http://svn.apache.org/viewvc/incubator/cayenne/sandbox/CocoaCayenne/CAYClient/AppController.h?view=diff&rev=448321&r1=448320&r2=448321
==============================================================================
--- incubator/cayenne/sandbox/CocoaCayenne/CAYClient/AppController.h (original)
+++ incubator/cayenne/sandbox/CocoaCayenne/CAYClient/AppController.h Wed Sep 20
13:06:42 2006
@@ -18,11 +18,13 @@
****************************************************************/
#import <Cocoa/Cocoa.h>
+
#import <CocoaCayenne/CAYObjectContext.h>
+#import <CocoaCayenne/CAYArrayController.h>
@interface AppController : NSObject
{
- IBOutlet NSArrayController *queryResultController;
+ IBOutlet CAYArrayController *artistsController;
CAYObjectContext *objectContext;
}
Modified: incubator/cayenne/sandbox/CocoaCayenne/CAYClient/AppController.m
URL:
http://svn.apache.org/viewvc/incubator/cayenne/sandbox/CocoaCayenne/CAYClient/AppController.m?view=diff&rev=448321&r1=448320&r2=448321
==============================================================================
--- incubator/cayenne/sandbox/CocoaCayenne/CAYClient/AppController.m (original)
+++ incubator/cayenne/sandbox/CocoaCayenne/CAYClient/AppController.m Wed Sep 20
13:06:42 2006
@@ -30,6 +30,7 @@
#import <CocoaCayenne/CAYClientConnection.h>
#import <CocoaCayenne/CAYDataMap.h>
#import <CocoaCayenne/CAYDataMapIO.h>
+#import <CocoaCayenne/CAYManagedObjectContext.h>
@implementation AppController
@@ -56,6 +57,11 @@
[self setObjectContext:ctxt];
[ctxt release];
+ // set the object context of the custom array controller. needed to
+ // be able to add artists
+ [artistsController setObjectContext:[self objectContext]];
+ [artistsController setDeleteObjectOnRemove:YES];
+
// test creating core data model:
CAYEntityResolver *entityResolver = [[self objectContext]
entityResolver];
CAYDataMap *dataMap = [[entityResolver maps] objectAtIndex:0];
@@ -67,8 +73,8 @@
[query setName:@"objcquery"];
NSArray *rows = [[self objectContext] performQuery:query];
- [queryResultController removeObjects:[queryResultController
arrangedObjects]];
- [queryResultController addObjects:rows];
+ [artistsController removeObjects:[artistsController arrangedObjects]];
+ [artistsController addObjects:rows];
[query release];
}
Modified:
incubator/cayenne/sandbox/CocoaCayenne/CAYClient/English.lproj/MainMenu.nib/classes.nib
URL:
http://svn.apache.org/viewvc/incubator/cayenne/sandbox/CocoaCayenne/CAYClient/English.lproj/MainMenu.nib/classes.nib?view=diff&rev=448321&r1=448320&r2=448321
==============================================================================
---
incubator/cayenne/sandbox/CocoaCayenne/CAYClient/English.lproj/MainMenu.nib/classes.nib
(original)
+++
incubator/cayenne/sandbox/CocoaCayenne/CAYClient/English.lproj/MainMenu.nib/classes.nib
Wed Sep 20 13:06:42 2006
@@ -4,9 +4,10 @@
ACTIONS = {commit = id; query = id; };
CLASS = AppController;
LANGUAGE = ObjC;
- OUTLETS = {queryResultController = NSArrayController; };
+ OUTLETS = {artistsController = CAYArrayController; };
SUPERCLASS = NSObject;
},
+ {CLASS = CAYArrayController; LANGUAGE = ObjC; SUPERCLASS =
NSArrayController; },
{CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; }
);
IBVersion = 1;
Modified:
incubator/cayenne/sandbox/CocoaCayenne/CAYClient/English.lproj/MainMenu.nib/info.nib
URL:
http://svn.apache.org/viewvc/incubator/cayenne/sandbox/CocoaCayenne/CAYClient/English.lproj/MainMenu.nib/info.nib?view=diff&rev=448321&r1=448320&r2=448321
==============================================================================
---
incubator/cayenne/sandbox/CocoaCayenne/CAYClient/English.lproj/MainMenu.nib/info.nib
(original)
+++
incubator/cayenne/sandbox/CocoaCayenne/CAYClient/English.lproj/MainMenu.nib/info.nib
Wed Sep 20 13:06:42 2006
@@ -3,11 +3,11 @@
<plist version="1.0">
<dict>
<key>IBDocumentLocation</key>
- <string>112 243 356 240 0 0 1280 832 </string>
+ <string>227 324 356 240 0 0 1680 1028 </string>
<key>IBEditorPositions</key>
<dict>
<key>29</key>
- <string>93 282 338 44 0 0 1280 832 </string>
+ <string>132 352 338 44 0 0 1680 1028 </string>
</dict>
<key>IBFramework Version</key>
<string>446.1</string>
@@ -17,6 +17,6 @@
<integer>21</integer>
</array>
<key>IBSystem Version</key>
- <string>8J135</string>
+ <string>8J2135a</string>
</dict>
</plist>
Modified:
incubator/cayenne/sandbox/CocoaCayenne/CAYClient/English.lproj/MainMenu.nib/keyedobjects.nib
URL:
http://svn.apache.org/viewvc/incubator/cayenne/sandbox/CocoaCayenne/CAYClient/English.lproj/MainMenu.nib/keyedobjects.nib?view=diff&rev=448321&r1=448320&r2=448321
==============================================================================
Binary files - no diff available.