diff --git a/app/src/main/java/com/hippo/gl/glrenderer/BasicTexture.java b/app/src/main/java/com/hippo/gl/glrenderer/BasicTexture.java index 9cd409df8..9a8da6c40 100644 --- a/app/src/main/java/com/hippo/gl/glrenderer/BasicTexture.java +++ b/app/src/main/java/com/hippo/gl/glrenderer/BasicTexture.java @@ -53,7 +53,7 @@ public abstract class BasicTexture implements Texture { protected GLCanvas mCanvasRef = null; private final static WeakHashMap sAllTextures = new WeakHashMap<>(); - private static ThreadLocal sInFinalizer = new ThreadLocal<>(); + private static final ThreadLocal sInFinalizer = new ThreadLocal<>(); protected BasicTexture(GLCanvas canvas, int id, int state) { setAssociatedCanvas(canvas); diff --git a/app/src/main/java/com/hippo/gl/glrenderer/ExtTexture.java b/app/src/main/java/com/hippo/gl/glrenderer/ExtTexture.java index 9b405bef4..34437b43c 100644 --- a/app/src/main/java/com/hippo/gl/glrenderer/ExtTexture.java +++ b/app/src/main/java/com/hippo/gl/glrenderer/ExtTexture.java @@ -20,7 +20,7 @@ package com.hippo.gl.glrenderer; // Before drawing, setSize() should be called. public class ExtTexture extends BasicTexture { - private int mTarget; + private final int mTarget; public ExtTexture(GLCanvas canvas, int target) { GLId glId = canvas.getGLId(); diff --git a/app/src/main/java/com/hippo/gl/glrenderer/MovableTextTexture.java b/app/src/main/java/com/hippo/gl/glrenderer/MovableTextTexture.java index f67593e3e..60e970f79 100644 --- a/app/src/main/java/com/hippo/gl/glrenderer/MovableTextTexture.java +++ b/app/src/main/java/com/hippo/gl/glrenderer/MovableTextTexture.java @@ -13,12 +13,12 @@ import java.util.Arrays; *
* Only support single line now */ -public class MovableTextTexture extends SpriteTexture { +public final class MovableTextTexture extends SpriteTexture { - private char[] mCharacters; - private float[] mWidths; - private float mHeight; - private float mMaxWidth; + private final char[] mCharacters; + private final float[] mWidths; + private final float mHeight; + private final float mMaxWidth; private MovableTextTexture(Bitmap bitmap, int count, int[] rects, char[] characters, float[] widths, float height, float maxWidth) { @@ -137,7 +137,7 @@ public class MovableTextTexture extends SpriteTexture { float[] widths = new float[length]; paint.getTextWidths(characters, 0, length, widths); - // Caculate bitmap size + // Calculate bitmap size float maxWidth = 0.0f; for (float f : widths) { maxWidth = Math.max(maxWidth, f); diff --git a/app/src/main/java/com/hippo/gl/glrenderer/SpriteTexture.java b/app/src/main/java/com/hippo/gl/glrenderer/SpriteTexture.java index 2c64ac226..c470e54dc 100644 --- a/app/src/main/java/com/hippo/gl/glrenderer/SpriteTexture.java +++ b/app/src/main/java/com/hippo/gl/glrenderer/SpriteTexture.java @@ -7,11 +7,11 @@ import com.hippo.yorozuya.AssertUtils; public class SpriteTexture extends TiledTexture { - private int mCount; - private int[] mRects; + private final int mCount; + private final int[] mRects; - private RectF mTempSource = new RectF(); - private RectF mTempTarget = new RectF(); + private final RectF mTempSource = new RectF(); + private final RectF mTempTarget = new RectF(); public SpriteTexture(Bitmap bitmap, boolean isOpaque, int count, int[] rects) { super(bitmap, isOpaque); diff --git a/app/src/main/java/com/hippo/gl/glrenderer/TextureUploader.java b/app/src/main/java/com/hippo/gl/glrenderer/TextureUploader.java index 34371585d..a3f72f022 100644 --- a/app/src/main/java/com/hippo/gl/glrenderer/TextureUploader.java +++ b/app/src/main/java/com/hippo/gl/glrenderer/TextureUploader.java @@ -25,9 +25,9 @@ public class TextureUploader implements GLRoot.OnGLIdleListener { private static final int QUOTA_PER_FRAME = 1; private final ArrayDeque mFgTextures = - new ArrayDeque(INIT_CAPACITY); + new ArrayDeque<>(INIT_CAPACITY); private final ArrayDeque mBgTextures = - new ArrayDeque(INIT_CAPACITY); + new ArrayDeque<>(INIT_CAPACITY); private final GLRoot mGLRoot; private volatile boolean mIsQueued = false; diff --git a/app/src/main/java/com/hippo/gl/glrenderer/TiledTexture.java b/app/src/main/java/com/hippo/gl/glrenderer/TiledTexture.java index b7c156a48..4ee23c94a 100644 --- a/app/src/main/java/com/hippo/gl/glrenderer/TiledTexture.java +++ b/app/src/main/java/com/hippo/gl/glrenderer/TiledTexture.java @@ -47,10 +47,10 @@ public class TiledTexture implements Texture { private static Tile sFreeTileHead = null; private static final Object sFreeTileLock = new Object(); - private static Bitmap sUploadBitmap; - private static Canvas sCanvas; - private static Paint sBitmapPaint; - private static Paint sPaint; + private static final Bitmap sUploadBitmap; + private static final Canvas sCanvas; + private static final Paint sBitmapPaint; + private static final Paint sPaint; private int mUploadIndex = 0; diff --git a/app/src/main/java/com/hippo/gl/glrenderer/UploadedTexture.java b/app/src/main/java/com/hippo/gl/glrenderer/UploadedTexture.java index 22e0ded0c..79ed2dfaf 100644 --- a/app/src/main/java/com/hippo/gl/glrenderer/UploadedTexture.java +++ b/app/src/main/java/com/hippo/gl/glrenderer/UploadedTexture.java @@ -44,9 +44,9 @@ public abstract class UploadedTexture extends BasicTexture { // To prevent keeping allocation the borders, we store those used borders here. // Since the length will be power of two, it won't use too much memory. - private static HashMap sBorderLines = + private static final HashMap sBorderLines = new HashMap<>(); - private static BorderKey sBorderKey = new BorderKey(); + private static final BorderKey sBorderKey = new BorderKey(); @SuppressWarnings("unused") private static final String TAG = "Texture"; diff --git a/app/src/main/java/com/hippo/gl/glrenderer/XmlResourceTexture.java b/app/src/main/java/com/hippo/gl/glrenderer/XmlResourceTexture.java index c38f9fbed..9c8afc120 100644 --- a/app/src/main/java/com/hippo/gl/glrenderer/XmlResourceTexture.java +++ b/app/src/main/java/com/hippo/gl/glrenderer/XmlResourceTexture.java @@ -25,8 +25,8 @@ import android.support.v4.content.ContextCompat; public class XmlResourceTexture extends UploadedTexture { - private Context mContext; - private int mResId; + private final Context mContext; + private final int mResId; private int mWidth; private int mHeight;