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
The following commit(s) were added to refs/heads/master by this push:
new a7e8a07c Inline and remove type casts
a7e8a07c is described below
commit a7e8a07cdef698a4bdacca99d3462766839b9bb2
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Sat Dec 10 17:36:12 2022 -0500
Inline and remove type casts
---
.../harmony/pack200/MetadataBandGroup.java | 52 +++++++++-------------
1 file changed, 20 insertions(+), 32 deletions(-)
diff --git
a/src/main/java/org/apache/commons/compress/harmony/pack200/MetadataBandGroup.java
b/src/main/java/org/apache/commons/compress/harmony/pack200/MetadataBandGroup.java
index d292aa62..f653fb6f 100644
---
a/src/main/java/org/apache/commons/compress/harmony/pack200/MetadataBandGroup.java
+++
b/src/main/java/org/apache/commons/compress/harmony/pack200/MetadataBandGroup.java
@@ -242,40 +242,32 @@ public class MetadataBandGroup extends BandSet {
case "I":
case "S":
case "Z": {
- final Integer value = (Integer) valuesIterator.next();
- caseI_KI.add(cpBands.getConstant(value));
+ caseI_KI.add(cpBands.getConstant(valuesIterator.next()));
break;
}
case "D": {
- final Double value = (Double) valuesIterator.next();
- caseD_KD.add(cpBands.getConstant(value));
+ caseD_KD.add(cpBands.getConstant(valuesIterator.next()));
break;
}
case "F": {
- final Float value = (Float) valuesIterator.next();
- caseF_KF.add(cpBands.getConstant(value));
+ caseF_KF.add(cpBands.getConstant(valuesIterator.next()));
break;
}
case "J": {
- final Long value = (Long) valuesIterator.next();
- caseJ_KJ.add(cpBands.getConstant(value));
+ caseJ_KJ.add(cpBands.getConstant(valuesIterator.next()));
break;
}
case "c": {
- final String value = (String) valuesIterator.next();
- casec_RS.add(cpBands.getCPSignature(value));
+
casec_RS.add(cpBands.getCPSignature(nextString(valuesIterator)));
break;
}
case "e": {
- final String value = (String) valuesIterator.next();
- final String value2 = (String) valuesIterator.next();
- caseet_RS.add(cpBands.getCPSignature(value));
- caseec_RU.add(cpBands.getCPUtf8(value2));
+
caseet_RS.add(cpBands.getCPSignature(nextString(valuesIterator)));
+
caseec_RU.add(cpBands.getCPUtf8(nextString(valuesIterator)));
break;
}
case "s": {
- final String value = (String) valuesIterator.next();
- cases_RU.add(cpBands.getCPUtf8(value));
+
cases_RU.add(cpBands.getCPUtf8(nextString(valuesIterator)));
break;
}
}
@@ -298,6 +290,10 @@ public class MetadataBandGroup extends BandSet {
}
}
+ private String nextString(final Iterator<Object> valuesIterator) {
+ return (String) valuesIterator.next();
+ }
+
/**
* Add an annotation to this set of bands
*
@@ -329,40 +325,32 @@ public class MetadataBandGroup extends BandSet {
case "I":
case "S":
case "Z": {
- final Integer value = (Integer) valuesIterator.next();
- caseI_KI.add(cpBands.getConstant(value));
+ caseI_KI.add(cpBands.getConstant(valuesIterator.next()));
break;
}
case "D": {
- final Double value = (Double) valuesIterator.next();
- caseD_KD.add(cpBands.getConstant(value));
+ caseD_KD.add(cpBands.getConstant(valuesIterator.next()));
break;
}
case "F": {
- final Float value = (Float) valuesIterator.next();
- caseF_KF.add(cpBands.getConstant(value));
+ caseF_KF.add(cpBands.getConstant(valuesIterator.next()));
break;
}
case "J": {
- final Long value = (Long) valuesIterator.next();
- caseJ_KJ.add(cpBands.getConstant(value));
+ caseJ_KJ.add(cpBands.getConstant(valuesIterator.next()));
break;
}
case "c": {
- final String value = (String) valuesIterator.next();
- casec_RS.add(cpBands.getCPSignature(value));
+
casec_RS.add(cpBands.getCPSignature(nextString(valuesIterator)));
break;
}
case "e": {
- final String value = (String) valuesIterator.next();
- final String value2 = (String) valuesIterator.next();
- caseet_RS.add(cpBands.getCPSignature(value));
- caseec_RU.add(cpBands.getCPUtf8(value2));
+
caseet_RS.add(cpBands.getCPSignature(nextString(valuesIterator)));
+
caseec_RU.add(cpBands.getCPUtf8(nextString(valuesIterator)));
break;
}
case "s": {
- final String value = (String) valuesIterator.next();
- cases_RU.add(cpBands.getCPUtf8(value));
+
cases_RU.add(cpBands.getCPUtf8(nextString(valuesIterator)));
break;
}
}
