TAPAAL

Merge lp:~tapaal-contributor/tapaal/unselect-objects-after-undo-1894108 into lp:tapaal

  1. unselect-objects-after-undo-1894108
  2. Merge into trunk
Proposed by Lena Ernstsen
Status: Merged
Approved by: Jiri Srba
Approved revision: 1095
Merged at revision: 1102
Proposed branch: lp:~tapaal-contributor/tapaal/unselect-objects-after-undo-1894108
Merge into: lp:tapaal
Diff against target: 133 lines (+10/-10)
8 files modified
src/pipe/gui/undo/DeleteAnnotationNoteCommand.java (+1/-0)
src/pipe/gui/undo/DeleteArcPathPointEdit.java (+1/-2)
src/pipe/gui/undo/DeleteTimedInhibitorArcCommand.java (+1/-1)
src/pipe/gui/undo/DeleteTimedInputArcCommand.java (+1/-2)
src/pipe/gui/undo/DeleteTimedOutputArcCommand.java (+1/-2)
src/pipe/gui/undo/DeleteTimedPlaceCommand.java (+1/-2)
src/pipe/gui/undo/DeleteTimedTransitionCommand.java (+1/-0)
src/pipe/gui/undo/DeleteTransportArcCommand.java (+3/-1)
To merge this branch: bzr merge lp:~tapaal-contributor/tapaal/unselect-objects-after-undo-1894108
Reviewer Review Type Date Requested Status
Kenneth Yrke Jørgensen Approve
Review via email: mp+390616@code.launchpad.net

Commit message

Objects are no longer selected after undoing delete

To post a comment you must log in.
Revision history for this message
Kenneth Yrke Jørgensen (yrke) :
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/DeleteAnnotationNoteCommand.java'
2--- src/pipe/gui/undo/DeleteAnnotationNoteCommand.java 2020-04-18 14:41:05 +0000
3+++ src/pipe/gui/undo/DeleteAnnotationNoteCommand.java 2020-09-11 12:43:06 +0000
4@@ -21,6 +21,7 @@
5
6 @Override
7 public void redo() {
8+ note.deselect();
9 model.removePetriNetObject(note);
10 }
11 }
12
13=== modified file 'src/pipe/gui/undo/DeleteArcPathPointEdit.java'
14--- src/pipe/gui/undo/DeleteArcPathPointEdit.java 2020-04-18 14:41:05 +0000
15+++ src/pipe/gui/undo/DeleteArcPathPointEdit.java 2020-09-11 12:43:06 +0000
16@@ -32,8 +32,8 @@
17 /** */
18 @Override
19 public void undo() {
20-
21 //guiModel.addPetriNetObject(point);
22+ point.deselect();
23 arcPath.insertPoint(index, point);
24 arcPath.updateArc();
25 }
26@@ -41,7 +41,6 @@
27 /** */
28 @Override
29 public void redo() {
30-
31 guiModel.removePetriNetObject(point);
32 arcPath.deletePoint(point);
33 arcPath.updateArc();
34
35=== modified file 'src/pipe/gui/undo/DeleteTimedInhibitorArcCommand.java'
36--- src/pipe/gui/undo/DeleteTimedInhibitorArcCommand.java 2020-03-30 08:58:25 +0000
37+++ src/pipe/gui/undo/DeleteTimedInhibitorArcCommand.java 2020-09-11 12:43:06 +0000
38@@ -21,8 +21,8 @@
39
40 @Override
41 public void undo() {
42+ inhibitorArc.deselect();
43 guiModel.addPetriNetObject(inhibitorArc);
44-
45 tapn.add(inhibitorArc.underlyingTimedInhibitorArc());
46 }
47 }
48
49=== modified file 'src/pipe/gui/undo/DeleteTimedInputArcCommand.java'
50--- src/pipe/gui/undo/DeleteTimedInputArcCommand.java 2020-03-30 08:58:25 +0000
51+++ src/pipe/gui/undo/DeleteTimedInputArcCommand.java 2020-09-11 12:43:06 +0000
52@@ -21,9 +21,8 @@
53
54 @Override
55 public void undo() {
56-
57+ timedInputArc.deselect();
58 guiModel.addPetriNetObject(timedInputArc);
59-
60 tapn.add(timedInputArc.underlyingTimedInputArc());
61 }
62
63
64=== modified file 'src/pipe/gui/undo/DeleteTimedOutputArcCommand.java'
65--- src/pipe/gui/undo/DeleteTimedOutputArcCommand.java 2020-03-30 08:58:25 +0000
66+++ src/pipe/gui/undo/DeleteTimedOutputArcCommand.java 2020-09-11 12:43:06 +0000
67@@ -14,7 +14,6 @@
68
69 @Override
70 public void redo() {
71-
72 arc.underlyingArc().delete();
73
74 guiModel.removePetriNetObject(arc);
75@@ -22,9 +21,9 @@
76
77 @Override
78 public void undo() {
79+ arc.deselect();
80 guiModel.addPetriNetObject(arc);
81 tapn.add(arc.underlyingArc());
82-
83 }
84
85 }
86
87=== modified file 'src/pipe/gui/undo/DeleteTimedPlaceCommand.java'
88--- src/pipe/gui/undo/DeleteTimedPlaceCommand.java 2020-04-18 14:41:05 +0000
89+++ src/pipe/gui/undo/DeleteTimedPlaceCommand.java 2020-09-11 12:43:06 +0000
90@@ -45,6 +45,7 @@
91
92 @Override
93 public void undo() {
94+ timedPlaceComponent.deselect();
95 guiModel.addPetriNetObject(timedPlaceComponent);
96 tapn.add(timedPlace);
97
98@@ -57,8 +58,6 @@
99 for(TAPNQuery q : queriesInclusion){
100 q.inclusionPlaces().inclusionPlaces().add(timedPlace);
101 }
102-
103 }
104
105-
106 }
107
108=== modified file 'src/pipe/gui/undo/DeleteTimedTransitionCommand.java'
109--- src/pipe/gui/undo/DeleteTimedTransitionCommand.java 2020-04-18 14:41:05 +0000
110+++ src/pipe/gui/undo/DeleteTimedTransitionCommand.java 2020-09-11 12:43:06 +0000
111@@ -24,6 +24,7 @@
112
113 @Override
114 public void undo() {
115+ transition.deselect();
116 guiModel.addPetriNetObject(transition);
117 if(sharedTransition != null) {
118 sharedTransition.makeShared(transition.underlyingTransition());
119
120=== modified file 'src/pipe/gui/undo/DeleteTransportArcCommand.java'
121--- src/pipe/gui/undo/DeleteTransportArcCommand.java 2020-03-30 08:58:25 +0000
122+++ src/pipe/gui/undo/DeleteTransportArcCommand.java 2020-09-11 12:43:06 +0000
123@@ -30,7 +30,9 @@
124 public void undo() {
125 TimedTransportArcComponent partner = transportArcComponent.getConnectedTo();
126
127- guiModel.addPetriNetObject(transportArcComponent);
128+ transportArcComponent.deselect();
129+
130+ guiModel.addPetriNetObject(transportArcComponent);
131 guiModel.addPetriNetObject(partner);
132
133 tapn.add(transportArc);

Subscribers

People subscribed via source and target branches