src/macosx/native/sun/awt/DnDUtilities.m

*** 159,190 ****
  
      return result;
  }
  
  // Mouse and key modifiers mapping:
- + (NSUInteger)mapJavaExtModifiersToNSKeyModifiers:(jint)modifiers
- {
-     NSUInteger result = 0;
- 
-     if ((modifiers & java_awt_event_InputEvent_SHIFT_DOWN_MASK) != 0)
-         result |= NSShiftKeyMask;
- 
-     if ((modifiers & java_awt_event_InputEvent_CTRL_DOWN_MASK) != 0)
-         result |= NSControlKeyMask;
- 
-     if ((modifiers & java_awt_event_InputEvent_META_DOWN_MASK) != 0)
-         result |= NSCommandKeyMask;
- 
-     if ((modifiers & java_awt_event_InputEvent_ALT_DOWN_MASK) != 0)
-         result |= NSAlternateKeyMask;
- 
-     if ((modifiers & java_awt_event_InputEvent_ALT_GRAPH_DOWN_MASK) != 0)
-         result |= NSAlternateKeyMask;
- 
-     return result;
- }
- 
  + (NSUInteger)mapJavaExtModifiersToNSMouseDownButtons:(jint)modifiers
  {
      NSUInteger result = NSLeftMouseDown;
  
      if ((modifiers & java_awt_event_InputEvent_BUTTON1_DOWN_MASK) != 0)
--- 159,168 ----
*** 243,278 ****
  
      // Get results
      return modifiers & mask;
  }
  
- 
- + (jint)currentJavaExtKeyModifiers
- {
-     NSUInteger modifiers = [NSEvent modifierFlags];
-     jint jmodifiers = 0;
- 
-     if(modifiers & NSShiftKeyMask) {
-         jmodifiers |= java_awt_event_InputEvent_SHIFT_DOWN_MASK;
-     }
- 
-     if(modifiers & NSControlKeyMask) {
-         jmodifiers |= java_awt_event_InputEvent_CTRL_DOWN_MASK;
-     }
- 
-     if(modifiers & NSAlternateKeyMask) {
-         jmodifiers |= java_awt_event_InputEvent_ALT_DOWN_MASK;
-     }
- 
-     if(modifiers & NSCommandKeyMask) {
-         jmodifiers |= java_awt_event_InputEvent_META_DOWN_MASK;
-     }
- 
-     return jmodifiers;
- }
- 
- 
  + (NSDragOperation) nsDragOperationForModifiers:(NSUInteger)modifiers {
  
      // Java first
      if ( (modifiers & NSShiftKeyMask) && (modifiers & NSControlKeyMask) ) {
          return NSDragOperationLink;
--- 221,230 ----