src/java.desktop/macosx/classes/com/apple/laf/AquaIcon.java

*** 71,89 ****
  
      public interface JRSUIControlSpec {
          public void initIconPainter(final AquaPainter<? extends JRSUIState> painter);
      }
  
!     static abstract class JRSUIIcon implements Icon, UIResource {
          protected final AquaPainter<JRSUIState> painter = AquaPainter.create(JRSUIState.getInstance());
  
          public void paintIcon(final Component c, final Graphics g, final int x, final int y) {
              painter.paint(g, c, x, y, getIconWidth(), getIconHeight());
          }
      }
  
!     static abstract class DynamicallySizingJRSUIIcon extends JRSUIIcon {
          protected final SizeDescriptor sizeDescriptor;
          protected SizeVariant sizeVariant;
  
          public DynamicallySizingJRSUIIcon(final SizeDescriptor sizeDescriptor) {
              this.sizeDescriptor = sizeDescriptor;
--- 71,89 ----
  
      public interface JRSUIControlSpec {
          public void initIconPainter(final AquaPainter<? extends JRSUIState> painter);
      }
  
!     abstract static class JRSUIIcon implements Icon, UIResource {
          protected final AquaPainter<JRSUIState> painter = AquaPainter.create(JRSUIState.getInstance());
  
          public void paintIcon(final Component c, final Graphics g, final int x, final int y) {
              painter.paint(g, c, x, y, getIconWidth(), getIconHeight());
          }
      }
  
!     abstract static class DynamicallySizingJRSUIIcon extends JRSUIIcon {
          protected final SizeDescriptor sizeDescriptor;
          protected SizeVariant sizeVariant;
  
          public DynamicallySizingJRSUIIcon(final SizeDescriptor sizeDescriptor) {
              this.sizeDescriptor = sizeDescriptor;
*** 107,117 ****
              painter.state.set(size);
              super.paintIcon(c, g, x, y);
          }
      }
  
!     static abstract class CachingScalingIcon implements Icon, UIResource {
          int width;
          int height;
          Image image;
  
          public CachingScalingIcon(final int width, final int height) {
--- 107,117 ----
              painter.state.set(size);
              super.paintIcon(c, g, x, y);
          }
      }
  
!     abstract static class CachingScalingIcon implements Icon, UIResource {
          int width;
          int height;
          Image image;
  
          public CachingScalingIcon(final int width, final int height) {
*** 165,175 ****
              return height;
          }
  
      }
  
!     static abstract class ScalingJRSUIIcon implements Icon, UIResource {
          final int width;
          final int height;
  
          public ScalingJRSUIIcon(final int width, final int height) {
              this.width = width;
--- 165,175 ----
              return height;
          }
  
      }
  
!     abstract static class ScalingJRSUIIcon implements Icon, UIResource {
          final int width;
          final int height;
  
          public ScalingJRSUIIcon(final int width, final int height) {
              this.width = width;