Conflict resolution in recovery of electronic data

• US 20080059894A1
• Filed: 08/04/2006
• Published: 03/06/2008
• Est. Priority Date: 08/04/2006
• Status: Active Grant

• Current Assignee: Apple Inc.
• Original Assignee: Apple Inc.
• Inventors: Ragan, Gene Zyrl, Cisler, Pavel, Lyons, Dave
• Granted Patent: US 7,853,567 B2
• Time in Patent Office: Days
• US Class Current: 715/762
• CPC Class Codes: G06F 11/1469 Backup restoration techniques
• CPC Class Codes: G06F 2201/84 Using snapshots, i.e. a logical point-in-time copy of the data

Abstract

Systems and methods are provided for resolving conflicts. In one implementation, a method relating to modifying a view in a user interface is provided. The method includes receiving, while a current view is displayed in a user interface, a first user input requesting that a history view associated with the current view be displayed. The history view is displayed in response to the first user input, the history view includes at least a first visual representation of an earlier version of the current view, and the earlier version includes a first element. There is received, while the history view is displayed, a second user input requesting that the current view be modified according to the earlier version, at least with regard to the first element. The method further includes determining, in response to the second user input, whether the current view includes a current version of the first element.

Claims

1. A method relating to modifying a view in a user interface, the method comprising:

receiving, while a current view is displayed in a user interface, a first user input requesting that a history view associated with the current view be displayed;

displaying the history view in response to the first user input, the history view including at least a first visual representation of an earlier version of the current view, the earlier version including a first element;

receiving, while the history view is displayed, a second user input requesting that the current view be modified according to the earlier version, at least with regard to the first element; and

determining, in response to the second user input, whether the current view includes a current version of the first element.

2. The method of claim 1, wherein the determination indicates that the current view does not include a current version of the first element, further comprising modifying, in response to the determination, the current view to include at least the first element.

3. The method of claim 1, wherein the determination indicates that the current view does include a current version of the first element, further comprising displaying a conflict resolution view in response to the determination.

4. The method of claim 3, wherein the conflict resolution view provides user-selectable conflict resolution by at least one option of:

canceling the request that the current view be modified;

replacing the current version of the first element with the first element included in the earlier version;

modifying the current view to include both the current version of the first element and the first element included in the earlier version.

5. The method of claim 4, wherein the user-selectable conflict resolution provides the option of merging, in the current view, the current version of the first element and the first element included in the earlier version.

6. The method of claim 4, wherein the user-selectable conflict resolution includes a rollover effect graphically indicating a result of selecting each of the options.

7. The method of claim 6, wherein, for the option of canceling the request that the current view be modified, the rollover effect indicates that the current version of the first element will be kept.

8. The method of claim 6, wherein, for the option of replacing the current version of the first element with the first element included in the earlier version, the rollover effect indicates that the current version of the first element will be discarded.

9. The method of claim 4, wherein, for the option of modifying the current view to include both the current version of the first element and the first element included in the earlier version, the rollover effect indicates that both the current version of the first element and the first element included in the earlier version will be kept.

10. The method of claim 3, wherein the conflict resolution view contains the current version of the first element and the first element included in the earlier version.

11. The method of claim 1, wherein the first element is one selected from the group consisting of:

a folder, a file, an item, an information portion, a playlist, a directory, an image, system parameters, and combinations thereof.

12. A computer-readable medium having stored thereon instructions which, when executed by a processor, causes the processor to perform operations comprising:

receiving, while a current view is displayed in a user interface, a first user input requesting that a history view associated with the current view be displayed;

displaying the history view in response to the first user input, the history view including at least a first visual representation of an earlier version of the current view, the earlier version including a first element;

receiving, while the history view is displayed, a second user input requesting that the current view be modified according to the earlier version, at least with regard to the first element; and

determining, in response to the second user input, whether the current view includes a current version of the first element.

13. A computer program product tangibly embodied in an information carrier, the computer program product including instructions that, when executed, generate on a display device a graphical user interface comprising:

a view display area for presenting a current view;

a history view display area for presenting a history view associated with the current view, the history view including at least a first visual representation of an earlier version of the current view, the history view providing that a user can initiate a restoration of the current view with at least a portion of the earlier version; and

a conflict resolution function for alerting the user to a conflict in performing the restoration.

14. The computer program product of claim 13, wherein the conflict resolution function includes at least one option of:

an input control to cancel restoration;

an input control to keep both conflicting elements;

an input control to perform the restoration; and

an input control to merge both conflicting elements.

15. The computer program product of claim 14, wherein a rollover effect is provided that graphically indicates a result of selecting any of the options.

16. The computer program product of claim 13, wherein the first visual representation is included in a timeline presented in the history view, the timeline including several visual representations of earlier versions of the current view.

17. The computer program product of claim 16, wherein the history view further includes an input control for modifying the timeline to include only at least one of the visual representations whose corresponding earlier version differs from the current view.

18. The computer program product of claim 13, wherein the conflict resolution function is included in a conflict resolution view that presents visual representations of respective elements in the current version and the earlier version that give rise to the conflict.

19. A method comprising:

defining a criterion for capturing a state of a view of a user interface;

capturing the state of the view in accordance with the criterion;

receiving a prompt to suspend presentation of a current view and present a captured view;

determining if a conflict exists between the captured view and the current view; and

if not, reinstating the captured view into the current view of the user interface.

20. The method of claim 19, further comprising if a conflict is detected, resolving the conflict prior to reinstating the captured view.

21. The method of claim 20, wherein the conflict is deemed to exist if the determination indicates that information present in the current view would be lost if the captured view were reinstated into the current view.

22. A computer-readable medium having stored thereon instructions which, when executed by a processor, causes the processor to perform operations comprising:

defining a criterion for capturing a state of a view of a user interface;

capturing the state of the view in accordance with the criterion;

receiving a prompt to suspend presentation of a current view and present a captured view;

determining if a conflict exists between the captured view and the current view; and

if not, reinstating the captured view into the current view of the user interface.

23. A method comprising:

evaluating a current view of a user interface;

determining that an undesirable change to the current view of the user interface has occurred relative to a past view of the user interface;

suspending the current view of the user interface;

presenting one or more past views of the user interface;

determining if a conflict exists between the captured view and the current view; and

if not, reinstating a past view of the user interface into the current view.

24. A computer-readable medium having stored thereon instructions which, when executed by a processor, causes the processor to perform operations comprising:

evaluating a current view of a user interface;

determining that an undesirable change to the current view of the user interface has occurred relative to a past view of the user interface;

suspending the current view of the user interface;

presenting one or more past views of the user interface;

determining if a conflict exists between the captured view and the current view; and

if not, reinstating a past view of the user interface into the current view.

25. A method comprising:

presenting an element in a user interface, the element having a current state and being presented in a current view of a user interface;

capturing over time, a state of the element;

suspending a current view of the user interface including the element; and

reinstating a past view of the element including resolving a conflict between the current view and past view with respect to the element.

26. A computer-readable medium having stored thereon instructions which, when executed by a processor, causes the processor to perform operations comprising:

presenting an element in a user interface, the element having a current state and being presented in a current view of a user interface;

capturing over time, a state of the element;

suspending a current view of the user interface including the element;

reinstating a past view of the element including resolving a conflict between the current view and past view with respect to the element.