infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-04-10 06:59:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

8049830: Remove reflection from ScreenMenuBar

Browse Source 
Reviewed-by: anthony, serb
This commit is contained in:
Petr Pchelko 2014-07-10 15:08:50 +04:00
parent 61b9232969
commit f77b84ddc6
3 changed files with 26 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
jdk/src/macosx/classes/com/apple/laf/ScreenMenuBar.java
View File

@ -25,6 +25,9 @@
package com.apple.laf;
import sun.awt.AWTAccessor;
import sun.lwawt.macosx.CMenuBar;
import java.awt.*;
import java.awt.event.*;
import java.lang.reflect.*;
@ -243,55 +246,25 @@ public class ScreenMenuBar extends MenuBar implements ContainerListener, ScreenM
fSubmenus.remove(menu);
}
private static Field[] stolenFields = null;
static {
stolenFields = AccessController.doPrivileged(new PrivilegedAction<Field[]>() {
public Field[] run() {
try {
final Field[] localFields = new Field[2];
localFields[0] = MenuBar.class.getDeclaredField("menus");
localFields[1] = MenuComponent.class.getDeclaredField("parent");
AccessibleObject.setAccessible(localFields, true);
return localFields;
} catch (final NoSuchFieldException nsf) {
// If this happens, Sun changed the definition of MenuBar and MenuComponent!
nsf.printStackTrace(System.err);
return null;
}
}
});
};
public Menu add(final Menu m, final int index) {
synchronized (getTreeLock()) {
if (m.getParent() != null) {
m.getParent().remove(m);
}
// Use nasty reflection to get at the menus array and parent fields.
try {
if (stolenFields == null) return m;
final Vector<Menu> menus = AWTAccessor.getMenuBarAccessor().getMenus(this);
menus.insertElementAt(m, index);
AWTAccessor.getMenuComponentAccessor().setParent(m, this);
@SuppressWarnings("unchecked")
final Vector<Menu> menus = (Vector<Menu>)stolenFields[0].get(this);
menus.insertElementAt(m, index);
final CMenuBar peer = (CMenuBar)getPeer();
if (peer == null) return m;
stolenFields[1].set(m, this);
final sun.lwawt.macosx.CMenuBar peer = (sun.lwawt.macosx.CMenuBar)getPeer();
if (peer == null) return m;
peer.setNextInsertionIndex(index);
if (m.getPeer() == null) {
m.addNotify();
}
peer.setNextInsertionIndex(-1);
} catch (final IllegalAccessException iae) {
iae.printStackTrace(System.err);
peer.setNextInsertionIndex(index);
if (m.getPeer() == null) {
m.addNotify();
}
peer.setNextInsertionIndex(-1);
return m;
}
}

8
jdk/src/share/classes/java/awt/MenuComponent.java
View File

@ -132,16 +132,24 @@ public abstract class MenuComponent implements java.io.Serializable {
static {
AWTAccessor.setMenuComponentAccessor(
new AWTAccessor.MenuComponentAccessor() {
@Override
public AppContext getAppContext(MenuComponent menuComp) {
return menuComp.appContext;
}
@Override
public void setAppContext(MenuComponent menuComp,
AppContext appContext) {
menuComp.appContext = appContext;
}
@Override
public MenuContainer getParent(MenuComponent menuComp) {
return menuComp.parent;
}
@Override
public void setParent(MenuComponent menuComp, MenuContainer menuContainer) {
menuComp.parent = menuContainer;
}
@Override
public Font getFont_NoClientCode(MenuComponent menuComp) {
return menuComp.getFont_NoClientCode();
}

7
jdk/src/share/classes/sun/awt/AWTAccessor.java
View File

@ -481,10 +481,15 @@ public final class AWTAccessor {
void setAppContext(MenuComponent menuComp, AppContext appContext);
/**
* Returns the menu container of the menu component
* Returns the menu container of the menu component.
*/
MenuContainer getParent(MenuComponent menuComp);
/**
* Sets the menu container of the menu component.
*/
void setParent(MenuComponent menuComp, MenuContainer menuContainer);
/**
* Gets the font used for this menu component.
*/