--- old/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsInternalFrameUI.java 2017-11-27 16:55:41.000000000 -0800 +++ /dev/null 2017-11-27 16:55:42.000000000 -0800 @@ -1,135 +0,0 @@ -/* - * Copyright (c) 1997, 2014, 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 java.beans.*; -import javax.swing.*; -import javax.swing.border.*; -import javax.swing.plaf.basic.*; -import javax.swing.plaf.ComponentUI; - -import static com.sun.java.swing.plaf.windows.TMSchema.*; -import static com.sun.java.swing.plaf.windows.XPStyle.Skin; - -/** - * Windows rendition of the component. - *

- * 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 WindowsInternalFrameUI extends BasicInternalFrameUI -{ - XPStyle xp = XPStyle.getXP(); - - public void installDefaults() { - super.installDefaults(); - - if (xp != null) { - frame.setBorder(new XPBorder()); - } else { - frame.setBorder(UIManager.getBorder("InternalFrame.border")); - } - } - - public void installUI(JComponent c) { - super.installUI(c); - - LookAndFeel.installProperty(c, "opaque", - xp == null? Boolean.TRUE : Boolean.FALSE); - } - - public void uninstallDefaults() { - frame.setBorder(null); - super.uninstallDefaults(); - } - - public static ComponentUI createUI(JComponent b) { - return new WindowsInternalFrameUI((JInternalFrame)b); - } - - public WindowsInternalFrameUI(JInternalFrame w){ - super(w); - } - - protected DesktopManager createDesktopManager(){ - return new WindowsDesktopManager(); - } - - protected JComponent createNorthPane(JInternalFrame w) { - titlePane = new WindowsInternalFrameTitlePane(w); - return titlePane; - } - - @SuppressWarnings("serial") // Superclass is not serializable across versions - private class XPBorder extends AbstractBorder { - private Skin leftSkin = xp.getSkin(frame, Part.WP_FRAMELEFT); - private Skin rightSkin = xp.getSkin(frame, Part.WP_FRAMERIGHT); - private Skin bottomSkin = xp.getSkin(frame, Part.WP_FRAMEBOTTOM); - - /** - * @param x the x position of the painted border - * @param y the y position of the painted border - * @param width the width of the painted border - * @param height the height of the painted border - */ - public void paintBorder(Component c, Graphics g, int x, int y, int width, int height) { - State state = ((JInternalFrame)c).isSelected() ? State.ACTIVE : State.INACTIVE; - int topBorderHeight = (titlePane != null) ? titlePane.getSize().height : 0; - - bottomSkin.paintSkin(g, 0, height-bottomSkin.getHeight(), - width, bottomSkin.getHeight(), - state); - - leftSkin.paintSkin(g, 0, topBorderHeight-1, - leftSkin.getWidth(), height-topBorderHeight-bottomSkin.getHeight()+2, - state); - - rightSkin.paintSkin(g, width-rightSkin.getWidth(), topBorderHeight-1, - rightSkin.getWidth(), height-topBorderHeight-bottomSkin.getHeight()+2, - state); - - } - - public Insets getBorderInsets(Component c, Insets insets) { - insets.top = 4; - insets.left = leftSkin.getWidth(); - insets.right = rightSkin.getWidth(); - insets.bottom = bottomSkin.getHeight(); - - return insets; - } - - public boolean isBorderOpaque() { - return true; - } - } - -} --- /dev/null 2017-11-27 16:55:42.000000000 -0800 +++ new/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsInternalFrameUI.java 2017-11-27 16:55:41.000000000 -0800 @@ -0,0 +1,135 @@ +/* + * Copyright (c) 1997, 2014, 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 java.beans.*; +import javax.swing.*; +import javax.swing.border.*; +import javax.swing.plaf.basic.*; +import javax.swing.plaf.ComponentUI; + +import static com.sun.java.swing.plaf.windows.TMSchema.*; +import static com.sun.java.swing.plaf.windows.XPStyle.Skin; + +/** + * Windows rendition of the component. + *

+ * 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 WindowsInternalFrameUI extends BasicInternalFrameUI +{ + XPStyle xp = XPStyle.getXP(); + + public void installDefaults() { + super.installDefaults(); + + if (xp != null) { + frame.setBorder(new XPBorder()); + } else { + frame.setBorder(UIManager.getBorder("InternalFrame.border")); + } + } + + public void installUI(JComponent c) { + super.installUI(c); + + LookAndFeel.installProperty(c, "opaque", + xp == null? Boolean.TRUE : Boolean.FALSE); + } + + public void uninstallDefaults() { + frame.setBorder(null); + super.uninstallDefaults(); + } + + public static ComponentUI createUI(JComponent b) { + return new WindowsInternalFrameUI((JInternalFrame)b); + } + + public WindowsInternalFrameUI(JInternalFrame w){ + super(w); + } + + protected DesktopManager createDesktopManager(){ + return new WindowsDesktopManager(); + } + + protected JComponent createNorthPane(JInternalFrame w) { + titlePane = new WindowsInternalFrameTitlePane(w); + return titlePane; + } + + @SuppressWarnings("serial") // Superclass is not serializable across versions + private class XPBorder extends AbstractBorder { + private Skin leftSkin = xp.getSkin(frame, Part.WP_FRAMELEFT); + private Skin rightSkin = xp.getSkin(frame, Part.WP_FRAMERIGHT); + private Skin bottomSkin = xp.getSkin(frame, Part.WP_FRAMEBOTTOM); + + /** + * @param x the x position of the painted border + * @param y the y position of the painted border + * @param width the width of the painted border + * @param height the height of the painted border + */ + public void paintBorder(Component c, Graphics g, int x, int y, int width, int height) { + State state = ((JInternalFrame)c).isSelected() ? State.ACTIVE : State.INACTIVE; + int topBorderHeight = (titlePane != null) ? titlePane.getSize().height : 0; + + bottomSkin.paintSkin(g, 0, height-bottomSkin.getHeight(), + width, bottomSkin.getHeight(), + state); + + leftSkin.paintSkin(g, 0, topBorderHeight-1, + leftSkin.getWidth(), height-topBorderHeight-bottomSkin.getHeight()+2, + state); + + rightSkin.paintSkin(g, width-rightSkin.getWidth(), topBorderHeight-1, + rightSkin.getWidth(), height-topBorderHeight-bottomSkin.getHeight()+2, + state); + + } + + public Insets getBorderInsets(Component c, Insets insets) { + insets.top = 4; + insets.left = leftSkin.getWidth(); + insets.right = rightSkin.getWidth(); + insets.bottom = bottomSkin.getHeight(); + + return insets; + } + + public boolean isBorderOpaque() { + return true; + } + } + +}