summaryrefslogtreecommitdiffstats
path: root/src/java/jogamp
diff options
context:
space:
mode:
authorSven Gothel <sgothel@jausoft.com>2013-01-19 03:57:52 +0100
committerSven Gothel <sgothel@jausoft.com>2013-01-19 03:57:52 +0100
commit039ff52d12f5dd750494fb2dea580946291bdb7e (patch)
tree120fedf7cc88637a087c51ae801d857c3ee82223 /src/java/jogamp
parent9bcec728aebc74c81cdd7c92aba5ac2706a7da19 (diff)
Modified Java 1.5 Buffers patch 2b7d1b1d25cb2cd73311ec9159b465f0391bf5e0 - May break GCJ/ECJ .. needs to be revised.
- Adding JAVA_6 in PlatformPropsImpl - Buffers.isDirect() chooses fast-path iff JAVA_6, otherwise using reflection (GCJ/ECJ) - Adding JAVA_6 info in VersionUtil - API doc: Refine JAVA_SE and JAVA_6 spec. TODO: In case GCJ etc is unable to compile the JAVA_6 code even though it uses a static condition (probably not), We have to wrap isStatic in an own class, one for JAVA_6 and one for <= 1.5. This will be a good exercise for further issues we may have w/ Java <= 1.5.
Diffstat (limited to 'src/java/jogamp')
-rw-r--r--src/java/jogamp/common/os/PlatformPropsImpl.java20
1 files changed, 13 insertions, 7 deletions
diff --git a/src/java/jogamp/common/os/PlatformPropsImpl.java b/src/java/jogamp/common/os/PlatformPropsImpl.java
index 3010a31..8a4f2b2 100644
--- a/src/java/jogamp/common/os/PlatformPropsImpl.java
+++ b/src/java/jogamp/common/os/PlatformPropsImpl.java
@@ -30,6 +30,9 @@ public abstract class PlatformPropsImpl {
// static initialization order:
//
+ /** Version 1.6. As a JVM version, it enables certain JVM 1. features. */
+ public static final VersionNumber Version16;
+
public static final String OS;
public static final String OS_lower;
public static final String OS_VERSION;
@@ -39,10 +42,13 @@ public abstract class PlatformPropsImpl {
public static final String JAVA_VENDOR;
public static final String JAVA_VENDOR_URL;
public static final String JAVA_VERSION;
- public static final VersionNumber JAVA_VERSION_NUMBER;
+ public static final VersionNumber JAVA_VERSION_NUMBER;
public static final String JAVA_VM_NAME;
public static final String JAVA_RUNTIME_NAME;
+ /** True if having {@link java.nio.LongBuffer} and {@link java.nio.DoubleBuffer} available. */
public static final boolean JAVA_SE;
+ /** True if being compatible w/ language level 6, e.g. JRE 1.6. Implies {@link #JAVA_SE}. <i>Note</i>: We claim Android is compatible. */
+ public static final boolean JAVA_6;
public static final String NEWLINE;
public static final boolean LITTLE_ENDIAN;
@@ -51,8 +57,9 @@ public abstract class PlatformPropsImpl {
public static final ABIType ABI_TYPE;
public static final OSType OS_TYPE;
public static final String os_and_arch;
-
+
static {
+ Version16 = new VersionNumber(1, 6, 0);
// We don't seem to need an AccessController.doPrivileged() block
// here as these system properties are visible even to unsigned Applets.
OS = System.getProperty("os.name");
@@ -68,6 +75,7 @@ public abstract class PlatformPropsImpl {
JAVA_VM_NAME = System.getProperty("java.vm.name");
JAVA_RUNTIME_NAME = getJavaRuntimeNameImpl();
JAVA_SE = initIsJavaSE();
+ JAVA_6 = JAVA_SE && ( AndroidVersion.isAvailable || JAVA_VERSION_NUMBER.compareTo(Version16) >= 0 ) ;
NEWLINE = System.getProperty("line.separator");
LITTLE_ENDIAN = queryIsLittleEndianImpl();
@@ -75,7 +83,7 @@ public abstract class PlatformPropsImpl {
CPU_ARCH = getCPUTypeImpl(ARCH_lower);
ABI_TYPE = guessABITypeImpl(CPU_ARCH);
OS_TYPE = getOSTypeImpl();
- os_and_arch = getOSAndArch(OS_TYPE, CPU_ARCH, ABI_TYPE);
+ os_and_arch = getOSAndArch(OS_TYPE, CPU_ARCH, ABI_TYPE);
}
protected PlatformPropsImpl() {}
@@ -90,10 +98,8 @@ public abstract class PlatformPropsImpl {
}
private static final boolean initIsJavaSE() {
- if(JAVA_RUNTIME_NAME!=null) {
- if(JAVA_RUNTIME_NAME.indexOf("Java SE") != -1) {
- return true;
- }
+ if( null != JAVA_RUNTIME_NAME && JAVA_RUNTIME_NAME.indexOf("Java SE") != -1) {
+ return true;
}
// probe for classes we need on a SE environment