Move implementation private files from com.jogamp.<module>.impl. to jogamp.<module> (2/2) - edit files

- com.jogamp.opengl.impl                     -> jogamp.opengl
- com.jogamp.opengl.util.glsl.fixedfunc.impl -> jogamp.opengl.util.glsl.fixedfunc
- com.jogamp.nativewindow.impl               -> jogamp.nativewindow
- com.jogamp.newt.impl                       -> jogamp.newt

This sorts implementation details from the top level, ie skipping the public 'com',
allowing a better seperation of public classes and implementation details
and also reduces strings.

This approach of public/private seperation is also used in the OpenJDK.

3 files changed, 43 insertions, 43 deletions

diff --git a/src/nativewindow/native/JAWT_DrawingSurfaceInfo.c b/src/nativewindow/native/JAWT_DrawingSurfaceInfo.c
index a0422fa8e..470f03a49 100644
--- a/src/nativewindow/native/JAWT_DrawingSurfaceInfo.c
+++ b/src/nativewindow/native/JAWT_DrawingSurfaceInfo.c
@@ -50,7 +50,7 @@
 #endif
 
 JNIEXPORT jobject JNICALL
-Java_com_jogamp_nativewindow_impl_jawt_JAWT_1DrawingSurfaceInfo_platformInfo0(JNIEnv* env, jobject unused, jobject jthis0) {
+Java_jogamp_nativewindow_jawt_JAWT_1DrawingSurfaceInfo_platformInfo0(JNIEnv* env, jobject unused, jobject jthis0) {
   JAWT_DrawingSurfaceInfo* dsi;
   dsi = (*env)->GetDirectBufferAddress(env, jthis0);
   if (dsi == NULL) {
diff --git a/src/nativewindow/native/windows/GDImisc.c b/src/nativewindow/native/windows/GDImisc.c
index 798edcbbf..9bead17ec 100644
--- a/src/nativewindow/native/windows/GDImisc.c
+++ b/src/nativewindow/native/windows/GDImisc.c
@@ -30,7 +30,7 @@
 #include <stdio.h>
 
 #include "NativewindowCommon.h"
-#include "com_jogamp_nativewindow_impl_windows_GDI.h"
+#include "jogamp_nativewindow_windows_GDI.h"
 
 // #define VERBOSE_ON 1
 
@@ -52,12 +52,12 @@ HINSTANCE GetApplicationHandle() {
 }
 
 /*   Java->C glue code:
- *   Java package: com.jogamp.nativewindow.impl.windows.GDI
+ *   Java package: jogamp.nativewindow.windows.GDI
  *    Java method: boolean CreateWindowClass(long hInstance, java.lang.String clazzName, long wndProc)
  *     C function: BOOL CreateWindowClass(HANDLE hInstance, LPCSTR clazzName, HANDLE wndProc);
  */
 JNIEXPORT jboolean JNICALL
-Java_com_jogamp_nativewindow_impl_windows_GDI_CreateWindowClass
+Java_jogamp_nativewindow_windows_GDI_CreateWindowClass
     (JNIEnv *env, jclass _unused, jlong jHInstance, jstring jClazzName, jlong wndProc) 
 {
     HINSTANCE hInstance = (HINSTANCE) (intptr_t) jHInstance;
@@ -101,12 +101,12 @@ Java_com_jogamp_nativewindow_impl_windows_GDI_CreateWindowClass
 }
 
 /*   Java->C glue code:
- *   Java package: com.jogamp.nativewindow.impl.windows.GDI
+ *   Java package: jogamp.nativewindow.windows.GDI
  *    Java method: boolean DestroyWindowClass(long hInstance, java.lang.String className)
  *     C function: BOOL DestroyWindowClass(HANDLE hInstance, LPCSTR className);
  */
 JNIEXPORT jboolean JNICALL
-Java_com_jogamp_nativewindow_impl_windows_GDI_DestroyWindowClass
+Java_jogamp_nativewindow_windows_GDI_DestroyWindowClass
     (JNIEnv *env, jclass _unused, jlong jHInstance, jstring jClazzName) 
 {
     HINSTANCE hInstance = (HINSTANCE) (intptr_t) jHInstance;
@@ -132,12 +132,12 @@ Java_com_jogamp_nativewindow_impl_windows_GDI_DestroyWindowClass
 
 
 /*   Java->C glue code:
- *   Java package: com.jogamp.nativewindow.impl.windows.GDI
+ *   Java package: jogamp.nativewindow.windows.GDI
  *    Java method: long CreateDummyWindow0(long hInstance, java.lang.String className, java.lang.String windowName, int x, int y, int width, int height)
  *     C function: HANDLE CreateDummyWindow0(HANDLE hInstance, LPCSTR className, LPCSTR windowName, int x, int y, int width, int height);
  */
 JNIEXPORT jlong JNICALL
-Java_com_jogamp_nativewindow_impl_windows_GDI_CreateDummyWindow0
+Java_jogamp_nativewindow_windows_GDI_CreateDummyWindow0
     (JNIEnv *env, jclass _unused, jlong jHInstance, jstring jWndClassName, jstring jWndName, jint x, jint y, jint width, jint height) 
 {
     HINSTANCE hInstance = (HINSTANCE) (intptr_t) jHInstance;
@@ -178,26 +178,26 @@ Java_com_jogamp_nativewindow_impl_windows_GDI_CreateDummyWindow0
 
 
 /*
- * Class:     com_jogamp_nativewindow_impl_windows_GDI
+ * Class:     jogamp_nativewindow_windows_GDI
  * Method:    initIDs0
  * Signature: ()Z
  */
-JNIEXPORT jboolean JNICALL Java_com_jogamp_nativewindow_impl_windows_GDI_initIDs0
+JNIEXPORT jboolean JNICALL Java_jogamp_nativewindow_windows_GDI_initIDs0
   (JNIEnv *env, jclass clazz)
 {
     if(NativewindowCommon_init(env)) {
         jclass c = (*env)->FindClass(env, ClazzNamePoint);
         if(NULL==c) {
-            NativewindowCommon_FatalError(env, "FatalError com_jogamp_nativewindow_impl_windows_GDI: can't find %s", ClazzNamePoint);
+            NativewindowCommon_FatalError(env, "FatalError jogamp_nativewindow_windows_GDI: can't find %s", ClazzNamePoint);
         }
         pointClz = (jclass)(*env)->NewGlobalRef(env, c);
         (*env)->DeleteLocalRef(env, c);
         if(NULL==pointClz) {
-            NativewindowCommon_FatalError(env, "FatalError com_jogamp_nativewindow_impl_windows_GDI: can't use %s", ClazzNamePoint);
+            NativewindowCommon_FatalError(env, "FatalError jogamp_nativewindow_windows_GDI: can't use %s", ClazzNamePoint);
         }
         pointCstr = (*env)->GetMethodID(env, pointClz, ClazzAnyCstrName, ClazzNamePointCstrSignature);
         if(NULL==pointCstr) {
-            NativewindowCommon_FatalError(env, "FatalError com_jogamp_nativewindow_impl_windows_GDI: can't fetch %s.%s %s",
+            NativewindowCommon_FatalError(env, "FatalError jogamp_nativewindow_windows_GDI: can't fetch %s.%s %s",
                 ClazzNamePoint, ClazzAnyCstrName, ClazzNamePointCstrSignature);
         }
     }
@@ -209,22 +209,22 @@ LRESULT CALLBACK DummyWndProc( HWND   hWnd, UINT   uMsg, WPARAM wParam, LPARAM l
 }
 
 /*
- * Class:     com_jogamp_nativewindow_impl_windows_GDI
+ * Class:     jogamp_nativewindow_windows_GDI
  * Method:    getDummyWndProc0
  * Signature: ()J
  */
-JNIEXPORT jlong JNICALL Java_com_jogamp_nativewindow_impl_windows_GDI_getDummyWndProc0
+JNIEXPORT jlong JNICALL Java_jogamp_nativewindow_windows_GDI_getDummyWndProc0
   (JNIEnv *env, jclass clazz)
 {
     return (jlong) (intptr_t) DummyWndProc;
 }
 
 /*
- * Class:     com_jogamp_nativewindow_impl_windows_GDI
+ * Class:     jogamp_nativewindow_windows_GDI
  * Method:    GetRelativeLocation0
  * Signature: (JJII)Ljavax/media/nativewindow/util/Point;
  */
-JNIEXPORT jobject JNICALL Java_com_jogamp_nativewindow_impl_windows_GDI_GetRelativeLocation0
+JNIEXPORT jobject JNICALL Java_jogamp_nativewindow_windows_GDI_GetRelativeLocation0
   (JNIEnv *env, jclass unused, jlong jsrc_win, jlong jdest_win, jint src_x, jint src_y)
 {
     HWND src_win = (HWND) (intptr_t) jsrc_win;
diff --git a/src/nativewindow/native/x11/Xmisc.c b/src/nativewindow/native/x11/Xmisc.c
index 0d92880b3..1ced0fff4 100644
--- a/src/nativewindow/native/x11/Xmisc.c
+++ b/src/nativewindow/native/x11/Xmisc.c
@@ -81,7 +81,7 @@ Bool XF86VidModeSetGammaRamp(
 #endif
 
 #include "NativewindowCommon.h"
-#include "com_jogamp_nativewindow_impl_x11_X11Lib.h"
+#include "jogamp_nativewindow_x11_X11Lib.h"
 
 // #define VERBOSE_ON 1
 
@@ -114,42 +114,42 @@ static void _initClazzAccess(JNIEnv *env) {
 
     c = (*env)->FindClass(env, ClazzNameBuffers);
     if(NULL==c) {
-        NativewindowCommon_FatalError(env, "FatalError Java_com_jogamp_nativewindow_impl_x11_X11Lib: can't find %s", ClazzNameBuffers);
+        NativewindowCommon_FatalError(env, "FatalError Java_jogamp_nativewindow_x11_X11Lib: can't find %s", ClazzNameBuffers);
     }
     clazzBuffers = (jclass)(*env)->NewGlobalRef(env, c);
     (*env)->DeleteLocalRef(env, c);
     if(NULL==clazzBuffers) {
-        NativewindowCommon_FatalError(env, "FatalError Java_com_jogamp_nativewindow_impl_x11_X11Lib: can't use %s", ClazzNameBuffers);
+        NativewindowCommon_FatalError(env, "FatalError Java_jogamp_nativewindow_x11_X11Lib: can't use %s", ClazzNameBuffers);
     }
     c = (*env)->FindClass(env, ClazzNameByteBuffer);
     if(NULL==c) {
-        NativewindowCommon_FatalError(env, "FatalError Java_com_jogamp_nativewindow_impl_x11_X11Lib: can't find %s", ClazzNameByteBuffer);
+        NativewindowCommon_FatalError(env, "FatalError Java_jogamp_nativewindow_x11_X11Lib: can't find %s", ClazzNameByteBuffer);
     }
     clazzByteBuffer = (jclass)(*env)->NewGlobalRef(env, c);
     (*env)->DeleteLocalRef(env, c);
     if(NULL==c) {
-        NativewindowCommon_FatalError(env, "FatalError Java_com_jogamp_nativewindow_impl_x11_X11Lib: can't use %s", ClazzNameByteBuffer);
+        NativewindowCommon_FatalError(env, "FatalError Java_jogamp_nativewindow_x11_X11Lib: can't use %s", ClazzNameByteBuffer);
     }
 
     cstrBuffers = (*env)->GetStaticMethodID(env, clazzBuffers, 
                             ClazzNameBuffersStaticCstrName, ClazzNameBuffersStaticCstrSignature);
     if(NULL==cstrBuffers) {
-        NativewindowCommon_FatalError(env, "FatalError Java_com_jogamp_nativewindow_impl_x11_X11Lib: can't create %s.%s %s",
+        NativewindowCommon_FatalError(env, "FatalError Java_jogamp_nativewindow_x11_X11Lib: can't create %s.%s %s",
             ClazzNameBuffers, ClazzNameBuffersStaticCstrName, ClazzNameBuffersStaticCstrSignature);
     }
 
     c = (*env)->FindClass(env, ClazzNamePoint);
     if(NULL==c) {
-        NativewindowCommon_FatalError(env, "FatalError Java_com_jogamp_nativewindow_impl_x11_X11Lib: can't find %s", ClazzNamePoint);
+        NativewindowCommon_FatalError(env, "FatalError Java_jogamp_nativewindow_x11_X11Lib: can't find %s", ClazzNamePoint);
     }
     pointClz = (jclass)(*env)->NewGlobalRef(env, c);
     (*env)->DeleteLocalRef(env, c);
     if(NULL==pointClz) {
-        NativewindowCommon_FatalError(env, "FatalError Java_com_jogamp_nativewindow_impl_x11_X11Lib: can't use %s", ClazzNamePoint);
+        NativewindowCommon_FatalError(env, "FatalError Java_jogamp_nativewindow_x11_X11Lib: can't use %s", ClazzNamePoint);
     }
     pointCstr = (*env)->GetMethodID(env, pointClz, ClazzAnyCstrName, ClazzNamePointCstrSignature);
     if(NULL==pointCstr) {
-        NativewindowCommon_FatalError(env, "FatalError Java_com_jogamp_nativewindow_impl_x11_X11Lib: can't fetch %s.%s %s",
+        NativewindowCommon_FatalError(env, "FatalError Java_jogamp_nativewindow_x11_X11Lib: can't fetch %s.%s %s",
             ClazzNamePoint, ClazzAnyCstrName, ClazzNamePointCstrSignature);
     }
 }
@@ -238,7 +238,7 @@ static void x11IOErrorHandlerEnable(int onoff, JNIEnv * env) {
 static int _initialized=0;
 
 JNIEXPORT void JNICALL 
-Java_com_jogamp_nativewindow_impl_x11_X11Util_initialize0(JNIEnv *env, jclass _unused, jboolean firstUIActionOnProcess) {
+Java_jogamp_nativewindow_x11_X11Util_initialize0(JNIEnv *env, jclass _unused, jboolean firstUIActionOnProcess) {
     if(0==_initialized) {
         if( JNI_TRUE == firstUIActionOnProcess ) {
             if( 0 == XInitThreads() ) {
@@ -257,17 +257,17 @@ Java_com_jogamp_nativewindow_impl_x11_X11Util_initialize0(JNIEnv *env, jclass _u
 }
 
 JNIEXPORT void JNICALL 
-Java_com_jogamp_nativewindow_impl_x11_X11Util_setX11ErrorHandler0(JNIEnv *env, jclass _unused, jboolean onoff, jboolean quiet) {
+Java_jogamp_nativewindow_x11_X11Util_setX11ErrorHandler0(JNIEnv *env, jclass _unused, jboolean onoff, jboolean quiet) {
   x11ErrorHandlerEnableBlocking(env, ( JNI_TRUE == onoff ) ? 1 : 0, ( JNI_TRUE == quiet ) ? 1 : 0);
 }
 
 /*   Java->C glue code:
- *   Java package: com.jogamp.nativewindow.impl.x11.X11Lib
+ *   Java package: jogamp.nativewindow.x11.X11Lib
  *    Java method: XVisualInfo XGetVisualInfo(long arg0, long arg1, XVisualInfo arg2, java.nio.IntBuffer arg3)
  *     C function: XVisualInfo *  XGetVisualInfo(Display * , long, XVisualInfo * , int * );
  */
 JNIEXPORT jobject JNICALL
-Java_com_jogamp_nativewindow_impl_x11_X11Lib_XGetVisualInfo1__JJLjava_nio_ByteBuffer_2Ljava_lang_Object_2I(JNIEnv *env, jclass _unused, jlong arg0, jlong arg1, jobject arg2, jobject arg3, jint arg3_byte_offset) {
+Java_jogamp_nativewindow_x11_X11Lib_XGetVisualInfo1__JJLjava_nio_ByteBuffer_2Ljava_lang_Object_2I(JNIEnv *env, jclass _unused, jlong arg0, jlong arg1, jobject arg2, jobject arg3, jint arg3_byte_offset) {
   XVisualInfo * _ptr2 = NULL;
   int * _ptr3 = NULL;
   XVisualInfo *  _res;
@@ -301,7 +301,7 @@ Java_com_jogamp_nativewindow_impl_x11_X11Lib_XGetVisualInfo1__JJLjava_nio_ByteBu
 }
 
 JNIEXPORT jlong JNICALL 
-Java_com_jogamp_nativewindow_impl_x11_X11Lib_DefaultVisualID(JNIEnv *env, jclass _unused, jlong display, jint screen) {
+Java_jogamp_nativewindow_x11_X11Lib_DefaultVisualID(JNIEnv *env, jclass _unused, jlong display, jint screen) {
   jlong r;
     if(0==display) {
         NativewindowCommon_FatalError(env, "invalid display connection..");
@@ -313,12 +313,12 @@ Java_com_jogamp_nativewindow_impl_x11_X11Lib_DefaultVisualID(JNIEnv *env, jclass
 }
 
 /*   Java->C glue code:
- *   Java package: com.jogamp.nativewindow.impl.x11.X11Lib
+ *   Java package: jogamp.nativewindow.x11.X11Lib
  *    Java method: void XLockDisplay(long display)
  *     C function: void XLockDisplay(Display *  display);
  */
 JNIEXPORT void JNICALL 
-Java_com_jogamp_nativewindow_impl_x11_X11Lib_XLockDisplay__J(JNIEnv *env, jclass _unused, jlong display) {
+Java_jogamp_nativewindow_x11_X11Lib_XLockDisplay__J(JNIEnv *env, jclass _unused, jlong display) {
   if(0==display) {
       NativewindowCommon_FatalError(env, "invalid display connection..");
   }
@@ -326,12 +326,12 @@ Java_com_jogamp_nativewindow_impl_x11_X11Lib_XLockDisplay__J(JNIEnv *env, jclass
 }
 
 /*   Java->C glue code:
- *   Java package: com.jogamp.nativewindow.impl.x11.X11Lib
+ *   Java package: jogamp.nativewindow.x11.X11Lib
  *    Java method: void XUnlockDisplay(long display)
  *     C function: void XUnlockDisplay(Display *  display);
  */
 JNIEXPORT void JNICALL 
-Java_com_jogamp_nativewindow_impl_x11_X11Lib_XUnlockDisplay__J(JNIEnv *env, jclass _unused, jlong display) {
+Java_jogamp_nativewindow_x11_X11Lib_XUnlockDisplay__J(JNIEnv *env, jclass _unused, jlong display) {
   if(0==display) {
       NativewindowCommon_FatalError(env, "invalid display connection..");
   }
@@ -339,12 +339,12 @@ Java_com_jogamp_nativewindow_impl_x11_X11Lib_XUnlockDisplay__J(JNIEnv *env, jcla
 }
 
 /*   Java->C glue code:
- *   Java package: com.jogamp.nativewindow.impl.x11.X11Lib
+ *   Java package: jogamp.nativewindow.x11.X11Lib
  *    Java method: int XCloseDisplay(long display)
  *     C function: int XCloseDisplay(Display *  display);
  */
 JNIEXPORT jint JNICALL 
-Java_com_jogamp_nativewindow_impl_x11_X11Lib_XCloseDisplay__J(JNIEnv *env, jclass _unused, jlong display) {
+Java_jogamp_nativewindow_x11_X11Lib_XCloseDisplay__J(JNIEnv *env, jclass _unused, jlong display) {
   int _res;
   if(0==display) {
       NativewindowCommon_FatalError(env, "invalid display connection..");
@@ -356,11 +356,11 @@ Java_com_jogamp_nativewindow_impl_x11_X11Lib_XCloseDisplay__J(JNIEnv *env, jclas
 }
 
 /*
- * Class:     com_jogamp_nativewindow_impl_x11_X11Lib
+ * Class:     jogamp_nativewindow_x11_X11Lib
  * Method:    CreateDummyWindow
  * Signature: (JIJII)J
  */
-JNIEXPORT jlong JNICALL Java_com_jogamp_nativewindow_impl_x11_X11Lib_CreateDummyWindow
+JNIEXPORT jlong JNICALL Java_jogamp_nativewindow_x11_X11Lib_CreateDummyWindow
   (JNIEnv *env, jclass unused, jlong display, jint screen_index, jlong visualID, jint width, jint height)
 {
     Display * dpy  = (Display *)(intptr_t)display;
@@ -464,11 +464,11 @@ JNIEXPORT jlong JNICALL Java_com_jogamp_nativewindow_impl_x11_X11Lib_CreateDummy
 
 
 /*
- * Class:     com_jogamp_nativewindow_impl_x11_X11Lib
+ * Class:     jogamp_nativewindow_x11_X11Lib
  * Method:    DestroyDummyWindow
  * Signature: (JJ)V
  */
-JNIEXPORT void JNICALL Java_com_jogamp_nativewindow_impl_x11_X11Lib_DestroyDummyWindow
+JNIEXPORT void JNICALL Java_jogamp_nativewindow_x11_X11Lib_DestroyDummyWindow
   (JNIEnv *env, jclass unused, jlong display, jlong window)
 {
     Display * dpy = (Display *)(intptr_t)display;
@@ -487,11 +487,11 @@ JNIEXPORT void JNICALL Java_com_jogamp_nativewindow_impl_x11_X11Lib_DestroyDummy
 }
 
 /*
- * Class:     com_jogamp_nativewindow_impl_x11_X11Lib
+ * Class:     jogamp_nativewindow_x11_X11Lib
  * Method:    GetRelativeLocation
  * Signature: (JIJJII)Ljavax/media/nativewindow/util/Point;
  */
-JNIEXPORT jobject JNICALL Java_com_jogamp_nativewindow_impl_x11_X11Lib_GetRelativeLocation0
+JNIEXPORT jobject JNICALL Java_jogamp_nativewindow_x11_X11Lib_GetRelativeLocation0
   (JNIEnv *env, jclass unused, jlong jdisplay, jint screen_index, jlong jsrc_win, jlong jdest_win, jint src_x, jint src_y)
 {
     Display * dpy = (Display *) (intptr_t) jdisplay;