Source code changes for issue 491: Refactor platform-specific classes to use non-overlapping class names

git-svn-id: https://svn.java.net/svn/j3d-core~svn/trunk@842 ba19aa83-45c5-6ac9-afd3-db810772062c

3 files changed, 30 insertions, 22 deletions

diff --git a/src/native/ogl/NativeConfigTemplate3D.c b/src/native/ogl/NativeConfigTemplate3D.c
index bae85db..4e1313d 100644
--- a/src/native/ogl/NativeConfigTemplate3D.c
+++ b/src/native/ogl/NativeConfigTemplate3D.c
@@ -335,7 +335,7 @@ GLXFBConfig *find_DB_AA_S_S_FBConfigs(jlong display,
  * combinations in hopes of finding an valid visual.
  */
 JNIEXPORT
-jint JNICALL Java_javax_media_j3d_NativeConfigTemplate3D_chooseOglVisual(
+jint JNICALL Java_javax_media_j3d_X11NativeConfigTemplate3D_chooseOglVisual(
     JNIEnv    *env,
     jobject    obj,
     jlong      display,
@@ -464,7 +464,7 @@ jint JNICALL Java_javax_media_j3d_NativeConfigTemplate3D_chooseOglVisual(
 
 
 JNIEXPORT 
-void JNICALL Java_javax_media_j3d_NativeConfigTemplate3D_freeFBConfig(
+void JNICALL Java_javax_media_j3d_X11NativeConfigTemplate3D_freeFBConfig(
      JNIEnv *env,
      jclass  class,	/* this is a static native method */
      jlong   fbConfigListPtr)
@@ -475,7 +475,7 @@ void JNICALL Java_javax_media_j3d_NativeConfigTemplate3D_freeFBConfig(
 
 
 JNIEXPORT
-jboolean JNICALL Java_javax_media_j3d_NativeConfigTemplate3D_isStereoAvailable(
+jboolean JNICALL Java_javax_media_j3d_X11NativeConfigTemplate3D_isStereoAvailable(
     JNIEnv *env,
     jobject obj,
     jlong display,
@@ -511,7 +511,7 @@ jboolean JNICALL Java_javax_media_j3d_NativeConfigTemplate3D_isStereoAvailable(
     return (stereoFlag ? JNI_TRUE : JNI_FALSE);
 }
 
-JNIEXPORT jint JNICALL Java_javax_media_j3d_NativeConfigTemplate3D_getStencilSize(
+JNIEXPORT jint JNICALL Java_javax_media_j3d_X11NativeConfigTemplate3D_getStencilSize(
      JNIEnv *env,
      jobject obj,
      jlong display,
@@ -535,7 +535,7 @@ JNIEXPORT jint JNICALL Java_javax_media_j3d_NativeConfigTemplate3D_getStencilSiz
 }
 
 JNIEXPORT
-jboolean JNICALL Java_javax_media_j3d_NativeConfigTemplate3D_isDoubleBufferAvailable(
+jboolean JNICALL Java_javax_media_j3d_X11NativeConfigTemplate3D_isDoubleBufferAvailable(
     JNIEnv *env,
     jobject obj,
     jlong display,
@@ -559,7 +559,7 @@ jboolean JNICALL Java_javax_media_j3d_NativeConfigTemplate3D_isDoubleBufferAvail
 }
 
 JNIEXPORT
-jboolean JNICALL Java_javax_media_j3d_NativeConfigTemplate3D_isSceneAntialiasingAccumAvailable(
+jboolean JNICALL Java_javax_media_j3d_X11NativeConfigTemplate3D_isSceneAntialiasingAccumAvailable(
     JNIEnv *env,
     jobject obj,
     jlong display,
@@ -583,7 +583,7 @@ jboolean JNICALL Java_javax_media_j3d_NativeConfigTemplate3D_isSceneAntialiasing
 }
 
 JNIEXPORT
-jboolean JNICALL Java_javax_media_j3d_NativeConfigTemplate3D_isSceneAntialiasingMultisampleAvailable(
+jboolean JNICALL Java_javax_media_j3d_X11NativeConfigTemplate3D_isSceneAntialiasingMultisampleAvailable(
     JNIEnv *env,
     jobject obj,
     jlong display,
@@ -1408,7 +1408,7 @@ PixelFormatInfo * newPixelFormatInfo(HDC hdc, jboolean usePbuffer)
 
 
 JNIEXPORT
-jint JNICALL Java_javax_media_j3d_NativeConfigTemplate3D_choosePixelFormat(
+jint JNICALL Java_javax_media_j3d_Win32NativeConfigTemplate3D_choosePixelFormat(
     JNIEnv   *env,
     jobject   obj,
     jlong     ctxInfo,
@@ -1633,7 +1633,7 @@ jint JNICALL Java_javax_media_j3d_NativeConfigTemplate3D_choosePixelFormat(
 
 
 JNIEXPORT 
-void JNICALL Java_javax_media_j3d_NativeConfigTemplate3D_freePixelFormatInfo(
+void JNICALL Java_javax_media_j3d_Win32NativeConfigTemplate3D_freePixelFormatInfo(
      JNIEnv *env,
      jclass  class,	/* this is a static native method */
      jlong   pFormatInfo)
@@ -1655,7 +1655,7 @@ void JNICALL Java_javax_media_j3d_NativeConfigTemplate3D_freePixelFormatInfo(
 
 
 JNIEXPORT
-jboolean JNICALL Java_javax_media_j3d_NativeConfigTemplate3D_isStereoAvailable(
+jboolean JNICALL Java_javax_media_j3d_Win32NativeConfigTemplate3D_isStereoAvailable(
     JNIEnv *env,
     jobject obj,
     jlong pFormatInfo,
@@ -1692,7 +1692,7 @@ jboolean JNICALL Java_javax_media_j3d_NativeConfigTemplate3D_isStereoAvailable(
 
 }
 
-JNIEXPORT jint JNICALL Java_javax_media_j3d_NativeConfigTemplate3D_getStencilSize(
+JNIEXPORT jint JNICALL Java_javax_media_j3d_Win32NativeConfigTemplate3D_getStencilSize(
     JNIEnv *env,
     jobject obj,
     jlong pFormatInfo,
@@ -1717,7 +1717,7 @@ JNIEXPORT jint JNICALL Java_javax_media_j3d_NativeConfigTemplate3D_getStencilSiz
 
 
 JNIEXPORT
-jboolean JNICALL Java_javax_media_j3d_NativeConfigTemplate3D_isDoubleBufferAvailable(
+jboolean JNICALL Java_javax_media_j3d_Win32NativeConfigTemplate3D_isDoubleBufferAvailable(
     JNIEnv *env,
     jobject obj,
     jlong pFormatInfo,
@@ -1741,7 +1741,7 @@ jboolean JNICALL Java_javax_media_j3d_NativeConfigTemplate3D_isDoubleBufferAvail
 }
 
 JNIEXPORT
-jboolean JNICALL Java_javax_media_j3d_NativeConfigTemplate3D_isSceneAntialiasingAccumAvailable(
+jboolean JNICALL Java_javax_media_j3d_Win32NativeConfigTemplate3D_isSceneAntialiasingAccumAvailable(
     JNIEnv *env,
     jobject obj,
     jlong pFormatInfo,
@@ -1763,7 +1763,7 @@ jboolean JNICALL Java_javax_media_j3d_NativeConfigTemplate3D_isSceneAntialiasing
 }
 
 JNIEXPORT
-jboolean JNICALL Java_javax_media_j3d_NativeConfigTemplate3D_isSceneAntialiasingMultisampleAvailable(
+jboolean JNICALL Java_javax_media_j3d_Win32NativeConfigTemplate3D_isSceneAntialiasingMultisampleAvailable(
     JNIEnv *env,
     jobject obj,
     jlong pFormatInfo,
diff --git a/src/native/ogl/NativeScreenInfo.c b/src/native/ogl/NativeScreenInfo.c
index 64396de..162820e 100644
--- a/src/native/ogl/NativeScreenInfo.c
+++ b/src/native/ogl/NativeScreenInfo.c
@@ -40,12 +40,12 @@
 
 
 /*
- * Class:     javax_media_j3d_NativeScreenInfo
+ * Class:     javax_media_j3d_X11NativeScreenInfo
  * Method:    openDisplay
  * Signature: ()J
  */
 JNIEXPORT jlong JNICALL
-Java_javax_media_j3d_NativeScreenInfo_openDisplay(
+Java_javax_media_j3d_X11NativeScreenInfo_openDisplay(
     JNIEnv *env,
     jclass cls)
 {
@@ -55,12 +55,12 @@ Java_javax_media_j3d_NativeScreenInfo_openDisplay(
 }
 
 /*
- * Class:     javax_media_j3d_NativeScreenInfo
+ * Class:     javax_media_j3d_X11NativeScreenInfo
  * Method:    getDefaultScreen
  * Signature: (J)I
  */
 JNIEXPORT jint JNICALL
-Java_javax_media_j3d_NativeScreenInfo_getDefaultScreen(
+Java_javax_media_j3d_X11NativeScreenInfo_getDefaultScreen(
     JNIEnv *env,
     jclass cls,
     jlong display)
@@ -70,12 +70,12 @@ Java_javax_media_j3d_NativeScreenInfo_getDefaultScreen(
 }
 
 /*
- * Class:     javax_media_j3d_NativeScreenInfo
+ * Class:     javax_media_j3d_X11NativeScreenInfo
  * Method:    queryGLX13
  * Signature: (J)Z
  */
 JNIEXPORT jboolean JNICALL
-Java_javax_media_j3d_NativeScreenInfo_queryGLX13(
+Java_javax_media_j3d_X11NativeScreenInfo_queryGLX13(
     JNIEnv *env,
     jclass cls,
     jlong display)
@@ -141,12 +141,12 @@ extern PIXELFORMATDESCRIPTOR getDummyPFD();
 extern BOOL isSupportedWGL(const char *extensions, const char *extension_string);    
 
 /*
- * Class:     javax_media_j3d_NativeScreenInfo
+ * Class:     javax_media_j3d_Win32NativeScreenInfo
  * Method:    queryWglARB
  * Signature: (J)Z
  */
 JNIEXPORT jboolean JNICALL
-Java_javax_media_j3d_NativeScreenInfo_queryWglARB(
+Java_javax_media_j3d_Win32NativeScreenInfo_queryWglARB(
     JNIEnv *env,
     jclass cls)
 {
diff --git a/src/native/ogl/gldefs.h b/src/native/ogl/gldefs.h
index edd5cdd..39ca6de 100644
--- a/src/native/ogl/gldefs.h
+++ b/src/native/ogl/gldefs.h
@@ -161,6 +161,14 @@
 #include "javax_media_j3d_ShaderAttributeObjectRetained.h"
 #include "javax_media_j3d_ShaderError.h"
 
+#ifdef WIN32
+#include "javax_media_j3d_Win32NativeConfigTemplate3D.h"
+#include "javax_media_j3d_Win32NativeScreenInfo.h"
+#else
+#include "javax_media_j3d_X11NativeConfigTemplate3D.h"
+#include "javax_media_j3d_X11NativeScreenInfo.h"
+#endif
+
 /* Used to compare floating point values close to 0.0 */
 #define  J3D_SMALL_FLOAT 0.00001f