Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Tiny change to fix UndoRedoStack.clear() #16

Merged
merged 1 commit into from
Mar 8, 2024
Merged

Tiny change to fix UndoRedoStack.clear() #16

merged 1 commit into from
Mar 8, 2024

Conversation

maarzt
Copy link
Contributor

@maarzt maarzt commented Mar 7, 2024 •
edited
Loading

The Mastodon Git Collaboration Plugin benefits a lot from the ability to reload the Mastodon Project from disk. This reload can actually be implemented fairly easily. The "reload from disk" operation triggers (intentionally) triggers a graphRebuilt. This graphRebuilt triggers a clearing of the undo redo history. But currently the clearing of the undo redo stack doesn't work properly. Adding a spot after a graphRebuilt event fails and triggers an ArrayIndexOutOfBoundsException:

Exception in thread "AWT-EventQueue-0" java.lang.ArrayIndexOutOfBoundsException: Array index out of range: 6
	at gnu.trove.list.array.TByteArrayList.set(TByteArrayList.java:298)
	at org.mastodon.undo.UndoRedoStack$ByteAccess.setValue(UndoRedoStack.java:338)
	at org.mastodon.undo.UndoRedoStack.record(UndoRedoStack.java:92)
	at org.mastodon.undo.AbstractUndoableEditType.recordType(AbstractUndoableEditType.java:59)
	at org.mastodon.undo.GraphUndoRedoStack$AddVertexType.record(GraphUndoRedoStack.java:163)
	at org.mastodon.undo.GraphUndoRedoStack$AddVertexType.record(GraphUndoRedoStack.java:144)
	at org.mastodon.undo.GraphUndoRecorder.vertexAdded(GraphUndoRecorder.java:184)
	at org.mastodon.graph.ref.ListenableGraphImp.notifyVertexAdded(ListenableGraphImp.java:149)
	at org.mastodon.graph.ref.ListenableGraphImp$1.notifyVertexAdded(ListenableGraphImp.java:78)
	at org.mastodon.graph.ref.ListenableGraphImp$1.notifyVertexAdded(ListenableGraphImp.java:74)
	at org.mastodon.graph.ref.AbstractListenableVertex.initDone(AbstractListenableVertex.java:147)
	at org.mastodon.mamut.model.Spot.init(Spot.java:144)
	at org.mastodon.mamut.model.ModelOverlayProperties.initVertex(ModelOverlayProperties.java:142)
	at org.mastodon.mamut.model.ModelOverlayProperties.initVertex(ModelOverlayProperties.java:39)
	at org.mastodon.views.bdv.overlay.wrap.OverlayVertexWrapper.init(OverlayVertexWrapper.java:137)
	at org.mastodon.views.bdv.overlay.wrap.OverlayVertexWrapper.init(OverlayVertexWrapper.java:41)
	at org.mastodon.views.bdv.overlay.EditSpecialBehaviours$AddSpotAndLinkIt.init(EditSpecialBehaviours.java:478)

This surprising small commit fixes that problem.

(I will open another PR to mastodon core, that thoroughly tests if undo/redo is working properly.)

@maarzt
Tiny change to fix UndoRedoStack.clear()
10be705 
The Mastodon Git Collaboration Plugin benefits a lot from the ability to
reload the Mastodon Project from disk. This reload can actually be
implemented fairly easily. The ModelGraph listeners are muted during the
reload, and a "graphRebuilt" event is triggered after the reload from disk
operation. The graphRebuilt requires a clearing of the undo redo history.
But currently the clearing of the undo redo stack doesn't work properly.
Adding a spot after a graphRebuilt event fails and triggers an
ArrayIndexOutOfBounds exception.

This commit fixes that problem.
This was referenced Mar 7, 2024
Merged
Closed
@tinevez tinevez merged commit 5747775 into master Mar 8, 2024
1 check passed
@tinevez tinevez deleted the fix-undoredostack-clear branch March 8, 2024 09:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@maarzt @tinevez