From 245f5386ceb783c8fd20fbc0acf269502fd047e1 Mon Sep 17 00:00:00 2001 From: "Anosh D. Ullenius" Date: Fri, 17 Jun 2022 20:26:22 +0200 Subject: [PATCH] Remove protected-modifier in final class --- .../threerings/getdown/util/StringUtil.java | 4 +- .../getdown/launcher/ProxyUtil.java | 2 +- .../getdown/launcher/RotatingBackgrounds.java | 14 +++--- .../getdown/launcher/StatusPanel.java | 46 +++++++++---------- 4 files changed, 33 insertions(+), 33 deletions(-) diff --git a/core/src/main/java/com/threerings/getdown/util/StringUtil.java b/core/src/main/java/com/threerings/getdown/util/StringUtil.java index 86277c8..0a18f25 100644 --- a/core/src/main/java/com/threerings/getdown/util/StringUtil.java +++ b/core/src/main/java/com/threerings/getdown/util/StringUtil.java @@ -187,7 +187,7 @@ public final class StringUtil { /** * Helper function for the various {@code join} methods. */ - protected static String join (Object[] values, String separator, boolean escape) + private static String join(Object[] values, String separator, boolean escape) { StringBuilder buf = new StringBuilder(); int vlength = values.length; @@ -202,5 +202,5 @@ public final class StringUtil { } /** Used by {@link #hexlate}. */ - protected static final String XLATE = "0123456789abcdef"; + private static final String XLATE = "0123456789abcdef"; } diff --git a/launcher/src/main/java/com/threerings/getdown/launcher/ProxyUtil.java b/launcher/src/main/java/com/threerings/getdown/launcher/ProxyUtil.java index ccacb2e..6f9a11f 100644 --- a/launcher/src/main/java/com/threerings/getdown/launcher/ProxyUtil.java +++ b/launcher/src/main/java/com/threerings/getdown/launcher/ProxyUtil.java @@ -289,6 +289,6 @@ public final class ProxyUtil { } } - protected static final String PROXY_REGISTRY = + private static final String PROXY_REGISTRY = "Software\\Microsoft\\Windows\\CurrentVersion\\Internet Settings"; } diff --git a/launcher/src/main/java/com/threerings/getdown/launcher/RotatingBackgrounds.java b/launcher/src/main/java/com/threerings/getdown/launcher/RotatingBackgrounds.java index d64e5f0..762153d 100644 --- a/launcher/src/main/java/com/threerings/getdown/launcher/RotatingBackgrounds.java +++ b/launcher/src/main/java/com/threerings/getdown/launcher/RotatingBackgrounds.java @@ -106,7 +106,7 @@ public final class RotatingBackgrounds return images.length; } - protected void makeEmpty () + private void makeEmpty() { percentages = new int[] {}; minDisplayTime = new int[] {}; @@ -114,19 +114,19 @@ public final class RotatingBackgrounds } /** Time at which the currently displayed image was first displayed in millis. */ - protected long currentDisplayStart; + private long currentDisplayStart; /** The index of the currently displayed image or -1 if we haven't displayed any. */ - protected int current = -1; + private int current = -1; - protected Image[] images; + private Image[] images; /** The image to display if getdown has failed due to an error. */ - protected Image errorImage; + private Image errorImage; /** Percentage at which each image should be displayed. */ - protected int[] percentages; + private int[] percentages; /** Time to show each image in seconds. */ - protected int[] minDisplayTime; + private int[] minDisplayTime; } diff --git a/launcher/src/main/java/com/threerings/getdown/launcher/StatusPanel.java b/launcher/src/main/java/com/threerings/getdown/launcher/StatusPanel.java index 9abac12..9e5d4c3 100644 --- a/launcher/src/main/java/com/threerings/getdown/launcher/StatusPanel.java +++ b/launcher/src/main/java/com/threerings/getdown/launcher/StatusPanel.java @@ -260,7 +260,7 @@ public final class StatusPanel extends JComponent /** * Update the status label. */ - protected void updateStatusLabel () + private void updateStatusLabel() { String status = _status; if (!_displayError) { @@ -285,7 +285,7 @@ public final class StatusPanel extends JComponent /** * Get the y coordinate of a label in the status area. */ - protected int getStatusY (Label label) + private int getStatusY(Label label) { // if the status region is higher than the progress region, we // want to align the label with the bottom of its region @@ -299,7 +299,7 @@ public final class StatusPanel extends JComponent /** * Create a label, taking care of adding the shadow if needed. */ - protected Label createLabel (String text, Color color) + private Label createLabel(String text, Color color) { Label label = new Label(text, color, FONT); if (_ifc.textShadow != 0) { @@ -310,7 +310,7 @@ public final class StatusPanel extends JComponent } /** Used by {@link #setStatus}. */ - protected String xlate (String compoundKey) + private String xlate(String compoundKey) { // to be more efficient about creating unnecessary objects, we // do some checking before splitting @@ -337,7 +337,7 @@ public final class StatusPanel extends JComponent } /** Used by {@link #setStatus}. */ - protected String get (String key, String[] args) + private String get(String key, String[] args) { String msg = get(key); if (msg != null) return MessageFormat.format(MessageUtil.escape(msg), (Object[])args); @@ -345,7 +345,7 @@ public final class StatusPanel extends JComponent } /** Used by {@link #setStatus}, and {@link #setProgress}. */ - protected String get (String key) + private String get(String key) { // if we have no _msgs that means we're probably recovering from a // failure to load the translation messages in the first place, so @@ -368,26 +368,26 @@ public final class StatusPanel extends JComponent } } - protected Image _barimg; - protected RotatingBackgrounds _bg; - protected Dimension _psize; + private Image _barimg; + private RotatingBackgrounds _bg; + private Dimension _psize; - protected final ResourceBundle _msgs; + private final ResourceBundle _msgs; - protected int _progress = -1; - protected String _status; - protected int _statusDots = 1; - protected boolean _displayError; - protected Label _label, _newlab; - protected Label _plabel, _newplab; - protected Label _rlabel, _newrlab; + private int _progress = -1; + private String _status; + private int _statusDots = 1; + private boolean _displayError; + private Label _label, _newlab; + private Label _plabel, _newplab; + private Label _rlabel, _newrlab; - protected UpdateInterface _ifc; - protected final Timer _timer; + private UpdateInterface _ifc; + private final Timer _timer; - protected final long[] _remain = new long[4]; - protected int _ridx; - protected Throttle _rthrottle = new Throttle(1, 1000L); + private final long[] _remain = new long[4]; + private int _ridx; + private Throttle _rthrottle = new Throttle(1, 1000L); - protected static final Font FONT = new Font("SansSerif", Font.BOLD, 12); + static final Font FONT = new Font("SansSerif", Font.BOLD, 12); }