diff options
| author | Sven Gothel <[email protected]> | 2010-03-28 01:45:00 +0100 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2010-03-28 01:45:00 +0100 |
| commit | 9e8ba29142d83d5749fc9650715019fef3539b1d (patch) | |
| tree | 9062b73c85c4facf9011b357fbda2b1195eb23a2 /src/nativewindow | |
| parent | 2dc67e8f8faeb418061e0dd450b37d4cb3ce4c2f (diff) | |
| parent | ea23f9505e3fcf3a5b928855eba739ad123b64f4 (diff) | |
Merge branch 'master' of github.com:mbien/jogl
Diffstat (limited to 'src/nativewindow')
3 files changed, 14 insertions, 2 deletions
diff --git a/src/nativewindow/Nativewindow.iml b/src/nativewindow/Nativewindow.iml new file mode 100644 index 000000000..673f8d17c --- /dev/null +++ b/src/nativewindow/Nativewindow.iml @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<module type="JAVA_MODULE" version="4"> + <component name="NewModuleRootManager" inherit-compiler-output="true"> + <exclude-output /> + <content url="file://$MODULE_DIR$"> + <sourceFolder url="file://$MODULE_DIR$/classes" isTestSource="false" /> + </content> + <orderEntry type="inheritedJdk" /> + <orderEntry type="sourceFolder" forTests="false" /> + </component> +</module> + diff --git a/src/nativewindow/classes/com/sun/nativewindow/impl/InternalBufferUtil.java b/src/nativewindow/classes/com/sun/nativewindow/impl/InternalBufferUtil.java index 0425014df..7cf2e3ff5 100644 --- a/src/nativewindow/classes/com/sun/nativewindow/impl/InternalBufferUtil.java +++ b/src/nativewindow/classes/com/sun/nativewindow/impl/InternalBufferUtil.java @@ -37,7 +37,7 @@ import java.lang.reflect.*; import java.nio.*; /** Internal copy of selected routines from BufferUtil to avoid - outward dependencies on com.sun.opengl.util package. */ + outward dependencies on com.jogamp.opengl.util package. */ public class InternalBufferUtil { public static final int SIZEOF_BYTE = 1; public static final int SIZEOF_SHORT = 2; diff --git a/src/nativewindow/classes/com/sun/nativewindow/impl/jawt/JAWTUtil.java b/src/nativewindow/classes/com/sun/nativewindow/impl/jawt/JAWTUtil.java index aac01e990..6a8f8cdb2 100644 --- a/src/nativewindow/classes/com/sun/nativewindow/impl/jawt/JAWTUtil.java +++ b/src/nativewindow/classes/com/sun/nativewindow/impl/jawt/JAWTUtil.java @@ -65,7 +65,7 @@ public class JAWTUtil { Method m=null; if(!headlessMode) { try { - jC = Class.forName("com.sun.opengl.impl.awt.Java2D"); + jC = Class.forName("com.jogamp.opengl.impl.awt.Java2D"); m = jC.getMethod("isQueueFlusherThread", null); ok = true; } catch (Exception e) {} |