From 14bfc7e166318736e256c5f4b43a046ee108c10b Mon Sep 17 00:00:00 2001 From: shadowislord Date: Sun, 9 Nov 2014 17:34:36 -0500 Subject: [PATCH] Minor cleanups (no functionality change) --- jme3-android/src/main/java/com/jme3/app/AndroidHarness.java | 2 -- .../main/java/com/jme3/system/android/JmeAndroidSystem.java | 3 --- .../src/main/java/com/jme3/system/android/OGLESContext.java | 4 ++-- .../com/jme3/texture/plugins/AndroidNativeImageLoader.java | 2 -- 4 files changed, 2 insertions(+), 9 deletions(-) diff --git a/jme3-android/src/main/java/com/jme3/app/AndroidHarness.java b/jme3-android/src/main/java/com/jme3/app/AndroidHarness.java index 29371bbe2..0f50e0543 100644 --- a/jme3-android/src/main/java/com/jme3/app/AndroidHarness.java +++ b/jme3-android/src/main/java/com/jme3/app/AndroidHarness.java @@ -24,7 +24,6 @@ import com.jme3.input.controls.TouchTrigger; import com.jme3.input.event.TouchEvent; import com.jme3.system.AppSettings; import com.jme3.system.SystemListener; -import com.jme3.system.android.AndroidConfigChooser.ConfigType; import com.jme3.system.android.JmeAndroidSystem; import com.jme3.system.android.OGLESContext; import com.jme3.util.AndroidLogHandler; @@ -187,7 +186,6 @@ public class AndroidHarness extends Activity implements TouchListener, DialogInt final DataObject data = new DataObject(); data.app = this.app; inConfigChange = true; - return data; } diff --git a/jme3-android/src/main/java/com/jme3/system/android/JmeAndroidSystem.java b/jme3-android/src/main/java/com/jme3/system/android/JmeAndroidSystem.java index 52406daaf..f4fdfad84 100644 --- a/jme3-android/src/main/java/com/jme3/system/android/JmeAndroidSystem.java +++ b/jme3-android/src/main/java/com/jme3/system/android/JmeAndroidSystem.java @@ -9,7 +9,6 @@ import com.jme3.asset.AndroidAssetManager; import com.jme3.asset.AndroidImageInfo; import com.jme3.asset.AssetManager; import com.jme3.audio.AudioRenderer; -import com.jme3.audio.android.AndroidAudioRenderer; import com.jme3.audio.android.AndroidMediaPlayerAudioRenderer; import com.jme3.audio.android.AndroidOpenALSoftAudioRenderer; import com.jme3.system.*; @@ -134,9 +133,7 @@ public class JmeAndroidSystem extends JmeSystemDelegate { if (initialized) { return; } - initialized = true; - logger.log(Level.INFO, "Running on {0}", getFullName()); } diff --git a/jme3-android/src/main/java/com/jme3/system/android/OGLESContext.java b/jme3-android/src/main/java/com/jme3/system/android/OGLESContext.java index a01d1a480..324964976 100644 --- a/jme3-android/src/main/java/com/jme3/system/android/OGLESContext.java +++ b/jme3-android/src/main/java/com/jme3/system/android/OGLESContext.java @@ -42,7 +42,6 @@ import android.opengl.GLSurfaceView; import android.os.Build; import android.text.InputType; import android.view.Gravity; -import android.view.SurfaceHolder; import android.view.ViewGroup.LayoutParams; import android.widget.EditText; import android.widget.FrameLayout; @@ -57,6 +56,7 @@ import com.jme3.system.*; import java.util.concurrent.atomic.AtomicBoolean; import java.util.logging.Level; import java.util.logging.Logger; +import javax.microedition.khronos.egl.EGL10; import javax.microedition.khronos.egl.EGLConfig; import javax.microedition.khronos.opengles.GL10; @@ -152,7 +152,7 @@ public class OGLESContext implements JmeContext, GLSurfaceView.Renderer, SoftTex if (Build.VERSION.SDK_INT >= 11) { view.setPreserveEGLContextOnPause(true); } - + return view; } diff --git a/jme3-android/src/main/java/com/jme3/texture/plugins/AndroidNativeImageLoader.java b/jme3-android/src/main/java/com/jme3/texture/plugins/AndroidNativeImageLoader.java index 0a72b37db..9fd292679 100644 --- a/jme3-android/src/main/java/com/jme3/texture/plugins/AndroidNativeImageLoader.java +++ b/jme3-android/src/main/java/com/jme3/texture/plugins/AndroidNativeImageLoader.java @@ -1,13 +1,11 @@ package com.jme3.texture.plugins; import com.jme3.asset.AssetInfo; -import com.jme3.asset.AssetLoadException; import com.jme3.asset.AssetLoader; import com.jme3.asset.TextureKey; import com.jme3.texture.Image; import java.io.IOException; import java.io.InputStream; -import java.util.logging.Logger; /** * Native image loader to deal with filetypes that support alpha channels.