From bef1687b1fc1be0467e14707fa7bddc40ffa3a10 Mon Sep 17 00:00:00 2001 From: Aparajita Fishman Date: Wed, 17 Aug 2011 11:28:23 -0400 Subject: [PATCH] Test app for bindings fixes. --- Tests/Manual/Bindings/AppController.j | 111 ++++++++++++++++++++ Tests/Manual/Bindings/Info.plist | 12 +++ Tests/Manual/Bindings/Jakefile | 93 ++++++++++++++++ Tests/Manual/Bindings/README.md | 14 +++ Tests/Manual/Bindings/Resources/spinner.gif | Bin 0 -> 1849 bytes Tests/Manual/Bindings/index-debug.html | 103 ++++++++++++++++++ Tests/Manual/Bindings/index.html | 78 ++++++++++++++ Tests/Manual/Bindings/main.j | 18 ++++ 8 files changed, 429 insertions(+) create mode 100644 Tests/Manual/Bindings/AppController.j create mode 100644 Tests/Manual/Bindings/Info.plist create mode 100644 Tests/Manual/Bindings/Jakefile create mode 100644 Tests/Manual/Bindings/README.md create mode 100644 Tests/Manual/Bindings/Resources/spinner.gif create mode 100644 Tests/Manual/Bindings/index-debug.html create mode 100644 Tests/Manual/Bindings/index.html create mode 100644 Tests/Manual/Bindings/main.j diff --git a/Tests/Manual/Bindings/AppController.j b/Tests/Manual/Bindings/AppController.j new file mode 100644 index 000000000..847e5b9ba --- /dev/null +++ b/Tests/Manual/Bindings/AppController.j @@ -0,0 +1,111 @@ +/* + * AppController.j + * BindingContentArrayTest + * + * Created by aparajita on August 17, 2011. + * Copyright 2011, Victory-Heart Productions All rights reserved. + */ + +@implementation Companies : CPObject +{ + CPMutableArray items @accessors; +} + +- (id)init +{ + self = [super init]; + + if (self) + { + items = [CPMutableArray array]; + [items addObject:[CPDictionary dictionaryWithObjectsAndKeys:@"Spacely Sprockets", @"name", [CPArray arrayWithObjects:@"Tom", @"Dick", @"Harry"], @"employees"]]; + [items addObject:[CPDictionary dictionaryWithObjectsAndKeys:@"Cogswell Cogs", @"name", [CPArray arrayWithObjects:@"Jane", @"Mary", @"Vic"], @"employees"]]; + } + + return self; +} + +@end + +@implementation AppController : CPObject +{ + CPString employee @accessors; + Companies companies @accessors; + CPArrayController companiesController; + CPArrayController employeesController; +} + +- (void)applicationDidFinishLaunching:(CPNotification)aNotification +{ + var theWindow = [[CPWindow alloc] initWithContentRect:CGRectMakeZero() styleMask:CPBorderlessBridgeWindowMask], + contentView = [theWindow contentView], + companiesScrollView = [[CPScrollView alloc] initWithFrame:CGRectMake(30, 30, 200, 100)], + companiesTable = [[CPTableView alloc] initWithFrame:CGRectMake(0, 0, 100, 100)], + employeesScrollView = [[CPScrollView alloc] initWithFrame:CGRectMake(250, 30, 200, 100)], + employeesTable = [[CPTableView alloc] initWithFrame:CGRectMake(0, 0, 200, 100)], + text = [[CPTextField alloc] initWithFrame:CGRectMake(250, 140, 200, 29)]; + + companies = [Companies new]; + + var column = [[CPTableColumn alloc] initWithIdentifier:@"name"]; + + [column setResizingMask:CPTableColumnAutoresizingMask]; + [companiesTable addTableColumn:column]; + [companiesTable setAllowsMultipleSelection:YES]; + [companiesTable setColumnAutoresizingStyle:CPTableViewLastColumnOnlyAutoresizingStyle]; + [companiesScrollView setHasHorizontalScroller:NO]; + [companiesScrollView setHasVerticalScroller:NO]; + [companiesScrollView setDocumentView:companiesTable]; + [companiesScrollView setBorderType:CPBezelBorder]; + [companiesTable setHeaderView:nil]; + [companiesTable setAllowsEmptySelection:NO]; + + [contentView addSubview:companiesScrollView]; + + column = [[CPTableColumn alloc] initWithIdentifier:@"name"]; + + [column setResizingMask:CPTableColumnAutoresizingMask]; + [employeesTable addTableColumn:column]; + [employeesTable setAllowsMultipleSelection:YES]; + [employeesTable setColumnAutoresizingStyle:CPTableViewLastColumnOnlyAutoresizingStyle]; + [employeesScrollView setHasHorizontalScroller:NO]; + [employeesScrollView setHasVerticalScroller:NO]; + [employeesScrollView setDocumentView:employeesTable]; + [employeesScrollView setBorderType:CPBezelBorder]; + [employeesTable setHeaderView:nil]; + [employeesTable setAllowsEmptySelection:YES]; + + [contentView addSubview:employeesScrollView]; + [contentView addSubview:text]; + + companiesController = [CPArrayController new]; + [companiesController bind:@"contentArray" toObject:companies withKeyPath:@"items" options:nil]; + + employeesController = [CPArrayController new]; + [employeesController bind:@"contentArray" toObject:companiesController withKeyPath:@"selection.employees" options:nil]; + + //var employeeController = [CPObjectController new]; + + //[employeeController bind:@"contentObject" toObject:self withKeyPath:@"employee" options:nil]; + + [[companiesTable tableColumnWithIdentifier:@"name"] bind:@"value" toObject:companiesController withKeyPath:@"arrangedObjects.name" options:nil]; + [[employeesTable tableColumnWithIdentifier:@"name"] bind:@"value" toObject:employeesController withKeyPath:@"arrangedObjects" options:nil]; + [text bind:@"value" toObject:employeesController withKeyPath:@"selection.self" options:nil]; + + [companiesController addObserver:self forKeyPath:@"selection" options:0 context:@"companies.selection"]; + [companiesController addObserver:self forKeyPath:@"selectionIndexes" options:0 context:@"companies.selectionIndexes"]; + [companiesController addObserver:self forKeyPath:@"arrangedObjects" options:0 context:@"companies.arrangedObjects"]; + [employeesController addObserver:self forKeyPath:@"selectionIndexes" options:0 context:@"employees.selectionIndexes"]; + [employeesController addObserver:self forKeyPath:@"selection" options:0 context:@"employees.selection"]; + [employeesController addObserver:self forKeyPath:@"arrangedObjects" options:0 context:@"employees.arrangedObjects"]; + + [theWindow setInitialFirstResponder:companiesTable]; + [theWindow orderFront:self]; +} + +- (void)observeValueForKeyPath:(CPString)keyPath ofObject:(id)object change:(CPDictionary)change context:(id)context +{ + console.log("\nkeyPath: %s\ncontext: %s\nnew: %s\nold: %s", keyPath, context, [[change valueForKey:CPKeyValueChangeNewKey] description], [[change valueForKey:CPKeyValueChangeOldKey] description]); +} + +@end diff --git a/Tests/Manual/Bindings/Info.plist b/Tests/Manual/Bindings/Info.plist new file mode 100644 index 000000000..49f8e3347 --- /dev/null +++ b/Tests/Manual/Bindings/Info.plist @@ -0,0 +1,12 @@ + + + + + CPApplicationDelegateClass + AppController + CPBundleName + BindingContentArrayTest + CPPrincipalClass + CPApplication + + diff --git a/Tests/Manual/Bindings/Jakefile b/Tests/Manual/Bindings/Jakefile new file mode 100644 index 000000000..a5d4665b0 --- /dev/null +++ b/Tests/Manual/Bindings/Jakefile @@ -0,0 +1,93 @@ +/* + * Jakefile + * BindingContentArrayTest + * + * Created by aparajita on August 17, 2011. + * Copyright 2011, Victory-Heart Productions 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 ("BindingContentArrayTest", function(task) +{ + task.setBuildIntermediatesPath(FILE.join("Build", "BindingContentArrayTest.build", configuration)); + task.setBuildPath(FILE.join("Build", configuration)); + + task.setProductName("BindingContentArrayTest"); + task.setIdentifier("com.aparajita.BindingContentArrayTest"); + task.setVersion("1.0"); + task.setAuthor("Victory-Heart Productions"); + task.setEmail("feedback @nospam@ yourcompany.com"); + task.setSummary("BindingContentArrayTest"); + 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", ["BindingContentArrayTest"], 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", "BindingContentArrayTest", "index.html")]); +}); + +task ("run-release", ["release"], function() +{ + OS.system(["open", FILE.join("Build", "Release", "BindingContentArrayTest", "index.html")]); +}); + +task ("deploy", ["release"], function() +{ + FILE.mkdirs(FILE.join("Build", "Deployment", "BindingContentArrayTest")); + OS.system(["press", "-f", FILE.join("Build", "Release", "BindingContentArrayTest"), FILE.join("Build", "Deployment", "BindingContentArrayTest")]); + printResults("Deployment") +}); + +task ("desktop", ["release"], function() +{ + FILE.mkdirs(FILE.join("Build", "Desktop", "BindingContentArrayTest")); + require("cappuccino/nativehost").buildNativeHost(FILE.join("Build", "Release", "BindingContentArrayTest"), FILE.join("Build", "Desktop", "BindingContentArrayTest", "BindingContentArrayTest.app")); + printResults("Desktop") +}); + +task ("run-desktop", ["desktop"], function() +{ + OS.system([FILE.join("Build", "Desktop", "BindingContentArrayTest", "BindingContentArrayTest.app", "Contents", "MacOS", "NativeHost"), "-i"]); +}); + +function printResults(configuration) +{ + print("----------------------------"); + print(configuration+" app built at path: "+FILE.join("Build", configuration, "BindingContentArrayTest")); + print("----------------------------"); +} diff --git a/Tests/Manual/Bindings/README.md b/Tests/Manual/Bindings/README.md new file mode 100644 index 000000000..0c9922fd9 --- /dev/null +++ b/Tests/Manual/Bindings/README.md @@ -0,0 +1,14 @@ +Run this application with the current master, and note the following bugs: + +- When you click on any item, there are two selection change notifications instead of one. + +- If you compare the order of the notifications with Cocoa, they are slightly different. + +- The right hand table is configured to allow an empty selection. If you click in the +empty area below the names, there is an empty selection notification, but then the +the current selection changes to the first item and generates another notification. + +- If you select multiple items on the left, there is an error. This is a bug that will +have to be fixed in a later commit. + +If you apply the changes in these commits, the first three bugs are fixed. diff --git a/Tests/Manual/Bindings/Resources/spinner.gif b/Tests/Manual/Bindings/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/Bindings/index-debug.html b/Tests/Manual/Bindings/index-debug.html new file mode 100644 index 000000000..9463d3392 --- /dev/null +++ b/Tests/Manual/Bindings/index-debug.html @@ -0,0 +1,103 @@ + + + + + + + + + + + + + + + Bindings + + + + + + + + + + + + + + +
+
+ + + +
+
+ + + diff --git a/Tests/Manual/Bindings/index.html b/Tests/Manual/Bindings/index.html new file mode 100644 index 000000000..3616a73b2 --- /dev/null +++ b/Tests/Manual/Bindings/index.html @@ -0,0 +1,78 @@ + + + + + + + + + + + + + + + Bindings + + + + + + + + + + + + +
+
+ + + +
+
+ + + + diff --git a/Tests/Manual/Bindings/main.j b/Tests/Manual/Bindings/main.j new file mode 100644 index 000000000..a3894cf42 --- /dev/null +++ b/Tests/Manual/Bindings/main.j @@ -0,0 +1,18 @@ +/* + * AppController.j + * BindingContentArrayTest + * + * Created by aparajita on August 17, 2011. + * Copyright 2011, Victory-Heart Productions All rights reserved. + */ + +@import +@import + +@import "AppController.j" + + +function main(args, namedArgs) +{ + CPApplicationMain(args, namedArgs); +}