From ae6b6a4ebec87be9a9dfb4df2eecb7c4e21dd37d Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Sat, 6 Aug 2011 09:47:10 +0200
Subject: Android: Extract static context holder
---
.../common/os/android/GluegenVersionActivity.java | 4 +-
.../jogamp/common/os/android/PackageInfoUtil.java | 13 ++-----
.../jogamp/common/os/android/StaticContext.java | 44 ++++++++++++++++++++++
3 files changed, 50 insertions(+), 11 deletions(-)
create mode 100644 src/java/jogamp/common/os/android/StaticContext.java
(limited to 'src/java/jogamp/common/os/android')
diff --git a/src/java/jogamp/common/os/android/GluegenVersionActivity.java b/src/java/jogamp/common/os/android/GluegenVersionActivity.java
index 16222b6..8ea10e2 100644
--- a/src/java/jogamp/common/os/android/GluegenVersionActivity.java
+++ b/src/java/jogamp/common/os/android/GluegenVersionActivity.java
@@ -43,7 +43,7 @@ public class GluegenVersionActivity extends Activity {
public void onCreate(Bundle savedInstanceState) {
Log.d(MD.TAG, "onCreate - S");
super.onCreate(savedInstanceState);
- PackageInfoUtil.setContext(this.getApplicationContext());
+ StaticContext.setContext(this.getApplicationContext());
tv = new TextView(this);
tv.setText(VersionUtil.getPlatformInfo()+Platform.NEWLINE+GlueGenVersion.getInstance()+Platform.NEWLINE+Platform.NEWLINE);
setContentView(tv);
@@ -109,7 +109,7 @@ public class GluegenVersionActivity extends Activity {
tv.append("> destroyed"+Platform.NEWLINE);
}
Log.d(MD.TAG, "onDestroy - x");
- PackageInfoUtil.setContext(null);
+ StaticContext.setContext(null);
super.onDestroy();
Log.d(MD.TAG, "onDestroy - X");
}
diff --git a/src/java/jogamp/common/os/android/PackageInfoUtil.java b/src/java/jogamp/common/os/android/PackageInfoUtil.java
index 473f262..28795a1 100644
--- a/src/java/jogamp/common/os/android/PackageInfoUtil.java
+++ b/src/java/jogamp/common/os/android/PackageInfoUtil.java
@@ -32,18 +32,13 @@ 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();
+ return getPackageInfo(StaticContext.getContext(), packageName);
+ }
+
+ public static final PackageInfo getPackageInfo(Context ctx, String packageName) {
if(null != ctx) {
try {
final PackageInfo pi = ctx.getPackageManager().getPackageInfo(packageName, PackageManager.GET_META_DATA);
diff --git a/src/java/jogamp/common/os/android/StaticContext.java b/src/java/jogamp/common/os/android/StaticContext.java
new file mode 100644
index 0000000..56f8f13
--- /dev/null
+++ b/src/java/jogamp/common/os/android/StaticContext.java
@@ -0,0 +1,44 @@
+/**
+ * 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.util.Log;
+
+public class StaticContext {
+ 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;
+ }
+}
--
cgit v1.2.3