TAPAAL

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

  1. undo-redo-update-scrollbar-1875174
  2. Merge into trunk
Proposed by Peter Haahr Taankvist
Status: Merged
Approved by: Jiri Srba
Approved revision: 1049
Merged at revision: 1049
Proposed branch: lp:~tapaal-contributor/tapaal/undo-redo-update-scrollbar-1875174
Merge into: lp:tapaal
Diff against target: 55 lines (+7/-2)
2 files modified
src/pipe/gui/canvas/DrawingSurfaceImpl.java (+1/-1)
src/pipe/gui/undo/TranslatePetriNetObjectEdit.java (+6/-1)
To merge this branch: bzr merge lp:~tapaal-contributor/tapaal/undo-redo-update-scrollbar-1875174
Reviewer Review Type Date Requested Status
Jiri Srba Approve
Kenneth Yrke Jørgensen code Approve
Review via email: mp+383301@code.launchpad.net

Commit message

Now revalidates the drawingsurface after undoing movement of pnobjects.

To post a comment you must log in.
Revision history for this message
Jiri Srba (srba) wrote :

Works fine and can be approved for merge to trunk. Please, prepare also a separate branch for merge to 3.6.

Revision history for this message
Kenneth Yrke Jørgensen (yrke) :
review: Approve (code)
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/canvas/DrawingSurfaceImpl.java'
2--- src/pipe/gui/canvas/DrawingSurfaceImpl.java 2020-04-18 13:18:51 +0000
3+++ src/pipe/gui/canvas/DrawingSurfaceImpl.java 2020-05-02 15:34:44 +0000
4@@ -675,7 +675,7 @@
5 public void translateSelection(ArrayList<PetriNetObject> objects, int transX, int transY) {
6 tabContent.getUndoManager().newEdit(); // new "transaction""
7 for (PetriNetObject pnobject : objects) {
8- tabContent.getUndoManager().addEdit(new TranslatePetriNetObjectEdit(pnobject, transX, transY));
9+ tabContent.getUndoManager().addEdit(new TranslatePetriNetObjectEdit(pnobject, transX, transY, this));
10 }
11 }
12 }
13
14=== modified file 'src/pipe/gui/undo/TranslatePetriNetObjectEdit.java'
15--- src/pipe/gui/undo/TranslatePetriNetObjectEdit.java 2011-09-22 13:02:33 +0000
16+++ src/pipe/gui/undo/TranslatePetriNetObjectEdit.java 2020-05-02 15:34:44 +0000
17@@ -4,6 +4,7 @@
18
19 package pipe.gui.undo;
20
21+import pipe.gui.canvas.DrawingSurfaceImpl;
22 import pipe.gui.graphicElements.PetriNetObject;
23 import dk.aau.cs.gui.undo.Command;
24
25@@ -16,25 +17,29 @@
26 PetriNetObject pnObject;
27 Integer transX;
28 Integer transY;
29+ DrawingSurfaceImpl ds;
30
31 /** Creates a new instance of */
32 public TranslatePetriNetObjectEdit(PetriNetObject _pnObject,
33- Integer _transX, Integer _transY) {
34+ Integer _transX, Integer _transY, DrawingSurfaceImpl drawingSurface) {
35 pnObject = _pnObject;
36 transX = _transX;
37 transY = _transY;
38+ ds = drawingSurface;
39 }
40
41 /** */
42 @Override
43 public void undo() {
44 pnObject.translate(-transX, -transY);
45+ ds.updatePreferredSize();
46 }
47
48 /** */
49 @Override
50 public void redo() {
51 pnObject.translate(transX, transY);
52+ ds.updatePreferredSize();
53 }
54
55 @Override

Subscribers

People subscribed via source and target branches