diff options
Diffstat (limited to 'src/java/jogamp/common/os/android')
4 files changed, 47 insertions, 45 deletions
diff --git a/src/java/jogamp/common/os/android/AndroidUtilsImpl.java b/src/java/jogamp/common/os/android/AndroidUtilsImpl.java index fc8d606..8dcdd6f 100644 --- a/src/java/jogamp/common/os/android/AndroidUtilsImpl.java +++ b/src/java/jogamp/common/os/android/AndroidUtilsImpl.java @@ -3,14 +3,14 @@ * * Redistribution and use in source and binary forms, with or without modification, are * permitted provided that the following conditions are met: - * + * * 1. Redistributions of source code must retain the above copyright notice, this list of * conditions and the following disclaimer. - * + * * 2. Redistributions in binary form must reproduce the above copyright notice, this list * of conditions and the following disclaimer in the documentation and/or other materials * provided with the distribution. - * + * * THIS SOFTWARE IS PROVIDED BY JogAmp Community ``AS IS'' AND ANY EXPRESS OR IMPLIED * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JogAmp Community OR @@ -20,7 +20,7 @@ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * + * * The views and conclusions contained in the software and documentation are those of the * authors and should not be interpreted as representing official policies, either expressed * or implied, of JogAmp Community. @@ -36,39 +36,39 @@ import android.util.Log; public class AndroidUtilsImpl { private static boolean DEBUG = false; - - public static final PackageInfo getPackageInfo(String packageName) { + + public static final PackageInfo getPackageInfo(final String packageName) { return getPackageInfo(StaticContext.getContext(), packageName); } - - public static final PackageInfo getPackageInfo(Context ctx, String packageName) { + + public static final PackageInfo getPackageInfo(final Context ctx, final String packageName) { if(null != ctx) { try { final PackageInfo pi = ctx.getPackageManager().getPackageInfo(packageName, PackageManager.GET_META_DATA); if(DEBUG) Log.d(MD.TAG, "getPackageInfo("+packageName+"): "+pi); return pi; - } catch (Exception e) { if(DEBUG) { Log.d(MD.TAG, "getPackageInfo("+packageName+")", e); } } + } catch (final Exception e) { if(DEBUG) { Log.d(MD.TAG, "getPackageInfo("+packageName+")", e); } } } if(DEBUG) Log.d(MD.TAG, "getPackageInfo("+packageName+"): NULL"); return null; } - - public static final int getPackageInfoVersionCode(String packageName) { + + public static final int getPackageInfoVersionCode(final String packageName) { final PackageInfo pInfo = getPackageInfo(packageName); return ( null != pInfo ) ? pInfo.versionCode : -1 ; } - - public static final String getPackageInfoVersionName(String packageName) { + + public static final String getPackageInfoVersionName(final String packageName) { final PackageInfo pInfo = getPackageInfo(packageName); final String s = ( null != pInfo ) ? pInfo.versionName : null ; if(DEBUG) Log.d(MD.TAG, "getPackageInfoVersionName("+packageName+"): "+s); return s; } - + /** - * @return null if no Android Context is registered - * via {@link jogamp.common.os.android.StaticContext#init(android.content.Context) StaticContext.init(..)}, - * otherwise the context relative world readable <code>temp</code> directory returned. + * @return null if no Android Context is registered + * via {@link jogamp.common.os.android.StaticContext#init(android.content.Context) StaticContext.init(..)}, + * otherwise the context relative world readable <code>temp</code> directory returned. */ public static File getTempRoot() throws SecurityException, RuntimeException @@ -86,5 +86,5 @@ public class AndroidUtilsImpl { } return null; } - + } diff --git a/src/java/jogamp/common/os/android/GluegenVersionActivity.java b/src/java/jogamp/common/os/android/GluegenVersionActivity.java index 5db3213..c216867 100644 --- a/src/java/jogamp/common/os/android/GluegenVersionActivity.java +++ b/src/java/jogamp/common/os/android/GluegenVersionActivity.java @@ -28,6 +28,8 @@ package jogamp.common.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 @@ public class GluegenVersionActivity extends Activity { TextView tv = null; @Override - public void onCreate(Bundle savedInstanceState) { + public void onCreate(final Bundle savedInstanceState) { Log.d(MD.TAG, "onCreate - S"); super.onCreate(savedInstanceState); StaticContext.init(this.getApplicationContext()); @@ -54,7 +56,7 @@ public class GluegenVersionActivity extends Activity { scroller.addView(tv); setContentView(scroller); - tv.setText(VersionUtil.getPlatformInfo()+Platform.NEWLINE+GlueGenVersion.getInstance()+Platform.NEWLINE+Platform.NEWLINE); + tv.setText(VersionUtil.getPlatformInfo()+PlatformPropsImpl.NEWLINE+GlueGenVersion.getInstance()+PlatformPropsImpl.NEWLINE+PlatformPropsImpl.NEWLINE); Log.d(MD.TAG, "onCreate - X"); } @@ -63,7 +65,7 @@ public class GluegenVersionActivity extends Activity { Log.d(MD.TAG, "onStart - S"); super.onStart(); if(null != tv) { - tv.append("> started"+Platform.NEWLINE); + tv.append("> started"+PlatformPropsImpl.NEWLINE); } Log.d(MD.TAG, "onStart - X"); } @@ -73,7 +75,7 @@ public class GluegenVersionActivity extends Activity { Log.d(MD.TAG, "onRestart - S"); super.onRestart(); if(null != tv) { - tv.append("> restarted"+Platform.NEWLINE); + tv.append("> restarted"+PlatformPropsImpl.NEWLINE); } Log.d(MD.TAG, "onRestart - X"); } @@ -82,7 +84,7 @@ public class GluegenVersionActivity extends Activity { public void onResume() { Log.d(MD.TAG, "onResume - S"); if(null != tv) { - tv.append("> resumed"+Platform.NEWLINE); + tv.append("> resumed"+PlatformPropsImpl.NEWLINE); } super.onResume(); Log.d(MD.TAG, "onResume - X"); @@ -92,7 +94,7 @@ public class GluegenVersionActivity extends Activity { public void onPause() { Log.d(MD.TAG, "onPause - S"); if(null != tv) { - tv.append("> paused"+Platform.NEWLINE); + tv.append("> paused"+PlatformPropsImpl.NEWLINE); } super.onPause(); // Log.d(MD.TAG, "onPause - x"); @@ -104,7 +106,7 @@ public class GluegenVersionActivity extends Activity { public void onStop() { Log.d(MD.TAG, "onStop - S"); if(null != tv) { - tv.append("> stopped"+Platform.NEWLINE); + tv.append("> stopped"+PlatformPropsImpl.NEWLINE); } super.onStop(); Log.d(MD.TAG, "onStop - X"); @@ -114,7 +116,7 @@ public class GluegenVersionActivity extends Activity { public void onDestroy() { Log.d(MD.TAG, "onDestroy - S"); if(null != tv) { - tv.append("> destroyed"+Platform.NEWLINE); + tv.append("> destroyed"+PlatformPropsImpl.NEWLINE); } Log.d(MD.TAG, "onDestroy - x"); StaticContext.clear(); diff --git a/src/java/jogamp/common/os/android/MD.java b/src/java/jogamp/common/os/android/MD.java index d6a2e48..4d0d631 100644 --- a/src/java/jogamp/common/os/android/MD.java +++ b/src/java/jogamp/common/os/android/MD.java @@ -3,14 +3,14 @@ * * Redistribution and use in source and binary forms, with or without modification, are * permitted provided that the following conditions are met: - * + * * 1. Redistributions of source code must retain the above copyright notice, this list of * conditions and the following disclaimer. - * + * * 2. Redistributions in binary form must reproduce the above copyright notice, this list * of conditions and the following disclaimer in the documentation and/or other materials * provided with the distribution. - * + * * THIS SOFTWARE IS PROVIDED BY JogAmp Community ``AS IS'' AND ANY EXPRESS OR IMPLIED * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JogAmp Community OR @@ -20,7 +20,7 @@ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * + * * The views and conclusions contained in the software and documentation are those of the * authors and should not be interpreted as representing official policies, either expressed * or implied, of JogAmp Community. diff --git a/src/java/jogamp/common/os/android/StaticContext.java b/src/java/jogamp/common/os/android/StaticContext.java index 359e603..5585407 100644 --- a/src/java/jogamp/common/os/android/StaticContext.java +++ b/src/java/jogamp/common/os/android/StaticContext.java @@ -3,14 +3,14 @@ * * Redistribution and use in source and binary forms, with or without modification, are * permitted provided that the following conditions are met: - * + * * 1. Redistributions of source code must retain the above copyright notice, this list of * conditions and the following disclaimer. - * + * * 2. Redistributions in binary form must reproduce the above copyright notice, this list * of conditions and the following disclaimer in the documentation and/or other materials * provided with the distribution. - * + * * THIS SOFTWARE IS PROVIDED BY JogAmp Community ``AS IS'' AND ANY EXPRESS OR IMPLIED * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JogAmp Community OR @@ -20,7 +20,7 @@ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * + * * The views and conclusions contained in the software and documentation are those of the * authors and should not be interpreted as representing official policies, either expressed * or implied, of JogAmp Community. @@ -34,27 +34,27 @@ import android.view.ViewGroup; public class StaticContext { private static Context appContext = null; private static ViewGroup contentViewGroup = null; - + private static boolean DEBUG = false; - + /** * Register Android application context for static usage. - * + * * @param appContext mandatory application Context * @throws RuntimeException if the context is already registered. */ - public static final synchronized void init(Context appContext) { + public static final synchronized void init(final Context appContext) { init(appContext, null); } - + /** * Register Android application context w/ a ViewGroup for static usage. - * + * * @param appContext mandatory application Context * @param contentViewGroup optional ViewGroup acting as the Window's ContentView, usually a FrameLayout instance. * @throws RuntimeException if the context is already registered. */ - public static final synchronized void init(Context appContext, ViewGroup contentViewGroup) { + public static final synchronized void init(final Context appContext, final ViewGroup contentViewGroup) { if(null != StaticContext.appContext) { throw new RuntimeException("Context already set"); } @@ -62,7 +62,7 @@ public class StaticContext { StaticContext.appContext = appContext; StaticContext.contentViewGroup = contentViewGroup; } - + /** * Unregister the Android application Context and ViewGroup */ @@ -71,15 +71,15 @@ public class StaticContext { appContext = null; contentViewGroup = null; } - + /** * Return the registered Android application Context * @return */ public static final synchronized Context getContext() { return appContext; - } - + } + /** * Return the registered Android ViewGroup acting as the Window's ContentView * @return |