src/share/classes/com/sun/java/swing/plaf/windows/WindowsInternalFrameTitlePane.java

*** 1,7 ****
  /*
!  * Copyright (c) 2001, 2013, 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) 2001, 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
*** 84,101 ****
              if (d != null && d.width != 0 && d.height != 0) {
                  buttonWidth = (int) ((float) buttonWidth * d.width / d.height);
              }
          } else {
              buttonWidth += 2;
-             selectedTitleGradientColor =
-                     UIManager.getColor("InternalFrame.activeTitleGradient");
-             notSelectedTitleGradientColor =
-                     UIManager.getColor("InternalFrame.inactiveTitleGradient");
              Color activeBorderColor =
                      UIManager.getColor("InternalFrame.activeBorderColor");
              setBorder(BorderFactory.createLineBorder(activeBorderColor, 1));
          }
      }
  
      protected void uninstallListeners() {
          // Get around protected method in superclass
          super.uninstallListeners();
--- 84,102 ----
              if (d != null && d.width != 0 && d.height != 0) {
                  buttonWidth = (int) ((float) buttonWidth * d.width / d.height);
              }
          } else {
              buttonWidth += 2;
              Color activeBorderColor =
                      UIManager.getColor("InternalFrame.activeBorderColor");
              setBorder(BorderFactory.createLineBorder(activeBorderColor, 1));
          }
+         // JDK-8039383: initialize these colors because getXP() may return null when theme is changed
+         selectedTitleGradientColor =
+                 UIManager.getColor("InternalFrame.activeTitleGradient");
+         notSelectedTitleGradientColor =
+                 UIManager.getColor("InternalFrame.inactiveTitleGradient");
      }
  
      protected void uninstallListeners() {
          // Get around protected method in superclass
          super.uninstallListeners();
*** 386,396 ****
      }
  
      public class WindowsTitlePaneLayout extends BasicInternalFrameTitlePane.TitlePaneLayout {
          private Insets captionMargin = null;
          private Insets contentMargin = null;
!         private XPStyle xp = XPStyle.getXP();
  
          WindowsTitlePaneLayout() {
              if (xp != null) {
                  Component c = WindowsInternalFrameTitlePane.this;
                  captionMargin = xp.getMargin(c, Part.WP_CAPTION, null, Prop.CAPTIONMARGINS);
--- 387,397 ----
      }
  
      public class WindowsTitlePaneLayout extends BasicInternalFrameTitlePane.TitlePaneLayout {
          private Insets captionMargin = null;
          private Insets contentMargin = null;
!         private final XPStyle xp = XPStyle.getXP();
  
          WindowsTitlePaneLayout() {
              if (xp != null) {
                  Component c = WindowsInternalFrameTitlePane.this;
                  captionMargin = xp.getMargin(c, Part.WP_CAPTION, null, Prop.CAPTIONMARGINS);