src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifMenuUI.java

*** 1,7 ****
  /*
!  * Copyright (c) 1997, 2004, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.  Oracle designates this
--- 1,7 ----
  /*
!  * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.  Oracle designates this
*** 63,73 ****
  
      protected ChangeListener createChangeListener(JComponent c) {
          return new MotifChangeHandler((JMenu)c, this);
      }
  
!     private boolean popupIsOpen(JMenu m,MenuElement me[]) {
          int i;
          JPopupMenu pm = m.getPopupMenu();
  
          for(i=me.length-1;i>=0;i--) {
              if(me[i].getComponent() == pm)
--- 63,73 ----
  
      protected ChangeListener createChangeListener(JComponent c) {
          return new MotifChangeHandler((JMenu)c, this);
      }
  
!     private boolean popupIsOpen(JMenu m,MenuElement[] me) {
          int i;
          JPopupMenu pm = m.getPopupMenu();
  
          for(i=me.length-1;i>=0;i--) {
              if(me[i].getComponent() == pm)
*** 109,129 ****
                      if(menu.isSelected()) {
                          manager.clearSelectedPath();
                      } else {
                          Container cnt = menu.getParent();
                          if(cnt != null && cnt instanceof JMenuBar) {
!                             MenuElement me[] = new MenuElement[2];
                              me[0]=(MenuElement)cnt;
                              me[1]=menu;
                              manager.setSelectedPath(me);
                          }
                      }
                  }
  
!                 MenuElement path[] = getPath();
                  if (path.length > 0) {
!                     MenuElement newPath[] = new MenuElement[path.length+1];
                      System.arraycopy(path,0,newPath,0,path.length);
                      newPath[path.length] = menu.getPopupMenu();
                      manager.setSelectedPath(newPath);
                  }
              }
--- 109,129 ----
                      if(menu.isSelected()) {
                          manager.clearSelectedPath();
                      } else {
                          Container cnt = menu.getParent();
                          if(cnt != null && cnt instanceof JMenuBar) {
!                             MenuElement[] me = new MenuElement[2];
                              me[0]=(MenuElement)cnt;
                              me[1]=menu;
                              manager.setSelectedPath(me);
                          }
                      }
                  }
  
!                 MenuElement[] path = getPath();
                  if (path.length > 0) {
!                     MenuElement[] newPath = new MenuElement[path.length+1];
                      System.arraycopy(path,0,newPath,0,path.length);
                      newPath[path.length] = menu.getPopupMenu();
                      manager.setSelectedPath(newPath);
                  }
              }