diff options
Diffstat (limited to 'src/java')
8 files changed, 300 insertions, 8 deletions
diff --git a/src/java/com/jogamp/common/GlueGenVersion.java b/src/java/com/jogamp/common/GlueGenVersion.java index c3dcc75..5ae3412 100644 --- a/src/java/com/jogamp/common/GlueGenVersion.java +++ b/src/java/com/jogamp/common/GlueGenVersion.java @@ -44,9 +44,15 @@ public class GlueGenVersion extends JogampVersion { if(null == jogampCommonVersionInfo) { // volatile: ok synchronized(GlueGenVersion.class) { if( null == jogampCommonVersionInfo ) { - final String packageName = "com.jogamp.common"; - final Manifest mf = VersionUtil.getManifest(GlueGenVersion.class.getClassLoader(), "com.jogamp.common"); - jogampCommonVersionInfo = new GlueGenVersion(packageName, mf); + final String packageNameCompileTime = "com.jogamp.gluegen"; + final String packageNameRuntime = "com.jogamp.common"; + Manifest mf = VersionUtil.getManifest(GlueGenVersion.class.getClassLoader(), packageNameRuntime); + if(null != mf) { + jogampCommonVersionInfo = new GlueGenVersion(packageNameRuntime, mf); + } else { + mf = VersionUtil.getManifest(GlueGenVersion.class.getClassLoader(), packageNameCompileTime); + jogampCommonVersionInfo = new GlueGenVersion(packageNameCompileTime, mf); + } } } } diff --git a/src/java/com/jogamp/common/os/AndroidVersion.java b/src/java/com/jogamp/common/os/AndroidVersion.java index 22786d2..b577631 100644 --- a/src/java/com/jogamp/common/os/AndroidVersion.java +++ b/src/java/com/jogamp/common/os/AndroidVersion.java @@ -1,8 +1,6 @@ package com.jogamp.common.os; -import java.lang.reflect.Constructor; import java.lang.reflect.Field; -import java.lang.reflect.Modifier; import java.util.HashMap; import java.util.Map; diff --git a/src/java/com/jogamp/common/util/AndroidPackageUtil.java b/src/java/com/jogamp/common/util/AndroidPackageUtil.java new file mode 100644 index 0000000..86b25dd --- /dev/null +++ b/src/java/com/jogamp/common/util/AndroidPackageUtil.java @@ -0,0 +1,59 @@ +/** + * Copyright 2011 JogAmp Community. All rights reserved. + * + * 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 + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + * 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. + */ + +package com.jogamp.common.util; + +import java.lang.reflect.Method; + +public class AndroidPackageUtil { + + static final Method androidPackageInfoUtilGetVersionName; + static final boolean androidPackageInfoUtilAvailable; + static { + final ClassLoader cl = AndroidPackageUtil.class.getClassLoader(); + Method m=null; + try { + final Class c = ReflectionUtil.getClass("jogamp.common.os.android.PackageInfoUtil", true, cl); + m = ReflectionUtil.getMethod(c, "getPackageInfoVersionName", String.class); + } catch (Exception e) { /* n/a */ } + androidPackageInfoUtilGetVersionName = m; + androidPackageInfoUtilAvailable = null != m ; + } + + public static boolean isAndroidPackageInfoAvailable() { + return androidPackageInfoUtilAvailable; + } + + public static String getAndroidPackageInfoVersionName(String packageName) { + if(androidPackageInfoUtilAvailable) { + return (String) ReflectionUtil.callMethod(null, androidPackageInfoUtilGetVersionName, packageName); + } + return null; + } +} + diff --git a/src/java/com/jogamp/common/util/JogampVersion.java b/src/java/com/jogamp/common/util/JogampVersion.java index 1af86d3..a2b1e2f 100644 --- a/src/java/com/jogamp/common/util/JogampVersion.java +++ b/src/java/com/jogamp/common/util/JogampVersion.java @@ -30,6 +30,7 @@ package com.jogamp.common.util; import com.jogamp.common.GlueGenVersion; import com.jogamp.common.os.Platform; + import java.util.Iterator; import java.util.Set; import java.util.jar.Attributes; @@ -45,13 +46,16 @@ public class JogampVersion { private int hash; private Attributes mainAttributes; private Set/*<Attributes.Name>*/ mainAttributeNames; - - protected JogampVersion(String packageName, Manifest mf) { + + private final String androidPackageVersionName; + + protected JogampVersion(String packageName, Manifest mf) { this.packageName = packageName; this.mf = ( null != mf ) ? mf : new Manifest(); this.hash = this.mf.hashCode(); mainAttributes = this.mf.getMainAttributes(); mainAttributeNames = mainAttributes.keySet(); + androidPackageVersionName = AndroidPackageUtil.getAndroidPackageInfoVersionName(packageName); } @Override @@ -98,6 +102,9 @@ public class JogampVersion { } public final String getExtensionName() { + if(null != androidPackageVersionName) { + return packageName; + } return this.getAttribute(Attributes.Name.EXTENSION_NAME); } @@ -129,6 +136,10 @@ public class JogampVersion { return this.getAttribute(Attributes.Name.IMPLEMENTATION_VERSION); } + public final String getAndroidPackageVersionName() { + return androidPackageVersionName; + } + public final String getSpecificationTitle() { return this.getAttribute(Attributes.Name.SPECIFICATION_TITLE); } @@ -162,6 +173,9 @@ public class JogampVersion { sb.append("Implementation Version: ").append(getImplementationVersion()).append(nl); sb.append("Implementation Branch: ").append(getImplementationBranch()).append(nl); sb.append("Implementation Commit: ").append(getImplementationCommit()).append(nl); + if(null != getAndroidPackageVersionName()) { + sb.append("Android Package Version: ").append(getAndroidPackageVersionName()).append(nl); + } return sb; } diff --git a/src/java/jogamp/common/os/MachineDescriptionRuntime.java b/src/java/jogamp/common/os/MachineDescriptionRuntime.java index 1413705..bf49105 100644 --- a/src/java/jogamp/common/os/MachineDescriptionRuntime.java +++ b/src/java/jogamp/common/os/MachineDescriptionRuntime.java @@ -28,7 +28,6 @@ package jogamp.common.os; -import com.jogamp.common.os.AndroidVersion; import com.jogamp.common.os.MachineDescription; import com.jogamp.common.os.NativeLibrary; import com.jogamp.common.os.Platform; diff --git a/src/java/jogamp/common/os/android/GluegenVersionActivity.java b/src/java/jogamp/common/os/android/GluegenVersionActivity.java new file mode 100644 index 0000000..34c6fb5 --- /dev/null +++ b/src/java/jogamp/common/os/android/GluegenVersionActivity.java @@ -0,0 +1,116 @@ +/** + * Copyright 2011 JogAmp Community. All rights reserved. + * + * 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 + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + * 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. + */ +package jogamp.common.os.android; + +import com.jogamp.common.GlueGenVersion; +import com.jogamp.common.os.Platform; +import com.jogamp.common.util.VersionUtil; + +import android.app.Activity; +import android.os.Bundle; +import android.widget.TextView; +import android.util.Log; + +public class GluegenVersionActivity extends Activity { + TextView tv = null; + + @Override + public void onCreate(Bundle savedInstanceState) { + Log.d(MD.TAG, "onCreate - S"); + super.onCreate(savedInstanceState); + PackageInfoUtil.setContext(this); + tv = new TextView(this); + tv.setText(VersionUtil.getPlatformInfo()+Platform.NEWLINE+GlueGenVersion.getInstance()+Platform.NEWLINE+Platform.NEWLINE); + setContentView(tv); + Log.d(MD.TAG, "onCreate - X"); + } + + @Override + public void onStart() { + Log.d(MD.TAG, "onStart - S"); + super.onStart(); + if(null != tv) { + tv.append("> started"+Platform.NEWLINE); + } + Log.d(MD.TAG, "onStart - X"); + } + + @Override + public void onRestart() { + Log.d(MD.TAG, "onRestart - S"); + super.onRestart(); + if(null != tv) { + tv.append("> restarted"+Platform.NEWLINE); + } + Log.d(MD.TAG, "onRestart - X"); + } + + @Override + public void onResume() { + Log.d(MD.TAG, "onResume - S"); + if(null != tv) { + tv.append("> resumed"+Platform.NEWLINE); + } + super.onResume(); + Log.d(MD.TAG, "onResume - X"); + } + + @Override + public void onPause() { + Log.d(MD.TAG, "onPause - S"); + if(null != tv) { + tv.append("> paused"+Platform.NEWLINE); + } + super.onPause(); + // Log.d(MD.TAG, "onPause - x"); + // finish(); // ensure destroy after pause() -> one shot activity + Log.d(MD.TAG, "onPause - X"); + } + + @Override + public void onStop() { + Log.d(MD.TAG, "onStop - S"); + if(null != tv) { + tv.append("> stopped"+Platform.NEWLINE); + } + super.onStop(); + Log.d(MD.TAG, "onStop - X"); + } + + @Override + public void onDestroy() { + Log.d(MD.TAG, "onDestroy - S"); + if(null != tv) { + tv.append("> destroyed"+Platform.NEWLINE); + } + PackageInfoUtil.setContext(null); + Log.d(MD.TAG, "onDestroy - x"); + super.onDestroy(); + Log.d(MD.TAG, "onDestroy - X"); + } +} diff --git a/src/java/jogamp/common/os/android/MD.java b/src/java/jogamp/common/os/android/MD.java new file mode 100644 index 0000000..d6a2e48 --- /dev/null +++ b/src/java/jogamp/common/os/android/MD.java @@ -0,0 +1,32 @@ +/** + * Copyright 2011 JogAmp Community. All rights reserved. + * + * 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 + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + * 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. + */ +package jogamp.common.os.android; + +public class MD { + public static final String TAG = "JogAmp.GlueGen"; +} diff --git a/src/java/jogamp/common/os/android/PackageInfoUtil.java b/src/java/jogamp/common/os/android/PackageInfoUtil.java new file mode 100644 index 0000000..473f262 --- /dev/null +++ b/src/java/jogamp/common/os/android/PackageInfoUtil.java @@ -0,0 +1,68 @@ +/** + * Copyright 2011 JogAmp Community. All rights reserved. + * + * 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 + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + * 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. + */ +package jogamp.common.os.android; + +import android.content.*; +import android.content.pm.*; +import android.util.Log; + +public class PackageInfoUtil { + private static Context context = null; + private static boolean DEBUG = false; + + public static final synchronized void setContext(Context ctx) { + if(DEBUG) Log.d(MD.TAG, "setContext("+ctx+")"); + context = ctx; + } + public static final synchronized Context getContext() { + return context; + } + public static final PackageInfo getPackageInfo(String packageName) { + Context ctx = getContext(); + 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); } } + } + if(DEBUG) Log.d(MD.TAG, "getPackageInfo("+packageName+"): NULL"); + return null; + } + + public static final int getPackageInfoVersionCode(String packageName) { + final PackageInfo pInfo = getPackageInfo(packageName); + return ( null != pInfo ) ? pInfo.versionCode : -1 ; + } + public static final String getPackageInfoVersionName(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; + } +} |