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/jogl/classes/javax/media/opengl/GLDrawableFactory.java | |
| parent | 2dc67e8f8faeb418061e0dd450b37d4cb3ce4c2f (diff) | |
| parent | ea23f9505e3fcf3a5b928855eba739ad123b64f4 (diff) | |
Merge branch 'master' of github.com:mbien/jogl
Diffstat (limited to 'src/jogl/classes/javax/media/opengl/GLDrawableFactory.java')
| -rw-r--r-- | src/jogl/classes/javax/media/opengl/GLDrawableFactory.java | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/jogl/classes/javax/media/opengl/GLDrawableFactory.java b/src/jogl/classes/javax/media/opengl/GLDrawableFactory.java index b7c81cbed..ca6bc9051 100644 --- a/src/jogl/classes/javax/media/opengl/GLDrawableFactory.java +++ b/src/jogl/classes/javax/media/opengl/GLDrawableFactory.java @@ -41,9 +41,8 @@ package javax.media.opengl; import javax.media.nativewindow.*; -import java.lang.reflect.*; import java.security.*; -import com.sun.opengl.impl.*; +import com.jogamp.opengl.impl.*; import com.sun.nativewindow.impl.NWReflection; /** <P> Provides a virtual machine- and operating system-independent @@ -88,8 +87,8 @@ public abstract class GLDrawableFactory { private static final GLDrawableFactory eglFactory; private static final GLDrawableFactory nativeOSFactory; private static final String nativeOSType; - static final String macosxFactoryClassNameCGL = "com.sun.opengl.impl.macosx.cgl.MacOSXCGLDrawableFactory"; - static final String macosxFactoryClassNameAWTCGL = "com.sun.opengl.impl.macosx.cgl.awt.MacOSXAWTCGLDrawableFactory"; + static final String macosxFactoryClassNameCGL = "com.jogamp.opengl.impl.macosx.cgl.MacOSXCGLDrawableFactory"; + static final String macosxFactoryClassNameAWTCGL = "com.jogamp.opengl.impl.macosx.cgl.awt.MacOSXAWTCGLDrawableFactory"; /** * Instantiate singleton factories if available, EGLES1, EGLES2 and the OS native ones. @@ -97,7 +96,7 @@ public abstract class GLDrawableFactory { static { GLDrawableFactory tmp = null; try { - tmp = (GLDrawableFactory) NWReflection.createInstance("com.sun.opengl.impl.egl.EGLDrawableFactory"); + tmp = (GLDrawableFactory) NWReflection.createInstance("com.jogamp.opengl.impl.egl.EGLDrawableFactory"); } catch (Throwable t) { if (GLProfile.DEBUG) { System.err.println("GLDrawableFactory.static - EGLDrawableFactory - not available"); @@ -114,9 +113,9 @@ public abstract class GLDrawableFactory { factoryClassName = Debug.getProperty("jogl.gldrawablefactory.class.name", true, AccessController.getContext()); if (null == factoryClassName) { if ( nativeOSType.equals(NativeWindowFactory.TYPE_X11) ) { - factoryClassName = "com.sun.opengl.impl.x11.glx.X11GLXDrawableFactory"; + factoryClassName = "com.jogamp.opengl.impl.x11.glx.X11GLXDrawableFactory"; } else if ( nativeOSType.equals(NativeWindowFactory.TYPE_WINDOWS) ) { - factoryClassName = "com.sun.opengl.impl.windows.wgl.WindowsWGLDrawableFactory"; + factoryClassName = "com.jogamp.opengl.impl.windows.wgl.WindowsWGLDrawableFactory"; } else if ( nativeOSType.equals(NativeWindowFactory.TYPE_MACOSX) ) { if(NWReflection.isClassAvailable(macosxFactoryClassNameAWTCGL)) { factoryClassName = macosxFactoryClassNameAWTCGL; |