From a90ee128ce0550cd05f969d0283312c2f42b8254 Mon Sep 17 00:00:00 2001 From: Sven Gothel Date: Thu, 3 Jul 2014 16:35:47 +0200 Subject: Code Clean-Up based on our Recommended Settings (jogamp-scripting c47bc86ae2ee268a1f38c5580d11f93d7f8d6e74) - Change non static accesses to static members using declaring type - Change indirect accesses to static members to direct accesses (accesses through subtypes) - Add final modifier to private fields - Add final modifier to method parameters - Add final modifier to local variables - Remove unnecessary casts - Remove unnecessary '$NON-NLS$' tags - Remove trailing white spaces on all lines --- src/jogamp/opencl/os/android/JoclBaseActivity.java | 6 +++--- src/jogamp/opencl/os/android/JoclVersionActivity.java | 14 ++++++++------ .../opencl/os/android/JoclVersionActivityLauncher.java | 2 +- 3 files changed, 12 insertions(+), 10 deletions(-) (limited to 'src/jogamp/opencl') diff --git a/src/jogamp/opencl/os/android/JoclBaseActivity.java b/src/jogamp/opencl/os/android/JoclBaseActivity.java index 207f5192..6bfe52f5 100644 --- a/src/jogamp/opencl/os/android/JoclBaseActivity.java +++ b/src/jogamp/opencl/os/android/JoclBaseActivity.java @@ -44,7 +44,7 @@ public class JoclBaseActivity extends Activity { rootActivity = this; } - public void setRootActivity(Activity rootActivity) { + public void setRootActivity(final Activity rootActivity) { this.rootActivity = rootActivity; this.isDelegatedActivity = this != rootActivity; } @@ -65,7 +65,7 @@ public class JoclBaseActivity extends Activity { * @param androidWindow * @param newtWindow */ - public void setFullscreenFeature(android.view.Window androidWindow, boolean fullscreen) { + public void setFullscreenFeature(final android.view.Window androidWindow, final boolean fullscreen) { if(null == androidWindow) { throw new IllegalArgumentException("Android or Window null"); } @@ -118,7 +118,7 @@ public class JoclBaseActivity extends Activity { } @Override - public void onCreate(Bundle savedInstanceState) { + public void onCreate(final Bundle savedInstanceState) { Log.d(MD.TAG, "onCreate.0"); if(!isDelegatedActivity()) { super.onCreate(savedInstanceState); diff --git a/src/jogamp/opencl/os/android/JoclVersionActivity.java b/src/jogamp/opencl/os/android/JoclVersionActivity.java index b9884141..1f98a0c8 100644 --- a/src/jogamp/opencl/os/android/JoclVersionActivity.java +++ b/src/jogamp/opencl/os/android/JoclVersionActivity.java @@ -27,6 +27,8 @@ */ package jogamp.opencl.os.android; +import jogamp.common.os.PlatformPropsImpl; + import com.jogamp.common.GlueGenVersion; import com.jogamp.common.os.Platform; import com.jogamp.common.util.VersionUtil; @@ -42,7 +44,7 @@ import android.widget.TextView; public class JoclVersionActivity extends JoclBaseActivity { @Override - public void onCreate(Bundle savedInstanceState) { + public void onCreate(final Bundle savedInstanceState) { super.onCreate(savedInstanceState); setFullscreenFeature(getWindow(), true); @@ -61,11 +63,11 @@ public class JoclVersionActivity extends JoclBaseActivity { setContentView(scroller); final JoclVersion joclVersion = JoclVersion.getInstance(); - final String info1 = "JOCL Version Info"+Platform.NEWLINE+ - VersionUtil.getPlatformInfo()+Platform.NEWLINE+ - GlueGenVersion.getInstance()+Platform.NEWLINE+ - joclVersion.toString()+Platform.NEWLINE+ - joclVersion.getOpenCLTextInfo(null).toString()+Platform.NEWLINE; + final String info1 = "JOCL Version Info"+PlatformPropsImpl.NEWLINE+ + VersionUtil.getPlatformInfo()+PlatformPropsImpl.NEWLINE+ + GlueGenVersion.getInstance()+PlatformPropsImpl.NEWLINE+ + joclVersion.toString()+PlatformPropsImpl.NEWLINE+ + joclVersion.getOpenCLTextInfo(null).toString()+PlatformPropsImpl.NEWLINE; System.err.println(info1); tv.setText(info1); diff --git a/src/jogamp/opencl/os/android/JoclVersionActivityLauncher.java b/src/jogamp/opencl/os/android/JoclVersionActivityLauncher.java index 4080250d..549477ea 100644 --- a/src/jogamp/opencl/os/android/JoclVersionActivityLauncher.java +++ b/src/jogamp/opencl/os/android/JoclVersionActivityLauncher.java @@ -8,7 +8,7 @@ import android.util.Log; public class JoclVersionActivityLauncher extends Activity { @Override - public void onCreate(Bundle savedInstanceState) { + public void onCreate(final Bundle savedInstanceState) { super.onCreate(savedInstanceState); final Uri uri = Uri.parse("launch://jogamp.org/jogamp.opencl.os.android.JoclVersionActivity?sys=com.jogamp.common&sys=javax.media.opengl&sys=com.jogamp.opencl&pkg=com.jogamp.opencl.test&jogamp.debug=all&jocl.debug=all"); -- cgit v1.2.3