@@ -72,5 +72,6 @@ - (BOOL) validateUserInterfaceItem:(id)anItem; - (void)setProjectsTableView:(NSTableView *)tv; +- (void)setDocument:(TTDocument *)aDocument; @end MainController.h @@ -689,6 +689,15 @@ tvProjects = [tv retain]; } +- (void)setDocument:(TTDocument *)aDocument +{ + [document release]; + document = [aDocument retain]; + [tvProjects reloadData]; + [tvTasks reloadData]; + [tvWorkPeriods reloadData]; +} + @@ -724,6 +733,15 @@ - (BOOL)tableView:(NSTableView *)aTableView acceptDrop:(id < NSDraggingInfo >)info row:(int)row dropOperation:(NSTableViewDropOperation)operation { + if (aTableView == tvProjects && [info draggingSource] == tvProjects) + { + NSData *rowsData = [[info draggingPasteboard] dataForType:@"TIME_TRACKER_PROJECT_ROWS"]; + NSIndexSet *indexSet = [NSKeyedUnarchiver unarchiveObjectWithData:rowsData]; + + int sourceRow = [indexSet firstIndex]; + [document moveProject:[document objectInProjectsAtIndex:sourceRow] toIndex:row]; + return YES; + } return NO; } MainController.m @@ -17,6 +17,8 @@ - (void) setProjects:(NSArray *)projs; - (void) addProject:(TProject *)proj; - (void) removeProject:(TProject *)proj; +- (id)objectInProjectsAtIndex:(int)index; +- (void)moveProject:(TProject *)proj toIndex:(int)index; - (NSData *)dataOfType:(NSString *)aType error:(NSError **)outError; TTDocument.h @@ -37,6 +37,17 @@ [_projects removeObject:proj]; } +- (id)objectInProjectsAtIndex:(int)index +{ + return [_projects objectAtIndex:index]; +} + +- (void)moveProject:(TProject *)proj toIndex:(int)index +{ +// [_projects insertObject:proj atIndex:index]; +// [_projects removeObject:proj]; +} + - (NSData *)dataOfType:(NSString *)aType error:(NSError **)outError { NSMutableData* data = [[[NSMutableData alloc] init] autorelease]; TTDocument.m @@ -34,8 +34,8 @@ describe OSX::MainController do rowData = pasteboard.dataForType("TIME_TRACKER_PROJECT_ROWS") rowDataUnarchived = OSX::NSKeyedUnarchiver.unarchiveObjectWithData(rowData) rowDataUnarchived.isKindOfClass(OSX::NSIndexSet).should be_true - rowDataUnarchived.count.should == 1 - rowDataUnarchived.firstIndex.should == 1 + rowDataUnarchived.count.should equal(1) + rowDataUnarchived.firstIndex.should equal(1) end @@ -52,7 +52,7 @@ describe OSX::MainController do mc.tableView_validateDrop_proposedRow_proposedDropOperation( mockTableViewProjects, mockDraggingInfo, dropRow, dropOperation - ).should equal OSX::NSDragOperationNone + ).should equal(OSX::NSDragOperationNone) end @@ -70,24 +70,47 @@ describe OSX::MainController do mc.tableView_validateDrop_proposedRow_proposedDropOperation( mockTableViewProjects, mockDraggingInfo, dropRow, dropOperation - ).should equal OSX::NSDragOperationMove + ).should equal(OSX::NSDragOperationMove) end + class MockDocument < OSX::NSObject + objc_method :objectInProjectsAtIndex, "@@:i" + objc_method :moveProject_toIndex, "v@:@i" + end + + it "should accept drops when moving rows within the table" do - mc = OSX::MainController.alloc.init mockTableViewProjects = mock("NSTableView Projects") + mockTableViewProjects.stub!(:reloadData) + mockDocument = MockDocument.new + mockProject = mock("Project 1") + mockDocument.stub!(:objectInProjectsAtIndex).with(1).and_return(mockProject) + mc = OSX::MainController.alloc.init mc.setProjectsTableView(mockTableViewProjects) + mc.setDocument(mockDocument) mockDraggingInfo = mock("NSDraggingInfo") + mockDraggingInfo.stub!(:draggingSource).and_return(mockTableViewProjects) dropRow = 0 dropOperation = OSX::NSTableViewDropAbove + dragRows = OSX::NSMutableIndexSet.alloc.init + dragRows.addIndex(1) + pasteboard = OSX::NSPasteboard.pasteboardWithName("rspec pasteboard") + + mc.tableView_writeRowsWithIndexes_toPasteboard( + mockTableViewProjects, dragRows, pasteboard + ) + + mockDraggingInfo.stub!(:draggingPasteboard).and_return(pasteboard) + + + mockDocument.should_receive(:moveProject_toIndex).with(mockProject, dropRow) + mc.tableView_acceptDrop_row_dropOperation( mockTableViewProjects, mockDraggingInfo, dropRow, dropOperation ).should be_true - # check that the row has been moved - end end spec/tt_data_source_reorder_projects_spec.rb da1ca7aa348f4f001e81d6cbdef9db0255a56403 Aaron VonderHaar gruen0aermel@gmail.com http://github.com/avh4/time-tracker-for-mac/commit/dcffed3d39342fedfa017443f6cf66f690740b30 dcffed3d39342fedfa017443f6cf66f690740b30 2008-08-10T23:33:37-07:00 2008-08-10T23:33:37-07:00 Test passes MainController it "should accept drops when moving rows within the table". Stubbed new methods in TTDocument. b457511187c07254acbb50a3a48aa7be58b345d6 Aaron VonderHaar gruen0aermel@gmail.com