Correctly Deal with Identity Changes and Divergent History #5

kske · 2021-12-22T15:53:38+01:00

kske commented

2021-12-22 15:53:38 +01:00

Identity changes are now immediately discarded by the change manager.
addChange returns whether the change was actually added or discarded.
When "overwriting" the history by adding change after performing an undo, the new change is added at the correct position and the divergent history is discarded.

* Identity changes are now immediately discarded by the change manager. * `addChange` returns whether the change was actually added or discarded. * When "overwriting" the history by adding change after performing an undo, the new change is added at the correct position and the divergent history is discarded.

kske self-assigned this 2021-12-22 15:53:38 +01:00

kske added 2 commits 2021-12-22 15:53:39 +01:00

zdm/undo-redo/pipeline/head This commit looks good Details

1155541350

Fix javafx module artifact name

zdm/undo-redo/pipeline/head This commit looks good Details

5d1ef84770

Discard identity changes, discard divergent branches

kske requested review from delvh 2021-12-22 15:53:43 +01:00

kske requested review from mpk 2021-12-22 15:53:43 +01:00

delvh started working 2021-12-22 16:52:08 +01:00

delvh reviewed 2021-12-22 17:06:46 +01:00

core/src/main/java/dev/kske/undoredo/core/UnlimitedChangeManager.java

						
				@ -16,2 +18,4 @@

					private int	markedIndex	= -1;

					/**

					 * @implNode As this change manager uses a linear history model, all changes behind the last

delvh commented

2021-12-22 17:06:13 +01:00

I can definitely see needing this Javadoc more often.
What about implementing a superclass called LinearHistoryChangeManager that automatically supplies the Javadoc and general implementations of functions (undo, redo, and addChange given a new protected abstract function removeDivergentChanges)?

I can definitely see needing this Javadoc more often. What about implementing a superclass called `LinearHistoryChangeManager` that automatically supplies the Javadoc and general implementations of functions (`undo`, `redo`, and `addChange` given a new protected abstract function `removeDivergentChanges`)?

kske commented

2021-12-23 09:00:14 +01:00

I think we need to create more change manager implementations before deciding what belongs in the superclass and what doesn't. In any case, this branch is probably the wrong place add this.

👀 1

delvh marked this conversation as resolved

core/src/test/java/dev/kske/undoredo/core/ChangeManagerTest.java

						
				@ -103,0 +124,4 @@

						manager.addChange(change);

						manager.undo();

						assertTrue(manager.addChange(new IntChange(wrapper, 2)));

						assertFalse(manager.isRedoAvailable());