src/java.desktop/macosx/classes/sun/lwawt/macosx/CPlatformResponder.java

*** 73,84 ****
          {
              jbuttonNumber = NSEvent.nsToJavaButton(buttonNumber);
              jclickCount = clickCount;
          }
  
!         int jmodifiers = NSEvent.nsToJavaMouseModifiers(buttonNumber,
!                                                         modifierFlags);
          boolean jpopupTrigger = NSEvent.isPopupTrigger(jmodifiers);
  
          eventNotifier.notifyMouseEvent(jeventType, System.currentTimeMillis(), jbuttonNumber,
                  x, y, absX, absY, jmodifiers, jclickCount,
                  jpopupTrigger, null);
--- 73,83 ----
          {
              jbuttonNumber = NSEvent.nsToJavaButton(buttonNumber);
              jclickCount = clickCount;
          }
  
!         int jmodifiers = NSEvent.nsToJavaModifiers(modifierFlags);
          boolean jpopupTrigger = NSEvent.isPopupTrigger(jmodifiers);
  
          eventNotifier.notifyMouseEvent(jeventType, System.currentTimeMillis(), jbuttonNumber,
                  x, y, absX, absY, jmodifiers, jclickCount,
                  jpopupTrigger, null);
*** 88,100 ****
       * Handles scroll events.
       */
      void handleScrollEvent(final int x, final int y, final int absX,
                             final int absY, final int modifierFlags,
                             final double deltaX, final double deltaY) {
!         final int buttonNumber = CocoaConstants.kCGMouseButtonCenter;
!         int jmodifiers = NSEvent.nsToJavaMouseModifiers(buttonNumber,
!                                                         modifierFlags);
          final boolean isShift = (jmodifiers & InputEvent.SHIFT_DOWN_MASK) != 0;
  
          // Vertical scroll.
          if (!isShift && deltaY != 0.0) {
              dispatchScrollEvent(x, y, absX, absY, jmodifiers, deltaY);
--- 87,97 ----
       * Handles scroll events.
       */
      void handleScrollEvent(final int x, final int y, final int absX,
                             final int absY, final int modifierFlags,
                             final double deltaX, final double deltaY) {
!         int jmodifiers = NSEvent.nsToJavaModifiers(modifierFlags);
          final boolean isShift = (jmodifiers & InputEvent.SHIFT_DOWN_MASK) != 0;
  
          // Vertical scroll.
          if (!isShift && deltaY != 0.0) {
              dispatchScrollEvent(x, y, absX, absY, jmodifiers, deltaY);
*** 185,196 ****
          // just check for CHAR_UNDEFINED.
          if (javaChar == KeyEvent.CHAR_UNDEFINED) {
              postsTyped = false;
          }
  
! 
!         int jmodifiers = NSEvent.nsToJavaKeyModifiers(modifierFlags);
          long when = System.currentTimeMillis();
  
          if (jeventType == KeyEvent.KEY_PRESSED) {
              lastKeyPressCode = jkeyCode;
          }
--- 182,192 ----
          // just check for CHAR_UNDEFINED.
          if (javaChar == KeyEvent.CHAR_UNDEFINED) {
              postsTyped = false;
          }
  
!         int jmodifiers = NSEvent.nsToJavaModifiers(modifierFlags);
          long when = System.currentTimeMillis();
  
          if (jeventType == KeyEvent.KEY_PRESSED) {
              lastKeyPressCode = jkeyCode;
          }