Avoid java.util.ArrayList usages #71 fixes REAndroid/APKEditor#116

Author: REAndroid

src/main/java/com/reandroid/apk/ApkBundle.java

@@ -18,6 +18,7 @@
 import com.reandroid.archive.ZipEntryMap;
 import com.reandroid.archive.block.ApkSignatureBlock;
 import com.reandroid.arsc.chunk.TableBlock;
+import com.reandroid.utils.collection.ArrayCollection;
 
 import java.io.Closeable;
 import java.io.File;
@@ -110,7 +111,7 @@ public ApkModule getBaseModule(){
         return null;
     }
     public List<ApkModule> getApkModuleList(){
-        return new ArrayList<>(mModulesMap.values());
+        return new ArrayCollection<>(mModulesMap.values());
     }
     public void loadApkDirectory(File dir) throws IOException{
         loadApkDirectory(dir, false);

src/main/java/com/reandroid/apk/FrameworkOptimizer.java

@@ -27,6 +27,7 @@
 import com.reandroid.arsc.model.ResourceEntry;
 import com.reandroid.arsc.pool.ResXmlStringPool;
 import com.reandroid.arsc.value.*;
+import com.reandroid.utils.collection.ArrayCollection;
 
 import java.io.IOException;
 import java.util.*;
@@ -150,7 +151,7 @@ private void compressManifest(AndroidManifestBlock manifestBlock){
         logMessage("Manifest size reduced by: "+percent+" %");
     }
     private List<ResXmlNode> getManifestElementToRemove(ResXmlElement manifest){
-        List<ResXmlNode> results = new ArrayList<>();
+        List<ResXmlNode> results = new ArrayCollection<>();
         for(ResXmlNode node:manifest.listXmlNodes()){
             if(!(node instanceof ResXmlElement)){
                 continue;

src/main/java/com/reandroid/arsc/base/BlockDiff.java

@@ -15,7 +15,8 @@
  */
 package com.reandroid.arsc.base;
 
-import java.util.ArrayList;
+import com.reandroid.utils.collection.ArrayCollection;
+
 import java.util.List;
 import java.util.Objects;
 
@@ -32,7 +33,7 @@ public DiffResult[] find(){
     public DiffResult[] find(int limit){
         byte[] bytes_a = block_a.getBytes();
         byte[] bytes_b = block_b.getBytes();
-        List<DiffResult> results = new ArrayList<>();
+        List<DiffResult> results = new ArrayCollection<>();
         int start = 0;
         int position = findByteDifferencePosition(start, bytes_a, bytes_b);
         while (limit < 0 || results.size() < limit){

src/main/java/com/reandroid/arsc/chunk/TypeBlock.java

@@ -32,11 +32,11 @@
 import com.reandroid.json.JSONObject;
 import com.reandroid.utils.HexUtil;
 import com.reandroid.utils.ObjectsUtil;
+import com.reandroid.utils.collection.CollectionUtil;
 import com.reandroid.utils.collection.IterableIterator;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
-import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
@@ -288,14 +288,8 @@ public void ensureEntriesCount(int count){
         entryArray.ensureSize(count);
         entryArray.refreshCount();
     }
-    public List<Entry> listEntries(boolean skipNullBlock){
-        List<Entry> results=new ArrayList<>();
-        Iterator<Entry> itr = getEntryArray().iterator(skipNullBlock);
-        while (itr.hasNext()){
-            Entry block=itr.next();
-            results.add(block);
-        }
-        return results;
+    public List<Entry> listEntries(boolean skipNullBlock) {
+        return CollectionUtil.toList(getEntryArray().iterator(skipNullBlock));
     }
     public Entry getEntry(int entryId){
         return getEntryArray().getEntry(entryId);

src/main/java/com/reandroid/arsc/chunk/xml/AndroidManifestBlock.java

@@ -22,12 +22,12 @@
 import com.reandroid.arsc.io.BlockReader;
 import com.reandroid.arsc.model.ResourceEntry;
 import com.reandroid.arsc.value.ValueType;
+import com.reandroid.utils.collection.ArrayCollection;
 import com.reandroid.utils.collection.FilterIterator;
 
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
-import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
@@ -283,7 +283,7 @@ public List<ResXmlElement> listActivities(){
     public List<ResXmlElement> listActivities(boolean includeActivityAlias){
         ResXmlElement application=getApplicationElement();
         if(application==null){
-            return new ArrayList<>();
+            return new ArrayCollection<>();
         }
         List<ResXmlElement> results = application.listElements(TAG_activity);
         if(includeActivityAlias && !results.isEmpty()){
@@ -294,12 +294,12 @@ public List<ResXmlElement> listActivities(boolean includeActivityAlias){
     public List<ResXmlElement> listApplicationElementsByTag(String tag){
         ResXmlElement application=getApplicationElement();
         if(application==null){
-            return new ArrayList<>();
+            return new ArrayCollection<>();
         }
         return application.listElements(tag);
     }
     public List<String> getUsesPermissions(){
-        List<String> results=new ArrayList<>();
+        List<String> results = new ArrayCollection<>();
         ResXmlElement manifestElement=getManifestElement();
         if(manifestElement==null){
             return results;

src/main/java/com/reandroid/arsc/chunk/xml/ParserEventList.java

@@ -17,8 +17,8 @@
 
 
 import com.reandroid.arsc.coder.XmlSanitizer;
+import com.reandroid.utils.collection.ArrayCollection;
 
-import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
@@ -28,7 +28,7 @@ public class ParserEventList implements Iterator<ParserEvent> {
     private ParserEvent mCurrent;
     private int type = -1;
     public ParserEventList(){
-        this.eventList = new ArrayList<>();
+        this.eventList = new ArrayCollection<>();
     }
     public void clear(){
         this.eventList.clear();

src/main/java/com/reandroid/arsc/chunk/xml/ResXmlElement.java

@@ -301,7 +301,7 @@ private void clearNullNodes(boolean recursive){
     }
     int removeUnusedNamespaces(){
         int count = 0;
-        List<ResXmlStartNamespace> nsList = new ArrayList<>(getStartNamespaceList());
+        List<ResXmlStartNamespace> nsList = new ArrayCollection<>(getStartNamespaceList());
         for(ResXmlStartNamespace ns : nsList){
             boolean removed = ns.removeIfNoReference();
             if(removed){

src/main/java/com/reandroid/arsc/container/SpecTypePair.java

@@ -35,6 +35,7 @@
 import com.reandroid.json.JSONConvert;
 import com.reandroid.json.JSONObject;
 import com.reandroid.utils.HexUtil;
+import com.reandroid.utils.collection.ArrayCollection;
 import com.reandroid.utils.collection.ComputeIterator;
 import com.reandroid.utils.collection.EmptyIterator;
 import com.reandroid.utils.collection.MergingIterator;
@@ -302,7 +303,7 @@ public PackageBlock getPackageBlock(){
         return getParent(PackageBlock.class);
     }
     public List<Entry> listEntries(int entryId){
-        List<Entry> results=new ArrayList<>();
+        List<Entry> results=new ArrayCollection<>();
         Iterator<TypeBlock> itr = mTypeBlockArray.iterator(true);
         while (itr.hasNext()){
             TypeBlock typeBlock=itr.next();
@@ -315,7 +316,7 @@ public List<Entry> listEntries(int entryId){
         return results;
     }
     public List<Entry> listEntries(String entryName){
-        List<Entry> results = new ArrayList<>();
+        List<Entry> results = new ArrayCollection<>();
         Iterator<TypeBlock> itr = mTypeBlockArray.iterator(true);
         while (itr.hasNext()){
             TypeBlock typeBlock = itr.next();

src/main/java/com/reandroid/arsc/model/FrameworkTable.java

@@ -29,11 +29,11 @@
 import com.reandroid.arsc.value.Entry;
 import com.reandroid.arsc.value.ResConfig;
 import com.reandroid.common.FileChannelInputStream;
+import com.reandroid.utils.collection.ArrayCollection;
 
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
-import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
@@ -192,7 +192,7 @@ private void shrinkTableString(){
         tableStringPool.refresh();
     }
     private void shrinkTableString(TableString zero, TableString tableString){
-        List<ReferenceItem> allRef = new ArrayList<>(tableString.getReferencedList());
+        List<ReferenceItem> allRef = new ArrayCollection<>(tableString.getReferencedList());
         tableString.removeAllReference();
         for(ReferenceItem item:allRef){
             item.set(zero.getIndex());

src/main/java/com/reandroid/common/ReferenceResolver.java

@@ -61,7 +61,7 @@ public List<Entry> resolveAll(int referenceId){
     }
     public synchronized List<Entry> resolveAll(int referenceId, Predicate<Entry> filter){
         resolveReference(referenceId, filter);
-        List<Entry> results = new ArrayList<>(this.results);
+        List<Entry> results = new ArrayCollection<>(this.results);
         reset();
         return results;
     }
@@ -105,7 +105,7 @@ private void addResult(Predicate<Entry> filter, Entry entry){
         }
     }
     private List<Entry> listNonNullEntries(int resourceId){
-        List<Entry> results = new ArrayList<>();
+        List<Entry> results = new ArrayCollection<>();
         ResourceEntry resourceEntry = this.entryStore.getResource(resourceId);
         if(resourceEntry == null){
             return results;