--- old/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsCheckBoxMenuItemUI.java 2017-11-27 16:55:31.000000000 -0800 +++ /dev/null 2017-11-27 16:55:31.000000000 -0800 @@ -1,104 +0,0 @@ -/* - * Copyright (c) 1997, 2006, 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 - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the LICENSE file that accompanied this code. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - */ - -package com.sun.java.swing.plaf.windows; - -import java.awt.*; -import javax.swing.*; -import javax.swing.plaf.*; -import javax.swing.plaf.basic.*; - -import com.sun.java.swing.plaf.windows.TMSchema.Part; -import com.sun.java.swing.plaf.windows.TMSchema.State; - - -/** - * Windows check box menu item. - *

- * Warning: - * Serialized objects of this class will not be compatible with - * future Swing releases. The current serialization support is appropriate - * for short term storage or RMI between applications running the same - * version of Swing. A future release of Swing will provide support for - * long term persistence. - */ -public class WindowsCheckBoxMenuItemUI extends BasicCheckBoxMenuItemUI { - - final WindowsMenuItemUIAccessor accessor = - new WindowsMenuItemUIAccessor() { - - public JMenuItem getMenuItem() { - return menuItem; - } - - public State getState(JMenuItem menuItem) { - return WindowsMenuItemUI.getState(this, menuItem); - } - - public Part getPart(JMenuItem menuItem) { - return WindowsMenuItemUI.getPart(this, menuItem); - } - }; - public static ComponentUI createUI(JComponent b) { - return new WindowsCheckBoxMenuItemUI(); - } - - @Override - protected void paintBackground(Graphics g, JMenuItem menuItem, - Color bgColor) { - if (WindowsMenuItemUI.isVistaPainting()) { - WindowsMenuItemUI.paintBackground(accessor, g, menuItem, bgColor); - return; - } - super.paintBackground(g, menuItem, bgColor); - } - /** - * Method which renders the text of the current menu item. - * - * @param g Graphics context - * @param menuItem Current menu item to render - * @param textRect Bounding rectangle to render the text. - * @param text String to render - * @since 1.4 - */ - protected void paintText(Graphics g, JMenuItem menuItem, - Rectangle textRect, String text) { - if (WindowsMenuItemUI.isVistaPainting()) { - WindowsMenuItemUI.paintText(accessor, g, menuItem, - textRect, text); - return; - } - ButtonModel model = menuItem.getModel(); - Color oldColor = g.getColor(); - - if(model.isEnabled() && model.isArmed()) { - g.setColor(selectionForeground); // Uses protected field. - } - - WindowsGraphicsUtils.paintText(g, menuItem, textRect, text, 0); - - g.setColor(oldColor); - } -} --- /dev/null 2017-11-27 16:55:31.000000000 -0800 +++ new/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsCheckBoxMenuItemUI.java 2017-11-27 16:55:30.000000000 -0800 @@ -0,0 +1,104 @@ +/* + * Copyright (c) 1997, 2006, 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 + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +package com.sun.java.swing.plaf.windows; + +import java.awt.*; +import javax.swing.*; +import javax.swing.plaf.*; +import javax.swing.plaf.basic.*; + +import com.sun.java.swing.plaf.windows.TMSchema.Part; +import com.sun.java.swing.plaf.windows.TMSchema.State; + + +/** + * Windows check box menu item. + *

+ * Warning: + * Serialized objects of this class will not be compatible with + * future Swing releases. The current serialization support is appropriate + * for short term storage or RMI between applications running the same + * version of Swing. A future release of Swing will provide support for + * long term persistence. + */ +public class WindowsCheckBoxMenuItemUI extends BasicCheckBoxMenuItemUI { + + final WindowsMenuItemUIAccessor accessor = + new WindowsMenuItemUIAccessor() { + + public JMenuItem getMenuItem() { + return menuItem; + } + + public State getState(JMenuItem menuItem) { + return WindowsMenuItemUI.getState(this, menuItem); + } + + public Part getPart(JMenuItem menuItem) { + return WindowsMenuItemUI.getPart(this, menuItem); + } + }; + public static ComponentUI createUI(JComponent b) { + return new WindowsCheckBoxMenuItemUI(); + } + + @Override + protected void paintBackground(Graphics g, JMenuItem menuItem, + Color bgColor) { + if (WindowsMenuItemUI.isVistaPainting()) { + WindowsMenuItemUI.paintBackground(accessor, g, menuItem, bgColor); + return; + } + super.paintBackground(g, menuItem, bgColor); + } + /** + * Method which renders the text of the current menu item. + * + * @param g Graphics context + * @param menuItem Current menu item to render + * @param textRect Bounding rectangle to render the text. + * @param text String to render + * @since 1.4 + */ + protected void paintText(Graphics g, JMenuItem menuItem, + Rectangle textRect, String text) { + if (WindowsMenuItemUI.isVistaPainting()) { + WindowsMenuItemUI.paintText(accessor, g, menuItem, + textRect, text); + return; + } + ButtonModel model = menuItem.getModel(); + Color oldColor = g.getColor(); + + if(model.isEnabled() && model.isArmed()) { + g.setColor(selectionForeground); // Uses protected field. + } + + WindowsGraphicsUtils.paintText(g, menuItem, textRect, text, 0); + + g.setColor(oldColor); + } +}