Merge lp:~tapaal-contributor/tapaal/game-shortcuts into lp:tapaal
- game-shortcuts
- Merge into trunk
Proposed by
Lena Ernstsen
Status: | Merged |
---|---|
Approved by: | Jiri Srba |
Approved revision: | 1112 |
Merged at revision: | 1086 |
Proposed branch: | lp:~tapaal-contributor/tapaal/game-shortcuts |
Merge into: | lp:tapaal |
Diff against target: |
284 lines (+95/-19) 5 files modified
src/dk/aau/cs/gui/TabContent.java (+88/-10) src/net/tapaal/swinghelpers/ToggleButtonWithoutText.java (+5/-3) src/pipe/gui/GuiFrame.java (+0/-1) src/pipe/gui/Pipe.java (+1/-1) src/pipe/gui/handler/TransitionHandler.java (+1/-4) |
To merge this branch: | bzr merge lp:~tapaal-contributor/tapaal/game-shortcuts |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Jiri Srba | Approve | ||
Kenneth Yrke Jørgensen | Approve | ||
Review via email: mp+389584@code.launchpad.net |
Commit message
Added game shortcuts
Description of the change
When a transition is selected it is possible to toggle between a controlled/
The shortcuts are only possible if the lens allows it
If the net is game, then it is possible to draw an uncontrollable transition by pressing L and clicking on the drawing surface
To post a comment you must log in.
- 1109. By Lena Ernstsen
-
Added annotation to toolbar
- 1110. By Lena Ernstsen
-
Moved the transition toggle shortcuts to be a guiAction
- 1111. By Lena Ernstsen
-
guiModelManager handles the toggle functionality
- 1112. By Lena Ernstsen
-
Added undo to the toggle
Revision history for this message
Jiri Srba (srba) wrote : | # |
Works very nice! Great usability addition.
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-17 08:18:13 +0000 | |||
3 | +++ src/dk/aau/cs/gui/TabContent.java 2020-08-21 08:37:32 +0000 | |||
4 | @@ -16,9 +16,7 @@ | |||
5 | 16 | import dk.aau.cs.gui.components.BugHandledJXMultisplitPane; | 16 | import dk.aau.cs.gui.components.BugHandledJXMultisplitPane; |
6 | 17 | import dk.aau.cs.gui.components.StatisticsPanel; | 17 | import dk.aau.cs.gui.components.StatisticsPanel; |
7 | 18 | import dk.aau.cs.gui.components.TransitionFireingComponent; | 18 | import dk.aau.cs.gui.components.TransitionFireingComponent; |
11 | 19 | import dk.aau.cs.gui.undo.Command; | 19 | import dk.aau.cs.gui.undo.*; |
9 | 20 | import dk.aau.cs.gui.undo.DeleteQueriesCommand; | ||
10 | 21 | import dk.aau.cs.gui.undo.TimedPlaceMarkingEdit; | ||
12 | 22 | import dk.aau.cs.io.*; | 20 | import dk.aau.cs.io.*; |
13 | 23 | import dk.aau.cs.io.queries.SUMOQueryLoader; | 21 | import dk.aau.cs.io.queries.SUMOQueryLoader; |
14 | 24 | import dk.aau.cs.io.queries.XMLQueryLoader; | 22 | import dk.aau.cs.io.queries.XMLQueryLoader; |
15 | @@ -168,9 +166,10 @@ | |||
16 | 168 | return new Result<>(pnObject); | 166 | return new Result<>(pnObject); |
17 | 169 | } | 167 | } |
18 | 170 | 168 | ||
20 | 171 | public Result<TimedTransitionComponent, ModelViolation> addNewTimedTransitions(DataLayer c, Point p) { | 169 | public Result<TimedTransitionComponent, ModelViolation> addNewTimedTransitions(DataLayer c, Point p, boolean isUncontrollable) { |
21 | 172 | dk.aau.cs.model.tapn.TimedTransition transition = new dk.aau.cs.model.tapn.TimedTransition(drawingSurface.getNameGenerator().getNewTransitionName(guiModelToModel.get(c))); | 170 | dk.aau.cs.model.tapn.TimedTransition transition = new dk.aau.cs.model.tapn.TimedTransition(drawingSurface.getNameGenerator().getNewTransitionName(guiModelToModel.get(c))); |
22 | 173 | 171 | ||
23 | 172 | transition.setUncontrollable(isUncontrollable); | ||
24 | 174 | TimedTransitionComponent pnObject = new TimedTransitionComponent(p.x, p.y, transition, lens); | 173 | TimedTransitionComponent pnObject = new TimedTransitionComponent(p.x, p.y, transition, lens); |
25 | 175 | 174 | ||
26 | 176 | guiModelToModel.get(c).add(transition); | 175 | guiModelToModel.get(c).add(transition); |
27 | @@ -539,6 +538,40 @@ | |||
28 | 539 | } | 538 | } |
29 | 540 | } | 539 | } |
30 | 541 | 540 | ||
31 | 541 | public void toggleUncontrollableTrans() { | ||
32 | 542 | ArrayList<PetriNetObject> selection = drawingSurface().getSelectionObject().getSelection(); | ||
33 | 543 | TabContent currentTab = TabContent.this; | ||
34 | 544 | getUndoManager().newEdit(); | ||
35 | 545 | |||
36 | 546 | for (PetriNetObject o : selection) { | ||
37 | 547 | if (o instanceof TimedTransitionComponent) { | ||
38 | 548 | TimedTransitionComponent transition = (TimedTransitionComponent) o; | ||
39 | 549 | Command cmd = new ToggleTransitionUncontrollable(transition.underlyingTransition(), currentTab); | ||
40 | 550 | |||
41 | 551 | cmd.redo(); | ||
42 | 552 | getUndoManager().addEdit(cmd); | ||
43 | 553 | } | ||
44 | 554 | } | ||
45 | 555 | repaint(); | ||
46 | 556 | } | ||
47 | 557 | |||
48 | 558 | public void toggleUrgentTrans() { | ||
49 | 559 | ArrayList<PetriNetObject> selection = drawingSurface().getSelectionObject().getSelection(); | ||
50 | 560 | TabContent currentTab = TabContent.this; | ||
51 | 561 | getUndoManager().newEdit(); | ||
52 | 562 | |||
53 | 563 | for (PetriNetObject o : selection) { | ||
54 | 564 | if (o instanceof TimedTransitionComponent) { | ||
55 | 565 | TimedTransitionComponent transition = (TimedTransitionComponent) o; | ||
56 | 566 | Command cmd = new ToggleTransitionUrgent(transition.underlyingTransition(), currentTab); | ||
57 | 567 | |||
58 | 568 | cmd.redo(); | ||
59 | 569 | getUndoManager().addEdit(cmd); | ||
60 | 570 | } | ||
61 | 571 | } | ||
62 | 572 | repaint(); | ||
63 | 573 | } | ||
64 | 574 | |||
65 | 542 | 575 | ||
66 | 543 | } | 576 | } |
67 | 544 | 577 | ||
68 | @@ -1749,6 +1782,9 @@ | |||
69 | 1749 | case TAPNTRANS: | 1782 | case TAPNTRANS: |
70 | 1750 | setManager(new CanvasTransitionDrawController()); | 1783 | setManager(new CanvasTransitionDrawController()); |
71 | 1751 | break; | 1784 | break; |
72 | 1785 | case UNCONTROLLABLETRANS: | ||
73 | 1786 | setManager(new CanvasUncontrollableTransitionDrawController()); | ||
74 | 1787 | break; | ||
75 | 1752 | case ANNOTATION: | 1788 | case ANNOTATION: |
76 | 1753 | setManager(new CanvasAnnotationNoteDrawController()); | 1789 | setManager(new CanvasAnnotationNoteDrawController()); |
77 | 1754 | break; | 1790 | break; |
78 | @@ -2109,7 +2145,22 @@ | |||
79 | 2109 | public void drawingSurfaceMousePressed(MouseEvent e) { | 2145 | public void drawingSurfaceMousePressed(MouseEvent e) { |
80 | 2110 | Point p = canvas.adjustPointToGridAndZoom(e.getPoint(), canvas.getZoom()); | 2146 | Point p = canvas.adjustPointToGridAndZoom(e.getPoint(), canvas.getZoom()); |
81 | 2111 | 2147 | ||
83 | 2112 | guiModelManager.addNewTimedTransitions(drawingSurface.getGuiModel(), p); | 2148 | guiModelManager.addNewTimedTransitions(drawingSurface.getGuiModel(), p, false); |
84 | 2149 | } | ||
85 | 2150 | |||
86 | 2151 | @Override | ||
87 | 2152 | public void registerEvents() { | ||
88 | 2153 | |||
89 | 2154 | } | ||
90 | 2155 | } | ||
91 | 2156 | |||
92 | 2157 | class CanvasUncontrollableTransitionDrawController extends AbstractDrawingSurfaceManager { | ||
93 | 2158 | |||
94 | 2159 | @Override | ||
95 | 2160 | public void drawingSurfaceMousePressed(MouseEvent e) { | ||
96 | 2161 | Point p = canvas.adjustPointToGridAndZoom(e.getPoint(), canvas.getZoom()); | ||
97 | 2162 | |||
98 | 2163 | guiModelManager.addNewTimedTransitions(drawingSurface.getGuiModel(), p, true); | ||
99 | 2113 | } | 2164 | } |
100 | 2114 | 2165 | ||
101 | 2115 | @Override | 2166 | @Override |
102 | @@ -2246,7 +2297,7 @@ | |||
103 | 2246 | var r = guiModelManager.addNewTimedPlace(getModel(), p); | 2297 | var r = guiModelManager.addNewTimedPlace(getModel(), p); |
104 | 2247 | placeClicked(r.result, e); | 2298 | placeClicked(r.result, e); |
105 | 2248 | } else { //Transition | 2299 | } else { //Transition |
107 | 2249 | var r = guiModelManager.addNewTimedTransitions(getModel(), p); | 2300 | var r = guiModelManager.addNewTimedTransitions(getModel(), p, false); |
108 | 2250 | transitionClicked(r.result, e); | 2301 | transitionClicked(r.result, e); |
109 | 2251 | } | 2302 | } |
110 | 2252 | } | 2303 | } |
111 | @@ -2667,10 +2718,14 @@ | |||
112 | 2667 | } | 2718 | } |
113 | 2668 | } | 2719 | } |
114 | 2669 | public List<GuiAction> getAvailableDrawActions(){ | 2720 | public List<GuiAction> getAvailableDrawActions(){ |
119 | 2670 | if(lens.isTimed()){ | 2721 | if (lens.isTimed() && !lens.isGame()) { |
120 | 2671 | return new ArrayList<>(Arrays.asList(selectAction, timedPlaceAction,transAction, timedArcAction, transportArcAction, inhibarcAction, tokenAction, deleteTokenAction)); | 2722 | return new ArrayList<>(Arrays.asList(selectAction, timedPlaceAction, transAction, timedArcAction, transportArcAction, inhibarcAction, tokenAction, deleteTokenAction, annotationAction, toggleUrgentAction)); |
121 | 2672 | } else{ | 2723 | } else if (lens.isTimed()) { |
122 | 2673 | return new ArrayList<>(Arrays.asList(selectAction, timedPlaceAction,transAction, timedArcAction, inhibarcAction, tokenAction, deleteTokenAction)); | 2724 | return new ArrayList<>(Arrays.asList(selectAction, timedPlaceAction, transAction, uncontrollableTransAction, timedArcAction, transportArcAction, inhibarcAction, tokenAction, deleteTokenAction, annotationAction, toggleUrgentAction, toggleUncontrollableAction)); |
123 | 2725 | } else if (lens.isGame()){ | ||
124 | 2726 | return new ArrayList<>(Arrays.asList(selectAction, timedPlaceAction, transAction, uncontrollableTransAction, timedArcAction, inhibarcAction, tokenAction, deleteTokenAction, annotationAction, toggleUncontrollableAction)); | ||
125 | 2727 | } else { | ||
126 | 2728 | return new ArrayList<>(Arrays.asList(selectAction, timedPlaceAction, transAction, timedArcAction, inhibarcAction, tokenAction, deleteTokenAction, annotationAction)); | ||
127 | 2674 | } | 2729 | } |
128 | 2675 | } | 2730 | } |
129 | 2676 | 2731 | ||
130 | @@ -2704,6 +2759,11 @@ | |||
131 | 2704 | setMode(Pipe.ElementType.TAPNTRANS); | 2759 | setMode(Pipe.ElementType.TAPNTRANS); |
132 | 2705 | } | 2760 | } |
133 | 2706 | }; | 2761 | }; |
134 | 2762 | private final GuiAction uncontrollableTransAction = new GuiAction("Uncontrollable transition", "Add an uncontrollable transition (L)", "L", true) { | ||
135 | 2763 | public void actionPerformed(ActionEvent e) { | ||
136 | 2764 | setMode(Pipe.ElementType.UNCONTROLLABLETRANS); | ||
137 | 2765 | } | ||
138 | 2766 | }; | ||
139 | 2707 | private final GuiAction tokenAction = new GuiAction("Add token", "Add a token (+)", "typed +", true) { | 2767 | private final GuiAction tokenAction = new GuiAction("Add token", "Add a token (+)", "typed +", true) { |
140 | 2708 | public void actionPerformed(ActionEvent e) { | 2768 | public void actionPerformed(ActionEvent e) { |
141 | 2709 | setMode(Pipe.ElementType.ADDTOKEN); | 2769 | setMode(Pipe.ElementType.ADDTOKEN); |
142 | @@ -2731,6 +2791,16 @@ | |||
143 | 2731 | setMode(Pipe.ElementType.TRANSPORTARC); | 2791 | setMode(Pipe.ElementType.TRANSPORTARC); |
144 | 2732 | } | 2792 | } |
145 | 2733 | }; | 2793 | }; |
146 | 2794 | private final GuiAction toggleUncontrollableAction = new GuiAction("Toggle uncontrollable transition", "Toggle between control/environment transition", "E", true) { | ||
147 | 2795 | public void actionPerformed(ActionEvent e) { | ||
148 | 2796 | guiModelManager.toggleUncontrollableTrans(); | ||
149 | 2797 | } | ||
150 | 2798 | }; | ||
151 | 2799 | private final GuiAction toggleUrgentAction = new GuiAction("Toggle urgent transition", "Toggle between urgent/non-urgent transition", "U", true) { | ||
152 | 2800 | public void actionPerformed(ActionEvent e) { | ||
153 | 2801 | guiModelManager.toggleUrgentTrans(); | ||
154 | 2802 | } | ||
155 | 2803 | }; | ||
156 | 2734 | private final GuiAction timeAction = new GuiAction("Delay one time unit", "Let time pass one time unit", "W") { | 2804 | private final GuiAction timeAction = new GuiAction("Delay one time unit", "Let time pass one time unit", "W") { |
157 | 2735 | public void actionPerformed(ActionEvent e) { | 2805 | public void actionPerformed(ActionEvent e) { |
158 | 2736 | timeDelay(); | 2806 | timeDelay(); |
159 | @@ -2746,6 +2816,7 @@ | |||
160 | 2746 | // deselect other actions | 2816 | // deselect other actions |
161 | 2747 | selectAction.setSelected(CreateGui.guiMode == Pipe.ElementType.SELECT); | 2817 | selectAction.setSelected(CreateGui.guiMode == Pipe.ElementType.SELECT); |
162 | 2748 | transAction.setSelected(editorMode == Pipe.ElementType.TAPNTRANS); | 2818 | transAction.setSelected(editorMode == Pipe.ElementType.TAPNTRANS); |
163 | 2819 | uncontrollableTransAction.setSelected(editorMode == Pipe.ElementType.UNCONTROLLABLETRANS); | ||
164 | 2749 | timedPlaceAction.setSelected(editorMode == Pipe.ElementType.TAPNPLACE); | 2820 | timedPlaceAction.setSelected(editorMode == Pipe.ElementType.TAPNPLACE); |
165 | 2750 | timedArcAction.setSelected(editorMode == Pipe.ElementType.TAPNARC); | 2821 | timedArcAction.setSelected(editorMode == Pipe.ElementType.TAPNARC); |
166 | 2751 | transportArcAction.setSelected(editorMode == Pipe.ElementType.TRANSPORTARC); | 2822 | transportArcAction.setSelected(editorMode == Pipe.ElementType.TRANSPORTARC); |
167 | @@ -2760,6 +2831,7 @@ | |||
168 | 2760 | case draw: | 2831 | case draw: |
169 | 2761 | selectAction.setEnabled(true); | 2832 | selectAction.setEnabled(true); |
170 | 2762 | transAction.setEnabled(true); | 2833 | transAction.setEnabled(true); |
171 | 2834 | uncontrollableTransAction.setEnabled(true); | ||
172 | 2763 | timedPlaceAction.setEnabled(true); | 2835 | timedPlaceAction.setEnabled(true); |
173 | 2764 | timedArcAction.setEnabled(true); | 2836 | timedArcAction.setEnabled(true); |
174 | 2765 | transportArcAction.setEnabled(true); | 2837 | transportArcAction.setEnabled(true); |
175 | @@ -2773,6 +2845,7 @@ | |||
176 | 2773 | case noNet: | 2845 | case noNet: |
177 | 2774 | selectAction.setEnabled(false); | 2846 | selectAction.setEnabled(false); |
178 | 2775 | transAction.setEnabled(false); | 2847 | transAction.setEnabled(false); |
179 | 2848 | uncontrollableTransAction.setEnabled(false); | ||
180 | 2776 | timedPlaceAction.setEnabled(false); | 2849 | timedPlaceAction.setEnabled(false); |
181 | 2777 | timedArcAction.setEnabled(false); | 2850 | timedArcAction.setEnabled(false); |
182 | 2778 | transportArcAction.setEnabled(false); | 2851 | transportArcAction.setEnabled(false); |
183 | @@ -2785,6 +2858,7 @@ | |||
184 | 2785 | case animation: | 2858 | case animation: |
185 | 2786 | selectAction.setEnabled(false); | 2859 | selectAction.setEnabled(false); |
186 | 2787 | transAction.setEnabled(false); | 2860 | transAction.setEnabled(false); |
187 | 2861 | uncontrollableTransAction.setEnabled(false); | ||
188 | 2788 | timedPlaceAction.setEnabled(false); | 2862 | timedPlaceAction.setEnabled(false); |
189 | 2789 | timedArcAction.setEnabled(false); | 2863 | timedArcAction.setEnabled(false); |
190 | 2790 | transportArcAction.setEnabled(false); | 2864 | transportArcAction.setEnabled(false); |
191 | @@ -2805,6 +2879,7 @@ | |||
192 | 2805 | public static final String textforTAPNPlace = "Place Mode: Right click on a place to see menu options "; | 2879 | public static final String textforTAPNPlace = "Place Mode: Right click on a place to see menu options "; |
193 | 2806 | public static final String textforTrans = "Transition Mode: Right click on a transition to see menu options [Mouse wheel -> rotate]"; | 2880 | public static final String textforTrans = "Transition Mode: Right click on a transition to see menu options [Mouse wheel -> rotate]"; |
194 | 2807 | public static final String textforTimedTrans = "Timed Transition Mode: Right click on a transition to see menu options [Mouse wheel -> rotate]"; | 2881 | public static final String textforTimedTrans = "Timed Transition Mode: Right click on a transition to see menu options [Mouse wheel -> rotate]"; |
195 | 2882 | public static final String textforUncontrollableTrans = "Uncontrollable Transition Mode: Right click on a transition to see menu options [Mouse wheel -> rotate]"; | ||
196 | 2808 | public static final String textforAddtoken = "Add Token Mode: Click on a place to add a token"; | 2883 | public static final String textforAddtoken = "Add Token Mode: Click on a place to add a token"; |
197 | 2809 | public static final String textforDeltoken = "Delete Token Mode: Click on a place to delete a token "; | 2884 | public static final String textforDeltoken = "Delete Token Mode: Click on a place to delete a token "; |
198 | 2810 | public static final String textforAnimation = "Simulation Mode: Red transitions are enabled, click a transition to fire it"; | 2885 | public static final String textforAnimation = "Simulation Mode: Red transitions are enabled, click a transition to fire it"; |
199 | @@ -2817,6 +2892,9 @@ | |||
200 | 2817 | 2892 | ||
201 | 2818 | public void changeStatusbarText(Pipe.ElementType type) { | 2893 | public void changeStatusbarText(Pipe.ElementType type) { |
202 | 2819 | switch (type) { | 2894 | switch (type) { |
203 | 2895 | case UNCONTROLLABLETRANS: | ||
204 | 2896 | app.ifPresent(o14 -> o14.setStatusBarText(textforUncontrollableTrans)); | ||
205 | 2897 | |||
206 | 2820 | case PLACE: | 2898 | case PLACE: |
207 | 2821 | app.ifPresent(o13 -> o13.setStatusBarText(textforPlace)); | 2899 | app.ifPresent(o13 -> o13.setStatusBarText(textforPlace)); |
208 | 2822 | break; | 2900 | break; |
209 | 2823 | 2901 | ||
210 | === modified file 'src/net/tapaal/swinghelpers/ToggleButtonWithoutText.java' | |||
211 | --- src/net/tapaal/swinghelpers/ToggleButtonWithoutText.java 2019-11-05 12:19:17 +0000 | |||
212 | +++ src/net/tapaal/swinghelpers/ToggleButtonWithoutText.java 2020-08-21 08:37:32 +0000 | |||
213 | @@ -1,6 +1,7 @@ | |||
214 | 1 | package net.tapaal.swinghelpers; | 1 | package net.tapaal.swinghelpers; |
215 | 2 | 2 | ||
216 | 3 | import javax.swing.*; | 3 | import javax.swing.*; |
217 | 4 | import java.awt.*; | ||
218 | 4 | 5 | ||
219 | 5 | /** | 6 | /** |
220 | 6 | * A JToggleButton that without any text | 7 | * A JToggleButton that without any text |
221 | @@ -9,10 +10,11 @@ | |||
222 | 9 | 10 | ||
223 | 10 | public ToggleButtonWithoutText(Action a) { | 11 | public ToggleButtonWithoutText(Action a) { |
224 | 11 | super(a); | 12 | super(a); |
228 | 12 | if (a.getValue(Action.SMALL_ICON) != null) { | 13 | if (a.getValue(Action.SMALL_ICON) == null) { |
229 | 13 | // toggle buttons like to have images *and* text, nasty | 14 | setVisible(false); |
227 | 14 | setText(null); | ||
230 | 15 | } | 15 | } |
231 | 16 | setText(null); | ||
232 | 17 | |||
233 | 16 | this.setRequestFocusEnabled(false); | 18 | this.setRequestFocusEnabled(false); |
234 | 17 | } | 19 | } |
235 | 18 | 20 | ||
236 | 19 | 21 | ||
237 | === modified file 'src/pipe/gui/GuiFrame.java' | |||
238 | --- src/pipe/gui/GuiFrame.java 2020-08-14 09:41:34 +0000 | |||
239 | +++ src/pipe/gui/GuiFrame.java 2020-08-21 08:37:32 +0000 | |||
240 | @@ -1167,7 +1167,6 @@ | |||
241 | 1167 | drawMenu.add(action); | 1167 | drawMenu.add(action); |
242 | 1168 | } | 1168 | } |
243 | 1169 | 1169 | ||
244 | 1170 | drawingToolBar.addSeparator(); | ||
245 | 1171 | drawingToolBar.add(featureInfoText); | 1170 | drawingToolBar.add(featureInfoText); |
246 | 1172 | } else { | 1171 | } else { |
247 | 1173 | drawMenu.setEnabled(false); | 1172 | drawMenu.setEnabled(false); |
248 | 1174 | 1173 | ||
249 | === modified file 'src/pipe/gui/Pipe.java' | |||
250 | --- src/pipe/gui/Pipe.java 2020-07-16 10:02:06 +0000 | |||
251 | +++ src/pipe/gui/Pipe.java 2020-08-21 08:37:32 +0000 | |||
252 | @@ -8,7 +8,7 @@ | |||
253 | 8 | public enum ElementType { | 8 | public enum ElementType { |
254 | 9 | PLACE, IMMTRANS, TIMEDTRANS, ANNOTATION, ARC, INHIBARC, | 9 | PLACE, IMMTRANS, TIMEDTRANS, ANNOTATION, ARC, INHIBARC, |
255 | 10 | //TAPN Elements | 10 | //TAPN Elements |
257 | 11 | TAPNPLACE, TAPNTRANS, TAPNARC, TRANSPORTARC, TAPNINHIBITOR_ARC, | 11 | TAPNPLACE, TAPNTRANS, UNCONTROLLABLETRANS, TAPNARC, TRANSPORTARC, TAPNINHIBITOR_ARC, |
258 | 12 | //Others (might refactore) | 12 | //Others (might refactore) |
259 | 13 | ADDTOKEN, DELTOKEN, SELECT, DRAW, DRAG, | 13 | ADDTOKEN, DELTOKEN, SELECT, DRAW, DRAG, |
260 | 14 | } | 14 | } |
261 | 15 | 15 | ||
262 | === modified file 'src/pipe/gui/handler/TransitionHandler.java' | |||
263 | --- src/pipe/gui/handler/TransitionHandler.java 2020-07-20 07:19:51 +0000 | |||
264 | +++ src/pipe/gui/handler/TransitionHandler.java 2020-08-21 08:37:32 +0000 | |||
265 | @@ -11,8 +11,7 @@ | |||
266 | 11 | /** | 11 | /** |
267 | 12 | * Class used to implement methods corresponding to mouse events on transitions. | 12 | * Class used to implement methods corresponding to mouse events on transitions. |
268 | 13 | */ | 13 | */ |
271 | 14 | public class TransitionHandler extends PlaceTransitionObjectHandler implements | 14 | public class TransitionHandler extends PlaceTransitionObjectHandler implements java.awt.event.MouseWheelListener { |
270 | 15 | java.awt.event.MouseWheelListener { | ||
272 | 16 | 15 | ||
273 | 17 | public TransitionHandler(Transition obj) { | 16 | public TransitionHandler(Transition obj) { |
274 | 18 | super(obj); | 17 | super(obj); |
275 | @@ -42,6 +41,4 @@ | |||
276 | 42 | 41 | ||
277 | 43 | return popup; | 42 | return popup; |
278 | 44 | } | 43 | } |
279 | 45 | |||
280 | 46 | |||
281 | 47 | } | 44 | } |
282 | 48 | 45 | ||
283 | === added file 'src/resources/Images/Uncontrollable transition.png' | |||
284 | 49 | Binary files src/resources/Images/Uncontrollable transition.png 1970-01-01 00:00:00 +0000 and src/resources/Images/Uncontrollable transition.png 2020-08-21 08:37:32 +0000 differ | 46 | Binary files src/resources/Images/Uncontrollable transition.png 1970-01-01 00:00:00 +0000 and src/resources/Images/Uncontrollable transition.png 2020-08-21 08:37:32 +0000 differ |
Looks good