8176409: [findbugs] some files under com.apple.laf with variable isn't final but should be
Reviewed-by: serb, azvegint
--- a/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaButtonBorder.java Thu Mar 16 01:40:21 2017 +0100
+++ b/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaButtonBorder.java Thu Mar 16 16:45:04 2017 +0300
@@ -37,7 +37,7 @@
import com.apple.laf.AquaUtils.*;
public abstract class AquaButtonBorder extends AquaBorder implements Border, UIResource {
- public static final RecyclableSingleton<Dynamic> fDynamic = new RecyclableSingletonFromDefaultConstructor<Dynamic>(Dynamic.class);
+ private static final RecyclableSingleton<Dynamic> fDynamic = new RecyclableSingletonFromDefaultConstructor<Dynamic>(Dynamic.class);
public static AquaButtonBorder getDynamicButtonBorder() {
return fDynamic.get();
}
@@ -47,12 +47,12 @@
return fToggle.get();
}
- public static final RecyclableSingleton<Toolbar> fToolBar = new RecyclableSingletonFromDefaultConstructor<Toolbar>(Toolbar.class);
+ private static final RecyclableSingleton<Toolbar> fToolBar = new RecyclableSingletonFromDefaultConstructor<Toolbar>(Toolbar.class);
public static Border getToolBarButtonBorder() {
return fToolBar.get();
}
- public static final RecyclableSingleton<Named> fBevel = new RecyclableSingleton<Named>() {
+ private static final RecyclableSingleton<Named> fBevel = new RecyclableSingleton<Named>() {
protected Named getInstance() {
return new Named(Widget.BUTTON_BEVEL, new SizeDescriptor(new SizeVariant().alterMargins(2, 4, 2, 4)));
}
--- a/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaButtonCheckBoxUI.java Thu Mar 16 01:40:21 2017 +0100
+++ b/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaButtonCheckBoxUI.java Thu Mar 16 16:45:04 2017 +0300
@@ -34,8 +34,8 @@
import com.apple.laf.AquaUtils.*;
public class AquaButtonCheckBoxUI extends AquaButtonLabeledUI {
- protected static final RecyclableSingleton<AquaButtonCheckBoxUI> instance = new RecyclableSingletonFromDefaultConstructor<AquaButtonCheckBoxUI>(AquaButtonCheckBoxUI.class);
- protected static final RecyclableSingleton<ImageIcon> sizingIcon = new RecyclableSingleton<ImageIcon>() {
+ private static final RecyclableSingleton<AquaButtonCheckBoxUI> instance = new RecyclableSingletonFromDefaultConstructor<AquaButtonCheckBoxUI>(AquaButtonCheckBoxUI.class);
+ private static final RecyclableSingleton<ImageIcon> sizingIcon = new RecyclableSingleton<ImageIcon>() {
protected ImageIcon getInstance() {
return new ImageIcon(AquaNativeResources.getRadioButtonSizerImage());
}
--- a/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaButtonExtendedTypes.java Thu Mar 16 01:40:21 2017 +0100
+++ b/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaButtonExtendedTypes.java Thu Mar 16 16:45:04 2017 +0300
@@ -138,7 +138,7 @@
return typeDefinitions.get().get(name);
}
- protected static final RecyclableSingleton<Map<String, TypeSpecifier>> typeDefinitions = new RecyclableSingleton<Map<String, TypeSpecifier>>() {
+ private static final RecyclableSingleton<Map<String, TypeSpecifier>> typeDefinitions = new RecyclableSingleton<Map<String, TypeSpecifier>>() {
protected Map<String, TypeSpecifier> getInstance() {
return getAllTypes();
}
--- a/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaButtonLabeledUI.java Thu Mar 16 01:40:21 2017 +0100
+++ b/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaButtonLabeledUI.java Thu Mar 16 16:45:04 2017 +0300
@@ -42,9 +42,9 @@
import com.apple.laf.AquaUtils.RecyclableSingleton;
public abstract class AquaButtonLabeledUI extends AquaButtonToggleUI implements Sizeable {
- protected static RecyclableSizingIcon regularIcon = new RecyclableSizingIcon(18);
- protected static RecyclableSizingIcon smallIcon = new RecyclableSizingIcon(16);
- protected static RecyclableSizingIcon miniIcon = new RecyclableSizingIcon(14);
+ private static final RecyclableSizingIcon regularIcon = new RecyclableSizingIcon(18);
+ private static final RecyclableSizingIcon smallIcon = new RecyclableSizingIcon(16);
+ private static final RecyclableSizingIcon miniIcon = new RecyclableSizingIcon(14);
protected static class RecyclableSizingIcon extends RecyclableSingleton<Icon> {
final int iconSize;
--- a/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaButtonRadioUI.java Thu Mar 16 01:40:21 2017 +0100
+++ b/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaButtonRadioUI.java Thu Mar 16 16:45:04 2017 +0300
@@ -34,8 +34,8 @@
import com.apple.laf.AquaUtils.*;
public class AquaButtonRadioUI extends AquaButtonLabeledUI {
- protected static final RecyclableSingleton<AquaButtonRadioUI> instance = new RecyclableSingletonFromDefaultConstructor<AquaButtonRadioUI>(AquaButtonRadioUI.class);
- protected static final RecyclableSingleton<ImageIcon> sizingIcon = new RecyclableSingleton<ImageIcon>() {
+ private static final RecyclableSingleton<AquaButtonRadioUI> instance = new RecyclableSingletonFromDefaultConstructor<AquaButtonRadioUI>(AquaButtonRadioUI.class);
+ private static final RecyclableSingleton<ImageIcon> sizingIcon = new RecyclableSingleton<ImageIcon>() {
protected ImageIcon getInstance() {
return new ImageIcon(AquaNativeResources.getRadioButtonSizerImage());
}
--- a/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaButtonToggleUI.java Thu Mar 16 01:40:21 2017 +0100
+++ b/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaButtonToggleUI.java Thu Mar 16 16:45:04 2017 +0300
@@ -32,7 +32,7 @@
public class AquaButtonToggleUI extends AquaButtonUI {
// Create PLAF
- static final RecyclableSingleton<AquaButtonToggleUI> aquaToggleButtonUI = new RecyclableSingletonFromDefaultConstructor<AquaButtonToggleUI>(AquaButtonToggleUI.class);
+ private static final RecyclableSingleton<AquaButtonToggleUI> aquaToggleButtonUI = new RecyclableSingletonFromDefaultConstructor<AquaButtonToggleUI>(AquaButtonToggleUI.class);
public static ComponentUI createUI(final JComponent b) {
return aquaToggleButtonUI.get();
}
--- a/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaButtonUI.java Thu Mar 16 01:40:21 2017 +0100
+++ b/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaButtonUI.java Thu Mar 16 16:45:04 2017 +0300
@@ -48,7 +48,7 @@
private static final String BUTTON_TYPE = "JButton.buttonType";
private static final String SEGMENTED_BUTTON_POSITION = "JButton.segmentPosition";
- protected static final RecyclableSingleton<AquaButtonUI> buttonUI = new RecyclableSingletonFromDefaultConstructor<AquaButtonUI>(AquaButtonUI.class);
+ private static final RecyclableSingleton<AquaButtonUI> buttonUI = new RecyclableSingletonFromDefaultConstructor<AquaButtonUI>(AquaButtonUI.class);
public static ComponentUI createUI(final JComponent c) {
return buttonUI.get();
}
@@ -462,7 +462,7 @@
return d;
}
- static final RecyclableSingleton<AquaHierarchyButtonListener> fHierListener = new RecyclableSingletonFromDefaultConstructor<AquaHierarchyButtonListener>(AquaHierarchyButtonListener.class);
+ private static final RecyclableSingleton<AquaHierarchyButtonListener> fHierListener = new RecyclableSingletonFromDefaultConstructor<AquaHierarchyButtonListener>(AquaHierarchyButtonListener.class);
static AquaHierarchyButtonListener getAquaHierarchyButtonListener() {
return fHierListener.get();
}
--- a/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaComboBoxUI.java Thu Mar 16 01:40:21 2017 +0100
+++ b/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaComboBoxUI.java Thu Mar 16 16:45:04 2017 +0300
@@ -594,7 +594,7 @@
}
@SuppressWarnings("unchecked")
- static final RecyclableSingleton<ClientPropertyApplicator<JComboBox<?>, AquaComboBoxUI>> APPLICATOR = new
+ private static final RecyclableSingleton<ClientPropertyApplicator<JComboBox<?>, AquaComboBoxUI>> APPLICATOR = new
RecyclableSingleton<ClientPropertyApplicator<JComboBox<?>, AquaComboBoxUI>>() {
@Override
protected ClientPropertyApplicator<JComboBox<?>, AquaComboBoxUI> getInstance() {
--- a/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaFileView.java Thu Mar 16 01:40:21 2017 +0100
+++ b/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaFileView.java Thu Mar 16 16:45:04 2017 +0300
@@ -75,7 +75,7 @@
private static native int getNativeLSInfo(final byte[] pathBytes, final boolean isDirectory);
private static native String getNativePathForResolvedAlias(final byte[] absolutePath, final boolean isDirectory);
- static final RecyclableSingleton<String> machineName = new RecyclableSingleton<String>() {
+ private static final RecyclableSingleton<String> machineName = new RecyclableSingleton<String>() {
@Override
protected String getInstance() {
return getNativeMachineName();
--- a/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaGroupBorder.java Thu Mar 16 01:40:21 2017 +0100
+++ b/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaGroupBorder.java Thu Mar 16 16:45:04 2017 +0300
@@ -35,17 +35,17 @@
import com.apple.laf.AquaUtils.RecyclableSingletonFromDefaultConstructor;
public abstract class AquaGroupBorder extends AquaBorder {
- static final RecyclableSingletonFromDefaultConstructor<? extends Border> tabbedPaneGroupBorder = new RecyclableSingletonFromDefaultConstructor<TabbedPane>(TabbedPane.class);
+ private static final RecyclableSingletonFromDefaultConstructor<? extends Border> tabbedPaneGroupBorder = new RecyclableSingletonFromDefaultConstructor<TabbedPane>(TabbedPane.class);
public static Border getTabbedPaneGroupBorder() {
return tabbedPaneGroupBorder.get();
}
- static final RecyclableSingletonFromDefaultConstructor<? extends Border> titleBorderGroupBorder = new RecyclableSingletonFromDefaultConstructor<Titled>(Titled.class);
+ private static final RecyclableSingletonFromDefaultConstructor<? extends Border> titleBorderGroupBorder = new RecyclableSingletonFromDefaultConstructor<Titled>(Titled.class);
public static Border getBorderForTitledBorder() {
return titleBorderGroupBorder.get();
}
- static final RecyclableSingletonFromDefaultConstructor<? extends Border> titlelessGroupBorder = new RecyclableSingletonFromDefaultConstructor<Titleless>(Titleless.class);
+ private static final RecyclableSingletonFromDefaultConstructor<? extends Border> titlelessGroupBorder = new RecyclableSingletonFromDefaultConstructor<Titleless>(Titleless.class);
public static Border getTitlelessBorder() {
return titlelessGroupBorder.get();
}
--- a/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaHighlighter.java Thu Mar 16 01:40:21 2017 +0100
+++ b/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaHighlighter.java Thu Mar 16 16:45:04 2017 +0300
@@ -37,7 +37,7 @@
import com.apple.laf.AquaUtils.RecyclableSingleton;
public class AquaHighlighter extends DefaultHighlighter implements UIResource {
- static final RecyclableSingleton<LayerPainter> instance = new RecyclableSingleton<LayerPainter>() {
+ private static final RecyclableSingleton<LayerPainter> instance = new RecyclableSingleton<LayerPainter>() {
protected LayerPainter getInstance() {
return new AquaHighlightPainter(null);
}
--- a/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaImageFactory.java Thu Mar 16 01:40:21 2017 +0100
+++ b/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaImageFactory.java Thu Mar 16 16:45:04 2017 +0300
@@ -240,14 +240,14 @@
}
}
- protected static final NamedImageSingleton northArrow = new NamedImageSingleton("NSMenuScrollUp");
- protected static final IconUIResourceSingleton northArrowIcon = new IconUIResourceSingleton(northArrow);
- protected static final NamedImageSingleton southArrow = new NamedImageSingleton("NSMenuScrollDown");
- protected static final IconUIResourceSingleton southArrowIcon = new IconUIResourceSingleton(southArrow);
- protected static final NamedImageSingleton westArrow = new NamedImageSingleton("NSMenuSubmenuLeft");
- protected static final IconUIResourceSingleton westArrowIcon = new IconUIResourceSingleton(westArrow);
- protected static final NamedImageSingleton eastArrow = new NamedImageSingleton("NSMenuSubmenu");
- protected static final IconUIResourceSingleton eastArrowIcon = new IconUIResourceSingleton(eastArrow);
+ private static final NamedImageSingleton northArrow = new NamedImageSingleton("NSMenuScrollUp");
+ private static final IconUIResourceSingleton northArrowIcon = new IconUIResourceSingleton(northArrow);
+ private static final NamedImageSingleton southArrow = new NamedImageSingleton("NSMenuScrollDown");
+ private static final IconUIResourceSingleton southArrowIcon = new IconUIResourceSingleton(southArrow);
+ private static final NamedImageSingleton westArrow = new NamedImageSingleton("NSMenuSubmenuLeft");
+ private static final IconUIResourceSingleton westArrowIcon = new IconUIResourceSingleton(westArrow);
+ private static final NamedImageSingleton eastArrow = new NamedImageSingleton("NSMenuSubmenu");
+ private static final IconUIResourceSingleton eastArrowIcon = new IconUIResourceSingleton(eastArrow);
static Image getArrowImageForDirection(final int direction) {
switch(direction) {
--- a/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaInternalFrameBorder.java Thu Mar 16 01:40:21 2017 +0100
+++ b/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaInternalFrameBorder.java Thu Mar 16 16:45:04 2017 +0300
@@ -55,7 +55,7 @@
private static final int kContentTester = 100; // For getting region insets
- static final RecyclableSingleton<AquaInternalFrameBorder> documentWindowFrame = new RecyclableSingleton<AquaInternalFrameBorder>() {
+ private static final RecyclableSingleton<AquaInternalFrameBorder> documentWindowFrame = new RecyclableSingleton<AquaInternalFrameBorder>() {
protected AquaInternalFrameBorder getInstance() {
return new AquaInternalFrameBorder(WindowType.DOCUMENT);
}
@@ -64,7 +64,7 @@
return documentWindowFrame.get();
}
- static final RecyclableSingleton<AquaInternalFrameBorder> utilityWindowFrame = new RecyclableSingleton<AquaInternalFrameBorder>() {
+ private static final RecyclableSingleton<AquaInternalFrameBorder> utilityWindowFrame = new RecyclableSingleton<AquaInternalFrameBorder>() {
protected AquaInternalFrameBorder getInstance() {
return new AquaInternalFrameBorder(WindowType.UTILITY);
}
@@ -73,7 +73,7 @@
return utilityWindowFrame.get();
}
- static final RecyclableSingleton<AquaInternalFrameBorder> dialogWindowFrame = new RecyclableSingleton<AquaInternalFrameBorder>() {
+ private static final RecyclableSingleton<AquaInternalFrameBorder> dialogWindowFrame = new RecyclableSingleton<AquaInternalFrameBorder>() {
protected AquaInternalFrameBorder getInstance() {
return new AquaInternalFrameBorder(WindowType.DOCUMENT);
}
--- a/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaInternalFrameUI.java Thu Mar 16 01:40:21 2017 +0100
+++ b/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaInternalFrameUI.java Thu Mar 16 16:45:04 2017 +0300
@@ -147,7 +147,7 @@
southPane = c;
}
- static final RecyclableSingleton<Icon> closeIcon = new RecyclableSingleton<Icon>() {
+ private static final RecyclableSingleton<Icon> closeIcon = new RecyclableSingleton<Icon>() {
@Override
protected Icon getInstance() {
return new AquaInternalFrameButtonIcon(Widget.TITLE_BAR_CLOSE_BOX);
@@ -157,7 +157,7 @@
return closeIcon.get();
}
- static final RecyclableSingleton<Icon> minimizeIcon = new RecyclableSingleton<Icon>() {
+ private static final RecyclableSingleton<Icon> minimizeIcon = new RecyclableSingleton<Icon>() {
@Override
protected Icon getInstance() {
return new AquaInternalFrameButtonIcon(Widget.TITLE_BAR_COLLAPSE_BOX);
@@ -167,7 +167,7 @@
return minimizeIcon.get();
}
- static final RecyclableSingleton<Icon> zoomIcon = new RecyclableSingleton<Icon>() {
+ private static final RecyclableSingleton<Icon> zoomIcon = new RecyclableSingleton<Icon>() {
@Override
protected Icon getInstance() {
return new AquaInternalFrameButtonIcon(Widget.TITLE_BAR_ZOOM_BOX);
@@ -738,7 +738,7 @@
}
} // end class PaletteListener
- static final InternalFrameShadow documentWindowShadow = new InternalFrameShadow() {
+ private static final InternalFrameShadow documentWindowShadow = new InternalFrameShadow() {
@Override
Border getForegroundShadowBorder() {
return new AquaUtils.SlicedShadowBorder(new Painter() {
@@ -778,7 +778,7 @@
}
};
- static final InternalFrameShadow paletteWindowShadow = new InternalFrameShadow() {
+ private static final InternalFrameShadow paletteWindowShadow = new InternalFrameShadow() {
@Override
Border getForegroundShadowBorder() {
return new AquaUtils.SlicedShadowBorder(new Painter() {
@@ -834,7 +834,7 @@
}
}
- static final RecyclableSingleton<Icon> RESIZE_ICON = new RecyclableSingleton<Icon>() {
+ private static final RecyclableSingleton<Icon> RESIZE_ICON = new RecyclableSingleton<Icon>() {
@Override
protected Icon getInstance() {
return new AquaIcon.ScalingJRSUIIcon(11, 11) {
--- a/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaKeyBindings.java Thu Mar 16 01:40:21 2017 +0100
+++ b/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaKeyBindings.java Thu Mar 16 16:45:04 2017 +0300
@@ -37,7 +37,7 @@
import com.apple.laf.AquaUtils.RecyclableSingletonFromDefaultConstructor;
public class AquaKeyBindings {
- static final RecyclableSingleton<AquaKeyBindings> instance = new RecyclableSingletonFromDefaultConstructor<AquaKeyBindings>(AquaKeyBindings.class);
+ private static final RecyclableSingleton<AquaKeyBindings> instance = new RecyclableSingletonFromDefaultConstructor<AquaKeyBindings>(AquaKeyBindings.class);
static AquaKeyBindings instance() {
return instance.get();
}
--- a/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaLabelUI.java Thu Mar 16 01:40:21 2017 +0100
+++ b/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaLabelUI.java Thu Mar 16 16:45:04 2017 +0300
@@ -37,7 +37,7 @@
import com.apple.laf.AquaUtils.RecyclableSingletonFromDefaultConstructor;
public class AquaLabelUI extends BasicLabelUI {
- protected static final RecyclableSingleton<AquaLabelUI> aquaLabelUI = new RecyclableSingletonFromDefaultConstructor<AquaLabelUI>(AquaLabelUI.class);
+ private static final RecyclableSingleton<AquaLabelUI> aquaLabelUI = new RecyclableSingletonFromDefaultConstructor<AquaLabelUI>(AquaLabelUI.class);
public static ComponentUI createUI(final JComponent c) {
return aquaLabelUI.get();
--- a/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaMenuPainter.java Thu Mar 16 01:40:21 2017 +0100
+++ b/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaMenuPainter.java Thu Mar 16 16:45:04 2017 +0300
@@ -125,7 +125,7 @@
return buf.toString();
}
- static final RecyclableSingleton<AquaMenuPainter> sPainter = new RecyclableSingletonFromDefaultConstructor<AquaMenuPainter>(AquaMenuPainter.class);
+ private static final RecyclableSingleton<AquaMenuPainter> sPainter = new RecyclableSingletonFromDefaultConstructor<AquaMenuPainter>(AquaMenuPainter.class);
static AquaMenuPainter instance() {
return sPainter.get();
}
@@ -139,9 +139,9 @@
protected Border getInstance() { return UIManager.getBorder(borderName); }
}
- protected final RecyclableBorder menuBarPainter = new RecyclableBorder("MenuBar.backgroundPainter");
- protected final RecyclableBorder selectedMenuBarItemPainter = new RecyclableBorder("MenuBar.selectedBackgroundPainter");
- protected final RecyclableBorder selectedMenuItemPainter = new RecyclableBorder("MenuItem.selectedBackgroundPainter");
+ private static final RecyclableBorder menuBarPainter = new RecyclableBorder("MenuBar.backgroundPainter");
+ private static final RecyclableBorder selectedMenuBarItemPainter = new RecyclableBorder("MenuBar.selectedBackgroundPainter");
+ private static final RecyclableBorder selectedMenuItemPainter = new RecyclableBorder("MenuItem.selectedBackgroundPainter");
public void paintMenuBarBackground(final Graphics g, final int width, final int height, final JComponent c) {
g.setColor(c == null ? Color.white : c.getBackground());
--- a/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaMnemonicHandler.java Thu Mar 16 01:40:21 2017 +0100
+++ b/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaMnemonicHandler.java Thu Mar 16 16:45:04 2017 +0300
@@ -34,7 +34,7 @@
import com.apple.laf.AquaUtils.RecyclableSingletonFromDefaultConstructor;
public class AquaMnemonicHandler {
- static final RecyclableSingleton<AltProcessor> altProcessor = new RecyclableSingletonFromDefaultConstructor<AltProcessor>(AltProcessor.class);
+ private static final RecyclableSingleton<AltProcessor> altProcessor = new RecyclableSingletonFromDefaultConstructor<AltProcessor>(AltProcessor.class);
public static KeyEventPostProcessor getInstance() {
return altProcessor.get();
}
--- a/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaNativeResources.java Thu Mar 16 01:40:21 2017 +0100
+++ b/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaNativeResources.java Thu Mar 16 16:45:04 2017 +0300
@@ -54,7 +54,7 @@
}
}
- static final RecyclableSingleton<Color> sBackgroundColor = new RecyclableSingleton<Color>() {
+ private static final RecyclableSingleton<Color> sBackgroundColor = new RecyclableSingleton<Color>() {
@Override
protected Color getInstance() {
final long backgroundID = getWindowBackgroundColor();
--- a/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaPanelUI.java Thu Mar 16 01:40:21 2017 +0100
+++ b/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaPanelUI.java Thu Mar 16 16:45:04 2017 +0300
@@ -35,7 +35,7 @@
import java.awt.Graphics;
public class AquaPanelUI extends BasicPanelUI {
- static RecyclableSingleton<AquaPanelUI> instance = new RecyclableSingletonFromDefaultConstructor<AquaPanelUI>(AquaPanelUI.class);
+ private static final RecyclableSingleton<AquaPanelUI> instance = new RecyclableSingletonFromDefaultConstructor<AquaPanelUI>(AquaPanelUI.class);
public static ComponentUI createUI(final JComponent c) {
return instance.get();
--- a/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaPopupMenuSeparatorUI.java Thu Mar 16 01:40:21 2017 +0100
+++ b/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaPopupMenuSeparatorUI.java Thu Mar 16 16:45:04 2017 +0300
@@ -34,7 +34,7 @@
import com.apple.laf.AquaUtils.RecyclableSingletonFromDefaultConstructor;
public class AquaPopupMenuSeparatorUI extends BasicSeparatorUI {
- protected static RecyclableSingletonFromDefaultConstructor<AquaPopupMenuSeparatorUI> instance = new RecyclableSingletonFromDefaultConstructor<AquaPopupMenuSeparatorUI>(AquaPopupMenuSeparatorUI.class);
+ private static final RecyclableSingletonFromDefaultConstructor<AquaPopupMenuSeparatorUI> instance = new RecyclableSingletonFromDefaultConstructor<AquaPopupMenuSeparatorUI>(AquaPopupMenuSeparatorUI.class);
public static ComponentUI createUI(final JComponent c) {
return instance.get();
--- a/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaProgressBarUI.java Thu Mar 16 01:40:21 2017 +0100
+++ b/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaProgressBarUI.java Thu Mar 16 16:45:04 2017 +0300
@@ -46,7 +46,7 @@
public class AquaProgressBarUI extends ProgressBarUI implements ChangeListener, PropertyChangeListener, AncestorListener, Sizeable {
private static final boolean ADJUSTTIMER = true;
- protected static final RecyclableSingleton<SizeDescriptor> sizeDescriptor = new RecyclableSingleton<SizeDescriptor>() {
+ private static final RecyclableSingleton<SizeDescriptor> sizeDescriptor = new RecyclableSingleton<SizeDescriptor>() {
@Override
protected SizeDescriptor getInstance() {
return new SizeDescriptor(new SizeVariant(146, 20)) {
--- a/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaScrollBarUI.java Thu Mar 16 01:40:21 2017 +0100
+++ b/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaScrollBarUI.java Thu Mar 16 16:45:04 2017 +0300
@@ -154,7 +154,7 @@
return State.ACTIVE;
}
- static final RecyclableSingleton<Map<Hit, ScrollBarPart>> hitToPressedPartMap = new RecyclableSingleton<Map<Hit,ScrollBarPart>>(){
+ private static final RecyclableSingleton<Map<Hit, ScrollBarPart>> hitToPressedPartMap = new RecyclableSingleton<Map<Hit,ScrollBarPart>>(){
@Override
protected Map<Hit, ScrollBarPart> getInstance() {
final Map<Hit, ScrollBarPart> map = new HashMap<Hit, ScrollBarPart>(7);
--- a/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaScrollRegionBorder.java Thu Mar 16 01:40:21 2017 +0100
+++ b/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaScrollRegionBorder.java Thu Mar 16 16:45:04 2017 +0300
@@ -40,7 +40,7 @@
import com.apple.laf.AquaUtils.RecyclableSingletonFromDefaultConstructor;
public class AquaScrollRegionBorder extends AquaBorder {
- static final RecyclableSingletonFromDefaultConstructor<AquaScrollRegionBorder> instance = new RecyclableSingletonFromDefaultConstructor<AquaScrollRegionBorder>(AquaScrollRegionBorder.class);
+ private static final RecyclableSingletonFromDefaultConstructor<AquaScrollRegionBorder> instance = new RecyclableSingletonFromDefaultConstructor<AquaScrollRegionBorder>(AquaScrollRegionBorder.class);
public static AquaScrollRegionBorder getScrollRegionBorder() {
return instance.get();
--- a/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaSliderUI.java Thu Mar 16 01:40:21 2017 +0100
+++ b/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaSliderUI.java Thu Mar 16 16:45:04 2017 +0300
@@ -45,7 +45,7 @@
// static final Dimension roundThumbSize = new Dimension(21 + 4, 21 + 4); // +2px on both sides for focus fuzz
// static final Dimension pointingThumbSize = new Dimension(19 + 4, 22 + 4);
- protected static final RecyclableSingleton<SizeDescriptor> roundThumbDescriptor = new RecyclableSingleton<SizeDescriptor>() {
+ private static final RecyclableSingleton<SizeDescriptor> roundThumbDescriptor = new RecyclableSingleton<SizeDescriptor>() {
protected SizeDescriptor getInstance() {
return new SizeDescriptor(new SizeVariant(25, 25)) {
public SizeVariant deriveSmall(final SizeVariant v) {
@@ -57,7 +57,7 @@
};
}
};
- protected static final RecyclableSingleton<SizeDescriptor> pointingThumbDescriptor = new RecyclableSingleton<SizeDescriptor>() {
+ private static final RecyclableSingleton<SizeDescriptor> pointingThumbDescriptor = new RecyclableSingleton<SizeDescriptor>() {
protected SizeDescriptor getInstance() {
return new SizeDescriptor(new SizeVariant(23, 26)) {
public SizeVariant deriveSmall(final SizeVariant v) {
--- a/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaTableHeaderBorder.java Thu Mar 16 01:40:21 2017 +0100
+++ b/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaTableHeaderBorder.java Thu Mar 16 16:45:04 2017 +0300
@@ -126,7 +126,7 @@
return State.ACTIVE;
}
- static final RecyclableSingleton<Border> alternateBorder = new RecyclableSingleton<Border>() {
+ private static final RecyclableSingleton<Border> alternateBorder = new RecyclableSingleton<Border>() {
@Override
protected Border getInstance() {
return BorderFactory.createRaisedBevelBorder();
--- a/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaTableHeaderUI.java Thu Mar 16 01:40:21 2017 +0100
+++ b/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaTableHeaderUI.java Thu Mar 16 16:45:04 2017 +0300
@@ -67,7 +67,7 @@
super.uninstallDefaults();
}
- static final RecyclableSingleton<ClientPropertyApplicator<JTableHeader, JTableHeader>> TABLE_HEADER_APPLICATORS = new RecyclableSingleton<ClientPropertyApplicator<JTableHeader, JTableHeader>>() {
+ private static final RecyclableSingleton<ClientPropertyApplicator<JTableHeader, JTableHeader>> TABLE_HEADER_APPLICATORS = new RecyclableSingleton<ClientPropertyApplicator<JTableHeader, JTableHeader>>() {
@Override
@SuppressWarnings("unchecked")
protected ClientPropertyApplicator<JTableHeader, JTableHeader> getInstance() {
--- a/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaTextFieldBorder.java Thu Mar 16 01:40:21 2017 +0100
+++ b/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaTextFieldBorder.java Thu Mar 16 16:45:04 2017 +0300
@@ -36,7 +36,7 @@
import com.apple.laf.AquaUtils.*;
public class AquaTextFieldBorder extends AquaBorder {
- protected static final RecyclableSingleton<AquaTextFieldBorder> instance = new RecyclableSingletonFromDefaultConstructor<AquaTextFieldBorder>(AquaTextFieldBorder.class);
+ private static final RecyclableSingleton<AquaTextFieldBorder> instance = new RecyclableSingletonFromDefaultConstructor<AquaTextFieldBorder>(AquaTextFieldBorder.class);
public static AquaTextFieldBorder getTextFieldBorder() {
return instance.get();
}
--- a/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaTextFieldSearch.java Thu Mar 16 01:40:21 2017 +0100
+++ b/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaTextFieldSearch.java Thu Mar 16 16:45:04 2017 +0300
@@ -90,7 +90,7 @@
return (c.getClientProperty(FIND_POPUP_KEY) instanceof JPopupMenu);
}
- protected static final RecyclableSingleton<SearchFieldBorder> instance = new RecyclableSingletonFromDefaultConstructor<SearchFieldBorder>(SearchFieldBorder.class);
+ private static final RecyclableSingleton<SearchFieldBorder> instance = new RecyclableSingletonFromDefaultConstructor<SearchFieldBorder>(SearchFieldBorder.class);
public static SearchFieldBorder getSearchTextFieldBorder() {
return instance.get();
}
--- a/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaTextPasswordFieldUI.java Thu Mar 16 01:40:21 2017 +0100
+++ b/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaTextPasswordFieldUI.java Thu Mar 16 16:45:04 2017 +0300
@@ -38,7 +38,7 @@
import com.apple.laf.AquaUtils.RecyclableSingletonFromDefaultConstructor;
public class AquaTextPasswordFieldUI extends AquaTextFieldUI {
- static final RecyclableSingleton<CapsLockSymbolPainter> capsLockPainter = new RecyclableSingletonFromDefaultConstructor<CapsLockSymbolPainter>(CapsLockSymbolPainter.class);
+ private static final RecyclableSingleton<CapsLockSymbolPainter> capsLockPainter = new RecyclableSingletonFromDefaultConstructor<CapsLockSymbolPainter>(CapsLockSymbolPainter.class);
static CapsLockSymbolPainter getCapsLockPainter() {
return capsLockPainter.get();
}
--- a/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaToolBarSeparatorUI.java Thu Mar 16 01:40:21 2017 +0100
+++ b/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaToolBarSeparatorUI.java Thu Mar 16 16:45:04 2017 +0300
@@ -34,7 +34,7 @@
import com.apple.laf.AquaUtils.*;
public class AquaToolBarSeparatorUI extends BasicToolBarSeparatorUI {
- protected static RecyclableSingleton<AquaToolBarSeparatorUI> instance = new RecyclableSingletonFromDefaultConstructor<AquaToolBarSeparatorUI>(AquaToolBarSeparatorUI.class);
+ private static final RecyclableSingleton<AquaToolBarSeparatorUI> instance = new RecyclableSingletonFromDefaultConstructor<AquaToolBarSeparatorUI>(AquaToolBarSeparatorUI.class);
public static ComponentUI createUI(final JComponent c) {
return instance.get();
--- a/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaToolBarUI.java Thu Mar 16 01:40:21 2017 +0100
+++ b/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaToolBarUI.java Thu Mar 16 16:45:04 2017 +0300
@@ -35,7 +35,7 @@
import com.apple.laf.AquaUtils.*;
public class AquaToolBarUI extends BasicToolBarUI implements SwingConstants {
- private static RecyclableSingleton<ToolBarBorder> toolBarBorder = new RecyclableSingletonFromDefaultConstructor<ToolBarBorder>(ToolBarBorder.class);
+ private static final RecyclableSingleton<ToolBarBorder> toolBarBorder = new RecyclableSingletonFromDefaultConstructor<ToolBarBorder>(ToolBarBorder.class);
public static Border getToolBarBorder() {
return toolBarBorder.get();
}
--- a/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaToolTipUI.java Thu Mar 16 01:40:21 2017 +0100
+++ b/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaToolTipUI.java Thu Mar 16 16:45:04 2017 +0300
@@ -34,7 +34,7 @@
import com.apple.laf.AquaUtils.RecyclableSingletonFromDefaultConstructor;
public class AquaToolTipUI extends BasicToolTipUI {
- static final RecyclableSingletonFromDefaultConstructor<AquaToolTipUI> sharedAquaInstance = new RecyclableSingletonFromDefaultConstructor<AquaToolTipUI>(AquaToolTipUI.class);
+ private static final RecyclableSingletonFromDefaultConstructor<AquaToolTipUI> sharedAquaInstance = new RecyclableSingletonFromDefaultConstructor<AquaToolTipUI>(AquaToolTipUI.class);
public static ComponentUI createUI(final JComponent c) {
return sharedAquaInstance.get();
--- a/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaUtilControlSize.java Thu Mar 16 01:40:21 2017 +0100
+++ b/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaUtilControlSize.java Thu Mar 16 16:45:04 2017 +0300
@@ -49,7 +49,7 @@
void applySizeFor(final JComponent c, final Size size);
}
- protected static final RecyclableSingleton<PropertySizeListener> sizeListener
+ private static final RecyclableSingleton<PropertySizeListener> sizeListener
= new RecyclableSingletonFromDefaultConstructor<>(PropertySizeListener.class);
protected static PropertySizeListener getSizeListener() {
return sizeListener.get();