src/java.desktop/macosx/native/libawt_lwawt/awt/CRobotKeyCode.m

*** 36,52 ****
  
      dispatch_once(&executeOnce, ^{
          instance = [[CRobotKeyCodeMapping alloc] init];
      });
  
      return instance;
  }
  
! -(id) init {
      self = [super init];
  
-     if (nil != self) {
          javaToMacKeyMap = [NSDictionary dictionaryWithObjectsAndKeys :
              [NSNumber numberWithInt : OSX_Delete], [NSNumber numberWithInt : java_awt_event_KeyEvent_VK_BACK_SPACE],
              [NSNumber numberWithInt : OSX_kVK_Tab], [NSNumber numberWithInt : java_awt_event_KeyEvent_VK_TAB],
              [NSNumber numberWithInt : OSX_kVK_Return], [NSNumber numberWithInt : java_awt_event_KeyEvent_VK_ENTER],
              [NSNumber numberWithInt : OSX_kVK_ANSI_KeypadClear], [NSNumber numberWithInt : java_awt_event_KeyEvent_VK_CLEAR],
--- 36,59 ----
  
      dispatch_once(&executeOnce, ^{
          instance = [[CRobotKeyCodeMapping alloc] init];
      });
  
+     if (instance != nil) {
+         [instance initializeKeyMap];
+     }
+         
      return instance;
  }
  
! - (id)init {
      self = [super init];
+     return self;
+ }
+ 
+ - (void)initializeKeyMap {
          
          javaToMacKeyMap = [NSDictionary dictionaryWithObjectsAndKeys :
                                             [NSNumber numberWithInt : OSX_Delete], [NSNumber numberWithInt : java_awt_event_KeyEvent_VK_BACK_SPACE],
                                             [NSNumber numberWithInt : OSX_kVK_Tab], [NSNumber numberWithInt : java_awt_event_KeyEvent_VK_TAB],
                                             [NSNumber numberWithInt : OSX_kVK_Return], [NSNumber numberWithInt : java_awt_event_KeyEvent_VK_ENTER],
                                             [NSNumber numberWithInt : OSX_kVK_ANSI_KeypadClear], [NSNumber numberWithInt : java_awt_event_KeyEvent_VK_CLEAR],
*** 159,179 ****
              [NSNumber numberWithInt : OSX_F18], [NSNumber numberWithInt : java_awt_event_KeyEvent_VK_F18],
              [NSNumber numberWithInt : OSX_F19], [NSNumber numberWithInt : java_awt_event_KeyEvent_VK_F19],
              [NSNumber numberWithInt : OSX_F20], [NSNumber numberWithInt : java_awt_event_KeyEvent_VK_F20],
  
              nil];
-     }
- 
-     return self;
  }
  
! -(int) getOSXKeyCodeForJavaKey : (int) javaKey {
!     id val = [javaToMacKeyMap objectForKey : [NSNumber numberWithInt : javaKey]];
          
      if (nil != val) {
          return [val intValue];
-     } else {
-         return OSX_Undefined;
      }
  }
  
  @end
--- 166,182 ----
                                             [NSNumber numberWithInt : OSX_F18], [NSNumber numberWithInt : java_awt_event_KeyEvent_VK_F18],
                                             [NSNumber numberWithInt : OSX_F19], [NSNumber numberWithInt : java_awt_event_KeyEvent_VK_F19],
                                             [NSNumber numberWithInt : OSX_F20], [NSNumber numberWithInt : java_awt_event_KeyEvent_VK_F20],
                                             
                                             nil];
  }
  
! - (int)getOSXKeyCodeForJavaKey : (int) javaKey {
          
+     id val = [javaToMacKeyMap objectForKey : [NSNumber numberWithInt : javaKey]];
      if (nil != val) {
          return [val intValue];
      }
+     return OSX_Undefined;
  }
  
  @end