Merge lp:~yrke/tapaal/fix-1890292-undoArcNeedTwoActions into lp:tapaal

Proposed by Kenneth Yrke Jørgensen
Status: Merged
Approved by: Jiri Srba
Approved revision: 1076
Merged at revision: 1076
Proposed branch: lp:~yrke/tapaal/fix-1890292-undoArcNeedTwoActions
Merge into: lp:tapaal
Diff against target: 65 lines (+16/-39)
1 file modified
src/dk/aau/cs/gui/TabContent.java (+16/-39)
To merge this branch: bzr merge lp:~yrke/tapaal/fix-1890292-undoArcNeedTwoActions
Reviewer Review Type Date Requested Status
Jiri Srba Approve
Review via email: mp+388814@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Jiri Srba (srba) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/dk/aau/cs/gui/TabContent.java'
2--- src/dk/aau/cs/gui/TabContent.java 2020-08-04 08:13:19 +0000
3+++ src/dk/aau/cs/gui/TabContent.java 2020-08-06 12:53:06 +0000
4@@ -1735,45 +1735,22 @@
5 getTransitionFireingComponent().fireSelectedTransition();
6 }
7
8- @Override
9- public void undo() {
10-
11- if (!isInAnimationMode()) {
12-
13- //If arc is being drawn delete it
14-
15- if (editorMode == Pipe.ElementType.SELECT) {
16- getUndoManager().undo();
17- network().buildConstraints();
18-
19- } else {
20-
21- setMode(Pipe.ElementType.SELECT);
22-
23- }
24- }
25-
26-
27- }
28-
29- @Override
30- public void redo() {
31-
32- if (!isInAnimationMode()) {
33-
34- //If arc is being drawn delete it
35-
36- if (editorMode == Pipe.ElementType.SELECT) {
37- getUndoManager().redo();
38- network().buildConstraints();
39-
40- } else {
41-
42- setMode(Pipe.ElementType.SELECT);
43-
44- }
45- }
46- }
47+ @Override
48+ public void undo() {
49+ if (!isInAnimationMode()) {
50+ getUndoManager().undo();
51+ network().buildConstraints();
52+
53+ }
54+ }
55+
56+ @Override
57+ public void redo() {
58+ if (!isInAnimationMode()) {
59+ getUndoManager().redo();
60+ network().buildConstraints();
61+ }
62+ }
63
64 final AbstractDrawingSurfaceManager notingManager = new AbstractDrawingSurfaceManager(){
65 @Override

Subscribers

People subscribed via source and target branches