From a4e38057ae1b300b5ddd2f4a42f278b0b08f6b69 Mon Sep 17 00:00:00 2001 From: "Anosh D. Ullenius" Date: Fri, 17 Jun 2022 20:20:05 +0200 Subject: [PATCH] Make fields final. Remove redundant modifier on final-class --- .../main/java/com/threerings/getdown/Log.java | 8 ++++---- .../threerings/getdown/data/Application.java | 20 +++++++++---------- .../com/threerings/getdown/data/Digest.java | 2 +- .../com/threerings/getdown/data/Resource.java | 13 +++++++----- .../getdown/tools/JarDiffPatcher.java | 2 +- .../com/threerings/getdown/util/FileUtil.java | 2 +- .../getdown/util/ProgressAggregator.java | 6 +++--- .../getdown/cache/GarbageCollectorTest.java | 2 +- .../getdown/data/ClassPathTest.java | 2 +- .../getdown/data/EnvConfigTest.java | 8 ++++---- .../getdown/data/PathBuilderTest.java | 2 +- .../threerings/getdown/util/ConfigTest.java | 2 +- .../threerings/getdown/util/FileUtilTest.java | 2 +- .../getdown/launcher/AbortPanel.java | 6 +++--- .../threerings/getdown/launcher/Getdown.java | 6 +++--- .../getdown/launcher/ProxyPanel.java | 10 +++++----- 16 files changed, 48 insertions(+), 45 deletions(-) diff --git a/core/src/main/java/com/threerings/getdown/Log.java b/core/src/main/java/com/threerings/getdown/Log.java index da98c90..2ad08a4 100644 --- a/core/src/main/java/com/threerings/getdown/Log.java +++ b/core/src/main/java/com/threerings/getdown/Log.java @@ -129,7 +129,7 @@ public final class Log PrintWriter pw = new PrintWriter(sw); record.getThrown().printStackTrace(pw); pw.close(); - buf.append(sw.toString()); + buf.append(sw); } catch (Exception ex) { buf.append("Format failure:").append(ex); } @@ -138,9 +138,9 @@ public final class Log return buf.toString(); } - protected Date _date = new Date(); - protected SimpleDateFormat _format = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss:SSS"); - protected FieldPosition _fpos = new FieldPosition(SimpleDateFormat.DATE_FIELD); + protected final Date _date = new Date(); + protected final SimpleDateFormat _format = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss:SSS"); + protected final FieldPosition _fpos = new FieldPosition(SimpleDateFormat.DATE_FIELD); } protected static final Level[] LEVELS = {Level.FINE, Level.INFO, Level.WARNING, Level.SEVERE}; diff --git a/core/src/main/java/com/threerings/getdown/data/Application.java b/core/src/main/java/com/threerings/getdown/data/Application.java index 7760e41..1e02b5f 100644 --- a/core/src/main/java/com/threerings/getdown/data/Application.java +++ b/core/src/main/java/com/threerings/getdown/data/Application.java @@ -1793,10 +1793,10 @@ public class Application protected String _javaLocation; protected File _javaLocalDir; - protected List _codes = new ArrayList<>(); - protected List _resources = new ArrayList<>(); - protected List _cleanupPatterns = new ArrayList<>(); - protected List _cpdirs = new ArrayList<>(); + protected final List _codes = new ArrayList<>(); + protected final List _resources = new ArrayList<>(); + protected final List _cleanupPatterns = new ArrayList<>(); + protected final List _cpdirs = new ArrayList<>(); protected int _verifyTimeout = 60; @@ -1804,15 +1804,15 @@ public class Application protected boolean _useCodeCache; protected int _codeCacheRetentionDays; - protected Map _auxgroups = new HashMap<>(); - protected Map _auxactive = new HashMap<>(); + protected final Map _auxgroups = new HashMap<>(); + protected final Map _auxactive = new HashMap<>(); - protected List _jvmargs = new ArrayList<>(); - protected List _appargs = new ArrayList<>(); + protected final List _jvmargs = new ArrayList<>(); + protected final List _appargs = new ArrayList<>(); protected String[] _optimumJvmArgs; - protected List _txtJvmArgs = new ArrayList<>(); + protected final List _txtJvmArgs = new ArrayList<>(); /** Locks gettingdown.lock in the app dir. Held the entire time updating is going on.*/ protected FileLock _lock; @@ -1820,7 +1820,7 @@ public class Application /** Channel to the file underlying _lock. Kept around solely so the lock doesn't close. */ protected FileChannel _lockChannel; - protected Random _rando = new Random(); + protected final Random _rando = new Random(); protected static final String[] EMPTY_STRING_ARRAY = new String[0]; diff --git a/core/src/main/java/com/threerings/getdown/data/Digest.java b/core/src/main/java/com/threerings/getdown/data/Digest.java index e310a52..2c4fee2 100644 --- a/core/src/main/java/com/threerings/getdown/data/Digest.java +++ b/core/src/main/java/com/threerings/getdown/data/Digest.java @@ -219,7 +219,7 @@ public class Digest data.append(path).append(" = ").append(digest).append("\n"); } - protected HashMap _digests = new HashMap<>(); + protected final HashMap _digests = new HashMap<>(); protected String _metaDigest = ""; protected static final String FILE_NAME = "digest"; diff --git a/core/src/main/java/com/threerings/getdown/data/Resource.java b/core/src/main/java/com/threerings/getdown/data/Resource.java index 2ea7798..7fa86e4 100644 --- a/core/src/main/java/com/threerings/getdown/data/Resource.java +++ b/core/src/main/java/com/threerings/getdown/data/Resource.java @@ -362,11 +362,14 @@ public class Resource implements Comparable } } - protected String _path; - protected URL _remote; - protected File _local, _localNew, _marker, _unpacked; - protected EnumSet _attrs; - protected boolean _isZip; + protected final String _path; + protected final URL _remote; + protected final File _local; + protected final File _localNew; + protected final File _marker; + protected File _unpacked; + protected final EnumSet _attrs; + protected final boolean _isZip; /** Used to sort the entries in a jar file. */ protected static final Comparator ENTRY_COMP = new Comparator() { diff --git a/core/src/main/java/com/threerings/getdown/tools/JarDiffPatcher.java b/core/src/main/java/com/threerings/getdown/tools/JarDiffPatcher.java index a65cbeb..2bde353 100644 --- a/core/src/main/java/com/threerings/getdown/tools/JarDiffPatcher.java +++ b/core/src/main/java/com/threerings/getdown/tools/JarDiffPatcher.java @@ -292,6 +292,6 @@ public class JarDiffPatcher implements JarDiffCodes protected static final int DEFAULT_READ_SIZE = 2048; - protected static byte[] newBytes = new byte[DEFAULT_READ_SIZE]; + protected static final byte[] newBytes = new byte[DEFAULT_READ_SIZE]; protected static byte[] oldBytes = new byte[DEFAULT_READ_SIZE]; } diff --git a/core/src/main/java/com/threerings/getdown/util/FileUtil.java b/core/src/main/java/com/threerings/getdown/util/FileUtil.java index a38136d..f7c67ef 100644 --- a/core/src/main/java/com/threerings/getdown/util/FileUtil.java +++ b/core/src/main/java/com/threerings/getdown/util/FileUtil.java @@ -154,7 +154,7 @@ public final class FileUtil continue; } - try (BufferedOutputStream fout = new BufferedOutputStream(new FileOutputStream(efile)); + try (BufferedOutputStream fout = new BufferedOutputStream(Files.newOutputStream(efile.toPath())); InputStream jin = jar.getInputStream(entry)) { StreamUtil.copy(jin, fout); } catch (Exception e) { diff --git a/core/src/main/java/com/threerings/getdown/util/ProgressAggregator.java b/core/src/main/java/com/threerings/getdown/util/ProgressAggregator.java index d74b011..8ec6605 100644 --- a/core/src/main/java/com/threerings/getdown/util/ProgressAggregator.java +++ b/core/src/main/java/com/threerings/getdown/util/ProgressAggregator.java @@ -44,7 +44,7 @@ public class ProgressAggregator return totalSize; } - protected ProgressObserver _target; - protected long[] _sizes; - protected int[] _progress; + protected final ProgressObserver _target; + protected final long[] _sizes; + protected final int[] _progress; } diff --git a/core/src/test/java/com/threerings/getdown/cache/GarbageCollectorTest.java b/core/src/test/java/com/threerings/getdown/cache/GarbageCollectorTest.java index c7fcf72..d34e584 100644 --- a/core/src/test/java/com/threerings/getdown/cache/GarbageCollectorTest.java +++ b/core/src/test/java/com/threerings/getdown/cache/GarbageCollectorTest.java @@ -77,7 +77,7 @@ public class GarbageCollectorTest assertFalse(_lastAccessedFile.exists()); } - @Rule public TemporaryFolder _folder = new TemporaryFolder(); + @Rule public final TemporaryFolder _folder = new TemporaryFolder(); private File _cachedFile; private File _lastAccessedFile; diff --git a/core/src/test/java/com/threerings/getdown/data/ClassPathTest.java b/core/src/test/java/com/threerings/getdown/data/ClassPathTest.java index c5998f2..c66ddc7 100644 --- a/core/src/test/java/com/threerings/getdown/data/ClassPathTest.java +++ b/core/src/test/java/com/threerings/getdown/data/ClassPathTest.java @@ -47,7 +47,7 @@ public class ClassPathTest assertEquals(_secondJar, new File(actualUrls[1].toURI())); } - @Rule public TemporaryFolder _folder = new TemporaryFolder(); + @Rule public final TemporaryFolder _folder = new TemporaryFolder(); private File _firstJar, _secondJar; private ClassPath _classPath; diff --git a/core/src/test/java/com/threerings/getdown/data/EnvConfigTest.java b/core/src/test/java/com/threerings/getdown/data/EnvConfigTest.java index 04a73d3..1900883 100644 --- a/core/src/test/java/com/threerings/getdown/data/EnvConfigTest.java +++ b/core/src/test/java/com/threerings/getdown/data/EnvConfigTest.java @@ -15,9 +15,9 @@ import static org.junit.Assert.*; public class EnvConfigTest { - static String CWD = System.getProperty("user.dir"); - static String TESTID = "testid"; - static String TESTBASE = "https://test.com/test"; + static final String CWD = System.getProperty("user.dir"); + static final String TESTID = "testid"; + static final String TESTBASE = "https://test.com/test"; private void debugNotes (List notes) { for (EnvConfig.Note note : notes) { @@ -33,7 +33,7 @@ public class EnvConfigTest { } } if (msg.length() > 0) { - fail("Unexpected notes:" + msg.toString()); + fail("Unexpected notes:" + msg); } } private void checkDir (EnvConfig cfg) { diff --git a/core/src/test/java/com/threerings/getdown/data/PathBuilderTest.java b/core/src/test/java/com/threerings/getdown/data/PathBuilderTest.java index af7e789..3bddb36 100644 --- a/core/src/test/java/com/threerings/getdown/data/PathBuilderTest.java +++ b/core/src/test/java/com/threerings/getdown/data/PathBuilderTest.java @@ -55,5 +55,5 @@ public class PathBuilderTest protected File _firstJarFile, _secondJarFile; - @Rule public TemporaryFolder _appdir = new TemporaryFolder(); + @Rule public final TemporaryFolder _appdir = new TemporaryFolder(); } diff --git a/core/src/test/java/com/threerings/getdown/util/ConfigTest.java b/core/src/test/java/com/threerings/getdown/util/ConfigTest.java index cdc5a91..f1bba18 100644 --- a/core/src/test/java/com/threerings/getdown/util/ConfigTest.java +++ b/core/src/test/java/com/threerings/getdown/util/ConfigTest.java @@ -167,5 +167,5 @@ public class ConfigTest return _rando.nextBoolean() ? " " : ""; } - protected static Random _rando = new Random(); + protected static final Random _rando = new Random(); } diff --git a/core/src/test/java/com/threerings/getdown/util/FileUtilTest.java b/core/src/test/java/com/threerings/getdown/util/FileUtilTest.java index cfd53a2..41de5ac 100644 --- a/core/src/test/java/com/threerings/getdown/util/FileUtilTest.java +++ b/core/src/test/java/com/threerings/getdown/util/FileUtilTest.java @@ -56,5 +56,5 @@ public class FileUtilTest assertEquals(3, visitor.fileCount); } - @Rule public TemporaryFolder _folder = new TemporaryFolder(); + @Rule public final TemporaryFolder _folder = new TemporaryFolder(); } diff --git a/launcher/src/main/java/com/threerings/getdown/launcher/AbortPanel.java b/launcher/src/main/java/com/threerings/getdown/launcher/AbortPanel.java index 4bd9f90..a282a1e 100644 --- a/launcher/src/main/java/com/threerings/getdown/launcher/AbortPanel.java +++ b/launcher/src/main/java/com/threerings/getdown/launcher/AbortPanel.java @@ -80,7 +80,7 @@ public final class AbortPanel extends JFrame } /** Used to look up localized messages. */ - protected String get (String key) + private String get(String key) { // if this string is tainted, we don't translate it, instead we // simply remove the taint character and return it to the caller @@ -95,6 +95,6 @@ public final class AbortPanel extends JFrame } } - protected Getdown _getdown; - protected ResourceBundle _msgs; + private final Getdown _getdown; + private final ResourceBundle _msgs; } diff --git a/launcher/src/main/java/com/threerings/getdown/launcher/Getdown.java b/launcher/src/main/java/com/threerings/getdown/launcher/Getdown.java index 59f084d..76970aa 100644 --- a/launcher/src/main/java/com/threerings/getdown/launcher/Getdown.java +++ b/launcher/src/main/java/com/threerings/getdown/launcher/Getdown.java @@ -1113,13 +1113,13 @@ public abstract class Getdown } /** Used to pass progress on to our user interface. */ - protected ProgressObserver _progobs = new ProgressObserver() { + protected final ProgressObserver _progobs = new ProgressObserver() { public void progress (int percent) { setStatusAsync(null, stepToGlobalPercent(percent), -1L, false); } }; - protected Application _app; + protected final Application _app; protected Application.UpdateInterface _ifc = new Application.UpdateInterface(Config.EMPTY); protected ResourceBundle _msgs; @@ -1134,7 +1134,7 @@ public abstract class Getdown protected boolean _silent; protected boolean _launchInSilent; protected boolean _noUpdate; - protected long _startup; + protected final long _startup; protected Set _toInstallResources; protected boolean _readyToInstall; diff --git a/launcher/src/main/java/com/threerings/getdown/launcher/ProxyPanel.java b/launcher/src/main/java/com/threerings/getdown/launcher/ProxyPanel.java index 5f18896..6705868 100644 --- a/launcher/src/main/java/com/threerings/getdown/launcher/ProxyPanel.java +++ b/launcher/src/main/java/com/threerings/getdown/launcher/ProxyPanel.java @@ -197,9 +197,9 @@ public final class ProxyPanel extends JPanel implements ActionListener protected final ResourceBundle _msgs; protected final boolean _updateAuth; - protected JTextField _host; - protected JTextField _port; - protected JCheckBox _useAuth; - protected JTextField _username; - protected JPasswordField _password; + protected final JTextField _host; + protected final JTextField _port; + protected final JCheckBox _useAuth; + protected final JTextField _username; + protected final JPasswordField _password; }