You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2021/12/03 00:33:31 UTC
[commons-compress] 02/04: Make some private instance variables final.
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-compress.git
commit aa9e91ff703acfc7933d71833fd2e14512ff9efb
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Thu Dec 2 19:11:26 2021 -0500
Make some private instance variables final.
---
.../compress/harmony/pack200/PackingOptions.java | 31 +++++++++-------------
1 file changed, 13 insertions(+), 18 deletions(-)
diff --git a/src/main/java/org/apache/commons/compress/harmony/pack200/PackingOptions.java b/src/main/java/org/apache/commons/compress/harmony/pack200/PackingOptions.java
index 4a63534..fdb9df8 100644
--- a/src/main/java/org/apache/commons/compress/harmony/pack200/PackingOptions.java
+++ b/src/main/java/org/apache/commons/compress/harmony/pack200/PackingOptions.java
@@ -42,7 +42,7 @@ public class PackingOptions {
private int effort = 5;
private String deflateHint = KEEP;
private String modificationTime = KEEP;
- private List<String> passFiles;
+ private final List<String> passFiles = new ArrayList<>();
private String unknownAttributeAction = PASS;
private final Map<String, String> classAttributeActions= new HashMap<>();
private final Map<String, String> fieldAttributeActions= new HashMap<>();
@@ -139,21 +139,19 @@ public class PackingOptions {
}
public boolean isPassFile(final String passFileName) {
- if (passFiles != null) {
- for (String pass : passFiles) {
- if (passFileName.equals(pass)) {
- return true;
- }
- if (!pass.endsWith(".class")) { // a whole directory is
- // passed
- if (!pass.endsWith("/")) {
- // Make sure we don't get any false positives (e.g.
- // exclude "org/apache/harmony/pack" should not match
- // files under "org/apache/harmony/pack200/")
- pass = pass + "/";
- }
- return passFileName.startsWith(pass);
+ for (String pass : passFiles) {
+ if (passFileName.equals(pass)) {
+ return true;
+ }
+ if (!pass.endsWith(".class")) { // a whole directory is
+ // passed
+ if (!pass.endsWith("/")) {
+ // Make sure we don't get any false positives (e.g.
+ // exclude "org/apache/harmony/pack" should not match
+ // files under "org/apache/harmony/pack200/")
+ pass = pass + "/";
}
+ return passFileName.startsWith(pass);
}
}
return false;
@@ -166,9 +164,6 @@ public class PackingOptions {
* @param passFileName the file name
*/
public void addPassFile(String passFileName) {
- if (passFiles == null) {
- passFiles = new ArrayList<>();
- }
String fileSeparator = System.getProperty("file.separator");
if (fileSeparator.equals("\\")) {
// Need to escape backslashes for replaceAll(), which uses regex