From 22262166e07de99ae0d4557e4f87e3bd1c5cd6dd Mon Sep 17 00:00:00 2001 From: Michael Bien Date: Wed, 31 Mar 2010 21:12:09 +0200 Subject: introduced com.jogamp.common.{nio,os} packages and moved some classes. --- src/java/com/sun/gluegen/JavaEmitter.java | 4 ++++ src/java/com/sun/gluegen/JavaType.java | 12 ++++++------ src/java/com/sun/gluegen/test/TestPointerBufferEndian.java | 4 ++-- src/java/com/sun/gluegen/test/TestStructAccessorEndian.java | 4 +++- 4 files changed, 15 insertions(+), 9 deletions(-) (limited to 'src/java/com/sun') diff --git a/src/java/com/sun/gluegen/JavaEmitter.java b/src/java/com/sun/gluegen/JavaEmitter.java index 0703f76..fc8ab34 100644 --- a/src/java/com/sun/gluegen/JavaEmitter.java +++ b/src/java/com/sun/gluegen/JavaEmitter.java @@ -39,6 +39,8 @@ package com.sun.gluegen; +import com.jogamp.common.nio.Buffers; +import com.jogamp.common.os.DynamicLookupHelper; import java.io.*; import java.util.*; import java.text.MessageFormat; @@ -869,6 +871,8 @@ public class JavaEmitter implements GlueEmitter { writer.println("import java.nio.*;"); writer.println(); writer.println("import " + cfg.gluegenRuntimePackage() + ".*;"); + writer.println("import " + DynamicLookupHelper.class.getPackage().getName() + ".*;"); + writer.println("import " + Buffers.class.getPackage().getName() + ".*;"); writer.println(); List imports = cfg.imports(); for (String str : imports) { diff --git a/src/java/com/sun/gluegen/JavaType.java b/src/java/com/sun/gluegen/JavaType.java index 23f48b2..c3cce38 100644 --- a/src/java/com/sun/gluegen/JavaType.java +++ b/src/java/com/sun/gluegen/JavaType.java @@ -197,13 +197,13 @@ public class JavaType { public static JavaType forNIOInt64BufferClass() { if(nioInt64BufferType == null) - nioInt64BufferType = createForClass(com.jogamp.gluegen.runtime.Int64Buffer.class); + nioInt64BufferType = createForClass(com.jogamp.common.nio.Int64Buffer.class); return nioInt64BufferType; } public static JavaType forNIOPointerBufferClass() { if(nioPointerBufferType == null) - nioPointerBufferType = createForClass(com.jogamp.gluegen.runtime.PointerBuffer.class); + nioPointerBufferType = createForClass(com.jogamp.common.nio.PointerBuffer.class); return nioPointerBufferType; } @@ -340,8 +340,8 @@ public class JavaType { public boolean isNIOBuffer() { return clazz != null && ( (java.nio.Buffer.class).isAssignableFrom(clazz) || - (com.jogamp.gluegen.runtime.PointerBuffer.class).isAssignableFrom(clazz) || - (com.jogamp.gluegen.runtime.Int64Buffer.class).isAssignableFrom(clazz) ) ; + (com.jogamp.common.nio.PointerBuffer.class).isAssignableFrom(clazz) || + (com.jogamp.common.nio.Int64Buffer.class).isAssignableFrom(clazz) ) ; } public boolean isNIOByteBuffer() { @@ -362,11 +362,11 @@ public class JavaType { } public boolean isNIOInt64Buffer() { - return (clazz == com.jogamp.gluegen.runtime.Int64Buffer.class); + return (clazz == com.jogamp.common.nio.Int64Buffer.class); } public boolean isNIOPointerBuffer() { - return (clazz == com.jogamp.gluegen.runtime.PointerBuffer.class); + return (clazz == com.jogamp.common.nio.PointerBuffer.class); } public boolean isString() { diff --git a/src/java/com/sun/gluegen/test/TestPointerBufferEndian.java b/src/java/com/sun/gluegen/test/TestPointerBufferEndian.java index 96e4e87..e64de92 100644 --- a/src/java/com/sun/gluegen/test/TestPointerBufferEndian.java +++ b/src/java/com/sun/gluegen/test/TestPointerBufferEndian.java @@ -1,8 +1,8 @@ package com.sun.gluegen.test; -import com.jogamp.gluegen.runtime.*; -import java.nio.*; +import com.jogamp.common.os.Platform; +import com.jogamp.common.nio.PointerBuffer; public class TestPointerBufferEndian { public static void main (String[] args) { diff --git a/src/java/com/sun/gluegen/test/TestStructAccessorEndian.java b/src/java/com/sun/gluegen/test/TestStructAccessorEndian.java index 7202056..4fe4008 100644 --- a/src/java/com/sun/gluegen/test/TestStructAccessorEndian.java +++ b/src/java/com/sun/gluegen/test/TestStructAccessorEndian.java @@ -1,7 +1,9 @@ package com.sun.gluegen.test; -import com.jogamp.gluegen.runtime.*; +import com.jogamp.common.os.Platform; +import com.jogamp.common.nio.Buffers; +import com.jogamp.common.nio.StructAccessor; import java.nio.*; public class TestStructAccessorEndian { -- cgit v1.2.3