--- old/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsDesktopIconUI.java 2017-11-27 16:55:34.000000000 -0800 +++ /dev/null 2017-11-27 16:55:34.000000000 -0800 @@ -1,98 +0,0 @@ -/* - * 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 - * 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.plaf.*; -import javax.swing.plaf.basic.*; -import javax.swing.*; -import javax.swing.border.*; - - - -/** - * Windows icon for a minimized window on the desktop. - *

- * 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 WindowsDesktopIconUI extends BasicDesktopIconUI { - private int width; - - public static ComponentUI createUI(JComponent c) { - return new WindowsDesktopIconUI(); - } - - public void installDefaults() { - super.installDefaults(); - width = UIManager.getInt("DesktopIcon.width"); - } - - public void installUI(JComponent c) { - super.installUI(c); - - c.setOpaque(XPStyle.getXP() == null); - } - - // Uninstall the listeners added by the WindowsInternalFrameTitlePane - public void uninstallUI(JComponent c) { - WindowsInternalFrameTitlePane thePane = - (WindowsInternalFrameTitlePane)iconPane; - super.uninstallUI(c); - thePane.uninstallListeners(); - } - - protected void installComponents() { - iconPane = new WindowsInternalFrameTitlePane(frame); - desktopIcon.setLayout(new BorderLayout()); - desktopIcon.add(iconPane, BorderLayout.CENTER); - - if (XPStyle.getXP() != null) { - desktopIcon.setBorder(null); - } - } - - public Dimension getPreferredSize(JComponent c) { - // Windows desktop icons can not be resized. Therefore, we should - // always return the minimum size of the desktop icon. See - // getMinimumSize(JComponent c). - return getMinimumSize(c); - } - - /** - * Windows desktop icons are restricted to a width of 160 pixels by - * default. This value is retrieved by the DesktopIcon.width property. - */ - public Dimension getMinimumSize(JComponent c) { - Dimension dim = super.getMinimumSize(c); - dim.width = width; - return dim; - } -} --- /dev/null 2017-11-27 16:55:34.000000000 -0800 +++ new/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsDesktopIconUI.java 2017-11-27 16:55:34.000000000 -0800 @@ -0,0 +1,98 @@ +/* + * 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 + * 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.plaf.*; +import javax.swing.plaf.basic.*; +import javax.swing.*; +import javax.swing.border.*; + + + +/** + * Windows icon for a minimized window on the desktop. + *

+ * 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 WindowsDesktopIconUI extends BasicDesktopIconUI { + private int width; + + public static ComponentUI createUI(JComponent c) { + return new WindowsDesktopIconUI(); + } + + public void installDefaults() { + super.installDefaults(); + width = UIManager.getInt("DesktopIcon.width"); + } + + public void installUI(JComponent c) { + super.installUI(c); + + c.setOpaque(XPStyle.getXP() == null); + } + + // Uninstall the listeners added by the WindowsInternalFrameTitlePane + public void uninstallUI(JComponent c) { + WindowsInternalFrameTitlePane thePane = + (WindowsInternalFrameTitlePane)iconPane; + super.uninstallUI(c); + thePane.uninstallListeners(); + } + + protected void installComponents() { + iconPane = new WindowsInternalFrameTitlePane(frame); + desktopIcon.setLayout(new BorderLayout()); + desktopIcon.add(iconPane, BorderLayout.CENTER); + + if (XPStyle.getXP() != null) { + desktopIcon.setBorder(null); + } + } + + public Dimension getPreferredSize(JComponent c) { + // Windows desktop icons can not be resized. Therefore, we should + // always return the minimum size of the desktop icon. See + // getMinimumSize(JComponent c). + return getMinimumSize(c); + } + + /** + * Windows desktop icons are restricted to a width of 160 pixels by + * default. This value is retrieved by the DesktopIcon.width property. + */ + public Dimension getMinimumSize(JComponent c) { + Dimension dim = super.getMinimumSize(c); + dim.width = width; + return dim; + } +}