General performance and memory usage improvements

AndEngine/src/org/anddev/andengine/opengl/font/Font.java

@@ -222,7 +222,6 @@ public synchronized void update(final GL10 pGL) {
 				bitmap.recycle();
 			}
 			lettersPendingToBeDrawnToTexture.clear();
-			System.gc();
 		}
 	}
 

AndEngine/src/org/anddev/andengine/opengl/texture/TextureManager.java

@@ -169,11 +169,6 @@ public synchronized void updateTextures(final GL10 pGL) {
 				texturesManaged.remove(textureToBeUnloaded);
 			}
 		}
-
-		/* Finally invoke the GC if anything has changed. */
-		if(texturesToBeLoadedCount > 0 || texturesToBeUnloadedCount > 0){
-			System.gc();
-		}
 	}
 
 	// ===========================================================

AndEngine/src/org/anddev/andengine/util/path/Path.java

@@ -119,7 +119,7 @@ public int getToTileColumn() {
 	// Inner and Anonymous Classes
 	// ===========================================================
 
-	public class Step {
+	public static class Step {
 		// ===========================================================
 		// Constants
 		// ===========================================================

src/com/dgsrz/bancho/security/SecurityUtils.java

@@ -78,7 +78,7 @@ public static void getAppSignature(Context context, String packageName) {
             return;
         }
         PackageManager pkgMgr = context.getPackageManager();
-        PackageInfo info = null;
+        PackageInfo info;
         Signature[] signatures;
 
         try {
@@ -90,22 +90,20 @@ public static void getAppSignature(Context context, String packageName) {
                 info = pkgMgr.getPackageInfo(packageName, PackageManager.GET_SIGNING_CERTIFICATES);
                 SigningInfo signInfo = info.signingInfo;
 
-                if(signInfo.hasMultipleSigners()) {
+                if (signInfo.hasMultipleSigners()) {
                     signatures = signInfo.getApkContentsSigners();
-                    appSignature = getHashCode(signatures[0].toByteArray());
                 }else {
                     signatures = signInfo.getSigningCertificateHistory();
-                    appSignature = getHashCode(signatures[0].toByteArray());
                 }
+                appSignature = getHashCode(signatures[0].toByteArray());
             }else {
                 info = pkgMgr.getPackageInfo(packageName, PackageManager.GET_SIGNATURES);
                 if(info != null && info.signatures != null && info.signatures.length > 0) {
                     Signature sign = info.signatures[0];
                     appSignature = getHashCode(sign.toByteArray());
                 }
             }
-        } catch (PackageManager.NameNotFoundException e) {
-            return;
+        } catch (PackageManager.NameNotFoundException ignored) {
         }
     }
 

src/com/dgsrz/bancho/ui/StoryBoardTestActivity.java

@@ -80,7 +80,6 @@ public Scene onLoadScene() {
         BassAudioPlayer.initDevice();
 
         try {
-            System.gc();
             OsbParser.instance.parse(FOLDER + PATH);
         } catch (IOException e) {
             e.printStackTrace();

src/com/edlplan/favorite/FavoriteLibrary.java

@@ -143,9 +143,7 @@ public void save() {
                 object.put(entry.getKey(), array);
             }
             cover(object.toString(2), json);
-        } catch (IOException e) {
-            e.printStackTrace();
-        } catch (JSONException e) {
+        } catch (IOException | JSONException e) {
             e.printStackTrace();
         }
     }

src/com/edlplan/framework/support/batch/BatchEngine.java

@@ -9,7 +9,7 @@ public class BatchEngine {
 
     public static GL10 pGL;
     public static ShaderGlobals shaderGlobals = new ShaderGlobals();
-    private static AbstractBatch savedbatch = null;
+    private static AbstractBatch<?> savedbatch = null;
     private static boolean flushing = false;
 
     public static ShaderGlobals getShaderGlobals() {
@@ -38,12 +38,12 @@ public static void setGlobalCamera(Camera camera) {
         shaderGlobals.camera.set(camera);
     }
 
-    static void bind(AbstractBatch batch) {
+    static <T> void bind(AbstractBatch<T> batch) {
         flush();
         savedbatch = batch;
     }
 
-    static void unbind(AbstractBatch batch) {
+    static <T> void unbind(AbstractBatch<T> batch) {
         if (savedbatch == batch) {
             savedbatch = null;
         }
@@ -58,7 +58,7 @@ public static void flush() {
         }
     }
 
-    public static AbstractBatch currentBatch() {
+    public static AbstractBatch<?> currentBatch() {
         return savedbatch;
     }
 }

src/com/edlplan/framework/support/batch/object/MultipleFlippableTextureQuad.java

@@ -70,7 +70,7 @@ public void initialWithTextureListWithScale(List<TextureRegion> textures, float
         switchTexture(0);
     }
 
-    public class TextureEntry {
+    public static class TextureEntry {
 
         public Vec2 size = new Vec2();
 

src/com/edlplan/framework/support/graphics/BlendProperty.java

@@ -6,7 +6,7 @@
 import com.edlplan.framework.support.batch.BatchEngine;
 import com.edlplan.framework.utils.interfaces.Copyable;
 
-public class BlendProperty implements Copyable {
+public class BlendProperty implements Copyable<BlendProperty> {
 
     public boolean enable = true;
 
@@ -61,7 +61,7 @@ public boolean equals(Object obj) {
     }
 
     @Override
-    public Copyable copy() {
+    public BlendProperty copy() {
         return new BlendProperty(this);
     }
 }

src/com/edlplan/framework/support/graphics/CanvasData.java

@@ -5,7 +5,7 @@
 import com.edlplan.framework.utils.interfaces.Copyable;
 import com.edlplan.framework.utils.interfaces.Recycleable;
 
-public class CanvasData implements Recycleable, Copyable {
+public class CanvasData implements Recycleable, Copyable<CanvasData> {
 
     private float width;
 
@@ -153,7 +153,7 @@ public void recycle() {
     }
 
     @Override
-    public Copyable copy() {
+    public CanvasData copy() {
         return new CanvasData(this);
     }
 }

src/com/edlplan/framework/support/graphics/texture/TexturePool.java

@@ -24,6 +24,7 @@
 import java.io.File;
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.Comparator;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
@@ -102,7 +103,7 @@ public void packAll(Iterator<String> collection, Consumer<Bitmap> onPackDrawDone
             testAddRaw(t);
         }
 
-        Collections.sort(infos, (p1, p2) -> Integer.compare(p1.pageIndex, p2.pageIndex));
+        Collections.sort(infos, (a, b) -> Integer.compare(a.pageIndex, b.pageIndex));
 
         ListIterator<TextureInfo> iterator = infos.listIterator();
 

src/com/edlplan/framework/support/osb/EGFStoryboardSprite.java

@@ -1,5 +1,6 @@
 package com.edlplan.framework.support.osb;
 
+import com.edlplan.edlosbsupport.command.SpriteCommand;
 import com.edlplan.edlosbsupport.command.Target;
 import com.edlplan.edlosbsupport.player.CommandBooleanHandleTimeline;
 import com.edlplan.edlosbsupport.player.CommandColor4HandleTimeline;

src/com/edlplan/framework/support/osb/StoryboardSprite.java

@@ -196,9 +196,7 @@ private void loadFromCache() {
             }
         });
 
-        Tracker.createTmpNode("LoadPlayer").wrap(() -> {
-            osbPlayer.loadStoryboard(storyboard);
-        }).then(System.out::println);
+        Tracker.createTmpNode("LoadPlayer").wrap(() -> osbPlayer.loadStoryboard(storyboard)).then(System.out::println);
     }
 
     public void loadStoryboard(String osuFile) {
@@ -255,9 +253,7 @@ public void loadStoryboard(String osuFile) {
             }
         });
 
-        Tracker.createTmpNode("LoadPlayer").wrap(() -> {
-            osbPlayer.loadStoryboard(storyboard);
-        }).then(System.out::println);
+        Tracker.createTmpNode("LoadPlayer").wrap(() -> osbPlayer.loadStoryboard(storyboard)).then(System.out::println);
 
     }
 

src/com/edlplan/framework/support/timing/RunnableHandler.java

@@ -12,7 +12,7 @@ public class RunnableHandler extends Loopable implements IRunnableHandler {
     private Loopable.Flag flag = Loopable.Flag.Run;
 
     public RunnableHandler() {
-        bufferedRunnables = new SafeList<DelayedRunnable>();
+        bufferedRunnables = new SafeList<>();
     }
 
     @Override
@@ -69,7 +69,7 @@ public Loopable.Flag getFlag() {
         return flag;
     }
 
-    private class DelayedRunnable {
+    private static class DelayedRunnable {
         public Runnable r;
         public double delay;
 

src/com/edlplan/framework/support/util/Tracker.java

@@ -1,5 +1,7 @@
 package com.edlplan.framework.support.util;
 
+import androidx.annotation.NonNull;
+
 import com.edlplan.framework.support.Framework;
 import com.edlplan.framework.utils.advance.ConsumerContainer;
 import com.edlplan.framework.utils.interfaces.Consumer;
@@ -28,8 +30,8 @@ public class Tracker {
 
 
     static {
-        nodes = new ArrayList<TrackNode>();
-        namemap = new HashMap<String, TrackNode>();
+        nodes = new ArrayList<>();
+        namemap = new HashMap<>();
 
         DrawArray = register(DRAW_ARRAY);
         PrepareVertexData = register(PREPARE_VERTEX_DATA);
@@ -63,7 +65,7 @@ public static void printlnAsTime(int ms) {
     }
 
     public static Consumer<Integer> printByTag(String tag) {
-        return t -> System.out.println(String.format("[%s] %dms", tag, t));
+        return t -> System.out.printf("[%s] %dms%n", tag, t);
     }
 
     public static class TrackNode {
@@ -121,16 +123,15 @@ public ConsumerContainer<TrackNode> wrap(Runnable runnable) {
             return new ConsumerContainer<>(this);
         }
 
+        @NonNull
         @Override
         public String toString() {
 
-            StringBuilder sb = new StringBuilder();
-            sb.append("------------------------------------\n");
-            sb.append("name         : " + name + " (" + id + ")\n");
-            sb.append("totalTime    : " + totalTimeMS + "ms\n");
-            sb.append("trackedTimes : " + trackedTimes + "\n");
-            sb.append("------------------------------------");
-            return sb.toString();
+            return "------------------------------------\n" +
+                    "name         : " + name + " (" + id + ")\n" +
+                    "totalTime    : " + totalTimeMS + "ms\n" +
+                    "trackedTimes : " + trackedTimes + "\n" +
+                    "------------------------------------";
         }
     }
 }

src/com/edlplan/osu/support/object/StdSliderPathMaker.java

@@ -44,7 +44,7 @@ public List<Vec2> calculateSubPath(List<Vec2> subPoints) {
 
     public LinePath calculatePath() {
         path.clear();
-        List<Vec2> subControlPoints = new ArrayList<Vec2>();
+        List<Vec2> subControlPoints = new ArrayList<>();
         for (int i = 0; i < getControlPoint().size(); i++) {
             subControlPoints.add(getControlPoint().get(i));
             if (i == getControlPoint().size() - 1 || getControlPoint().get(i).equals(getControlPoint().get(i + 1))) {

src/com/edlplan/osu/support/slider/DrawLinePath.java

@@ -32,7 +32,6 @@ public DrawLinePath(AbstractPath p, float width) {
 
     public DrawLinePath() {
         alpha = 1;
-        this.width = width;
     }
 
     public DrawLinePath reset(AbstractPath p, float width) {

src/com/edlplan/osu/support/slider/SliderBody2D.java

@@ -17,7 +17,7 @@
 
 public class SliderBody2D extends AbstractSliderBody {
 
-    private static final ThreadLocal<BuildCache> localCache = new ThreadLocal<BuildCache>() {
+    private static final ThreadLocal<BuildCache> localCache = new ThreadLocal<>() {
         @Override
         public BuildCache get() {
             BuildCache cache = super.get();

src/com/edlplan/osu/support/timing/TimingPoint.java

@@ -106,14 +106,13 @@ public void setKiaiMode(boolean kiaiMode) {
     @Override
     public String toString() {
 
-        StringBuilder sb = new StringBuilder();
-        sb.append(getTime()).append(",");
-        sb.append(getBeatLength()).append(",");
-        sb.append(getMeter()).append(",");
-        sb.append(getSampleType()).append(",");
-        sb.append(getSampleSet()).append(",");
-        sb.append(U.toVString(isInherited())).append(",");
-        sb.append(((isKiaiMode()) ? 1 : 0) + ((isOmitFirstBarSignature()) ? 8 : 0));
-        return sb.toString();
+        String sb = getTime() + "," +
+                getBeatLength() + "," +
+                getMeter() + "," +
+                getSampleType() + "," +
+                getSampleSet() + "," +
+                U.toVString(isInherited()) + "," +
+                (((isKiaiMode()) ? 1 : 0) + ((isOmitFirstBarSignature()) ? 8 : 0));
+        return sb;
     }
 }

src/com/edlplan/osu/support/timing/controlpoint/ControlPoints.java

@@ -5,7 +5,9 @@
 
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.Comparator;
 import java.util.List;
+import java.util.Objects;
 
 public class ControlPoints {
     private final ArrayList<TimingControlPoint> timingPoints = new ArrayList<>();
@@ -171,9 +173,9 @@ public DifficultyControlPoint getDifficultyPointAt(double time) {
         DifficultyControlPoint difficultyControlPoint = binarySearch(difficultyPoints, time, defaultDifficultyPoint);
         if (difficultyControlPoint == null) {
             return defaultDifficultyPoint;
-        } else {
-            return difficultyControlPoint;
         }
+
+        return difficultyControlPoint;
     }
 
     private <T extends ControlPoint> T binarySearch(List<T> list, double time, T prePoint) {

src/com/edlplan/replay/OsuDroidReplayPack.java

@@ -27,31 +27,32 @@ public static void packTo(File file, OsuDroidReplay replay) throws Exception {
     }
 
     public static byte[] pack(OsuDroidReplay replay) throws Exception {
-        ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
-        ZipOutputStream outputStream = new ZipOutputStream(byteArrayOutputStream);
-        //try {
-        outputStream.putNextEntry(new ZipEntry("entry.json"));
+        try (ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
+             ZipOutputStream outputStream = new ZipOutputStream(byteArrayOutputStream)){
+            outputStream.putNextEntry(new ZipEntry("entry.json"));
 
-        JSONObject entryJson = new JSONObject();
-        entryJson.put("version", 1);
-        entryJson.put("replaydata", replay.toJSON());
+            JSONObject entryJson = new JSONObject();
+            entryJson.put("version", 1);
+            entryJson.put("replaydata", replay.toJSON());
 
-        outputStream.write(entryJson.toString(2).getBytes());
+            outputStream.write(entryJson.toString(2).getBytes());
 
-        outputStream.putNextEntry(new ZipEntry(replay.getReplayFileName()));
+            outputStream.putNextEntry(new ZipEntry(replay.getReplayFileName()));
 
-        File file = replay.isAbsoluteReplay() ?
-                new File(replay.getReplayFile()) : new File(OdrConfig.getScoreDir(), replay.getReplayFileName());
-        FileInputStream inputStream = new FileInputStream(file);
+            File file = replay.isAbsoluteReplay() ?
+                    new File(replay.getReplayFile()) : new File(OdrConfig.getScoreDir(), replay.getReplayFileName());
 
-        byte[] buffer = new byte[1024];
-        int l;
-        while ((l = inputStream.read(buffer)) != -1) {
-            outputStream.write(buffer, 0, l);
-        }
+            try (FileInputStream inputStream = new FileInputStream(file)) {
+                byte[] buffer = new byte[1024];
+                int l;
+                while ((l = inputStream.read(buffer)) != -1) {
+                    outputStream.write(buffer, 0, l);
+                }
+            }
 
-        outputStream.finish();
-        return byteArrayOutputStream.toByteArray();
+            outputStream.finish();
+            return byteArrayOutputStream.toByteArray();
+        }
     }
 
     public static ReplayEntry unpack(InputStream raw) throws IOException, JSONException {