JBR-2041: Swing support draft

src/java.desktop/share/classes/javax/swing/plaf/basic/BasicScrollBarUI.java

@@ -324,6 +324,7 @@ public class BasicScrollBarUI
 
         scrollbar.addMouseListener(trackListener);
         scrollbar.addMouseMotionListener(trackListener);
+        scrollbar.addMouseWheelListener(trackListener);
         scrollbar.getModel().addChangeListener(modelListener);
         scrollbar.addPropertyChangeListener(propertyChangeListener);
         scrollbar.addFocusListener(getHandler());
@@ -1480,6 +1481,32 @@ public class BasicScrollBarUI
                 setThumbRollover(false);
             }
         }
+
+        public void mouseWheelMoved(MouseWheelEvent e) {
+            // TODO this is draft to resume work in January 2020
+            if (e.getScrollType() < 2) {
+                scrollbar.getParent().dispatchEvent(e);
+            }
+
+            if (getTrackBounds().contains(e.getX(), e.getY())) {
+                if (scrollbar.getOrientation() == JScrollBar.VERTICAL &&
+                        !e.isShiftDown() &&
+                        e.getScrollType() == 3) {
+                    setValueFrom(e);
+                }
+
+                if (scrollbar.getOrientation() == JScrollBar.HORIZONTAL &&
+                        e.isShiftDown() &&
+                        e.getScrollType() == 3) {
+                    setValueFrom(e);
+                }
+
+                e.consume();
+            } else {
+                scrollbar.getParent().dispatchEvent(e);
+            }
+        }
+
     }
 
 

src/java.desktop/share/classes/javax/swing/plaf/basic/BasicScrollPaneUI.java

@@ -1111,6 +1111,8 @@ public class BasicScrollPaneUI
                 else if (e.getScrollType() ==
                          MouseWheelEvent.WHEEL_BLOCK_SCROLL) {
                     BasicScrollBarUI.scrollByBlock(toScroll, direction);
+                } else if (e.getScrollType() == 3) {
+                    toScroll.setValue(toScroll.getValue() + e.getWheelRotation());
                 }
             }
         }

src/java.desktop/share/classes/javax/swing/plaf/basic/BasicSplitPaneDivider.java

@@ -191,6 +191,7 @@ public class BasicSplitPaneDivider extends Container
                 if (mouseHandler == null) mouseHandler = new MouseHandler();
                 splitPane.addMouseListener(mouseHandler);
                 splitPane.addMouseMotionListener(mouseHandler);
+                splitPane.addMouseWheelListener(mouseHandler);
                 addMouseListener(mouseHandler);
                 addMouseMotionListener(mouseHandler);
                 splitPane.addPropertyChangeListener(this);
@@ -681,6 +682,22 @@ public class BasicSplitPaneDivider extends Container
                 setMouseOver(false);
             }
         }
+
+        public void mouseWheelMoved(MouseWheelEvent e) {
+            // TODO this is draft to resume work in January 2020
+            if (e.getScrollType() < 2) {
+                getParent().dispatchEvent(e);
+            }
+
+            if (e.getScrollType() != 3) {
+                return;
+            }
+
+            int loc = getLocation().x - e.getWheelRotation();
+            dragDividerTo(loc);
+            finishDraggingTo(loc);
+
+        }
     }