Merge lp:~tapaal-contributor/tapaal/undo-redo-update-scrollbar-3.6-1875174 into lp:tapaal/3.6

Proposed by Jiri Srba
Status: Merged
Approved by: Jiri Srba
Approved revision: 1049
Merged at revision: 1049
Proposed branch: lp:~tapaal-contributor/tapaal/undo-redo-update-scrollbar-3.6-1875174
Merge into: lp:tapaal/3.6
Diff against target: 54 lines (+7/-2)
2 files modified
src/pipe/gui/undo/TranslatePetriNetObjectEdit.java (+6/-1)
src/pipe/gui/undo/UndoManager.java (+1/-1)
To merge this branch: bzr merge lp:~tapaal-contributor/tapaal/undo-redo-update-scrollbar-3.6-1875174
Reviewer Review Type Date Requested Status
Jiri Srba Approve
Review via email: mp+383674@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/pipe/gui/undo/TranslatePetriNetObjectEdit.java'
2--- src/pipe/gui/undo/TranslatePetriNetObjectEdit.java 2011-09-22 13:02:33 +0000
3+++ src/pipe/gui/undo/TranslatePetriNetObjectEdit.java 2020-05-10 19:50:57 +0000
4@@ -4,6 +4,7 @@
5
6 package pipe.gui.undo;
7
8+import pipe.gui.DrawingSurfaceImpl;
9 import pipe.gui.graphicElements.PetriNetObject;
10 import dk.aau.cs.gui.undo.Command;
11
12@@ -16,25 +17,29 @@
13 PetriNetObject pnObject;
14 Integer transX;
15 Integer transY;
16+ DrawingSurfaceImpl view;
17
18 /** Creates a new instance of */
19 public TranslatePetriNetObjectEdit(PetriNetObject _pnObject,
20- Integer _transX, Integer _transY) {
21+ Integer _transX, Integer _transY, DrawingSurfaceImpl view) {
22 pnObject = _pnObject;
23 transX = _transX;
24 transY = _transY;
25+ this.view = view;
26 }
27
28 /** */
29 @Override
30 public void undo() {
31 pnObject.translate(-transX, -transY);
32+ view.updatePreferredSize();
33 }
34
35 /** */
36 @Override
37 public void redo() {
38 pnObject.translate(transX, transY);
39+ view.updatePreferredSize();
40 }
41
42 @Override
43
44=== modified file 'src/pipe/gui/undo/UndoManager.java'
45--- src/pipe/gui/undo/UndoManager.java 2019-04-28 10:13:47 +0000
46+++ src/pipe/gui/undo/UndoManager.java 2020-05-10 19:50:57 +0000
47@@ -190,7 +190,7 @@
48 Iterator<PetriNetObject> iterator = objects.iterator();
49 while (iterator.hasNext()) {
50 addEdit(new TranslatePetriNetObjectEdit(iterator.next(), transX,
51- transY));
52+ transY, view));
53 }
54 }
55

Subscribers

People subscribed via source and target branches