Merged with latest of mbien

7 files changed, 17 insertions, 13 deletions

diff --git a/src/junit/com/jogamp/gluegen/test/junit/generation/BaseTest1.java b/src/junit/com/jogamp/gluegen/test/junit/generation/BaseTest1.java
index 0654392..b689e6d 100644
--- a/src/junit/com/jogamp/gluegen/test/junit/generation/BaseTest1.java
+++ b/src/junit/com/jogamp/gluegen/test/junit/generation/BaseTest1.java
@@ -32,10 +32,10 @@
 
 package com.jogamp.gluegen.test.junit.generation;
 
-import com.jogamp.gluegen.runtime.Buffers;
-import com.jogamp.gluegen.runtime.PointerBuffer;
-import com.jogamp.gluegen.runtime.Int64Buffer;
-import com.jogamp.gluegen.runtime.Platform;
+import com.jogamp.common.nio.Buffers;
+import com.jogamp.common.nio.PointerBuffer;
+import com.jogamp.common.nio.Int64Buffer;
+import com.jogamp.common.os.Platform;
 import java.nio.*;
 import java.io.File;
 import java.lang.reflect.InvocationTargetException;
diff --git a/src/junit/com/jogamp/gluegen/test/junit/generation/Test1p1JavaEmitter.java b/src/junit/com/jogamp/gluegen/test/junit/generation/Test1p1JavaEmitter.java
index f4c5027..6320f92 100644
--- a/src/junit/com/jogamp/gluegen/test/junit/generation/Test1p1JavaEmitter.java
+++ b/src/junit/com/jogamp/gluegen/test/junit/generation/Test1p1JavaEmitter.java
@@ -34,8 +34,8 @@ package com.jogamp.gluegen.test.junit.generation;
 
 import com.jogamp.gluegen.test.junit.generation.impl.BindingTest1p1Impl;
 
-import com.jogamp.gluegen.runtime.Buffers;
-import com.jogamp.gluegen.runtime.PointerBuffer;
+import com.jogamp.common.nio.Buffers;
+import com.jogamp.common.nio.PointerBuffer;
 import java.nio.*;
 import java.io.File;
 import java.lang.reflect.InvocationTargetException;
diff --git a/src/junit/com/jogamp/gluegen/test/junit/generation/Test1p2ProcAddressEmitter.java b/src/junit/com/jogamp/gluegen/test/junit/generation/Test1p2ProcAddressEmitter.java
index 2662786..83f20d1 100644
--- a/src/junit/com/jogamp/gluegen/test/junit/generation/Test1p2ProcAddressEmitter.java
+++ b/src/junit/com/jogamp/gluegen/test/junit/generation/Test1p2ProcAddressEmitter.java
@@ -34,10 +34,10 @@ package com.jogamp.gluegen.test.junit.generation;
 
 import com.jogamp.gluegen.test.junit.generation.impl.BindingTest1p2Impl;
 
-import com.jogamp.gluegen.runtime.Buffers;
-import com.jogamp.gluegen.runtime.PointerBuffer;
-import com.jogamp.gluegen.runtime.NativeLibrary;
-import com.jogamp.gluegen.runtime.DynamicLookupHelper;
+import com.jogamp.common.nio.Buffers;
+import com.jogamp.common.nio.PointerBuffer;
+import com.jogamp.common.os.NativeLibrary;
+import com.jogamp.common.os.DynamicLookupHelper;
 import java.nio.*;
 import java.io.File;
 import java.lang.reflect.InvocationTargetException;
diff --git a/src/junit/com/jogamp/gluegen/test/junit/generation/test1-common.cfg b/src/junit/com/jogamp/gluegen/test/junit/generation/test1-common.cfg
index 2709e80..6ba4b78 100644
--- a/src/junit/com/jogamp/gluegen/test/junit/generation/test1-common.cfg
+++ b/src/junit/com/jogamp/gluegen/test/junit/generation/test1-common.cfg
@@ -28,6 +28,9 @@ CustomCCode #include "test1.h"
 # Imports needed by all glue code
 Import java.nio.*
 Import java.util.*
+Import com.jogamp.common.util.*
+Import com.jogamp.common.os.*
+Import com.jogamp.common.nio.*
 
 
 
diff --git a/src/junit/com/jogamp/gluegen/test/junit/generation/test1p2-gluegen.cfg b/src/junit/com/jogamp/gluegen/test/junit/generation/test1p2-gluegen.cfg
index f10a760..e5ace6e 100644
--- a/src/junit/com/jogamp/gluegen/test/junit/generation/test1p2-gluegen.cfg
+++ b/src/junit/com/jogamp/gluegen/test/junit/generation/test1p2-gluegen.cfg
@@ -26,7 +26,6 @@ Include ../../../../../../../../make/config/intptr.cfg
 
 Import com.jogamp.gluegen.test.junit.generation.BindingTest1
 Import com.jogamp.gluegen.test.junit.generation.BindingTest1p2
-Import com.jogamp.gluegen.runtime.*
 
 CustomJavaCode BindingTest1p2Impl  private static BindingTest1p2ProcAddressTable _table = new BindingTest1p2ProcAddressTable();
 CustomJavaCode BindingTest1p2Impl  public static void resetProcAddressTable(DynamicLookupHelper lookup) {
diff --git a/src/junit/com/jogamp/gluegen/test/junit/runtime/TestPointerBufferEndian.java b/src/junit/com/jogamp/gluegen/test/junit/runtime/TestPointerBufferEndian.java
index cab64c0..a57fd22 100644
--- a/src/junit/com/jogamp/gluegen/test/junit/runtime/TestPointerBufferEndian.java
+++ b/src/junit/com/jogamp/gluegen/test/junit/runtime/TestPointerBufferEndian.java
@@ -1,7 +1,8 @@
 
 package com.jogamp.gluegen.test.junit.runtime;
 
-import com.jogamp.gluegen.runtime.*;
+import com.jogamp.common.nio.*;
+import com.jogamp.common.os.*;
 
 import java.nio.*;
 
diff --git a/src/junit/com/jogamp/gluegen/test/junit/runtime/TestStructAccessorEndian.java b/src/junit/com/jogamp/gluegen/test/junit/runtime/TestStructAccessorEndian.java
index 669fd78..264c86b 100644
--- a/src/junit/com/jogamp/gluegen/test/junit/runtime/TestStructAccessorEndian.java
+++ b/src/junit/com/jogamp/gluegen/test/junit/runtime/TestStructAccessorEndian.java
@@ -1,6 +1,7 @@
 package com.jogamp.gluegen.test.junit.runtime;
 
-import com.jogamp.gluegen.runtime.*;
+import com.jogamp.common.nio.*;
+import com.jogamp.common.os.*;
 
 import java.nio.*;