Fix Bug 583: Remove Android compile-time dependencies and exclude Android specific classes for non Android platforms.

Android specifics are delegated via class AndroidUtils,
which uses reflection to call AndroidUtilsImpl if platform is Android.

Android code is confined to the packages:
  jogamp.common.os.android.*
  jogamp.android.launcher.*

and only included when compiled for the Android platform.

2 files changed, 14 insertions, 27 deletions

diff --git a/src/java/com/jogamp/common/util/IOUtil.java b/src/java/com/jogamp/common/util/IOUtil.java
index 5f26c53..ed74fa2 100644
--- a/src/java/com/jogamp/common/util/IOUtil.java
+++ b/src/java/com/jogamp/common/util/IOUtil.java
@@ -44,13 +44,10 @@ import java.net.URLConnection;
 import java.nio.ByteBuffer;
 
 import jogamp.common.Debug;
-import jogamp.common.os.android.StaticContext;
-
-import android.content.Context;
+import jogamp.common.os.AndroidUtils;
 
 import com.jogamp.common.net.AssetURLContext;
 import com.jogamp.common.nio.Buffers;
-import com.jogamp.common.os.AndroidVersion;
 import com.jogamp.common.os.MachineDescription;
 import com.jogamp.common.os.Platform;
 
@@ -632,7 +629,7 @@ public class IOUtil {
      * On Android a <code>temp</code> folder relative to the applications local folder 
      * (see {@link Context#getDir(String, int)}) is returned, if
      * the Android application/activity has registered it's Application Context
-     * via {@link StaticContext#init(Context, ClassLoader)}.
+     * via {@link jogamp.common.os.android.StaticContext.StaticContext#init(Context, ClassLoader) StaticContext.init(..)}.
      * This allows using the temp folder w/o the need for <code>sdcard</code>
      * access, which would be the <code>java.io.tempdir</code> location on Android!
      * </p>
@@ -642,22 +639,14 @@ public class IOUtil {
      * @throws RuntimeException is the property <code>java.io.tmpdir</code> or the resulting temp directory is invalid
      *  
      * @see PropertyAccess#getProperty(String, boolean, java.security.AccessControlContext)
-     * @see StaticContext#init(Context, ClassLoader)
      * @see Context#getDir(String, int)
      */
     public static File getTempRoot(AccessControlContext acc)
         throws SecurityException, RuntimeException
     {
-        if(AndroidVersion.isAvailable) {
-            final Context ctx = StaticContext.getContext();
-            if(null != ctx) {
-                final File tmpRoot = ctx.getDir("temp", Context.MODE_WORLD_READABLE);
-                if(null==tmpRoot|| !tmpRoot.isDirectory() || !tmpRoot.canWrite()) {
-                    throw new RuntimeException("Not a writable directory: '"+tmpRoot+"', retrieved Android static context");
-                }
-                if(DEBUG) {
-                    System.err.println("IOUtil.getTempRoot(Android): temp dir: "+tmpRoot.getAbsolutePath());
-                }
+        {
+            final File tmpRoot = AndroidUtils.getTempRoot(acc); // null if ( !Android || no android-ctx )
+            if(null != tmpRoot) {
                 return tmpRoot;
             }
         }
@@ -670,7 +659,7 @@ public class IOUtil {
             throw new RuntimeException("Not a writable directory: '"+tmpRoot+"', retrieved by propery '"+java_io_tmpdir_propkey+"'");
         }
         if(DEBUG) {
-            System.err.println("IOUtil.getTempRoot(isAndroid: "+AndroidVersion.isAvailable+"): temp dir: "+tmpRoot.getAbsolutePath());
+            System.err.println("IOUtil.getTempRoot(): temp dir: "+tmpRoot.getAbsolutePath());
         }
         return tmpRoot;
     }
diff --git a/src/java/com/jogamp/common/util/JogampVersion.java b/src/java/com/jogamp/common/util/JogampVersion.java
index 2461c3e..de65f90 100644
--- a/src/java/com/jogamp/common/util/JogampVersion.java
+++ b/src/java/com/jogamp/common/util/JogampVersion.java
@@ -29,7 +29,6 @@
 package com.jogamp.common.util;
 
 import com.jogamp.common.GlueGenVersion;
-import com.jogamp.common.os.AndroidVersion;
 import com.jogamp.common.os.Platform;
 
 import java.util.Iterator;
@@ -37,7 +36,7 @@ import java.util.Set;
 import java.util.jar.Attributes;
 import java.util.jar.Manifest;
 
-import jogamp.common.os.android.PackageInfoUtil;
+import jogamp.common.os.AndroidUtils;
 
 public class JogampVersion {
 
@@ -48,7 +47,7 @@ public class JogampVersion {
     private Manifest mf;
     private int hash;
     private Attributes mainAttributes;
-    private Set/*<Attributes.Name>*/ mainAttributeNames;
+    private Set<?>/*<Attributes.Name>*/ mainAttributeNames;
     
     private final String androidPackageVersionName;
     
@@ -58,11 +57,7 @@ public class JogampVersion {
         this.hash = this.mf.hashCode();
         mainAttributes = this.mf.getMainAttributes();
         mainAttributeNames = mainAttributes.keySet();
-        if(AndroidVersion.isAvailable) {
-            androidPackageVersionName = PackageInfoUtil.getPackageInfoVersionName(packageName);
-        } else {
-            androidPackageVersionName = null;
-        }
+        androidPackageVersionName = AndroidUtils.getPackageInfoVersionName(packageName); // null if !Android
     }
 
     @Override
@@ -95,7 +90,7 @@ public class JogampVersion {
     }
 
     public final Attributes.Name getAttributeName(String attributeName) {
-        for (Iterator iter = mainAttributeNames.iterator(); iter.hasNext();) {
+        for (Iterator<?> iter = mainAttributeNames.iterator(); iter.hasNext();) {
             Attributes.Name an = (Attributes.Name) iter.next();
             if (an.toString().equals(attributeName)) {
                 return an;
@@ -104,7 +99,10 @@ public class JogampVersion {
         return null;
     }
 
-    public final Set getAttributeNames() {
+    /**
+     * @return set of type {@link Attributes.Name}, disguised as anonymous   
+     */
+    public final Set<?>/*<Attributes.Name>*/ getAttributeNames() {
         return mainAttributeNames;
     }