diff options
4 files changed, 5 insertions, 20 deletions
diff --git a/src/java/com/jogamp/common/os/DynamicLookupHelper.java b/src/java/com/jogamp/common/os/DynamicLookupHelper.java index a4f74a4..5da2b67 100755 --- a/src/java/com/jogamp/common/os/DynamicLookupHelper.java +++ b/src/java/com/jogamp/common/os/DynamicLookupHelper.java @@ -39,8 +39,7 @@ package com.jogamp.common.os; -/** Interface callers may use to use the ProcAddressHelper's {@link - ProcAddressHelper#resetProcAddressTable resetProcAddressTable} +/** Interface callers may use to use the ProcAddressHelper's {@link ProcAddressTable#reset reset} helper method to install function pointers into a ProcAddressTable. This must typically be written with native code. */ diff --git a/src/java/com/jogamp/gluegen/runtime/ProcAddressTable.java b/src/java/com/jogamp/gluegen/runtime/ProcAddressTable.java index 448c945..9a05fce 100644 --- a/src/java/com/jogamp/gluegen/runtime/ProcAddressTable.java +++ b/src/java/com/jogamp/gluegen/runtime/ProcAddressTable.java @@ -89,14 +89,14 @@ public abstract class ProcAddressTable { public abstract long getAddressFor(String functionName); - public void resetProcAddressTable(DynamicLookupHelper lookup) throws RuntimeException { + public void reset(DynamicLookupHelper lookup) throws RuntimeException { Class tableClass = getClass(); Field[] fields = tableClass.getFields(); PrintStream dout = getDebugOutStream(); if (DEBUG) { - dout.println("ProcAddressHelper.resetProcAddressTable(" + getClass().getName() + ")"); + dout.println("ProcAddressTable.reset(" + getClass().getName() + ")"); } for (int i = 0; i < fields.length; ++i) { String addressFieldName = fields[i].getName(); @@ -137,7 +137,7 @@ public abstract class ProcAddressTable { if (DEBUG_PREFIX != null) { try { out = new PrintStream(new BufferedOutputStream(new FileOutputStream(DEBUG_PREFIX + File.separatorChar - + "procaddresshelper-" + (++debugNum) + ".txt"))); + + "procaddresstable-" + (++debugNum) + ".txt"))); } catch (IOException e) { e.printStackTrace(); out = System.err; 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 3035ad1..a299799 100644 --- a/src/junit/com/jogamp/gluegen/test/junit/generation/Test1p2ProcAddressEmitter.java +++ b/src/junit/com/jogamp/gluegen/test/junit/generation/Test1p2ProcAddressEmitter.java @@ -34,26 +34,12 @@ package com.jogamp.gluegen.test.junit.generation; import com.jogamp.gluegen.test.junit.generation.impl.BindingTest1p2Impl; -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; -import java.lang.reflect.Method; -import java.net.URISyntaxException; -import java.nio.ByteBuffer; -import java.nio.ByteOrder; -import java.util.logging.Level; -import java.util.logging.Logger; import org.junit.Assert; -import org.junit.Before; -import org.junit.BeforeClass; import org.junit.Test; -import static java.lang.System.*; import static com.jogamp.gluegen.test.junit.generation.BuildEnvironment.*; /** 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 fe6328c..d8ef816 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 @@ -29,7 +29,7 @@ Import com.jogamp.gluegen.test.junit.generation.BindingTest1p2 CustomJavaCode BindingTest1p2Impl private static BindingTest1p2ProcAddressTable _table = new BindingTest1p2ProcAddressTable(); CustomJavaCode BindingTest1p2Impl public static void resetProcAddressTable(DynamicLookupHelper lookup) { -CustomJavaCode BindingTest1p2Impl _table.resetProcAddressTable(lookup); +CustomJavaCode BindingTest1p2Impl _table.reset(lookup); CustomJavaCode BindingTest1p2Impl } |