Techniques to manage collaborative documents
First Claim
1. A method implemented in computer hardware, comprising:
- processing a collaborative document having a presentation surface with multiple constructs;
rendering a first document instance of the collaborative document;
receiving a document update list comprising a set of change records for a second document instance of the collaborative document, each change record comprising information for a modification made to a construct of the second document instance;
determining that a time stamp of an undo record and a time stamp of a change record are both within a synchronization interval when the undo record and the change record have matching constructs, annotating the undo record as a conflict record, and resolving the conflict record using a set of construct-based conflict rules;
modifying properties of one or more constructs for the first document instance based on the change records to form a merged document instance of the collaborative document;
managing a local undo stack for the first document instance, the local undo stack comprising a set of undo records each storing information to undo a modification made to a construct of the first document instance; and
preserving one or more of the undo records of the local undo stack after formation of the merged document instance based on one or more of the change records.
0 Assignments
0 Petitions
Accused Products
Abstract
Techniques to manage collaborative documents are described. An application program may comprise a document render component to render a first document instance of a collaborative document, a document share component to receive a document update list comprising a set of change records for a second document instance of the collaborative document, and modify properties of one or more constructs for the first document instance based on the change records to form a merged document instance of the collaborative document, and an undo manager component to manage a local undo stack for the first document instance, the local undo stack comprising a set of undo records, and determine whether to preserve one or more of the undo records of the local undo stack after formation of the merged document instance based on one or more of the change records. Other embodiments are described and claimed.
-
Citations
14 Claims
-
1. A method implemented in computer hardware, comprising:
-
processing a collaborative document having a presentation surface with multiple constructs; rendering a first document instance of the collaborative document; receiving a document update list comprising a set of change records for a second document instance of the collaborative document, each change record comprising information for a modification made to a construct of the second document instance; determining that a time stamp of an undo record and a time stamp of a change record are both within a synchronization interval when the undo record and the change record have matching constructs, annotating the undo record as a conflict record, and resolving the conflict record using a set of construct-based conflict rules; modifying properties of one or more constructs for the first document instance based on the change records to form a merged document instance of the collaborative document; managing a local undo stack for the first document instance, the local undo stack comprising a set of undo records each storing information to undo a modification made to a construct of the first document instance; and preserving one or more of the undo records of the local undo stack after formation of the merged document instance based on one or more of the change records. - View Dependent Claims (2, 3, 4, 5, 6, 7, 8, 9, 10)
-
-
11. An apparatus, comprising:
-
a processor circuit coupled to memory; and an application program stored in the memory and operative to; retrieve, by the processor circuit, a set of undo records of a local undo stack, each undo record comprising information to undo a modification made to a construct of a first document instance of a collaborative document, retrieve, by the processor circuit, a set of change records of a document update list, each change record comprising information for a modification made to a construct of a second document instance of the collaborative document, determine, by the processor circuit, whether a time stamp of an undo record and a time stamp of a change record are both within a synchronization interval when the undo record and the change record have matching constructs, and if so, annotate the undo record as a conflict record and delete the local undo stack, compare, by the processor circuit, the set of undo records and the set of change records to produce comparison results, and determine whether to preserve, by the processor circuit, one or more of the undo records of the local undo stack based on the comparison results. - View Dependent Claims (12, 13, 14)
-
Specification