Author: ericwa
Date: Wed Mar 12 23:05:04 2014
New Revision: 10552
URL: http://svn.gna.org/viewcvs/etoile?rev=10552&view=rev
Log:
COUndoTrack: make -setCurrentNode: disable coalescing
Modified:
trunk/Etoile/Frameworks/CoreObject/Tests/Undo/TestUndo.m
trunk/Etoile/Frameworks/CoreObject/Undo/COUndoTrack.m
Modified: trunk/Etoile/Frameworks/CoreObject/Tests/Undo/TestUndo.m
URL:
http://svn.gna.org/viewcvs/etoile/trunk/Etoile/Frameworks/CoreObject/Tests/Undo/TestUndo.m?rev=10552&r1=10551&r2=10552&view=diff
==============================================================================
--- trunk/Etoile/Frameworks/CoreObject/Tests/Undo/TestUndo.m (original)
+++ trunk/Etoile/Frameworks/CoreObject/Tests/Undo/TestUndo.m Wed Mar 12
23:05:04 2014
@@ -693,6 +693,25 @@
[self checkCommand: _testTrack.nodes[4] isSetVersionFrom: r5 to: r6];
}
+- (void)testUndoDisablesCoalescing
+{
+ OutlineItem *item = [[ctx insertNewPersistentRootWithEntityName:
@"OutlineItem"] rootObject];
+ [ctx commit];
+
+ [_testTrack beginCoalescing];
+
+ UKTrue([_testTrack isCoalescing]);
+
+ item.label = @"a";
+ [ctx commitWithUndoTrack: _testTrack];
+
+ UKTrue([_testTrack isCoalescing]);
+
+ [_testTrack undo];
+
+ UKFalse([_testTrack isCoalescing]);
+}
+
- (void) testSelectiveUndoCommitDescriptor
{
UKNotNil([COCommitDescriptor registeredDescriptorForIdentifier:
@"org.etoile.CoreObject.selective-undo"]);
Modified: trunk/Etoile/Frameworks/CoreObject/Undo/COUndoTrack.m
URL:
http://svn.gna.org/viewcvs/etoile/trunk/Etoile/Frameworks/CoreObject/Undo/COUndoTrack.m?rev=10552&r1=10551&r2=10552&view=diff
==============================================================================
--- trunk/Etoile/Frameworks/CoreObject/Undo/COUndoTrack.m (original)
+++ trunk/Etoile/Frameworks/CoreObject/Undo/COUndoTrack.m Wed Mar 12
23:05:04 2014
@@ -153,6 +153,7 @@
- (BOOL)setCurrentNode: (id <COTrackNode>)node
{
+ [self endCoalescing];
const NSUInteger currentIndex = [_nodesOnCurrentUndoBranch
indexOfObject: [self currentNode]];
const NSUInteger targetIndex = [_nodesOnCurrentUndoBranch
indexOfObject: node];
_______________________________________________
Etoile-cvs mailing list
Etoile-cvs@gna.org
https://mail.gna.org/listinfo/etoile-cvs
