ReVanced/smali
1
0
Fork 0
mirror of https://github.com/revanced/smali.git synced 2025-06-13 04:27:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix some warnings in AnnotationDirectoryPool

Browse Source
This commit is contained in:
Ben Gruver
2012-12-30 21:41:48 -08:00
parent 8867056494
commit 982e9f614f
1 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
dexlib2/src/main/java/org/jf/dexlib2/writer/AnnotationDirectoryPool.java
View File

@ -140,12 +140,11 @@ public class AnnotationDirectoryPool {
writer.writeInt(key.methodAnnotationCount);
writer.writeInt(key.parameterAnnotationCount);
Iterable<? extends Field> fieldsWithAnnotations = null;
Iterable<? extends Field> fieldsWithAnnotations;
if (CollectionUtils.isNaturalSortedSet(key.classDef.getFields())) {
fieldsWithAnnotations = key.getFieldsWithAnnotations();
} else {
fieldsWithAnnotations = Lists.newArrayList(key.getFieldsWithAnnotations());
Collections.sort((List<? extends Field>)fieldsWithAnnotations);
fieldsWithAnnotations = Ordering.natural().immutableSortedCopy(key.getFieldsWithAnnotations());
}
for (Field field: fieldsWithAnnotations) {
writer.writeInt(dexFile.fieldPool.getIndex(field));
@ -153,10 +152,9 @@ public class AnnotationDirectoryPool {
}
boolean sortMethods = !CollectionUtils.isNaturalSortedSet(key.classDef.getMethods());
Iterable<? extends Method> methodsWithAnnotations = null;
Iterable<? extends Method> methodsWithAnnotations;
if (sortMethods) {
methodsWithAnnotations = Lists.newArrayList(key.getMethodsWithAnnotations());
Collections.sort((List<? extends Method>)methodsWithAnnotations);
methodsWithAnnotations = Ordering.natural().immutableSortedCopy(key.getMethodsWithAnnotations());
} else {
methodsWithAnnotations = key.getMethodsWithAnnotations();
}
@ -165,10 +163,10 @@ public class AnnotationDirectoryPool {
writer.writeInt(dexFile.annotationSetPool.getOffset(method.getAnnotations()));
}
Iterable<? extends Method> methodsWithParameterAnnotations = null;
Iterable<? extends Method> methodsWithParameterAnnotations;
if (sortMethods) {
methodsWithParameterAnnotations = Lists.newArrayList(key.getMethodsWithParameterAnnotations());
Collections.sort((List<? extends Method>)methodsWithParameterAnnotations);
methodsWithParameterAnnotations = Ordering.natural().immutableSortedCopy(
key.getMethodsWithParameterAnnotations());
} else {
methodsWithParameterAnnotations = key.getMethodsWithParameterAnnotations();
}