From 364208e0295e4ba8ed90bc9f24f2a5bf1a7d6778 Mon Sep 17 00:00:00 2001 From: ggsato Date: Tue, 17 Jul 2012 15:36:18 +0900 Subject: [PATCH] fixed a bug that removeObject shows empty selection if an object at index 0 was removed --- AppKit/CPArrayController.j | 3 + .../AppController.j | 102 +++++++++++++++++ .../Info.plist | 12 ++ .../ArrayControllerRemovingFirstTest/Jakefile | 93 +++++++++++++++ .../Resources/spinner.gif | Bin 0 -> 1849 bytes .../index-debug.html | 107 ++++++++++++++++++ .../index.html | 78 +++++++++++++ .../ArrayControllerRemovingFirstTest/main.j | 18 +++ 8 files changed, 413 insertions(+) create mode 100644 Tests/Manual/ArrayControllerRemovingFirstTest/AppController.j create mode 100644 Tests/Manual/ArrayControllerRemovingFirstTest/Info.plist create mode 100644 Tests/Manual/ArrayControllerRemovingFirstTest/Jakefile create mode 100644 Tests/Manual/ArrayControllerRemovingFirstTest/Resources/spinner.gif create mode 100644 Tests/Manual/ArrayControllerRemovingFirstTest/index-debug.html create mode 100644 Tests/Manual/ArrayControllerRemovingFirstTest/index.html create mode 100644 Tests/Manual/ArrayControllerRemovingFirstTest/main.j diff --git a/AppKit/CPArrayController.j b/AppKit/CPArrayController.j index 764096a0b..3e22ad838 100644 --- a/AppKit/CPArrayController.j +++ b/AppKit/CPArrayController.j @@ -879,6 +879,9 @@ [_arrangedObjects removeObjectAtIndex:pos]; [_selectionIndexes shiftIndexesStartingAtIndex:pos by:-1]; + + // This will automatically handle the avoidsEmptySelection case. + [self __setSelectionIndexes:_selectionIndexes]; } [self didChangeValueForKey:@"content"]; diff --git a/Tests/Manual/ArrayControllerRemovingFirstTest/AppController.j b/Tests/Manual/ArrayControllerRemovingFirstTest/AppController.j new file mode 100644 index 000000000..1ddd8d6f6 --- /dev/null +++ b/Tests/Manual/ArrayControllerRemovingFirstTest/AppController.j @@ -0,0 +1,102 @@ +/* + * AppController.j + * ArrayControllerRemovingFirstTest + * + * Created by You on July 17, 2012. + * Copyright 2012, Your Company All rights reserved. + */ + +@import + + +@implementation AppController : CPObject +{ + CPArrayController arrayController; +} + +- (void)applicationDidFinishLaunching:(CPNotification)aNotification +{ + var theWindow = [[CPWindow alloc] initWithContentRect:CGRectMakeZero() styleMask:CPBorderlessBridgeWindowMask], + contentView = [theWindow contentView]; + + arrayController = [[CPArrayController alloc] init]; + [arrayController addObserver:self forKeyPath:@"selectionIndex" options: nil context: nil]; + var items = [CPMutableArray array]; + [items addObject:[[Item alloc] initWithTitle:@"1st Item"]]; + [items addObject:[[Item alloc] initWithTitle:@"2nd Item"]]; + [items addObject:[[Item alloc] initWithTitle:@"3rd Item"]]; + [items addObject:[[Item alloc] initWithTitle:@"4th Item"]]; + [arrayController setContent:items]; + + var label = [CPTextField labelWithTitle:@"Press buttons to see [Remove First By Object] fails while [Remove First By Index] succeeds"]; + [label setFrameOrigin:CGPointMake(20, 20)]; + [contentView addSubview:label]; + + var field = [CPTextField textFieldWithStringValue:@"" placeholder:@"" width:100]; + [field setFrameOrigin:CGPointMake(20, 50)]; + [field bind:@"value" toObject:self withKeyPath:@"arrayController.selection.title" options:nil]; + [contentView addSubview:field]; + + var button = [CPButton buttonWithTitle:@"Remove First By Object"]; + [button setFrameOrigin:CGPointMake(150, 50)]; + [button setTarget:self]; + [button setAction:@selector(removeFirst:)]; + [contentView addSubview:button]; + + var button2 = [CPButton buttonWithTitle:@"Remove First By Index"]; + [button2 setFrameOrigin:CGPointMake(350, 50)]; + [button2 setTarget:self]; + [button2 setAction:@selector(removeFirstByIndex:)]; + [contentView addSubview:button2]; + + [arrayController setSelectionIndex:0] + + [theWindow orderFront:self]; + + // Uncomment the following line to turn on the standard menu bar. + //[CPMenu setMenuBarVisible:YES]; +} + +- (void)removeFirst:(id)sender +{ + var selectedObjects = [arrayController selectedObjects]; + [arrayController removeObject:[selectedObjects objectAtIndex:0]]; +} + +- (void)removeFirstByIndex:(id)sender +{ + [arrayController removeObjectAtArrangedObjectIndex:0]; +} + +- (void)observeValueForKeyPath:(CPString)keyPath ofObject:(id)object change:(CPDictionary)change context:(id)context +{ + var oldIndex = [change valueForKey:CPKeyValueChangeOldKey]; + var newIndex = [change valueForKey:CPKeyValueChangeNewKey]; + + CPLog("TCDocument selectionIndexChanged from " + oldIndex + " to " + newIndex + ", contains " + [[arrayController arrangedObjects] count] + " objects"); +} + +@end + +@implementation Item : CPObject +{ + CPString title; +} + +- (id)initWithTitle:(CPString)aTitle +{ + self = [super init]; + if (self) + { + title = aTitle; + } + return self; +} + +- (CPString)title +{ + return title; +} + +@end + diff --git a/Tests/Manual/ArrayControllerRemovingFirstTest/Info.plist b/Tests/Manual/ArrayControllerRemovingFirstTest/Info.plist new file mode 100644 index 000000000..42f65de58 --- /dev/null +++ b/Tests/Manual/ArrayControllerRemovingFirstTest/Info.plist @@ -0,0 +1,12 @@ + + + + + CPApplicationDelegateClass + AppController + CPBundleName + ArrayControllerRemovingFirstTest + CPPrincipalClass + CPApplication + + diff --git a/Tests/Manual/ArrayControllerRemovingFirstTest/Jakefile b/Tests/Manual/ArrayControllerRemovingFirstTest/Jakefile new file mode 100644 index 000000000..6f4a90273 --- /dev/null +++ b/Tests/Manual/ArrayControllerRemovingFirstTest/Jakefile @@ -0,0 +1,93 @@ +/* + * Jakefile + * ArrayControllerRemovingFirstTest + * + * Created by You on July 17, 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 ("ArrayControllerRemovingFirstTest", function(task) +{ + task.setBuildIntermediatesPath(FILE.join("Build", "ArrayControllerRemovingFirstTest.build", configuration)); + task.setBuildPath(FILE.join("Build", configuration)); + + task.setProductName("ArrayControllerRemovingFirstTest"); + task.setIdentifier("com.yourcompany.ArrayControllerRemovingFirstTest"); + task.setVersion("1.0"); + task.setAuthor("Your Company"); + task.setEmail("feedback @nospam@ yourcompany.com"); + task.setSummary("ArrayControllerRemovingFirstTest"); + 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", ["ArrayControllerRemovingFirstTest"], 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", "ArrayControllerRemovingFirstTest", "index.html")]); +}); + +task ("run-release", ["release"], function() +{ + OS.system(["open", FILE.join("Build", "Release", "ArrayControllerRemovingFirstTest", "index.html")]); +}); + +task ("deploy", ["release"], function() +{ + FILE.mkdirs(FILE.join("Build", "Deployment", "ArrayControllerRemovingFirstTest")); + OS.system(["press", "-f", FILE.join("Build", "Release", "ArrayControllerRemovingFirstTest"), FILE.join("Build", "Deployment", "ArrayControllerRemovingFirstTest")]); + printResults("Deployment") +}); + +task ("desktop", ["release"], function() +{ + FILE.mkdirs(FILE.join("Build", "Desktop", "ArrayControllerRemovingFirstTest")); + require("cappuccino/nativehost").buildNativeHost(FILE.join("Build", "Release", "ArrayControllerRemovingFirstTest"), FILE.join("Build", "Desktop", "ArrayControllerRemovingFirstTest", "ArrayControllerRemovingFirstTest.app")); + printResults("Desktop") +}); + +task ("run-desktop", ["desktop"], function() +{ + OS.system([FILE.join("Build", "Desktop", "ArrayControllerRemovingFirstTest", "ArrayControllerRemovingFirstTest.app", "Contents", "MacOS", "NativeHost"), "-i"]); +}); + +function printResults(configuration) +{ + print("----------------------------"); + print(configuration+" app built at path: "+FILE.join("Build", configuration, "ArrayControllerRemovingFirstTest")); + print("----------------------------"); +} diff --git a/Tests/Manual/ArrayControllerRemovingFirstTest/Resources/spinner.gif b/Tests/Manual/ArrayControllerRemovingFirstTest/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/ArrayControllerRemovingFirstTest/index-debug.html b/Tests/Manual/ArrayControllerRemovingFirstTest/index-debug.html new file mode 100644 index 000000000..1c5f0943a --- /dev/null +++ b/Tests/Manual/ArrayControllerRemovingFirstTest/index-debug.html @@ -0,0 +1,107 @@ + + + + + + + + + + + + + + + ArrayControllerRemovingFirstTest + + + + + + + + + + + + + + +
+
+ + + +
+
+ + + diff --git a/Tests/Manual/ArrayControllerRemovingFirstTest/index.html b/Tests/Manual/ArrayControllerRemovingFirstTest/index.html new file mode 100644 index 000000000..707d86be9 --- /dev/null +++ b/Tests/Manual/ArrayControllerRemovingFirstTest/index.html @@ -0,0 +1,78 @@ + + + + + + + + + + + + + + + ArrayControllerRemovingFirstTest + + + + + + + + + + + + +
+
+ + + +
+
+ + + + diff --git a/Tests/Manual/ArrayControllerRemovingFirstTest/main.j b/Tests/Manual/ArrayControllerRemovingFirstTest/main.j new file mode 100644 index 000000000..60b8fb56d --- /dev/null +++ b/Tests/Manual/ArrayControllerRemovingFirstTest/main.j @@ -0,0 +1,18 @@ +/* + * AppController.j + * ArrayControllerRemovingFirstTest + * + * Created by You on July 17, 2012. + * Copyright 2012, Your Company All rights reserved. + */ + +@import +@import + +@import "AppController.j" + + +function main(args, namedArgs) +{ + CPApplicationMain(args, namedArgs); +}