From 360b6716f68b44b28fd8c4f8e61ab86d5a56738b Mon Sep 17 00:00:00 2001 From: Sven Gothel Date: Wed, 9 Feb 2011 02:50:09 +0100 Subject: Move implementation private files from com.jogamp..impl. to jogamp. (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. --- .../media/nativewindow/DefaultGraphicsDevice.java | 4 +- .../nativewindow/GraphicsConfigurationFactory.java | 6 +-- .../media/nativewindow/NativeWindowFactory.java | 26 +++++------ .../javax/media/nativewindow/ToolkitLock.java | 4 +- .../nativewindow/awt/AWTGraphicsConfiguration.java | 2 +- .../nativewindow/awt/AWTWindowClosingProtocol.java | 2 +- .../nativewindow/x11/X11GraphicsConfiguration.java | 2 +- .../media/nativewindow/x11/X11GraphicsDevice.java | 4 +- .../media/nativewindow/x11/X11GraphicsScreen.java | 2 +- .../classes/jogamp/nativewindow/Debug.java | 2 +- .../DefaultGraphicsConfigurationFactoryImpl.java | 2 +- .../jogamp/nativewindow/NWJNILibLoader.java | 2 +- .../nativewindow/NativeWindowFactoryImpl.java | 8 ++-- .../jogamp/nativewindow/NullToolkitLock.java | 2 +- .../classes/jogamp/nativewindow/ProxySurface.java | 2 +- .../classes/jogamp/nativewindow/awt/AWTMisc.java | 2 +- .../jogamp/nativewindow/jawt/JAWTJNILibLoader.java | 4 +- .../jogamp/nativewindow/jawt/JAWTToolkitLock.java | 2 +- .../classes/jogamp/nativewindow/jawt/JAWTUtil.java | 6 +-- .../jogamp/nativewindow/jawt/JAWTWindow.java | 2 +- .../nativewindow/jawt/JAWT_PlatformInfo.java | 4 +- .../nativewindow/jawt/macosx/MacOSXJAWTWindow.java | 12 ++--- .../jawt/windows/Win32SunJDKReflection.java | 2 +- .../jawt/windows/WindowsJAWTWindow.java | 14 +++--- .../nativewindow/jawt/x11/X11JAWTToolkitLock.java | 6 +-- .../nativewindow/jawt/x11/X11JAWTWindow.java | 14 +++--- .../nativewindow/jawt/x11/X11SunJDKReflection.java | 2 +- .../nativewindow/windows/RegisteredClass.java | 2 +- .../windows/RegisteredClassFactory.java | 4 +- .../x11/X11GraphicsConfigurationFactory.java | 2 +- .../jogamp/nativewindow/x11/X11ToolkitLock.java | 2 +- .../classes/jogamp/nativewindow/x11/X11Util.java | 6 +-- src/nativewindow/native/JAWT_DrawingSurfaceInfo.c | 2 +- src/nativewindow/native/windows/GDImisc.c | 32 ++++++------- src/nativewindow/native/x11/Xmisc.c | 52 +++++++++++----------- 35 files changed, 121 insertions(+), 121 deletions(-) (limited to 'src/nativewindow') diff --git a/src/nativewindow/classes/javax/media/nativewindow/DefaultGraphicsDevice.java b/src/nativewindow/classes/javax/media/nativewindow/DefaultGraphicsDevice.java index 3d9f6d6ca..bf755d5bc 100644 --- a/src/nativewindow/classes/javax/media/nativewindow/DefaultGraphicsDevice.java +++ b/src/nativewindow/classes/javax/media/nativewindow/DefaultGraphicsDevice.java @@ -34,7 +34,7 @@ package javax.media.nativewindow; import com.jogamp.common.util.ReflectionUtil; -import com.jogamp.nativewindow.impl.NativeWindowFactoryImpl; +import jogamp.nativewindow.NativeWindowFactoryImpl; public class DefaultGraphicsDevice implements Cloneable, AbstractGraphicsDevice { private static final String separator = "_"; @@ -151,7 +151,7 @@ public class DefaultGraphicsDevice implements Cloneable, AbstractGraphicsDevice * Set the internal ToolkitLock, which is used within the * {@link #lock()} and {@link #unlock()} implementation. * - * @param locker the ToolkitLock, if null, {@link com.jogamp.nativewindow.impl.NullToolkitLock} is being used + * @param locker the ToolkitLock, if null, {@link jogamp.nativewindow.NullToolkitLock} is being used */ protected void setToolkitLock(ToolkitLock locker) { this.toolkitLock = ( null == locker ) ? NativeWindowFactoryImpl.getNullToolkitLock() : locker ; diff --git a/src/nativewindow/classes/javax/media/nativewindow/GraphicsConfigurationFactory.java b/src/nativewindow/classes/javax/media/nativewindow/GraphicsConfigurationFactory.java index ad1bc3634..fa3923dcf 100644 --- a/src/nativewindow/classes/javax/media/nativewindow/GraphicsConfigurationFactory.java +++ b/src/nativewindow/classes/javax/media/nativewindow/GraphicsConfigurationFactory.java @@ -34,8 +34,8 @@ package javax.media.nativewindow; import com.jogamp.common.util.ReflectionUtil; -import com.jogamp.nativewindow.impl.Debug; -import com.jogamp.nativewindow.impl.DefaultGraphicsConfigurationFactoryImpl; +import jogamp.nativewindow.Debug; +import jogamp.nativewindow.DefaultGraphicsConfigurationFactoryImpl; import java.util.Collections; import java.util.HashMap; import java.util.Map; @@ -91,7 +91,7 @@ public abstract class GraphicsConfigurationFactory { if (NativeWindowFactory.TYPE_X11.equals(NativeWindowFactory.getNativeWindowType(true))) { try { GraphicsConfigurationFactory factory = (GraphicsConfigurationFactory) - ReflectionUtil.createInstance("com.jogamp.nativewindow.impl.x11.X11GraphicsConfigurationFactory", null, + ReflectionUtil.createInstance("jogamp.nativewindow.x11.X11GraphicsConfigurationFactory", null, GraphicsConfigurationFactory.class.getClassLoader()); registerFactory(javax.media.nativewindow.x11.X11GraphicsDevice.class, factory); } catch (Exception e) { diff --git a/src/nativewindow/classes/javax/media/nativewindow/NativeWindowFactory.java b/src/nativewindow/classes/javax/media/nativewindow/NativeWindowFactory.java index 5d36df6ed..d0df41794 100644 --- a/src/nativewindow/classes/javax/media/nativewindow/NativeWindowFactory.java +++ b/src/nativewindow/classes/javax/media/nativewindow/NativeWindowFactory.java @@ -38,7 +38,7 @@ import java.util.*; import com.jogamp.common.util.*; import com.jogamp.common.jvm.JVMUtil; -import com.jogamp.nativewindow.impl.*; +import jogamp.nativewindow.*; import java.lang.reflect.Constructor; import java.lang.reflect.Method; @@ -78,11 +78,11 @@ public abstract class NativeWindowFactory { private static String nativeOSNameCustom; private static boolean isAWTAvailable; public static final String AWTComponentClassName = "java.awt.Component" ; - public static final String JAWTUtilClassName = "com.jogamp.nativewindow.impl.jawt.JAWTUtil" ; - public static final String X11UtilClassName = "com.jogamp.nativewindow.impl.x11.X11Util"; - public static final String GDIClassName = "com.jogamp.nativewindow.impl.windows.GDI"; - public static final String X11JAWTToolkitLockClassName = "com.jogamp.nativewindow.impl.jawt.x11.X11JAWTToolkitLock" ; - public static final String X11ToolkitLockClassName = "com.jogamp.nativewindow.impl.x11.X11ToolkitLock" ; + public static final String JAWTUtilClassName = "jogamp.nativewindow.jawt.JAWTUtil" ; + public static final String X11UtilClassName = "jogamp.nativewindow.x11.X11Util"; + public static final String GDIClassName = "jogamp.nativewindow.windows.GDI"; + public static final String X11JAWTToolkitLockClassName = "jogamp.nativewindow.jawt.x11.X11JAWTToolkitLock" ; + public static final String X11ToolkitLockClassName = "jogamp.nativewindow.x11.X11ToolkitLock" ; private static Class jawtUtilClass; private static Method jawtUtilGetJAWTToolkitMethod; private static Method jawtUtilInitMethod; @@ -310,11 +310,11 @@ public abstract class NativeWindowFactory { *
    *
  • If AWT available
    • *
      - *
    • return {@link com.jogamp.nativewindow.impl.jawt.JAWTToolkitLock}
      • + *
    • return {@link jogamp.nativewindow.jawt.JAWTToolkitLock}
      • *
    *
* - *
  • Otherwise return {@link com.jogamp.nativewindow.impl.NullToolkitLock}
    • + *
  • Otherwise return {@link jogamp.nativewindow.NullToolkitLock}
    • * */ public static ToolkitLock getDefaultToolkitLock(String type) { @@ -352,15 +352,15 @@ public abstract class NativeWindowFactory { *
      *
    • If AWT available
      • *
        - *
      • return {@link com.jogamp.nativewindow.impl.jawt.x11.X11JAWTToolkitLock}
        • + *
      • return {@link jogamp.nativewindow.jawt.x11.X11JAWTToolkitLock}
        • *
      *
    • If AWT not available
      • *
        - *
      • return {@link com.jogamp.nativewindow.impl.x11.X11ToolkitLock}
        • + *
      • return {@link jogamp.nativewindow.x11.X11ToolkitLock}
        • *
      *
    * - *
  • Otherwise return {@link com.jogamp.nativewindow.impl.NullToolkitLock}
    • + *
  • Otherwise return {@link jogamp.nativewindow.NullToolkitLock}
    • * */ public static ToolkitLock createDefaultToolkitLock(String type, long deviceHandle) { @@ -386,10 +386,10 @@ public abstract class NativeWindowFactory { *
      *
    • If X11 type
      • *
        - *
      • return {@link com.jogamp.nativewindow.impl.x11.X11ToolkitLock}
        • + *
      • return {@link jogamp.nativewindow.x11.X11ToolkitLock}
        • *
      *
    - *
  • Otherwise return {@link com.jogamp.nativewindow.impl.NullToolkitLock}
    • + *
  • Otherwise return {@link jogamp.nativewindow.NullToolkitLock}
    • * */ public static ToolkitLock createDefaultToolkitLockNoAWT(String type, long deviceHandle) { diff --git a/src/nativewindow/classes/javax/media/nativewindow/ToolkitLock.java b/src/nativewindow/classes/javax/media/nativewindow/ToolkitLock.java index 226998860..982ce469b 100644 --- a/src/nativewindow/classes/javax/media/nativewindow/ToolkitLock.java +++ b/src/nativewindow/classes/javax/media/nativewindow/ToolkitLock.java @@ -28,14 +28,14 @@ package javax.media.nativewindow; -import com.jogamp.nativewindow.impl.Debug; +import jogamp.nativewindow.Debug; import java.security.AccessController; /** * Marker for a singleton global recursive blocking lock implementation, * optionally locking a native windowing toolkit as well. *
    - * One use case is the AWT locking on X11, see {@link com.jogamp.nativewindow.impl.jawt.JAWTToolkitLock}. + * One use case is the AWT locking on X11, see {@link jogamp.nativewindow.jawt.JAWTToolkitLock}. */ public interface ToolkitLock { public static final boolean TRACE_LOCK = Debug.isPropertyDefined("nativewindow.debug.ToolkitLock.TraceLock", true, AccessController.getContext()); diff --git a/src/nativewindow/classes/javax/media/nativewindow/awt/AWTGraphicsConfiguration.java b/src/nativewindow/classes/javax/media/nativewindow/awt/AWTGraphicsConfiguration.java index e428bb0b1..3915158b0 100644 --- a/src/nativewindow/classes/javax/media/nativewindow/awt/AWTGraphicsConfiguration.java +++ b/src/nativewindow/classes/javax/media/nativewindow/awt/AWTGraphicsConfiguration.java @@ -47,7 +47,7 @@ import java.awt.GraphicsConfiguration; import java.awt.GraphicsDevice; import java.awt.image.ColorModel; import javax.media.nativewindow.AbstractGraphicsConfiguration; -import com.jogamp.nativewindow.impl.Debug; +import jogamp.nativewindow.Debug; /** A wrapper for an AWT GraphicsConfiguration allowing it to be handled in a toolkit-independent manner. */ diff --git a/src/nativewindow/classes/javax/media/nativewindow/awt/AWTWindowClosingProtocol.java b/src/nativewindow/classes/javax/media/nativewindow/awt/AWTWindowClosingProtocol.java index a0e9efa49..7112f944d 100644 --- a/src/nativewindow/classes/javax/media/nativewindow/awt/AWTWindowClosingProtocol.java +++ b/src/nativewindow/classes/javax/media/nativewindow/awt/AWTWindowClosingProtocol.java @@ -34,7 +34,7 @@ import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; import java.awt.event.WindowListener; import javax.media.nativewindow.WindowClosingProtocol; -import com.jogamp.nativewindow.impl.awt.AWTMisc; +import jogamp.nativewindow.awt.AWTMisc; public class AWTWindowClosingProtocol implements WindowClosingProtocol { diff --git a/src/nativewindow/classes/javax/media/nativewindow/x11/X11GraphicsConfiguration.java b/src/nativewindow/classes/javax/media/nativewindow/x11/X11GraphicsConfiguration.java index 7b5f19047..dbf06f435 100644 --- a/src/nativewindow/classes/javax/media/nativewindow/x11/X11GraphicsConfiguration.java +++ b/src/nativewindow/classes/javax/media/nativewindow/x11/X11GraphicsConfiguration.java @@ -35,7 +35,7 @@ package javax.media.nativewindow.x11; import javax.media.nativewindow.*; import com.jogamp.common.util.ReflectionUtil; -import com.jogamp.nativewindow.impl.x11.XVisualInfo; +import jogamp.nativewindow.x11.XVisualInfo; /** Encapsulates a graphics configuration, or OpenGL pixel format, on X11 platforms. Objects of this type are returned from {@link diff --git a/src/nativewindow/classes/javax/media/nativewindow/x11/X11GraphicsDevice.java b/src/nativewindow/classes/javax/media/nativewindow/x11/X11GraphicsDevice.java index 33799d717..48fd63e3c 100644 --- a/src/nativewindow/classes/javax/media/nativewindow/x11/X11GraphicsDevice.java +++ b/src/nativewindow/classes/javax/media/nativewindow/x11/X11GraphicsDevice.java @@ -32,8 +32,8 @@ package javax.media.nativewindow.x11; -import com.jogamp.nativewindow.impl.Debug; -import com.jogamp.nativewindow.impl.x11.X11Util; +import jogamp.nativewindow.Debug; +import jogamp.nativewindow.x11.X11Util; import javax.media.nativewindow.DefaultGraphicsDevice; import javax.media.nativewindow.NativeWindowException; import javax.media.nativewindow.NativeWindowFactory; diff --git a/src/nativewindow/classes/javax/media/nativewindow/x11/X11GraphicsScreen.java b/src/nativewindow/classes/javax/media/nativewindow/x11/X11GraphicsScreen.java index 9de3baa51..ffe84cb6d 100644 --- a/src/nativewindow/classes/javax/media/nativewindow/x11/X11GraphicsScreen.java +++ b/src/nativewindow/classes/javax/media/nativewindow/x11/X11GraphicsScreen.java @@ -33,7 +33,7 @@ package javax.media.nativewindow.x11; import javax.media.nativewindow.*; -import com.jogamp.nativewindow.impl.x11.X11Util; +import jogamp.nativewindow.x11.X11Util; /** Encapsulates a screen index on X11 platforms. Objects of this type are passed to {@link diff --git a/src/nativewindow/classes/jogamp/nativewindow/Debug.java b/src/nativewindow/classes/jogamp/nativewindow/Debug.java index edb682392..f1cd209dc 100644 --- a/src/nativewindow/classes/jogamp/nativewindow/Debug.java +++ b/src/nativewindow/classes/jogamp/nativewindow/Debug.java @@ -37,7 +37,7 @@ * and developed by Kenneth Bradley Russell and Christopher John Kline. */ -package com.jogamp.nativewindow.impl; +package jogamp.nativewindow; import java.security.*; diff --git a/src/nativewindow/classes/jogamp/nativewindow/DefaultGraphicsConfigurationFactoryImpl.java b/src/nativewindow/classes/jogamp/nativewindow/DefaultGraphicsConfigurationFactoryImpl.java index f77454fac..f34b740d4 100644 --- a/src/nativewindow/classes/jogamp/nativewindow/DefaultGraphicsConfigurationFactoryImpl.java +++ b/src/nativewindow/classes/jogamp/nativewindow/DefaultGraphicsConfigurationFactoryImpl.java @@ -31,7 +31,7 @@ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. */ -package com.jogamp.nativewindow.impl; +package jogamp.nativewindow; import javax.media.nativewindow.*; diff --git a/src/nativewindow/classes/jogamp/nativewindow/NWJNILibLoader.java b/src/nativewindow/classes/jogamp/nativewindow/NWJNILibLoader.java index 3b2a728e5..33e2905a0 100644 --- a/src/nativewindow/classes/jogamp/nativewindow/NWJNILibLoader.java +++ b/src/nativewindow/classes/jogamp/nativewindow/NWJNILibLoader.java @@ -27,7 +27,7 @@ */ -package com.jogamp.nativewindow.impl; +package jogamp.nativewindow; import java.security.AccessController; import java.security.PrivilegedAction; diff --git a/src/nativewindow/classes/jogamp/nativewindow/NativeWindowFactoryImpl.java b/src/nativewindow/classes/jogamp/nativewindow/NativeWindowFactoryImpl.java index 860be6f95..d514b662d 100644 --- a/src/nativewindow/classes/jogamp/nativewindow/NativeWindowFactoryImpl.java +++ b/src/nativewindow/classes/jogamp/nativewindow/NativeWindowFactoryImpl.java @@ -30,7 +30,7 @@ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. */ -package com.jogamp.nativewindow.impl; +package jogamp.nativewindow; import com.jogamp.common.util.*; import java.lang.reflect.*; @@ -82,12 +82,12 @@ public class NativeWindowFactoryImpl extends NativeWindowFactory { // make it easier to run this code on mobile devices if (osType.equals(TYPE_WINDOWS)) { - windowClassName = "com.jogamp.nativewindow.impl.jawt.windows.WindowsJAWTWindow"; + windowClassName = "jogamp.nativewindow.jawt.windows.WindowsJAWTWindow"; } else if (osType.equals(TYPE_MACOSX)) { - windowClassName = "com.jogamp.nativewindow.impl.jawt.macosx.MacOSXJAWTWindow"; + windowClassName = "jogamp.nativewindow.jawt.macosx.MacOSXJAWTWindow"; } else if (osType.equals(TYPE_X11)) { // Assume Linux, Solaris, etc. Should probably test for these explicitly. - windowClassName = "com.jogamp.nativewindow.impl.jawt.x11.X11JAWTWindow"; + windowClassName = "jogamp.nativewindow.jawt.x11.X11JAWTWindow"; } else { throw new IllegalArgumentException("OS " + getNativeOSName(false) + " not yet supported"); } diff --git a/src/nativewindow/classes/jogamp/nativewindow/NullToolkitLock.java b/src/nativewindow/classes/jogamp/nativewindow/NullToolkitLock.java index db4db1126..2056d205e 100644 --- a/src/nativewindow/classes/jogamp/nativewindow/NullToolkitLock.java +++ b/src/nativewindow/classes/jogamp/nativewindow/NullToolkitLock.java @@ -26,7 +26,7 @@ * or implied, of JogAmp Community. */ -package com.jogamp.nativewindow.impl; +package jogamp.nativewindow; import javax.media.nativewindow.ToolkitLock; diff --git a/src/nativewindow/classes/jogamp/nativewindow/ProxySurface.java b/src/nativewindow/classes/jogamp/nativewindow/ProxySurface.java index e0ad95e1f..6dfbb2a91 100644 --- a/src/nativewindow/classes/jogamp/nativewindow/ProxySurface.java +++ b/src/nativewindow/classes/jogamp/nativewindow/ProxySurface.java @@ -35,7 +35,7 @@ * facility. */ -package com.jogamp.nativewindow.impl; +package jogamp.nativewindow; import javax.media.nativewindow.AbstractGraphicsConfiguration; import javax.media.nativewindow.NativeSurface; diff --git a/src/nativewindow/classes/jogamp/nativewindow/awt/AWTMisc.java b/src/nativewindow/classes/jogamp/nativewindow/awt/AWTMisc.java index c61ae5531..c3518ed85 100644 --- a/src/nativewindow/classes/jogamp/nativewindow/awt/AWTMisc.java +++ b/src/nativewindow/classes/jogamp/nativewindow/awt/AWTMisc.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of JogAmp Community. */ -package com.jogamp.nativewindow.impl.awt; +package jogamp.nativewindow.awt; import java.awt.Window; import java.awt.Component; diff --git a/src/nativewindow/classes/jogamp/nativewindow/jawt/JAWTJNILibLoader.java b/src/nativewindow/classes/jogamp/nativewindow/jawt/JAWTJNILibLoader.java index 4ea404c09..adbd0885f 100644 --- a/src/nativewindow/classes/jogamp/nativewindow/jawt/JAWTJNILibLoader.java +++ b/src/nativewindow/classes/jogamp/nativewindow/jawt/JAWTJNILibLoader.java @@ -37,10 +37,10 @@ * and developed by Kenneth Bradley Russell and Christopher John Kline. */ -package com.jogamp.nativewindow.impl.jawt; +package jogamp.nativewindow.jawt; import javax.media.nativewindow.NativeWindowFactory; -import com.jogamp.nativewindow.impl.NWJNILibLoader; +import jogamp.nativewindow.NWJNILibLoader; import java.awt.Toolkit; import java.lang.reflect.InvocationTargetException; diff --git a/src/nativewindow/classes/jogamp/nativewindow/jawt/JAWTToolkitLock.java b/src/nativewindow/classes/jogamp/nativewindow/jawt/JAWTToolkitLock.java index 017d74874..37e34c01c 100644 --- a/src/nativewindow/classes/jogamp/nativewindow/jawt/JAWTToolkitLock.java +++ b/src/nativewindow/classes/jogamp/nativewindow/jawt/JAWTToolkitLock.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of JogAmp Community. */ -package com.jogamp.nativewindow.impl.jawt; +package jogamp.nativewindow.jawt; import javax.media.nativewindow.ToolkitLock; diff --git a/src/nativewindow/classes/jogamp/nativewindow/jawt/JAWTUtil.java b/src/nativewindow/classes/jogamp/nativewindow/jawt/JAWTUtil.java index 0c6fc3f55..e392e935f 100644 --- a/src/nativewindow/classes/jogamp/nativewindow/jawt/JAWTUtil.java +++ b/src/nativewindow/classes/jogamp/nativewindow/jawt/JAWTUtil.java @@ -35,9 +35,9 @@ * facility. */ -package com.jogamp.nativewindow.impl.jawt; +package jogamp.nativewindow.jawt; -import com.jogamp.nativewindow.impl.*; +import jogamp.nativewindow.*; import java.awt.EventQueue; import javax.media.nativewindow.*; @@ -78,7 +78,7 @@ public class JAWTUtil { Method m = null; if (!headlessMode) { try { - jC = Class.forName("com.jogamp.opengl.impl.awt.Java2D"); + jC = Class.forName("jogamp.opengl.awt.Java2D"); m = jC.getMethod("isQueueFlusherThread", null); ok = true; } catch (Exception e) { diff --git a/src/nativewindow/classes/jogamp/nativewindow/jawt/JAWTWindow.java b/src/nativewindow/classes/jogamp/nativewindow/jawt/JAWTWindow.java index de6360212..944c08604 100644 --- a/src/nativewindow/classes/jogamp/nativewindow/jawt/JAWTWindow.java +++ b/src/nativewindow/classes/jogamp/nativewindow/jawt/JAWTWindow.java @@ -35,7 +35,7 @@ * facility. */ -package com.jogamp.nativewindow.impl.jawt; +package jogamp.nativewindow.jawt; import com.jogamp.common.util.locks.RecursiveLock; diff --git a/src/nativewindow/classes/jogamp/nativewindow/jawt/JAWT_PlatformInfo.java b/src/nativewindow/classes/jogamp/nativewindow/jawt/JAWT_PlatformInfo.java index d49e2f8d0..11651ac15 100644 --- a/src/nativewindow/classes/jogamp/nativewindow/jawt/JAWT_PlatformInfo.java +++ b/src/nativewindow/classes/jogamp/nativewindow/jawt/JAWT_PlatformInfo.java @@ -37,9 +37,9 @@ * and developed by Kenneth Bradley Russell and Christopher John Kline. */ -package com.jogamp.nativewindow.impl.jawt; +package jogamp.nativewindow.jawt; -import com.jogamp.nativewindow.impl.*; +import jogamp.nativewindow.*; /** Marker class for all window system-specific JAWT data structures. */ diff --git a/src/nativewindow/classes/jogamp/nativewindow/jawt/macosx/MacOSXJAWTWindow.java b/src/nativewindow/classes/jogamp/nativewindow/jawt/macosx/MacOSXJAWTWindow.java index fc5607707..9c29bbd52 100644 --- a/src/nativewindow/classes/jogamp/nativewindow/jawt/macosx/MacOSXJAWTWindow.java +++ b/src/nativewindow/classes/jogamp/nativewindow/jawt/macosx/MacOSXJAWTWindow.java @@ -38,7 +38,7 @@ * and developed by Kenneth Bradley Russell and Christopher John Kline. */ -package com.jogamp.nativewindow.impl.jawt.macosx; +package jogamp.nativewindow.jawt.macosx; import java.security.AccessController; import java.security.PrivilegedAction; @@ -48,11 +48,11 @@ import javax.media.nativewindow.NativeWindow; import javax.media.nativewindow.NativeWindowException; import javax.media.nativewindow.util.Point; -import com.jogamp.nativewindow.impl.jawt.JAWT; -import com.jogamp.nativewindow.impl.jawt.JAWTFactory; -import com.jogamp.nativewindow.impl.jawt.JAWTWindow; -import com.jogamp.nativewindow.impl.jawt.JAWT_DrawingSurface; -import com.jogamp.nativewindow.impl.jawt.JAWT_DrawingSurfaceInfo; +import jogamp.nativewindow.jawt.JAWT; +import jogamp.nativewindow.jawt.JAWTFactory; +import jogamp.nativewindow.jawt.JAWTWindow; +import jogamp.nativewindow.jawt.JAWT_DrawingSurface; +import jogamp.nativewindow.jawt.JAWT_DrawingSurfaceInfo; public class MacOSXJAWTWindow extends JAWTWindow { diff --git a/src/nativewindow/classes/jogamp/nativewindow/jawt/windows/Win32SunJDKReflection.java b/src/nativewindow/classes/jogamp/nativewindow/jawt/windows/Win32SunJDKReflection.java index 05d31a40e..1ff485290 100644 --- a/src/nativewindow/classes/jogamp/nativewindow/jawt/windows/Win32SunJDKReflection.java +++ b/src/nativewindow/classes/jogamp/nativewindow/jawt/windows/Win32SunJDKReflection.java @@ -38,7 +38,7 @@ * and developed by Kenneth Bradley Russell and Christopher John Kline. */ -package com.jogamp.nativewindow.impl.jawt.windows; +package jogamp.nativewindow.jawt.windows; import java.awt.GraphicsConfiguration; import java.awt.GraphicsDevice; diff --git a/src/nativewindow/classes/jogamp/nativewindow/jawt/windows/WindowsJAWTWindow.java b/src/nativewindow/classes/jogamp/nativewindow/jawt/windows/WindowsJAWTWindow.java index d7cd55f9a..612d571f2 100644 --- a/src/nativewindow/classes/jogamp/nativewindow/jawt/windows/WindowsJAWTWindow.java +++ b/src/nativewindow/classes/jogamp/nativewindow/jawt/windows/WindowsJAWTWindow.java @@ -38,19 +38,19 @@ * and developed by Kenneth Bradley Russell and Christopher John Kline. */ -package com.jogamp.nativewindow.impl.jawt.windows; +package jogamp.nativewindow.jawt.windows; import javax.media.nativewindow.AbstractGraphicsConfiguration; import javax.media.nativewindow.NativeWindow; import javax.media.nativewindow.NativeWindowException; import javax.media.nativewindow.util.Point; -import com.jogamp.nativewindow.impl.jawt.JAWT; -import com.jogamp.nativewindow.impl.jawt.JAWTFactory; -import com.jogamp.nativewindow.impl.jawt.JAWTWindow; -import com.jogamp.nativewindow.impl.jawt.JAWT_DrawingSurface; -import com.jogamp.nativewindow.impl.jawt.JAWT_DrawingSurfaceInfo; -import com.jogamp.nativewindow.impl.windows.GDI; +import jogamp.nativewindow.jawt.JAWT; +import jogamp.nativewindow.jawt.JAWTFactory; +import jogamp.nativewindow.jawt.JAWTWindow; +import jogamp.nativewindow.jawt.JAWT_DrawingSurface; +import jogamp.nativewindow.jawt.JAWT_DrawingSurfaceInfo; +import jogamp.nativewindow.windows.GDI; public class WindowsJAWTWindow extends JAWTWindow { diff --git a/src/nativewindow/classes/jogamp/nativewindow/jawt/x11/X11JAWTToolkitLock.java b/src/nativewindow/classes/jogamp/nativewindow/jawt/x11/X11JAWTToolkitLock.java index 7eaac2ca6..5d4fa0dad 100644 --- a/src/nativewindow/classes/jogamp/nativewindow/jawt/x11/X11JAWTToolkitLock.java +++ b/src/nativewindow/classes/jogamp/nativewindow/jawt/x11/X11JAWTToolkitLock.java @@ -25,10 +25,10 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of JogAmp Community. */ -package com.jogamp.nativewindow.impl.jawt.x11; +package jogamp.nativewindow.jawt.x11; -import com.jogamp.nativewindow.impl.jawt.*; -import com.jogamp.nativewindow.impl.x11.X11Util; +import jogamp.nativewindow.jawt.*; +import jogamp.nativewindow.x11.X11Util; import javax.media.nativewindow.ToolkitLock; /** diff --git a/src/nativewindow/classes/jogamp/nativewindow/jawt/x11/X11JAWTWindow.java b/src/nativewindow/classes/jogamp/nativewindow/jawt/x11/X11JAWTWindow.java index f87558dbc..2319d6269 100644 --- a/src/nativewindow/classes/jogamp/nativewindow/jawt/x11/X11JAWTWindow.java +++ b/src/nativewindow/classes/jogamp/nativewindow/jawt/x11/X11JAWTWindow.java @@ -35,7 +35,7 @@ * facility. */ -package com.jogamp.nativewindow.impl.jawt.x11; +package jogamp.nativewindow.jawt.x11; import javax.media.nativewindow.AbstractGraphicsConfiguration; import javax.media.nativewindow.AbstractGraphicsDevice; @@ -46,12 +46,12 @@ import javax.media.nativewindow.NativeWindowFactory; import javax.media.nativewindow.awt.AWTGraphicsDevice; import javax.media.nativewindow.util.Point; -import com.jogamp.nativewindow.impl.jawt.JAWT; -import com.jogamp.nativewindow.impl.jawt.JAWTFactory; -import com.jogamp.nativewindow.impl.jawt.JAWTWindow; -import com.jogamp.nativewindow.impl.jawt.JAWT_DrawingSurface; -import com.jogamp.nativewindow.impl.jawt.JAWT_DrawingSurfaceInfo; -import com.jogamp.nativewindow.impl.x11.X11Util; +import jogamp.nativewindow.jawt.JAWT; +import jogamp.nativewindow.jawt.JAWTFactory; +import jogamp.nativewindow.jawt.JAWTWindow; +import jogamp.nativewindow.jawt.JAWT_DrawingSurface; +import jogamp.nativewindow.jawt.JAWT_DrawingSurfaceInfo; +import jogamp.nativewindow.x11.X11Util; public class X11JAWTWindow extends JAWTWindow { diff --git a/src/nativewindow/classes/jogamp/nativewindow/jawt/x11/X11SunJDKReflection.java b/src/nativewindow/classes/jogamp/nativewindow/jawt/x11/X11SunJDKReflection.java index b4a99624c..b28874ef1 100644 --- a/src/nativewindow/classes/jogamp/nativewindow/jawt/x11/X11SunJDKReflection.java +++ b/src/nativewindow/classes/jogamp/nativewindow/jawt/x11/X11SunJDKReflection.java @@ -38,7 +38,7 @@ * and developed by Kenneth Bradley Russell and Christopher John Kline. */ -package com.jogamp.nativewindow.impl.jawt.x11; +package jogamp.nativewindow.jawt.x11; import java.awt.GraphicsConfiguration; import java.awt.GraphicsDevice; diff --git a/src/nativewindow/classes/jogamp/nativewindow/windows/RegisteredClass.java b/src/nativewindow/classes/jogamp/nativewindow/windows/RegisteredClass.java index a30a81948..16f1046a7 100644 --- a/src/nativewindow/classes/jogamp/nativewindow/windows/RegisteredClass.java +++ b/src/nativewindow/classes/jogamp/nativewindow/windows/RegisteredClass.java @@ -26,7 +26,7 @@ * or implied, of JogAmp Community. */ -package com.jogamp.nativewindow.impl.windows; +package jogamp.nativewindow.windows; public class RegisteredClass { long hInstance; diff --git a/src/nativewindow/classes/jogamp/nativewindow/windows/RegisteredClassFactory.java b/src/nativewindow/classes/jogamp/nativewindow/windows/RegisteredClassFactory.java index d04640747..15e0a67cb 100644 --- a/src/nativewindow/classes/jogamp/nativewindow/windows/RegisteredClassFactory.java +++ b/src/nativewindow/classes/jogamp/nativewindow/windows/RegisteredClassFactory.java @@ -26,9 +26,9 @@ * or implied, of JogAmp Community. */ -package com.jogamp.nativewindow.impl.windows; +package jogamp.nativewindow.windows; -import com.jogamp.nativewindow.impl.Debug; +import jogamp.nativewindow.Debug; import java.util.ArrayList; import javax.media.nativewindow.NativeWindowException; diff --git a/src/nativewindow/classes/jogamp/nativewindow/x11/X11GraphicsConfigurationFactory.java b/src/nativewindow/classes/jogamp/nativewindow/x11/X11GraphicsConfigurationFactory.java index fec7ca29d..b669bce75 100644 --- a/src/nativewindow/classes/jogamp/nativewindow/x11/X11GraphicsConfigurationFactory.java +++ b/src/nativewindow/classes/jogamp/nativewindow/x11/X11GraphicsConfigurationFactory.java @@ -31,7 +31,7 @@ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. */ -package com.jogamp.nativewindow.impl.x11; +package jogamp.nativewindow.x11; import javax.media.nativewindow.*; import javax.media.nativewindow.x11.*; diff --git a/src/nativewindow/classes/jogamp/nativewindow/x11/X11ToolkitLock.java b/src/nativewindow/classes/jogamp/nativewindow/x11/X11ToolkitLock.java index 2e0e911b9..fb0aff10d 100644 --- a/src/nativewindow/classes/jogamp/nativewindow/x11/X11ToolkitLock.java +++ b/src/nativewindow/classes/jogamp/nativewindow/x11/X11ToolkitLock.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of JogAmp Community. */ -package com.jogamp.nativewindow.impl.x11; +package jogamp.nativewindow.x11; import javax.media.nativewindow.ToolkitLock; diff --git a/src/nativewindow/classes/jogamp/nativewindow/x11/X11Util.java b/src/nativewindow/classes/jogamp/nativewindow/x11/X11Util.java index c56f632d8..4098e101b 100644 --- a/src/nativewindow/classes/jogamp/nativewindow/x11/X11Util.java +++ b/src/nativewindow/classes/jogamp/nativewindow/x11/X11Util.java @@ -31,11 +31,11 @@ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. */ -package com.jogamp.nativewindow.impl.x11; +package jogamp.nativewindow.x11; import com.jogamp.common.util.LongObjectHashMap; -import com.jogamp.nativewindow.impl.Debug; -import com.jogamp.nativewindow.impl.NWJNILibLoader; +import jogamp.nativewindow.Debug; +import jogamp.nativewindow.NWJNILibLoader; import javax.media.nativewindow.*; 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 #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; -- cgit v1.2.3