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

Fix undo (CTRL + Z) and redo for inserting an entry #9777

Merged
merged 9 commits into from
May 7, 2023
Merged

Fix undo (CTRL + Z) and redo for inserting an entry #9777

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
da2d715
We fixed an issue where an exception was thrown for the user after Ct…
brunaoo Apr 18, 2023
89c4b32
remove two spaces (Style code error).
brunaoo Apr 18, 2023
703e5f5
pass frame params to prevent ctrl z exeptions in input text controls
Siedlerchr Apr 24, 2023
c7aab8a
Merge branch 'main' into fix-for-issue-9737
koppor Apr 24, 2023
16a4cb6
Merge branch 'JabRef:main' into fix-for-issue-9737
brunaoo Apr 27, 2023
2025b31
check if we can do a redo/undo to prevent exceptions
Siedlerchr Apr 28, 2023
50b18f7
Merge remote-tracking branch 'upstream/main' into fix-for-issue-9737
Siedlerchr May 5, 2023
69613d4
move exception handling upwards
Siedlerchr May 5, 2023
ec9f899
cleanup
Siedlerchr May 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 10 additions & 6 deletions src/main/java/org/jabref/gui/undo/CountingUndoManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,16 +27,20 @@ public synchronized boolean addEdit(UndoableEdit edit) {

@Override
public synchronized void undo() throws CannotUndoException {
super.undo();
current--;
postUndoRedoEvent();
if (canUndo()) {
super.undo();
current--;
postUndoRedoEvent();
}
Siedlerchr marked this conversation as resolved.
Show resolved Hide resolved
}

@Override
public synchronized void redo() throws CannotUndoException {
super.redo();
current++;
postUndoRedoEvent();
if (canRedo()) {
super.redo();
current++;
postUndoRedoEvent();
}
}

public synchronized void markUnchanged() {
Expand Down