diff options
author | Sven Gothel <[email protected]> | 2011-02-09 02:50:09 +0100 |
---|---|---|
committer | Sven Gothel <[email protected]> | 2011-02-09 02:50:09 +0100 |
commit | 360b6716f68b44b28fd8c4f8e61ab86d5a56738b (patch) | |
tree | 765cb43350428d7775f9624745714eac7f5fbc02 /make/config/nativewindow | |
parent | 4cda4b70dbcd21cf57e1e253ddba32b88bcaec18 (diff) |
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.
Diffstat (limited to 'make/config/nativewindow')
-rw-r--r-- | make/config/nativewindow/jawt-DrawingSurfaceInfo-CustomJavaCode.java | 6 | ||||
-rw-r--r-- | make/config/nativewindow/jawt-common.cfg | 4 | ||||
-rw-r--r-- | make/config/nativewindow/jawt-macosx.cfg | 2 | ||||
-rw-r--r-- | make/config/nativewindow/jawt-win32.cfg | 2 | ||||
-rw-r--r-- | make/config/nativewindow/jawt-x11.cfg | 2 | ||||
-rw-r--r-- | make/config/nativewindow/win32-lib.cfg | 6 | ||||
-rw-r--r-- | make/config/nativewindow/x11-lib.cfg | 2 |
7 files changed, 12 insertions, 12 deletions
diff --git a/make/config/nativewindow/jawt-DrawingSurfaceInfo-CustomJavaCode.java b/make/config/nativewindow/jawt-DrawingSurfaceInfo-CustomJavaCode.java index aad0ab261..598ced346 100644 --- a/make/config/nativewindow/jawt-DrawingSurfaceInfo-CustomJavaCode.java +++ b/make/config/nativewindow/jawt-DrawingSurfaceInfo-CustomJavaCode.java @@ -16,12 +16,12 @@ private static JAWT_PlatformInfo newPlatformInfo(ByteBuffer buf) { try { Class factoryClass; if (osName.startsWith("wind")) { - factoryClass = Class.forName("com.jogamp.nativewindow.impl.jawt.windows.JAWT_Win32DrawingSurfaceInfo"); + factoryClass = Class.forName("jogamp.nativewindow.jawt.windows.JAWT_Win32DrawingSurfaceInfo"); } else if (osName.startsWith("mac os x")) { - factoryClass = Class.forName("com.jogamp.nativewindow.impl.jawt.macosx.JAWT_MacOSXDrawingSurfaceInfo"); + factoryClass = Class.forName("jogamp.nativewindow.jawt.macosx.JAWT_MacOSXDrawingSurfaceInfo"); } else { // Assume Linux, Solaris, etc. Should probably test for these explicitly. - factoryClass = Class.forName("com.jogamp.nativewindow.impl.jawt.x11.JAWT_X11DrawingSurfaceInfo"); + factoryClass = Class.forName("jogamp.nativewindow.jawt.x11.JAWT_X11DrawingSurfaceInfo"); } platformInfoFactoryMethod = factoryClass.getMethod("create", new Class[] { ByteBuffer.class }); diff --git a/make/config/nativewindow/jawt-common.cfg b/make/config/nativewindow/jawt-common.cfg index 4ed0a88f1..d633c47d6 100644 --- a/make/config/nativewindow/jawt-common.cfg +++ b/make/config/nativewindow/jawt-common.cfg @@ -1,6 +1,6 @@ # Common JAWT config file Style AllStatic -Package com.jogamp.nativewindow.impl.jawt +Package jogamp.nativewindow.jawt JavaClass JAWTFactory JavaOutputDir gensrc/classes #NativeOutputDir gensrc/native/<PLATFORM> @@ -21,6 +21,6 @@ IncludeAs CustomJavaCode JAWT jawt-CustomJavaCode.java CustomCCode #include <jawt.h> import java.security.* -import com.jogamp.nativewindow.impl.jawt.* +import jogamp.nativewindow.jawt.* IncludeAs CustomJavaCode JAWT_DrawingSurfaceInfo jawt-DrawingSurfaceInfo-CustomJavaCode.java diff --git a/make/config/nativewindow/jawt-macosx.cfg b/make/config/nativewindow/jawt-macosx.cfg index e018af0dc..c41367f4a 100644 --- a/make/config/nativewindow/jawt-macosx.cfg +++ b/make/config/nativewindow/jawt-macosx.cfg @@ -9,6 +9,6 @@ Opaque long NSView * CustomCCode #include <inttypes.h> CustomCCode #include </usr/include/machine/types.h> -StructPackage JAWT_MacOSXDrawingSurfaceInfo com.jogamp.nativewindow.impl.jawt.macosx +StructPackage JAWT_MacOSXDrawingSurfaceInfo jogamp.nativewindow.jawt.macosx EmitStruct JAWT_MacOSXDrawingSurfaceInfo Implements JAWT_MacOSXDrawingSurfaceInfo JAWT_PlatformInfo diff --git a/make/config/nativewindow/jawt-win32.cfg b/make/config/nativewindow/jawt-win32.cfg index 00b3a3322..d1fa7020a 100644 --- a/make/config/nativewindow/jawt-win32.cfg +++ b/make/config/nativewindow/jawt-win32.cfg @@ -10,6 +10,6 @@ IgnoreField JAWT_Win32DrawingSurfaceInfo hpalette Include ../intptr.cfg -StructPackage JAWT_Win32DrawingSurfaceInfo com.jogamp.nativewindow.impl.jawt.windows +StructPackage JAWT_Win32DrawingSurfaceInfo jogamp.nativewindow.jawt.windows EmitStruct JAWT_Win32DrawingSurfaceInfo Implements JAWT_Win32DrawingSurfaceInfo JAWT_PlatformInfo diff --git a/make/config/nativewindow/jawt-x11.cfg b/make/config/nativewindow/jawt-x11.cfg index 4e7ed267b..ac9d1aa9a 100644 --- a/make/config/nativewindow/jawt-x11.cfg +++ b/make/config/nativewindow/jawt-x11.cfg @@ -10,6 +10,6 @@ IgnoreField JAWT_X11DrawingSurfaceInfo GetAWTColor CustomCCode #include <inttypes.h> -StructPackage JAWT_X11DrawingSurfaceInfo com.jogamp.nativewindow.impl.jawt.x11 +StructPackage JAWT_X11DrawingSurfaceInfo jogamp.nativewindow.jawt.x11 EmitStruct JAWT_X11DrawingSurfaceInfo Implements JAWT_X11DrawingSurfaceInfo JAWT_PlatformInfo diff --git a/make/config/nativewindow/win32-lib.cfg b/make/config/nativewindow/win32-lib.cfg index d4ca642bf..894211182 100644 --- a/make/config/nativewindow/win32-lib.cfg +++ b/make/config/nativewindow/win32-lib.cfg @@ -3,7 +3,7 @@ JavaOutputDir gensrc/classes NativeOutputDir gensrc/native/Windows -Package com.jogamp.nativewindow.impl.windows +Package jogamp.nativewindow.windows JavaClass GDI Style AllStatic @@ -22,8 +22,8 @@ Opaque long void ** Import javax.media.nativewindow.util.Point Import javax.media.nativewindow.NativeWindowException -Import com.jogamp.nativewindow.impl.NWJNILibLoader -import com.jogamp.nativewindow.impl.Debug +Import jogamp.nativewindow.NWJNILibLoader +import jogamp.nativewindow.Debug CustomCCode #define WIN32_LEAN_AND_MEAN CustomCCode #include <windows.h> diff --git a/make/config/nativewindow/x11-lib.cfg b/make/config/nativewindow/x11-lib.cfg index fb481ac51..8848980ea 100644 --- a/make/config/nativewindow/x11-lib.cfg +++ b/make/config/nativewindow/x11-lib.cfg @@ -1,6 +1,6 @@ # This .cfg file is used to generate the interface to the GLX routines # used internally by the X11GLContext implementation. -Package com.jogamp.nativewindow.impl.x11 +Package jogamp.nativewindow.x11 JavaClass X11Lib Style AllStatic |