diff options
42 files changed, 99 insertions, 103 deletions
diff --git a/doc/manual/index.html b/doc/manual/index.html index a0c27ff..8fe51c0 100755 --- a/doc/manual/index.html +++ b/doc/manual/index.html @@ -984,11 +984,11 @@ C APIs have corresponding Java classes emitted. <dt><strong><a name="GlueGenRuntimePackage">GlueGenRuntimePackage</a></strong> -<dd>Syntax: <code>GlueGenRuntimePackage [package name, like com.sun.gluegen.runtime]</code> <br> +<dd>Syntax: <code>GlueGenRuntimePackage [package name, like com.jogamp.gluegen.runtime]</code> <br> (optional) Changes the package in which the generated glue code expects to find its run-time helper classes (like BufferFactory, CPU, -StructAccessor). Defaults to <CODE>com.sun.gluegen.runtime</CODE> (no +StructAccessor). Defaults to <CODE>com.jogamp.gluegen.runtime</CODE> (no quotes). This is useful if you want to bundle the runtime classes in your application without the possibility of interfering with other versions elsewhere in the system. diff --git a/make/build.xml b/make/build.xml index 9460b3f..db6de19 100755 --- a/make/build.xml +++ b/make/build.xml @@ -31,19 +31,19 @@ </target> <target name="setup-excludes-2" unless="gluegen.nsig"> - <property name="gluegen.excludes" value="com/sun/gluegen/runtime/BufferFactoryInternal.java,com/sun/gluegen/nativesig/**" /> + <property name="gluegen.excludes" value="com/jogamp/gluegen/runtime/BufferFactoryInternal.java,com/sun/gluegen/nativesig/**" /> </target> <target name="setup.javase"> - <copy file="../src/java/com/sun/gluegen/runtime/BufferFactory.java.javase" tofile="${src.generated.java}/com/sun/gluegen/runtime/BufferFactory.java" /> - <copy file="../src/java/com/sun/gluegen/runtime/StructAccessor.java.javase" tofile="${src.generated.java}/com/sun/gluegen/runtime/StructAccessor.java" /> - <copy file="../src/java/com/sun/gluegen/runtime/PointerBuffer.java.javase" tofile="${src.generated.java}/com/sun/gluegen/runtime/PointerBuffer.java" /> + <copy file="../src/java/com/jogamp/gluegen/runtime/BufferFactory.java.javase" tofile="${src.generated.java}/com/jogamp/gluegen/runtime/BufferFactory.java" /> + <copy file="../src/java/com/jogamp/gluegen/runtime/StructAccessor.java.javase" tofile="${src.generated.java}/com/jogamp/gluegen/runtime/StructAccessor.java" /> + <copy file="../src/java/com/jogamp/gluegen/runtime/PointerBuffer.java.javase" tofile="${src.generated.java}/com/jogamp/gluegen/runtime/PointerBuffer.java" /> </target> <target name="setup.javacdc"> - <copy file="../src/java/com/sun/gluegen/runtime/BufferFactory.java.javame_cdc_fp" tofile="${src.generated.java-cdc}/com/sun/gluegen/runtime/BufferFactory.java" /> - <copy file="../src/java/com/sun/gluegen/runtime/StructAccessor.java.javame_cdc_fp" tofile="${src.generated.java-cdc}/com/sun/gluegen/runtime/StructAccessor.java" /> - <copy file="../src/java/com/sun/gluegen/runtime/PointerBuffer.java.javame_cdc_fp" tofile="${src.generated.java-cdc}/com/sun/gluegen/runtime/PointerBuffer.java" /> + <copy file="../src/java/com/jogamp/gluegen/runtime/BufferFactory.java.javame_cdc_fp" tofile="${src.generated.java-cdc}/com/jogamp/gluegen/runtime/BufferFactory.java" /> + <copy file="../src/java/com/jogamp/gluegen/runtime/StructAccessor.java.javame_cdc_fp" tofile="${src.generated.java-cdc}/com/jogamp/gluegen/runtime/StructAccessor.java" /> + <copy file="../src/java/com/jogamp/gluegen/runtime/PointerBuffer.java.javame_cdc_fp" tofile="${src.generated.java-cdc}/com/jogamp/gluegen/runtime/PointerBuffer.java" /> </target> <target name="init" depends="gluegen.properties.load.user,setup-excludes-1,setup-excludes-2"> @@ -413,7 +413,7 @@ <copy todir="${classes-cdc}"> <fileset dir="${classes}" includes="com/** net/**" - excludes="com/sun/gluegen/runtime/** com/sun/gluegen/test/**" /> + excludes="com/jogamp/gluegen/runtime/** com/sun/gluegen/test/**" /> </copy> <javac destdir="${classes-cdc}" @@ -483,7 +483,7 @@ <!-- Build GlueGen using the generated Java files along with the - original source. --> - <property name="gluegen-rt.classes" value="com/sun/gluegen/runtime/**"/> + <property name="gluegen-rt.classes" value="com/jogamp/gluegen/runtime/**"/> <!--compile gluegen-rt with source=1.4 first--> <javac destdir="${classes}" @@ -534,8 +534,8 @@ <!-- Build gluegen-rt.jar. --> <jar destfile="${build}/gluegen-rt.jar" manifest="${build}/Manifest-rt.temp"> <fileset dir="${classes}"> - <include name="com/sun/gluegen/runtime/*.class" /> - <include name="com/sun/gluegen/runtime/opengl/*.class" /> + <include name="com/jogamp/gluegen/runtime/*.class" /> + <include name="com/jogamp/gluegen/runtime/opengl/*.class" /> </fileset> </jar> @@ -550,8 +550,8 @@ <!-- Build gluegen-rt-cdc.jar. --> <jar destfile="${build}/gluegen-rt-cdc.jar" manifest="${build}/Manifest-rt-cdc.temp"> <fileset dir="${classes-cdc}"> - <include name="com/sun/gluegen/runtime/*.class" /> - <include name="com/sun/gluegen/runtime/opengl/*.class" /> + <include name="com/jogamp/gluegen/runtime/*.class" /> + <include name="com/jogamp/gluegen/runtime/opengl/*.class" /> </fileset> </jar> diff --git a/make/dynlink-macosx.cfg b/make/dynlink-macosx.cfg index 8ba4c51..cdeb556 100755 --- a/make/dynlink-macosx.cfg +++ b/make/dynlink-macosx.cfg @@ -1,6 +1,6 @@ Style AllStatic JavaClass MacOSXDynamicLinkerImpl -Package com.sun.gluegen.runtime +Package com.jogamp.gluegen.runtime Implements MacOSXDynamicLinkerImpl DynamicLinker JavaOutputDir ../src/java NativeOutputDir ../src/native/macosx diff --git a/make/dynlink-unix.cfg b/make/dynlink-unix.cfg index d762c8f..c93e701 100755 --- a/make/dynlink-unix.cfg +++ b/make/dynlink-unix.cfg @@ -1,6 +1,6 @@ Style AllStatic JavaClass UnixDynamicLinkerImpl -Package com.sun.gluegen.runtime +Package com.jogamp.gluegen.runtime Implements UnixDynamicLinkerImpl DynamicLinker JavaOutputDir ../src/java NativeOutputDir ../src/native/unix diff --git a/make/dynlink-windows.cfg b/make/dynlink-windows.cfg index fe69e1c..8626039 100755 --- a/make/dynlink-windows.cfg +++ b/make/dynlink-windows.cfg @@ -1,6 +1,6 @@ Style AllStatic JavaClass WindowsDynamicLinkerImpl -Package com.sun.gluegen.runtime +Package com.jogamp.gluegen.runtime Implements WindowsDynamicLinkerImpl DynamicLinker JavaOutputDir ../src/java NativeOutputDir ../src/native/windows diff --git a/src/java/com/sun/gluegen/runtime/BufferFactory.java.javame_cdc_fp b/src/java/com/jogamp/gluegen/runtime/BufferFactory.java.javame_cdc_fp index 822d62d..de09ef3 100755 --- a/src/java/com/sun/gluegen/runtime/BufferFactory.java.javame_cdc_fp +++ b/src/java/com/jogamp/gluegen/runtime/BufferFactory.java.javame_cdc_fp @@ -37,7 +37,7 @@ * and developed by Kenneth Bradley Russell and Christopher John Kline. */ -package com.sun.gluegen.runtime; +package com.jogamp.gluegen.runtime; import java.nio.*; diff --git a/src/java/com/sun/gluegen/runtime/BufferFactory.java.javase b/src/java/com/jogamp/gluegen/runtime/BufferFactory.java.javase index 60a79c3..24d842c 100755 --- a/src/java/com/sun/gluegen/runtime/BufferFactory.java.javase +++ b/src/java/com/jogamp/gluegen/runtime/BufferFactory.java.javase @@ -37,7 +37,7 @@ * and developed by Kenneth Bradley Russell and Christopher John Kline. */ -package com.sun.gluegen.runtime; +package com.jogamp.gluegen.runtime; import java.nio.*; diff --git a/src/java/com/sun/gluegen/runtime/BufferFactoryInternal.java b/src/java/com/jogamp/gluegen/runtime/BufferFactoryInternal.java index 7a0e6a8..e99fba6 100755 --- a/src/java/com/sun/gluegen/runtime/BufferFactoryInternal.java +++ b/src/java/com/jogamp/gluegen/runtime/BufferFactoryInternal.java @@ -38,7 +38,7 @@ * and developed by Kenneth Bradley Russell and Christopher John Kline. */ -package com.sun.gluegen.runtime; +package com.jogamp.gluegen.runtime; import java.lang.reflect.Constructor; import java.lang.reflect.Field; diff --git a/src/java/com/sun/gluegen/runtime/CPU.java b/src/java/com/jogamp/gluegen/runtime/CPU.java index 8c6d500..027b602 100755 --- a/src/java/com/sun/gluegen/runtime/CPU.java +++ b/src/java/com/jogamp/gluegen/runtime/CPU.java @@ -37,7 +37,7 @@ * and developed by Kenneth Bradley Russell and Christopher John Kline. */ -package com.sun.gluegen.runtime; +package com.jogamp.gluegen.runtime; /** Provides information to autogenerated struct accessors about what kind of data model (32- or 64-bit) is being used by the currently diff --git a/src/java/com/sun/gluegen/runtime/DynamicLinker.java b/src/java/com/jogamp/gluegen/runtime/DynamicLinker.java index 871be04..f3cfcfd 100755 --- a/src/java/com/sun/gluegen/runtime/DynamicLinker.java +++ b/src/java/com/jogamp/gluegen/runtime/DynamicLinker.java @@ -37,7 +37,7 @@ * and developed by Kenneth Bradley Russell and Christopher John Kline. */ -package com.sun.gluegen.runtime; +package com.jogamp.gluegen.runtime; /** Provides an abstract interface to the OS's low-level dynamic linking functionality. */ diff --git a/src/java/com/sun/gluegen/runtime/DynamicLookupHelper.java b/src/java/com/jogamp/gluegen/runtime/DynamicLookupHelper.java index ad3de7f..bc29732 100755 --- a/src/java/com/sun/gluegen/runtime/DynamicLookupHelper.java +++ b/src/java/com/jogamp/gluegen/runtime/DynamicLookupHelper.java @@ -37,7 +37,7 @@ * and developed by Kenneth Bradley Russell and Christopher John Kline. */ -package com.sun.gluegen.runtime; +package com.jogamp.gluegen.runtime; /** Interface callers may use to use the ProcAddressHelper's {@link ProcAddressHelper#resetProcAddressTable resetProcAddressTable} diff --git a/src/java/com/sun/gluegen/runtime/MacOSXDynamicLinkerImpl.java b/src/java/com/jogamp/gluegen/runtime/MacOSXDynamicLinkerImpl.java index 83ebd7a..8abbd4e 100755 --- a/src/java/com/sun/gluegen/runtime/MacOSXDynamicLinkerImpl.java +++ b/src/java/com/jogamp/gluegen/runtime/MacOSXDynamicLinkerImpl.java @@ -1,8 +1,8 @@ /* !---- DO NOT EDIT: This file autogenerated by com\sun\gluegen\JavaEmitter.java on Mon Jul 31 16:27:00 PDT 2006 ----! */ -package com.sun.gluegen.runtime; +package com.jogamp.gluegen.runtime; -import com.sun.gluegen.runtime.*; +import com.jogamp.gluegen.runtime.*; public class MacOSXDynamicLinkerImpl implements DynamicLinker { diff --git a/src/java/com/sun/gluegen/runtime/NativeLibLoader.java b/src/java/com/jogamp/gluegen/runtime/NativeLibLoader.java index 0e6e3da..662a059 100755 --- a/src/java/com/sun/gluegen/runtime/NativeLibLoader.java +++ b/src/java/com/jogamp/gluegen/runtime/NativeLibLoader.java @@ -37,7 +37,7 @@ * and developed by Kenneth Bradley Russell and Christopher John Kline. */ -package com.sun.gluegen.runtime; +package com.jogamp.gluegen.runtime; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; diff --git a/src/java/com/sun/gluegen/runtime/NativeLibrary.java b/src/java/com/jogamp/gluegen/runtime/NativeLibrary.java index eb465c8..7de75a3 100755 --- a/src/java/com/sun/gluegen/runtime/NativeLibrary.java +++ b/src/java/com/jogamp/gluegen/runtime/NativeLibrary.java @@ -37,7 +37,7 @@ * and developed by Kenneth Bradley Russell and Christopher John Kline. */ -package com.sun.gluegen.runtime; +package com.jogamp.gluegen.runtime; import java.io.*; import java.lang.reflect.*; diff --git a/src/java/com/sun/gluegen/runtime/PointerBuffer.java.javame_cdc_fp b/src/java/com/jogamp/gluegen/runtime/PointerBuffer.java.javame_cdc_fp index 7e9142c..20a70c1 100755 --- a/src/java/com/sun/gluegen/runtime/PointerBuffer.java.javame_cdc_fp +++ b/src/java/com/jogamp/gluegen/runtime/PointerBuffer.java.javame_cdc_fp @@ -34,7 +34,7 @@ * facility. */ -package com.sun.gluegen.runtime; +package com.jogamp.gluegen.runtime; import java.nio.*; diff --git a/src/java/com/sun/gluegen/runtime/PointerBuffer.java.javase b/src/java/com/jogamp/gluegen/runtime/PointerBuffer.java.javase index 851c400..09ca2db 100755 --- a/src/java/com/sun/gluegen/runtime/PointerBuffer.java.javase +++ b/src/java/com/jogamp/gluegen/runtime/PointerBuffer.java.javase @@ -34,7 +34,7 @@ * facility. */ -package com.sun.gluegen.runtime; +package com.jogamp.gluegen.runtime; import java.nio.*; diff --git a/src/java/com/sun/gluegen/runtime/ProcAddressHelper.java b/src/java/com/jogamp/gluegen/runtime/ProcAddressHelper.java index f0dbe8b..1b7f9d6 100644 --- a/src/java/com/sun/gluegen/runtime/ProcAddressHelper.java +++ b/src/java/com/jogamp/gluegen/runtime/ProcAddressHelper.java @@ -37,7 +37,7 @@ * and developed by Kenneth Bradley Russell and Christopher John Kline. */ -package com.sun.gluegen.runtime; +package com.jogamp.gluegen.runtime; import java.security.*; diff --git a/src/java/com/sun/gluegen/runtime/ProcAddressTable.java b/src/java/com/jogamp/gluegen/runtime/ProcAddressTable.java index 4271a8c..1e7d34b 100644 --- a/src/java/com/sun/gluegen/runtime/ProcAddressTable.java +++ b/src/java/com/jogamp/gluegen/runtime/ProcAddressTable.java @@ -34,7 +34,7 @@ * facility. */ -package com.sun.gluegen.runtime; +package com.jogamp.gluegen.runtime; public interface ProcAddressTable { public long getAddressFor(String functionName); diff --git a/src/java/com/sun/gluegen/runtime/StructAccessor.java.javame_cdc_fp b/src/java/com/jogamp/gluegen/runtime/StructAccessor.java.javame_cdc_fp index d97d2a0..28a8339 100755 --- a/src/java/com/sun/gluegen/runtime/StructAccessor.java.javame_cdc_fp +++ b/src/java/com/jogamp/gluegen/runtime/StructAccessor.java.javame_cdc_fp @@ -37,7 +37,7 @@ * and developed by Kenneth Bradley Russell and Christopher John Kline. */ -package com.sun.gluegen.runtime; +package com.jogamp.gluegen.runtime; import java.nio.*; diff --git a/src/java/com/sun/gluegen/runtime/StructAccessor.java.javase b/src/java/com/jogamp/gluegen/runtime/StructAccessor.java.javase index 9113859..4101571 100755 --- a/src/java/com/sun/gluegen/runtime/StructAccessor.java.javase +++ b/src/java/com/jogamp/gluegen/runtime/StructAccessor.java.javase @@ -37,7 +37,7 @@ * and developed by Kenneth Bradley Russell and Christopher John Kline. */ -package com.sun.gluegen.runtime; +package com.jogamp.gluegen.runtime; import java.nio.*; diff --git a/src/java/com/sun/gluegen/runtime/UnixDynamicLinkerImpl.java b/src/java/com/jogamp/gluegen/runtime/UnixDynamicLinkerImpl.java index 773d832..018f31b 100755 --- a/src/java/com/sun/gluegen/runtime/UnixDynamicLinkerImpl.java +++ b/src/java/com/jogamp/gluegen/runtime/UnixDynamicLinkerImpl.java @@ -1,8 +1,8 @@ /* !---- DO NOT EDIT: This file autogenerated by com\sun\gluegen\JavaEmitter.java on Mon Jul 31 16:26:59 PDT 2006 ----! */ -package com.sun.gluegen.runtime; +package com.jogamp.gluegen.runtime; -import com.sun.gluegen.runtime.*; +import com.jogamp.gluegen.runtime.*; public class UnixDynamicLinkerImpl implements DynamicLinker { diff --git a/src/java/com/sun/gluegen/runtime/WindowsDynamicLinkerImpl.java b/src/java/com/jogamp/gluegen/runtime/WindowsDynamicLinkerImpl.java index 325078b..87b9a37 100755 --- a/src/java/com/sun/gluegen/runtime/WindowsDynamicLinkerImpl.java +++ b/src/java/com/jogamp/gluegen/runtime/WindowsDynamicLinkerImpl.java @@ -1,8 +1,8 @@ /* !---- DO NOT EDIT: This file autogenerated by com\sun\gluegen\JavaEmitter.java on Tue May 27 02:37:55 PDT 2008 ----! */ -package com.sun.gluegen.runtime; +package com.jogamp.gluegen.runtime; -import com.sun.gluegen.runtime.*; +import com.jogamp.gluegen.runtime.*; public class WindowsDynamicLinkerImpl implements DynamicLinker { diff --git a/src/java/com/sun/gluegen/runtime/opengl/GLExtensionNames.java b/src/java/com/jogamp/gluegen/runtime/opengl/GLExtensionNames.java index 3c6f600..b07a96f 100644 --- a/src/java/com/sun/gluegen/runtime/opengl/GLExtensionNames.java +++ b/src/java/com/jogamp/gluegen/runtime/opengl/GLExtensionNames.java @@ -35,10 +35,10 @@ * */ -package com.sun.gluegen.runtime.opengl; +package com.jogamp.gluegen.runtime.opengl; import java.util.*; -import com.sun.gluegen.runtime.*; +import com.jogamp.gluegen.runtime.*; public class GLExtensionNames { //GL_XYZ : GL_XYZ, GL_XYZ_GL2, GL_XYZ_ARB, GL_XYZ_OES, GL_XYZ_OML diff --git a/src/java/com/sun/gluegen/runtime/opengl/GLProcAddressHelper.java b/src/java/com/jogamp/gluegen/runtime/opengl/GLProcAddressHelper.java index 4110b6f..7470c46 100644 --- a/src/java/com/sun/gluegen/runtime/opengl/GLProcAddressHelper.java +++ b/src/java/com/jogamp/gluegen/runtime/opengl/GLProcAddressHelper.java @@ -34,11 +34,9 @@ * facility. */ -package com.sun.gluegen.runtime.opengl; +package com.jogamp.gluegen.runtime.opengl; -import com.sun.gluegen.runtime.*; - -import java.security.*; +import com.jogamp.gluegen.runtime.*; // Debugging only import java.io.PrintStream; diff --git a/src/java/com/sun/gluegen/JavaConfiguration.java b/src/java/com/sun/gluegen/JavaConfiguration.java index d5e71e2..3683e29 100644 --- a/src/java/com/sun/gluegen/JavaConfiguration.java +++ b/src/java/com/sun/gluegen/JavaConfiguration.java @@ -105,9 +105,9 @@ public class JavaConfiguration { /** * The package in which the generated glue code expects to find its * run-time helper classes (BufferFactory, CPU, - * StructAccessor). Defaults to "com.sun.gluegen.runtime". + * StructAccessor). Defaults to "com.jogamp.gluegen.runtime". */ - private String gluegenRuntimePackage = "com.sun.gluegen.runtime"; + private String gluegenRuntimePackage = "com.jogamp.gluegen.runtime"; /** * The kind of exception raised by the generated code if run-time @@ -309,7 +309,7 @@ public class JavaConfiguration { /** Returns the package in which the generated glue code expects to find its run-time helper classes (BufferFactory, CPU, - StructAccessor). Defaults to "com.sun.gluegen.runtime". */ + StructAccessor). Defaults to "com.jogamp.gluegen.runtime". */ public String gluegenRuntimePackage() { return gluegenRuntimePackage; } diff --git a/src/java/com/sun/gluegen/JavaType.java b/src/java/com/sun/gluegen/JavaType.java index 30f30a2..19ac945 100644 --- a/src/java/com/sun/gluegen/JavaType.java +++ b/src/java/com/sun/gluegen/JavaType.java @@ -194,10 +194,9 @@ public class JavaType { return nioLongBufferType; } - public static JavaType forNIOPointerBufferClass() - { + public static JavaType forNIOPointerBufferClass() { if(nioPointerBufferType == null) - nioPointerBufferType = createForClass(com.sun.gluegen.runtime.PointerBuffer.class); + nioPointerBufferType = createForClass(com.jogamp.gluegen.runtime.PointerBuffer.class); return nioPointerBufferType; } @@ -334,7 +333,7 @@ public class JavaType { public boolean isNIOBuffer() { return clazz != null && ( (java.nio.Buffer.class).isAssignableFrom(clazz) || - (com.sun.gluegen.runtime.PointerBuffer.class).isAssignableFrom(clazz) ) ; + (com.jogamp.gluegen.runtime.PointerBuffer.class).isAssignableFrom(clazz) ) ; } public boolean isNIOByteBuffer() { @@ -354,9 +353,8 @@ public class JavaType { return (clazz == java.nio.LongBuffer.class); } - public boolean isNIOPointerBuffer() - { - return (clazz == com.sun.gluegen.runtime.PointerBuffer.class); + public boolean isNIOPointerBuffer() { + return (clazz == com.jogamp.gluegen.runtime.PointerBuffer.class); } public boolean isString() { diff --git a/src/java/com/sun/gluegen/opengl/BuildComposablePipeline.java b/src/java/com/sun/gluegen/opengl/BuildComposablePipeline.java index e83b43c..cbc0d89 100644 --- a/src/java/com/sun/gluegen/opengl/BuildComposablePipeline.java +++ b/src/java/com/sun/gluegen/opengl/BuildComposablePipeline.java @@ -374,7 +374,7 @@ public class BuildComposablePipeline CodeGenUtils.emitJavaHeaders(output, outputPackage, outputClassName, - "com.sun.gluegen.runtime", // FIXME: should make configurable + "com.jogamp.gluegen.runtime", // FIXME: should make configurable true, importNames, new String[] { "public" }, @@ -563,7 +563,7 @@ public class BuildComposablePipeline * method wrappers have been generated. */ protected void preMethodEmissionHook(PrintWriter output) { - output.println(" public static final boolean DEBUG = com.sun.opengl.impl.Debug.debug(\""+getOutputName()+"\");"); + output.println(" public static final boolean DEBUG = com.jogamp.opengl.impl.Debug.debug(\""+getOutputName()+"\");"); } /** diff --git a/src/java/com/sun/gluegen/opengl/BuildStaticGLInfo.java b/src/java/com/sun/gluegen/opengl/BuildStaticGLInfo.java index 8653b07..f7a7fe0 100644 --- a/src/java/com/sun/gluegen/opengl/BuildStaticGLInfo.java +++ b/src/java/com/sun/gluegen/opengl/BuildStaticGLInfo.java @@ -282,9 +282,9 @@ public class BuildStaticGLInfo output.println(" public static String getFunctionAssociation(String glFunctionName)"); output.println(" {"); output.println(" String mappedName = null;"); - output.println(" int funcNamePermNum = com.sun.gluegen.runtime.opengl.GLExtensionNames.getFuncNamePermutationNumber(glFunctionName);"); + output.println(" int funcNamePermNum = com.jogamp.gluegen.runtime.opengl.GLExtensionNames.getFuncNamePermutationNumber(glFunctionName);"); output.println(" for(int i = 0; null==mappedName && i < funcNamePermNum; i++) {"); - output.println(" String tmp = com.sun.gluegen.runtime.opengl.GLExtensionNames.getFuncNamePermutation(glFunctionName, i);"); + output.println(" String tmp = com.jogamp.gluegen.runtime.opengl.GLExtensionNames.getFuncNamePermutation(glFunctionName, i);"); output.println(" try {"); output.println(" mappedName = (String)funcToAssocMap.get(tmp);"); output.println(" } catch (Exception e) { }"); diff --git a/src/java/com/sun/gluegen/opengl/GLConfiguration.java b/src/java/com/sun/gluegen/opengl/GLConfiguration.java index 5e7ef7a..19cf85a 100755 --- a/src/java/com/sun/gluegen/opengl/GLConfiguration.java +++ b/src/java/com/sun/gluegen/opengl/GLConfiguration.java @@ -44,7 +44,7 @@ import java.util.*; import com.sun.gluegen.*; import com.sun.gluegen.procaddress.*; -import com.sun.gluegen.runtime.opengl.GLExtensionNames; +import com.jogamp.gluegen.runtime.opengl.GLExtensionNames; public class GLConfiguration extends ProcAddressConfiguration { // The following data members support ignoring an entire extension at a time diff --git a/src/java/com/sun/gluegen/opengl/GLEmitter.java b/src/java/com/sun/gluegen/opengl/GLEmitter.java index ff307c4..e9ae750 100644 --- a/src/java/com/sun/gluegen/opengl/GLEmitter.java +++ b/src/java/com/sun/gluegen/opengl/GLEmitter.java @@ -45,7 +45,7 @@ import java.util.*; import com.sun.gluegen.*; import com.sun.gluegen.cgram.types.*; import com.sun.gluegen.procaddress.*; -import com.sun.gluegen.runtime.opengl.GLExtensionNames; +import com.jogamp.gluegen.runtime.opengl.GLExtensionNames; /** * A subclass of ProcAddressEmitter with special OpenGL-specific @@ -433,12 +433,12 @@ public class GLEmitter extends ProcAddressEmitter { w.println(" * it was statically linked."); w.println(" */"); w.println(" public long getAddressFor(String functionNameUsr) {"); - w.println(" String functionNameBase = com.sun.gluegen.runtime.opengl.GLExtensionNames.normalizeVEN(com.sun.gluegen.runtime.opengl.GLExtensionNames.normalizeARB(functionNameUsr, true), true);"); + w.println(" String functionNameBase = com.jogamp.gluegen.runtime.opengl.GLExtensionNames.normalizeVEN(com.jogamp.gluegen.runtime.opengl.GLExtensionNames.normalizeARB(functionNameUsr, true), true);"); w.println(" String addressFieldNameBase = " + getProcAddressConfig().gluegenRuntimePackage() + ".ProcAddressHelper.PROCADDRESS_VAR_PREFIX + functionNameBase;"); w.println(" java.lang.reflect.Field addressField = null;"); - w.println(" int funcNamePermNum = com.sun.gluegen.runtime.opengl.GLExtensionNames.getFuncNamePermutationNumber(functionNameBase);"); + w.println(" int funcNamePermNum = com.jogamp.gluegen.runtime.opengl.GLExtensionNames.getFuncNamePermutationNumber(functionNameBase);"); w.println(" for(int i = 0; null==addressField && i < funcNamePermNum; i++) {"); - w.println(" String addressFieldName = com.sun.gluegen.runtime.opengl.GLExtensionNames.getFuncNamePermutation(addressFieldNameBase, i);"); + w.println(" String addressFieldName = com.jogamp.gluegen.runtime.opengl.GLExtensionNames.getFuncNamePermutation(addressFieldNameBase, i);"); w.println(" try {"); w.println(" addressField = getClass().getField(addressFieldName);"); w.println(" } catch (Exception e) { }"); diff --git a/src/java/com/sun/gluegen/procaddress/ProcAddressEmitter.java b/src/java/com/sun/gluegen/procaddress/ProcAddressEmitter.java index 871dc5e..98ff860 100755 --- a/src/java/com/sun/gluegen/procaddress/ProcAddressEmitter.java +++ b/src/java/com/sun/gluegen/procaddress/ProcAddressEmitter.java @@ -44,7 +44,7 @@ import java.text.MessageFormat; import java.util.*; import com.sun.gluegen.*; import com.sun.gluegen.cgram.types.*; -import com.sun.gluegen.runtime.*; +import com.jogamp.gluegen.runtime.*; /** * A subclass of JavaEmitter that modifies the normal emission of C @@ -337,7 +337,7 @@ public class ProcAddressEmitter extends JavaEmitter tableWriter.println(" * pointer is 0, the function is considered to be unavailable and can"); tableWriter.println(" * not be called."); tableWriter.println(" */"); - tableWriter.println("public class " + tableClassName + " implements com.sun.gluegen.runtime.ProcAddressTable"); + tableWriter.println("public class " + tableClassName + " implements com.jogamp.gluegen.runtime.ProcAddressTable"); tableWriter.println("{"); for (Iterator iter = getProcAddressConfig().getForceProcAddressGen().iterator(); iter.hasNext(); ) { diff --git a/src/java/com/sun/gluegen/test/TestPointerBufferEndian.java b/src/java/com/sun/gluegen/test/TestPointerBufferEndian.java index ba77eed..cd9e0cc 100644 --- a/src/java/com/sun/gluegen/test/TestPointerBufferEndian.java +++ b/src/java/com/sun/gluegen/test/TestPointerBufferEndian.java @@ -1,7 +1,7 @@ package com.sun.gluegen.test; -import com.sun.gluegen.runtime.*; +import com.jogamp.gluegen.runtime.*; import java.nio.*; public class TestPointerBufferEndian { diff --git a/src/java/com/sun/gluegen/test/TestStructAccessorEndian.java b/src/java/com/sun/gluegen/test/TestStructAccessorEndian.java index dc53a10..53ff0ef 100644 --- a/src/java/com/sun/gluegen/test/TestStructAccessorEndian.java +++ b/src/java/com/sun/gluegen/test/TestStructAccessorEndian.java @@ -1,7 +1,7 @@ package com.sun.gluegen.test; -import com.sun.gluegen.runtime.*; +import com.jogamp.gluegen.runtime.*; import java.nio.*; public class TestStructAccessorEndian { diff --git a/src/junit/com/jogamp/gluegen/test/junit/BaseTest1.java b/src/junit/com/jogamp/gluegen/test/junit/BaseTest1.java index 457d96f..ddf2906 100644 --- a/src/junit/com/jogamp/gluegen/test/junit/BaseTest1.java +++ b/src/junit/com/jogamp/gluegen/test/junit/BaseTest1.java @@ -32,8 +32,8 @@ package com.jogamp.gluegen.test.junit; -import com.sun.gluegen.runtime.BufferFactory; -import com.sun.gluegen.runtime.PointerBuffer; +import com.jogamp.gluegen.runtime.BufferFactory; +import com.jogamp.gluegen.runtime.PointerBuffer; import java.nio.*; import java.io.File; import java.lang.reflect.InvocationTargetException; diff --git a/src/junit/com/jogamp/gluegen/test/junit/Test1p1JavaEmitter.java b/src/junit/com/jogamp/gluegen/test/junit/Test1p1JavaEmitter.java index 1edb70e..0438a76 100644 --- a/src/junit/com/jogamp/gluegen/test/junit/Test1p1JavaEmitter.java +++ b/src/junit/com/jogamp/gluegen/test/junit/Test1p1JavaEmitter.java @@ -34,8 +34,8 @@ package com.jogamp.gluegen.test.junit; import com.jogamp.gluegen.test.junit.impl.BindingTest1p1Impl; -import com.sun.gluegen.runtime.BufferFactory; -import com.sun.gluegen.runtime.PointerBuffer; +import com.jogamp.gluegen.runtime.BufferFactory; +import com.jogamp.gluegen.runtime.PointerBuffer; import java.nio.*; import java.io.File; import java.lang.reflect.InvocationTargetException; diff --git a/src/junit/com/jogamp/gluegen/test/junit/Test1p2ProcAddressEmitter.java b/src/junit/com/jogamp/gluegen/test/junit/Test1p2ProcAddressEmitter.java index 63d41f3..53ea5c8 100644 --- a/src/junit/com/jogamp/gluegen/test/junit/Test1p2ProcAddressEmitter.java +++ b/src/junit/com/jogamp/gluegen/test/junit/Test1p2ProcAddressEmitter.java @@ -34,10 +34,10 @@ package com.jogamp.gluegen.test.junit; import com.jogamp.gluegen.test.junit.impl.BindingTest1p2Impl; -import com.sun.gluegen.runtime.BufferFactory; -import com.sun.gluegen.runtime.PointerBuffer; -import com.sun.gluegen.runtime.NativeLibrary; -import com.sun.gluegen.runtime.DynamicLookupHelper; +import com.jogamp.gluegen.runtime.BufferFactory; +import com.jogamp.gluegen.runtime.PointerBuffer; +import com.jogamp.gluegen.runtime.NativeLibrary; +import com.jogamp.gluegen.runtime.DynamicLookupHelper; import java.nio.*; import java.io.File; import java.lang.reflect.InvocationTargetException; diff --git a/src/junit/com/jogamp/gluegen/test/junit/test1p2-gluegen.cfg b/src/junit/com/jogamp/gluegen/test/junit/test1p2-gluegen.cfg index c0a63b4..1ec1b6d 100644 --- a/src/junit/com/jogamp/gluegen/test/junit/test1p2-gluegen.cfg +++ b/src/junit/com/jogamp/gluegen/test/junit/test1p2-gluegen.cfg @@ -26,7 +26,7 @@ Include ../../../../../../../make/config/intptr.cfg Import com.jogamp.gluegen.test.junit.BindingTest1 Import com.jogamp.gluegen.test.junit.BindingTest1p2 -Import com.sun.gluegen.runtime.* +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/native/common/CPU.c b/src/native/common/CPU.c index 8c4135c..cde2732 100644 --- a/src/native/common/CPU.c +++ b/src/native/common/CPU.c @@ -4,7 +4,7 @@ #include <assert.h> JNIEXPORT jint JNICALL -Java_com_sun_gluegen_runtime_CPU_getPointerSizeInBits(JNIEnv *env, jclass _unused) { +Java_com_jogamp_gluegen_runtime_CPU_getPointerSizeInBits(JNIEnv *env, jclass _unused) { return sizeof(void *) * 8; } diff --git a/src/native/macosx/MacOSXDynamicLinkerImpl_JNI.c b/src/native/macosx/MacOSXDynamicLinkerImpl_JNI.c index 2b0a2a7..e6017d7 100755 --- a/src/native/macosx/MacOSXDynamicLinkerImpl_JNI.c +++ b/src/native/macosx/MacOSXDynamicLinkerImpl_JNI.c @@ -8,12 +8,12 @@ #include </usr/include/machine/types.h> /* Java->C glue code: - * Java package: com.sun.gluegen.runtime.MacOSXDynamicLinkerImpl + * Java package: com.jogamp.gluegen.runtime.MacOSXDynamicLinkerImpl * Java method: int dlclose(long __handle) * C function: int dlclose(void * __handle); */ JNIEXPORT jint JNICALL -Java_com_sun_gluegen_runtime_MacOSXDynamicLinkerImpl_dlclose__J(JNIEnv *env, jclass _unused, jlong __handle) { +Java_com_jogamp_gluegen_runtime_MacOSXDynamicLinkerImpl_dlclose__J(JNIEnv *env, jclass _unused, jlong __handle) { int _res; _res = dlclose((void *) (intptr_t) __handle); return _res; @@ -21,12 +21,12 @@ Java_com_sun_gluegen_runtime_MacOSXDynamicLinkerImpl_dlclose__J(JNIEnv *env, jcl /* Java->C glue code: - * Java package: com.sun.gluegen.runtime.MacOSXDynamicLinkerImpl + * Java package: com.jogamp.gluegen.runtime.MacOSXDynamicLinkerImpl * Java method: java.lang.String dlerror() * C function: char * dlerror(void); */ JNIEXPORT jstring JNICALL -Java_com_sun_gluegen_runtime_MacOSXDynamicLinkerImpl_dlerror__(JNIEnv *env, jclass _unused) { +Java_com_jogamp_gluegen_runtime_MacOSXDynamicLinkerImpl_dlerror__(JNIEnv *env, jclass _unused) { char * _res; _res = dlerror(); if (_res == NULL) return NULL; return (*env)->NewStringUTF(env, _res); @@ -34,12 +34,12 @@ Java_com_sun_gluegen_runtime_MacOSXDynamicLinkerImpl_dlerror__(JNIEnv *env, jcla /* Java->C glue code: - * Java package: com.sun.gluegen.runtime.MacOSXDynamicLinkerImpl + * Java package: com.jogamp.gluegen.runtime.MacOSXDynamicLinkerImpl * Java method: long dlopen(java.lang.String __path, int __mode) * C function: void * dlopen(const char * __path, int __mode); */ JNIEXPORT jlong JNICALL -Java_com_sun_gluegen_runtime_MacOSXDynamicLinkerImpl_dlopen__Ljava_lang_String_2I(JNIEnv *env, jclass _unused, jstring __path, jint __mode) { +Java_com_jogamp_gluegen_runtime_MacOSXDynamicLinkerImpl_dlopen__Ljava_lang_String_2I(JNIEnv *env, jclass _unused, jstring __path, jint __mode) { const char* _UTF8__path = NULL; void * _res; if (__path != NULL) { @@ -61,12 +61,12 @@ Java_com_sun_gluegen_runtime_MacOSXDynamicLinkerImpl_dlopen__Ljava_lang_String_2 /* Java->C glue code: - * Java package: com.sun.gluegen.runtime.MacOSXDynamicLinkerImpl + * Java package: com.jogamp.gluegen.runtime.MacOSXDynamicLinkerImpl * Java method: long dlsym(long __handle, java.lang.String __symbol) * C function: void * dlsym(void * __handle, const char * __symbol); */ JNIEXPORT jlong JNICALL -Java_com_sun_gluegen_runtime_MacOSXDynamicLinkerImpl_dlsym__JLjava_lang_String_2(JNIEnv *env, jclass _unused, jlong __handle, jstring __symbol) { +Java_com_jogamp_gluegen_runtime_MacOSXDynamicLinkerImpl_dlsym__JLjava_lang_String_2(JNIEnv *env, jclass _unused, jlong __handle, jstring __symbol) { const char* _UTF8__symbol = NULL; void * _res; if (__symbol != NULL) { diff --git a/src/native/unix/UnixDynamicLinkerImpl_JNI.c b/src/native/unix/UnixDynamicLinkerImpl_JNI.c index 6d72646..937c71c 100755 --- a/src/native/unix/UnixDynamicLinkerImpl_JNI.c +++ b/src/native/unix/UnixDynamicLinkerImpl_JNI.c @@ -8,12 +8,12 @@ #include <inttypes.h> /* Java->C glue code: - * Java package: com.sun.gluegen.runtime.UnixDynamicLinkerImpl + * Java package: com.jogamp.gluegen.runtime.UnixDynamicLinkerImpl * Java method: int dlclose(long arg0) * C function: int dlclose(void * ); */ JNIEXPORT jint JNICALL -Java_com_sun_gluegen_runtime_UnixDynamicLinkerImpl_dlclose__J(JNIEnv *env, jclass _unused, jlong arg0) { +Java_com_jogamp_gluegen_runtime_UnixDynamicLinkerImpl_dlclose__J(JNIEnv *env, jclass _unused, jlong arg0) { int _res; _res = dlclose((void *) (intptr_t) arg0); return _res; @@ -21,12 +21,12 @@ Java_com_sun_gluegen_runtime_UnixDynamicLinkerImpl_dlclose__J(JNIEnv *env, jclas /* Java->C glue code: - * Java package: com.sun.gluegen.runtime.UnixDynamicLinkerImpl + * Java package: com.jogamp.gluegen.runtime.UnixDynamicLinkerImpl * Java method: java.lang.String dlerror() * C function: char * dlerror(void); */ JNIEXPORT jstring JNICALL -Java_com_sun_gluegen_runtime_UnixDynamicLinkerImpl_dlerror__(JNIEnv *env, jclass _unused) { +Java_com_jogamp_gluegen_runtime_UnixDynamicLinkerImpl_dlerror__(JNIEnv *env, jclass _unused) { char * _res; _res = dlerror(); if (_res == NULL) return NULL; return (*env)->NewStringUTF(env, _res); @@ -34,12 +34,12 @@ Java_com_sun_gluegen_runtime_UnixDynamicLinkerImpl_dlerror__(JNIEnv *env, jclass /* Java->C glue code: - * Java package: com.sun.gluegen.runtime.UnixDynamicLinkerImpl + * Java package: com.jogamp.gluegen.runtime.UnixDynamicLinkerImpl * Java method: long dlopen(java.lang.String arg0, int arg1) * C function: void * dlopen(const char * , int); */ JNIEXPORT jlong JNICALL -Java_com_sun_gluegen_runtime_UnixDynamicLinkerImpl_dlopen__Ljava_lang_String_2I(JNIEnv *env, jclass _unused, jstring arg0, jint arg1) { +Java_com_jogamp_gluegen_runtime_UnixDynamicLinkerImpl_dlopen__Ljava_lang_String_2I(JNIEnv *env, jclass _unused, jstring arg0, jint arg1) { const char* _UTF8arg0 = NULL; void * _res; if (arg0 != NULL) { @@ -61,12 +61,12 @@ Java_com_sun_gluegen_runtime_UnixDynamicLinkerImpl_dlopen__Ljava_lang_String_2I( /* Java->C glue code: - * Java package: com.sun.gluegen.runtime.UnixDynamicLinkerImpl + * Java package: com.jogamp.gluegen.runtime.UnixDynamicLinkerImpl * Java method: long dlsym(long arg0, java.lang.String arg1) * C function: void * dlsym(void * , const char * ); */ JNIEXPORT jlong JNICALL -Java_com_sun_gluegen_runtime_UnixDynamicLinkerImpl_dlsym__JLjava_lang_String_2(JNIEnv *env, jclass _unused, jlong arg0, jstring arg1) { +Java_com_jogamp_gluegen_runtime_UnixDynamicLinkerImpl_dlsym__JLjava_lang_String_2(JNIEnv *env, jclass _unused, jlong arg0, jstring arg1) { const char* _UTF8arg1 = NULL; void * _res; if (arg1 != NULL) { diff --git a/src/native/windows/WindowsDynamicLinkerImpl_JNI.c b/src/native/windows/WindowsDynamicLinkerImpl_JNI.c index 63afd99..35ea742 100755 --- a/src/native/windows/WindowsDynamicLinkerImpl_JNI.c +++ b/src/native/windows/WindowsDynamicLinkerImpl_JNI.c @@ -17,12 +17,12 @@ #endif /* Java->C glue code: - * Java package: com.sun.gluegen.runtime.WindowsDynamicLinkerImpl + * Java package: com.jogamp.gluegen.runtime.WindowsDynamicLinkerImpl * Java method: int FreeLibrary(long hLibModule) * C function: BOOL FreeLibrary(HANDLE hLibModule); */ JNIEXPORT jint JNICALL -Java_com_sun_gluegen_runtime_WindowsDynamicLinkerImpl_FreeLibrary__J(JNIEnv *env, jclass _unused, jlong hLibModule) { +Java_com_jogamp_gluegen_runtime_WindowsDynamicLinkerImpl_FreeLibrary__J(JNIEnv *env, jclass _unused, jlong hLibModule) { BOOL _res; _res = FreeLibrary((HANDLE) (intptr_t) hLibModule); return _res; @@ -30,12 +30,12 @@ Java_com_sun_gluegen_runtime_WindowsDynamicLinkerImpl_FreeLibrary__J(JNIEnv *env /* Java->C glue code: - * Java package: com.sun.gluegen.runtime.WindowsDynamicLinkerImpl + * Java package: com.jogamp.gluegen.runtime.WindowsDynamicLinkerImpl * Java method: int GetLastError() * C function: DWORD GetLastError(void); */ JNIEXPORT jint JNICALL -Java_com_sun_gluegen_runtime_WindowsDynamicLinkerImpl_GetLastError__(JNIEnv *env, jclass _unused) { +Java_com_jogamp_gluegen_runtime_WindowsDynamicLinkerImpl_GetLastError__(JNIEnv *env, jclass _unused) { DWORD _res; _res = GetLastError(); return _res; @@ -43,12 +43,12 @@ Java_com_sun_gluegen_runtime_WindowsDynamicLinkerImpl_GetLastError__(JNIEnv *env /* Java->C glue code: - * Java package: com.sun.gluegen.runtime.WindowsDynamicLinkerImpl + * Java package: com.jogamp.gluegen.runtime.WindowsDynamicLinkerImpl * Java method: long GetProcAddressA(long hModule, java.lang.String lpProcName) * C function: PROC GetProcAddressA(HANDLE hModule, LPCSTR lpProcName); */ JNIEXPORT jlong JNICALL -Java_com_sun_gluegen_runtime_WindowsDynamicLinkerImpl_GetProcAddressA__JLjava_lang_String_2(JNIEnv *env, jclass _unused, jlong hModule, jstring lpProcName) { +Java_com_jogamp_gluegen_runtime_WindowsDynamicLinkerImpl_GetProcAddressA__JLjava_lang_String_2(JNIEnv *env, jclass _unused, jlong hModule, jstring lpProcName) { const char* _strchars_lpProcName = NULL; PROC _res; if (lpProcName != NULL) { @@ -68,12 +68,12 @@ Java_com_sun_gluegen_runtime_WindowsDynamicLinkerImpl_GetProcAddressA__JLjava_la /* Java->C glue code: - * Java package: com.sun.gluegen.runtime.WindowsDynamicLinkerImpl + * Java package: com.jogamp.gluegen.runtime.WindowsDynamicLinkerImpl * Java method: long LoadLibraryW(java.lang.String lpLibFileName) * C function: HANDLE LoadLibraryW(LPCWSTR lpLibFileName); */ JNIEXPORT jlong JNICALL -Java_com_sun_gluegen_runtime_WindowsDynamicLinkerImpl_LoadLibraryW__Ljava_lang_String_2(JNIEnv *env, jclass _unused, jstring lpLibFileName) { +Java_com_jogamp_gluegen_runtime_WindowsDynamicLinkerImpl_LoadLibraryW__Ljava_lang_String_2(JNIEnv *env, jclass _unused, jstring lpLibFileName) { jchar* _strchars_lpLibFileName = NULL; HANDLE _res; if (lpLibFileName != NULL) { diff --git a/test/junit/com/sun/gluegen/BasicTest.java b/test/junit/com/sun/gluegen/BasicTest.java index 144128c..c09fe60 100644 --- a/test/junit/com/sun/gluegen/BasicTest.java +++ b/test/junit/com/sun/gluegen/BasicTest.java @@ -1,7 +1,7 @@ package com.sun.gluegen; -import com.sun.gluegen.runtime.BufferFactory; -import com.sun.gluegen.runtime.PointerBuffer; +import com.jogamp.gluegen.runtime.BufferFactory; +import com.jogamp.gluegen.runtime.PointerBuffer; import java.lang.reflect.Field; import java.lang.reflect.Method; import java.nio.ByteBuffer; |