Merge lp:~yrke/tapaal/fix1894107-mouseWheelOnPTO into lp:tapaal

[Kenneth Yrke Jørgensen]

=== modified file 'src/dk/aau/cs/gui/TabContent.java'
--- src/dk/aau/cs/gui/TabContent.java	2020-09-03 08:21:27 +0000
+++ src/dk/aau/cs/gui/TabContent.java	2020-09-15 13:11:48 +0000
@@ -2688,32 +2688,40 @@
                 e->arcDoubleClickedWithContrl(((Arc) e.pno), e.e)
             );
             registerEvent(
-                e->e.pno instanceof TimedPlaceComponent && e.a == MouseAction.wheel && e.e.isShiftDown(),
+                e->e.pno instanceof TimedPlaceComponent && e.a == MouseAction.wheel,
                 e->timedPlaceMouseWheelWithShift(((TimedPlaceComponent) e.pno), ((MouseWheelEvent) e.e))
             );
             registerEvent(
-                e->e.pno instanceof TimedTransitionComponent && e.a == MouseAction.wheel && e.e.isShiftDown(),
+                e->e.pno instanceof TimedTransitionComponent && e.a == MouseAction.wheel,
                 e->timedTranstionMouseWheelWithShift(((TimedTransitionComponent) e.pno), ((MouseWheelEvent) e.e))
             );
 
         }
 
         private void timedTranstionMouseWheelWithShift(TimedTransitionComponent p, MouseWheelEvent e) {
-            int rotation = 0;
-            if (e.getWheelRotation() < 0) {
-                rotation = -e.getWheelRotation() * 135;
+            if (p.isSelected()) {
+                int rotation = 0;
+                if (e.getWheelRotation() < 0) {
+                    rotation = -e.getWheelRotation() * 135;
+                } else {
+                    rotation = e.getWheelRotation() * 45;
+                }
+
+                CreateGui.getCurrentTab().getUndoManager().addNewEdit(((Transition) p).rotate(rotation));
             } else {
-                rotation = e.getWheelRotation() * 45;
+                p.getParent().dispatchEvent(e);
             }
-
-            CreateGui.getCurrentTab().getUndoManager().addNewEdit(((Transition) p).rotate(rotation));
         }
 
         private void timedPlaceMouseWheelWithShift(TimedPlaceComponent p, MouseWheelEvent e) {
-            if (e.getWheelRotation() < 0) {
-                guiModelManager.addToken(getModel(), p, 1);
+            if (p.isSelected()) {
+                if (e.getWheelRotation() < 0) {
+                    guiModelManager.addToken(getModel(), p, 1);
+                } else {
+                    guiModelManager.removeToken(getModel(), p, 1);
+                }
             } else {
-                guiModelManager.removeToken(getModel(), p, 1);
+                p.getParent().dispatchEvent(e);
             }
         }