From 0582033fb76bcb5c4560f86b175cf9d2cb6c446f Mon Sep 17 00:00:00 2001 From: ggsato Date: Sat, 21 Jul 2012 14:40:44 +0900 Subject: [PATCH] a suggested fix for CPArrayController selection binding failure in retrieving initial selection values --- AppKit/CPObjectController.j | 1 + .../AppController.j | 130 ++++++++++++++++++ .../Info.plist | 12 ++ .../Jakefile | 93 +++++++++++++ .../Resources/spinner.gif | Bin 0 -> 1849 bytes .../index-debug.html | 107 ++++++++++++++ .../index.html | 78 +++++++++++ .../main.j | 18 +++ 8 files changed, 439 insertions(+) create mode 100644 Tests/Manual/ArrayControllerInitialSelectionTest/AppController.j create mode 100644 Tests/Manual/ArrayControllerInitialSelectionTest/Info.plist create mode 100644 Tests/Manual/ArrayControllerInitialSelectionTest/Jakefile create mode 100644 Tests/Manual/ArrayControllerInitialSelectionTest/Resources/spinner.gif create mode 100644 Tests/Manual/ArrayControllerInitialSelectionTest/index-debug.html create mode 100644 Tests/Manual/ArrayControllerInitialSelectionTest/index.html create mode 100644 Tests/Manual/ArrayControllerInitialSelectionTest/main.j diff --git a/AppKit/CPObjectController.j b/AppKit/CPObjectController.j index 64ee8f5a0..18cd07792 100644 --- a/AppKit/CPObjectController.j +++ b/AppKit/CPObjectController.j @@ -109,6 +109,7 @@ [self setObjectClass:[CPMutableDictionary class]]; _observedKeys = [[CPCountedSet alloc] init]; + _selection = [[CPControllerSelectionProxy alloc] initWithController:self]; } return self; diff --git a/Tests/Manual/ArrayControllerInitialSelectionTest/AppController.j b/Tests/Manual/ArrayControllerInitialSelectionTest/AppController.j new file mode 100644 index 000000000..30a44eb30 --- /dev/null +++ b/Tests/Manual/ArrayControllerInitialSelectionTest/AppController.j @@ -0,0 +1,130 @@ +/* + * AppController.j + * ArrayControllerSetContentTest + * + * Created by You on July 17, 2012. + * Copyright 2012, Your Company All rights reserved. + */ + +@import +@import +@import + +@implementation AppController : CPObject +{ + CPString log; + CPString selectedValue; +} + +- (void)applicationDidFinishLaunching:(CPNotification)aNotification +{ + var theWindow = [[CPWindow alloc] initWithContentRect:CGRectMakeZero() styleMask:CPBorderlessBridgeWindowMask], + contentView = [theWindow contentView], + contentWidth = [contentView frame].size.width; + + // instantiate a controller + var controller = [[CPArrayController alloc] init]; + var content = [CPMutableArray array], + message = [[Message alloc] initWithMessage:@"This is an initial content" withAppController:self]; + [content addObject:message]; + [controller setContent:content]; + + // listen to selectedIndex change + [controller addObserver:self forKeyPath:@"selectionIndex" options: nil context: nil]; + + // create a field, and establish a binding + var field = [CPTextField textFieldWithStringValue:@"" placeholder:@"bound value appears here..." width:contentWidth/2]; + [field setFrameOrigin:CGPointMake(20, 20)]; + [field bind:@"value" toObject:controller withKeyPath:@"selection.message" options:nil]; + [field setEditable:NO]; + [contentView addSubview:field]; + + var logField = [CPTextField textFieldWithStringValue:@"" placeholder:@"access to bound field is logged here..." width:contentWidth/2]; + [logField setFrameOrigin:CGPointMake(20, 50)]; + [logField bind:@"value" toObject:self withKeyPath:@"log" options:nil]; + [logField setEditable:NO]; + [contentView addSubview:logField]; + + var selectedField = [CPTextField textFieldWithStringValue:@"" placeholder:@"waiting for a selection" width:contentWidth/2]; + [selectedField setFrameOrigin:CGPointMake(20, 80)]; + [selectedField bind:@"value" toObject:self withKeyPath:@"selectedValue" options:nil]; + [selectedField setEditable:NO]; + [contentView addSubview:selectedField]; + + [theWindow orderFront:self]; + + // later, a content is retrieved from a server, and updated by setContent or contetnArray binding. + // Here, uses setContent + var newContent = [CPMutableArray array], + newMessage = [[Message alloc] initWithMessage:@"Successfully you see a new content" withAppController:self]; + [newContent addObject:newMessage]; + [controller setContent:newContent]; + + // Uncomment the following line to turn on the standard menu bar. + //[CPMenu setMenuBarVisible:YES]; +} + +- (CPArrayController)controller +{ + return controller; +} + +- (CPString)log +{ + return log; +} + +- (void)setLog:(CPString)aLog +{ + log = aLog; +} + +- (CPString)selectedValue +{ + return selectedValue; +} + +- (void)setSelectedValue:(CPString)aSelectedValue +{ + selectedValue = aSelectedValue; +} + +- (void)observeValueForKeyPath:(CPString)keyPath ofObject:(id)object change:(CPDictionary)change context:(id)context +{ + var newIndex = [change valueForKey:CPKeyValueChangeNewKey], + selectedObject = [[object content] objectAtIndex:newIndex]; + + return [self setSelectedValue:@"Current Value via selectionIndex: " + [selectedObject messageWithoutCheck]]; +} + +@end + +@implementation Message : CPObject +{ + CPString message; + AppController app; +} + +- (id)initWithMessage:(CPString)aMessage withAppController:(AppController)anApp +{ + self = [super init]; + if (self) + { + message = aMessage; + app = anApp; + } + return self; +} + +- (CPString)message +{ + [app setLog:@"the following message is about to be read: " + message]; + return message; +} + +- (CPString)messageWithoutCheck +{ + return message; +} + +@end diff --git a/Tests/Manual/ArrayControllerInitialSelectionTest/Info.plist b/Tests/Manual/ArrayControllerInitialSelectionTest/Info.plist new file mode 100644 index 000000000..3ce4a1551 --- /dev/null +++ b/Tests/Manual/ArrayControllerInitialSelectionTest/Info.plist @@ -0,0 +1,12 @@ + + + + + CPApplicationDelegateClass + AppController + CPBundleName + ArrayControllerInitialSelectionTest + CPPrincipalClass + CPApplication + + diff --git a/Tests/Manual/ArrayControllerInitialSelectionTest/Jakefile b/Tests/Manual/ArrayControllerInitialSelectionTest/Jakefile new file mode 100644 index 000000000..a0e64eac4 --- /dev/null +++ b/Tests/Manual/ArrayControllerInitialSelectionTest/Jakefile @@ -0,0 +1,93 @@ +/* + * Jakefile + * ArrayControllerInitialSelectionTest + * + * Created by You on July 21, 2012. + * Copyright 2012, Your Company All rights reserved. + */ + +var ENV = require("system").env, + FILE = require("file"), + JAKE = require("jake"), + task = JAKE.task, + FileList = JAKE.FileList, + app = require("cappuccino/jake").app, + configuration = ENV["CONFIG"] || ENV["CONFIGURATION"] || ENV["c"] || "Debug", + OS = require("os"); + +app ("ArrayControllerInitialSelectionTest", function(task) +{ + task.setBuildIntermediatesPath(FILE.join("Build", "ArrayControllerInitialSelectionTest.build", configuration)); + task.setBuildPath(FILE.join("Build", configuration)); + + task.setProductName("ArrayControllerInitialSelectionTest"); + task.setIdentifier("com.yourcompany.ArrayControllerInitialSelectionTest"); + task.setVersion("1.0"); + task.setAuthor("Your Company"); + task.setEmail("feedback @nospam@ yourcompany.com"); + task.setSummary("ArrayControllerInitialSelectionTest"); + task.setSources((new FileList("**/*.j")).exclude(FILE.join("Build", "**"))); + task.setResources(new FileList("Resources/**")); + task.setIndexFilePath("index.html"); + task.setInfoPlistPath("Info.plist"); + + if (configuration === "Debug") + task.setCompilerFlags("-DDEBUG -g"); + else + task.setCompilerFlags("-O"); +}); + +task ("default", ["ArrayControllerInitialSelectionTest"], function() +{ + printResults(configuration); +}); + +task ("build", ["default"]); + +task ("debug", function() +{ + ENV["CONFIGURATION"] = "Debug"; + JAKE.subjake(["."], "build", ENV); +}); + +task ("release", function() +{ + ENV["CONFIGURATION"] = "Release"; + JAKE.subjake(["."], "build", ENV); +}); + +task ("run", ["debug"], function() +{ + OS.system(["open", FILE.join("Build", "Debug", "ArrayControllerInitialSelectionTest", "index.html")]); +}); + +task ("run-release", ["release"], function() +{ + OS.system(["open", FILE.join("Build", "Release", "ArrayControllerInitialSelectionTest", "index.html")]); +}); + +task ("deploy", ["release"], function() +{ + FILE.mkdirs(FILE.join("Build", "Deployment", "ArrayControllerInitialSelectionTest")); + OS.system(["press", "-f", FILE.join("Build", "Release", "ArrayControllerInitialSelectionTest"), FILE.join("Build", "Deployment", "ArrayControllerInitialSelectionTest")]); + printResults("Deployment") +}); + +task ("desktop", ["release"], function() +{ + FILE.mkdirs(FILE.join("Build", "Desktop", "ArrayControllerInitialSelectionTest")); + require("cappuccino/nativehost").buildNativeHost(FILE.join("Build", "Release", "ArrayControllerInitialSelectionTest"), FILE.join("Build", "Desktop", "ArrayControllerInitialSelectionTest", "ArrayControllerInitialSelectionTest.app")); + printResults("Desktop") +}); + +task ("run-desktop", ["desktop"], function() +{ + OS.system([FILE.join("Build", "Desktop", "ArrayControllerInitialSelectionTest", "ArrayControllerInitialSelectionTest.app", "Contents", "MacOS", "NativeHost"), "-i"]); +}); + +function printResults(configuration) +{ + print("----------------------------"); + print(configuration+" app built at path: "+FILE.join("Build", configuration, "ArrayControllerInitialSelectionTest")); + print("----------------------------"); +} diff --git a/Tests/Manual/ArrayControllerInitialSelectionTest/Resources/spinner.gif b/Tests/Manual/ArrayControllerInitialSelectionTest/Resources/spinner.gif new file mode 100644 index 0000000000000000000000000000000000000000..06dbc2bc21dddcf0e09b566d5b211aee89570f52 GIT binary patch literal 1849 zcma*odr(tX9tZHtz31lM+(&Y`A`Ou`NeG&R#DrIfV%?hng21vs6v>ooRQQFbk7E_K!V( z{?5!fpZWgIZ%*d6t%i*j24bL}AZUJm9)h6R*;%L4IWse3G#VWaN1#$zSSXcBhlYlH zJ|D}n{r&w2f+Qp)SS*&n?*G4}{}!h?td_mjU6Kad-rW*QwWYCUk7d^e+sjpZAn6kT z5rM;`{~_}-wm+L@%+E;JphLm}C3WzQAQD0wBoY|rOTQX{(@pp-WAA8Iw0HKl|15j) zhGh(SFWu#5zUCw^T!}C~eC}~?{xG-r7ugQC>taC+|L^xr&a%{#cgUOZXIM&v?)k^2 z1i5%0!U00wq)r4vlAwXBA_m5J5WNeuBm-XJQ5pG4GD%vc|K){+TJ{AkHqN@SJKczX zU}QRd9n*_bf^h94)6Ctv{CUfz_;qs#RDuQ$DR%y1&5G-a6rhf*4Y zl+UOD1*GE{GQ7vv;c-tTIMkz0ovO>9j%b5hpa@a*CBJ#W!0@ndSwF|%hMkdFtXiU) z`BEp+yhkt8ZY>tg&uyH@%^%K4jDrbA;et&vnnzZ3z22@e6<27z2Vk13kb7OtISyxv z(XoO-LNQCZe3lfzc%*pNqU<9T+p~teThOEB+~e&U0mC|zS{Q)dJZ)!^1f7L(zg*L> z*vSW%?dR~@@0(}x6-V^A`~ImD;)NaBUnP8;RH=bS2@pk`wp>>8r&jGjmGPy%1BW}v zoPo}ca$~bze@efc3kapuEVW1!%teOZT3j2Tw5=hjiAf02d}7dL0oFC%@=RXp5Ow#% z@a>+AM|YWt$n&e`>sB-32gBcuTi>R>*|8@lp`y6thc7ydyqDsuUn~YzZf|{-R@-3y zL#wx{Ii}xxL_csiW*LBn0-A$>zp4WOmkf6=ilrjlW?-l9+bCd7|i?*b5NTmy<<6NZ0T8$SN@mwdC2f z6jqK=N@bS@!=YSj%>h0}*4p+%0HbTIrE$w7UMT6+AZZ&DAo*qZAAi(OtNbIfl#Dw^ zJWeiCp~zi#&t6x}m9)O^eR4HiLV3QA<<0>HZ8%$^lrSE94Wb}=+MM^!b>n#5&-JQR zkr-CEu9C;_F*7DqDisulV6Pmg$nFL0TPn%~*m^-`Z3^BgU(sNpnx%nW(!eV9A&FvI zHL3X3lw8Wji^6=8KbQDE-e%b?svdFxxdh$8r97@7$ojeI`6AL8Ob6QC$qh&>ZWVDX1F{0vJnT%%mE;GveKWR%C} zM&4d;Jf3s9|HAA)yVUPo`Aq;0do#)uHSXi5*QF*)x@MVVHr+cN)uMZ__F|&Ta#p8d z53TOKtce!PJUuie8UWol-S(`c2nH?UGqJP{!4RR4u$LCfn)q-hj0^f=h(VYy)T6eN zhRO!ja-aDBTcgeyP(8Ua4IdiOog^*CQa?R(cP#9AgL9`j>EX-6Yf1lzX(!~``M1XC zNmM<4<6d~wWZ$Xrk0K}UteTrq@LBBk#MsjkK;pbuVhe)NI7(7Pf(l?lxC7=1Z7Pzl zMbS;nV4NI5_N{1$P)&XC)huOGQ+h^zpYUZfb*1n6>!`#*b3y52LGmi+<4sY5jyD#- zw&$d}DTguLAfnRtjrM*JfqtHqUu6rQoU=g%1E9xk%;)TDm^2<8n-0IhTsQFaek)MY}>PK4;nBk=ow4pF>vzkO& gna%Org-kgQCf=+BeMi^RbuY;YE~rTjend;_cdi8t>i_@% literal 0 HcmV?d00001 diff --git a/Tests/Manual/ArrayControllerInitialSelectionTest/index-debug.html b/Tests/Manual/ArrayControllerInitialSelectionTest/index-debug.html new file mode 100644 index 000000000..b1224f0f1 --- /dev/null +++ b/Tests/Manual/ArrayControllerInitialSelectionTest/index-debug.html @@ -0,0 +1,107 @@ + + + + + + + + + + + + + + + ArrayControllerInitialSelectionTest + + + + + + + + + + + + + + +
+
+ + + +
+
+ + + diff --git a/Tests/Manual/ArrayControllerInitialSelectionTest/index.html b/Tests/Manual/ArrayControllerInitialSelectionTest/index.html new file mode 100644 index 000000000..d5bfff88b --- /dev/null +++ b/Tests/Manual/ArrayControllerInitialSelectionTest/index.html @@ -0,0 +1,78 @@ + + + + + + + + + + + + + + + ArrayControllerInitialSelectionTest + + + + + + + + + + + + +
+
+ + + +
+
+ + + + diff --git a/Tests/Manual/ArrayControllerInitialSelectionTest/main.j b/Tests/Manual/ArrayControllerInitialSelectionTest/main.j new file mode 100644 index 000000000..402ea8b60 --- /dev/null +++ b/Tests/Manual/ArrayControllerInitialSelectionTest/main.j @@ -0,0 +1,18 @@ +/* + * AppController.j + * ArrayControllerInitialSelectionTest + * + * Created by You on July 21, 2012. + * Copyright 2012, Your Company All rights reserved. + */ + +@import +@import + +@import "AppController.j" + + +function main(args, namedArgs) +{ + CPApplicationMain(args, namedArgs); +}