diff options
author | Sven Gothel <[email protected]> | 2010-03-28 01:41:36 +0100 |
---|---|---|
committer | Sven Gothel <[email protected]> | 2010-03-28 01:41:36 +0100 |
commit | 93c16379f28104b079a12e7ed9787da439e54a3c (patch) | |
tree | d81781142b11c962312559bfe96d6c9b1d593551 /src/java/com | |
parent | a41f4d504d2f8cf58114d570d23f757ab2659cfc (diff) | |
parent | 2ea8c93d5fd27207872b97c964e3f8af5ac850c6 (diff) |
Merge with mbien's 2ea8c93d5fd27207872b97c964e3f8af5ac850c6
Diffstat (limited to 'src/java/com')
-rwxr-xr-x | src/java/com/jogamp/gluegen/runtime/BufferFactory.java.javame_cdc_fp (renamed from src/java/com/sun/gluegen/runtime/BufferFactory.java.javame_cdc_fp) | 2 | ||||
-rwxr-xr-x | src/java/com/jogamp/gluegen/runtime/BufferFactory.java.javase (renamed from src/java/com/sun/gluegen/runtime/BufferFactory.java.javase) | 2 | ||||
-rwxr-xr-x | src/java/com/jogamp/gluegen/runtime/BufferFactoryInternal.java (renamed from src/java/com/sun/gluegen/runtime/BufferFactoryInternal.java) | 2 | ||||
-rwxr-xr-x | src/java/com/jogamp/gluegen/runtime/CPU.java (renamed from src/java/com/sun/gluegen/runtime/CPU.java) | 2 | ||||
-rwxr-xr-x | src/java/com/jogamp/gluegen/runtime/DynamicLinker.java (renamed from src/java/com/sun/gluegen/runtime/DynamicLinker.java) | 2 | ||||
-rwxr-xr-x | src/java/com/jogamp/gluegen/runtime/DynamicLookupHelper.java (renamed from src/java/com/sun/gluegen/runtime/DynamicLookupHelper.java) | 2 | ||||
-rwxr-xr-x | src/java/com/jogamp/gluegen/runtime/MacOSXDynamicLinkerImpl.java (renamed from src/java/com/sun/gluegen/runtime/MacOSXDynamicLinkerImpl.java) | 4 | ||||
-rwxr-xr-x | src/java/com/jogamp/gluegen/runtime/NativeLibLoader.java (renamed from src/java/com/sun/gluegen/runtime/NativeLibLoader.java) | 2 | ||||
-rwxr-xr-x | src/java/com/jogamp/gluegen/runtime/NativeLibrary.java (renamed from src/java/com/sun/gluegen/runtime/NativeLibrary.java) | 2 | ||||
-rwxr-xr-x | src/java/com/jogamp/gluegen/runtime/PointerBuffer.java.javame_cdc_fp (renamed from src/java/com/sun/gluegen/runtime/PointerBuffer.java.javame_cdc_fp) | 2 | ||||
-rwxr-xr-x | src/java/com/jogamp/gluegen/runtime/PointerBuffer.java.javase (renamed from src/java/com/sun/gluegen/runtime/PointerBuffer.java.javase) | 2 | ||||
-rw-r--r-- | src/java/com/jogamp/gluegen/runtime/ProcAddressHelper.java (renamed from src/java/com/sun/gluegen/runtime/ProcAddressHelper.java) | 2 | ||||
-rw-r--r-- | src/java/com/jogamp/gluegen/runtime/ProcAddressTable.java (renamed from src/java/com/sun/gluegen/runtime/ProcAddressTable.java) | 2 | ||||
-rwxr-xr-x | src/java/com/jogamp/gluegen/runtime/StructAccessor.java.javame_cdc_fp (renamed from src/java/com/sun/gluegen/runtime/StructAccessor.java.javame_cdc_fp) | 2 | ||||
-rwxr-xr-x | src/java/com/jogamp/gluegen/runtime/StructAccessor.java.javase (renamed from src/java/com/sun/gluegen/runtime/StructAccessor.java.javase) | 2 | ||||
-rwxr-xr-x | src/java/com/jogamp/gluegen/runtime/UnixDynamicLinkerImpl.java (renamed from src/java/com/sun/gluegen/runtime/UnixDynamicLinkerImpl.java) | 4 | ||||
-rwxr-xr-x | src/java/com/jogamp/gluegen/runtime/WindowsDynamicLinkerImpl.java (renamed from src/java/com/sun/gluegen/runtime/WindowsDynamicLinkerImpl.java) | 4 | ||||
-rw-r--r-- | src/java/com/jogamp/gluegen/runtime/opengl/GLExtensionNames.java (renamed from src/java/com/sun/gluegen/runtime/opengl/GLExtensionNames.java) | 4 | ||||
-rw-r--r-- | src/java/com/jogamp/gluegen/runtime/opengl/GLProcAddressHelper.java (renamed from src/java/com/sun/gluegen/runtime/opengl/GLProcAddressHelper.java) | 6 | ||||
-rw-r--r-- | src/java/com/sun/gluegen/JavaConfiguration.java | 6 | ||||
-rw-r--r-- | src/java/com/sun/gluegen/JavaType.java | 12 | ||||
-rw-r--r-- | src/java/com/sun/gluegen/opengl/BuildComposablePipeline.java | 4 | ||||
-rw-r--r-- | src/java/com/sun/gluegen/opengl/BuildStaticGLInfo.java | 4 | ||||
-rwxr-xr-x | src/java/com/sun/gluegen/opengl/GLConfiguration.java | 2 | ||||
-rw-r--r-- | src/java/com/sun/gluegen/opengl/GLEmitter.java | 8 | ||||
-rwxr-xr-x | src/java/com/sun/gluegen/procaddress/ProcAddressEmitter.java | 4 | ||||
-rw-r--r-- | src/java/com/sun/gluegen/test/TestPointerBufferEndian.java | 2 | ||||
-rw-r--r-- | src/java/com/sun/gluegen/test/TestStructAccessorEndian.java | 2 |
28 files changed, 45 insertions, 49 deletions
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 { |