diff options
author | Sven Gothel <[email protected]> | 2011-02-09 08:08:54 +0100 |
---|---|---|
committer | Sven Gothel <[email protected]> | 2011-02-09 08:08:54 +0100 |
commit | 209253c301a0afa13a9edb3d68adb67040a7e619 (patch) | |
tree | 418834237f174b8114f88107340ab00fca1978cc | |
parent | a43a3ee9106431ac089eee31b500211f775e684b (diff) |
Fix: Java 1.5 warnings
7 files changed, 18 insertions, 18 deletions
diff --git a/src/jogl/classes/jogamp/opengl/awt/AWTUtil.java b/src/jogl/classes/jogamp/opengl/awt/AWTUtil.java index 29328f216..51143ab51 100644 --- a/src/jogl/classes/jogamp/opengl/awt/AWTUtil.java +++ b/src/jogl/classes/jogamp/opengl/awt/AWTUtil.java @@ -58,8 +58,8 @@ public class AWTUtil { if(!headlessMode) { try { j2dClazz = Class.forName("jogamp.opengl.awt.Java2D"); - isOGLPipelineActive = j2dClazz.getMethod("isOGLPipelineActive", null); - isQueueFlusherThread = j2dClazz.getMethod("isQueueFlusherThread", null); + isOGLPipelineActive = j2dClazz.getMethod("isOGLPipelineActive", (Class[])null); + isQueueFlusherThread = j2dClazz.getMethod("isQueueFlusherThread", (Class[])null); j2dOk = true; } catch (Exception e) {} } @@ -82,8 +82,8 @@ public class AWTUtil { if(j2dOk) { try { - if( !((Boolean)isOGLPipelineActive.invoke(null, null)).booleanValue() || - !((Boolean)isQueueFlusherThread.invoke(null, null)).booleanValue() ) { + if( !((Boolean)isOGLPipelineActive.invoke(null, (Object[])null)).booleanValue() || + !((Boolean)isQueueFlusherThread.invoke(null, (Object[])null)).booleanValue() ) { JAWTUtil.lockToolkit(); } } catch (Exception e) { j2dOk=false; } @@ -105,8 +105,8 @@ public class AWTUtil { if(j2dOk) { try { - if( !((Boolean)isOGLPipelineActive.invoke(null, null)).booleanValue() || - !((Boolean)isQueueFlusherThread.invoke(null, null)).booleanValue() ) { + if( !((Boolean)isOGLPipelineActive.invoke(null, (Object[])null)).booleanValue() || + !((Boolean)isQueueFlusherThread.invoke(null, (Object[])null)).booleanValue() ) { JAWTUtil.unlockToolkit(); } } catch (Exception e) { j2dOk=false; } diff --git a/src/jogl/classes/jogamp/opengl/awt/Java2D.java b/src/jogl/classes/jogamp/opengl/awt/Java2D.java index d57cde12a..e240169e1 100644 --- a/src/jogl/classes/jogamp/opengl/awt/Java2D.java +++ b/src/jogl/classes/jogamp/opengl/awt/Java2D.java @@ -265,7 +265,7 @@ public class Java2D { checkActive(); try { - return ((Boolean) isQueueFlusherThreadMethod.invoke(null, null)).booleanValue(); + return ((Boolean) isQueueFlusherThreadMethod.invoke(null, (Object[])null)).booleanValue(); } catch (InvocationTargetException e) { throw new GLException(e.getTargetException()); } catch (Exception e) { diff --git a/src/nativewindow/classes/javax/media/nativewindow/NativeWindowFactory.java b/src/nativewindow/classes/javax/media/nativewindow/NativeWindowFactory.java index d0df41794..b0f5cb3f9 100644 --- a/src/nativewindow/classes/javax/media/nativewindow/NativeWindowFactory.java +++ b/src/nativewindow/classes/javax/media/nativewindow/NativeWindowFactory.java @@ -189,7 +189,7 @@ public abstract class NativeWindowFactory { public Object run() { try { jawtUtilClass = Class.forName(JAWTUtilClassName, false, NativeWindowFactory.class.getClassLoader()); - jawtUtilInitMethod = jawtUtilClass.getDeclaredMethod("initSingleton", null); + jawtUtilInitMethod = jawtUtilClass.getDeclaredMethod("initSingleton", (Class[])null); jawtUtilInitMethod.setAccessible(true); jawtUtilGetJAWTToolkitMethod = jawtUtilClass.getDeclaredMethod("getJAWTToolkitLock", new Class[]{}); jawtUtilGetJAWTToolkitMethod.setAccessible(true); diff --git a/src/nativewindow/classes/jogamp/nativewindow/jawt/JAWTUtil.java b/src/nativewindow/classes/jogamp/nativewindow/jawt/JAWTUtil.java index e392e935f..d5811d9c5 100644 --- a/src/nativewindow/classes/jogamp/nativewindow/jawt/JAWTUtil.java +++ b/src/nativewindow/classes/jogamp/nativewindow/jawt/JAWTUtil.java @@ -79,7 +79,7 @@ public class JAWTUtil { if (!headlessMode) { try { jC = Class.forName("jogamp.opengl.awt.Java2D"); - m = jC.getMethod("isQueueFlusherThread", null); + m = jC.getMethod("isQueueFlusherThread", (Class[])null); ok = true; } catch (Exception e) { } @@ -104,8 +104,8 @@ public class JAWTUtil { boolean _hasSunToolkitAWTLock = false; if (null != sunToolkitAWTLockMethod && null != sunToolkitAWTUnlockMethod) { try { - sunToolkitAWTLockMethod.invoke(null, null); - sunToolkitAWTUnlockMethod.invoke(null, null); + sunToolkitAWTLockMethod.invoke(null, (Object[])null); + sunToolkitAWTUnlockMethod.invoke(null, (Object[])null); _hasSunToolkitAWTLock = true; } catch (Exception e) { } @@ -160,7 +160,7 @@ public class JAWTUtil { boolean b = false; if(j2dExist) { try { - b = ((Boolean)isQueueFlusherThread.invoke(null, null)).booleanValue(); + b = ((Boolean)isQueueFlusherThread.invoke(null, (Object[])null)).booleanValue(); } catch (Exception e) {} } return b; @@ -179,7 +179,7 @@ public class JAWTUtil { public static void awtLock() { if(hasSunToolkitAWTLock) { try { - sunToolkitAWTLockMethod.invoke(null, null); + sunToolkitAWTLockMethod.invoke(null, (Object[])null); } catch (Exception e) { throw new NativeWindowException("SunToolkit.awtLock failed", e); } @@ -197,7 +197,7 @@ public class JAWTUtil { public static void awtUnlock() { if(hasSunToolkitAWTLock) { try { - sunToolkitAWTUnlockMethod.invoke(null, null); + sunToolkitAWTUnlockMethod.invoke(null, (Object[])null); } catch (Exception e) { throw new NativeWindowException("SunToolkit.awtUnlock failed", e); } diff --git a/src/nativewindow/classes/jogamp/nativewindow/jawt/windows/Win32SunJDKReflection.java b/src/nativewindow/classes/jogamp/nativewindow/jawt/windows/Win32SunJDKReflection.java index 1ff485290..5ad22807f 100644 --- a/src/nativewindow/classes/jogamp/nativewindow/jawt/windows/Win32SunJDKReflection.java +++ b/src/nativewindow/classes/jogamp/nativewindow/jawt/windows/Win32SunJDKReflection.java @@ -109,7 +109,7 @@ public class Win32SunJDKReflection { } try { - return ((Integer) win32GraphicsConfigGetVisualMethod.invoke(config, null)).intValue(); + return ((Integer) win32GraphicsConfigGetVisualMethod.invoke(config, (Object[])null)).intValue(); } catch (Exception e) { return 0; } diff --git a/src/nativewindow/classes/jogamp/nativewindow/jawt/x11/X11SunJDKReflection.java b/src/nativewindow/classes/jogamp/nativewindow/jawt/x11/X11SunJDKReflection.java index b28874ef1..b576b0c6b 100644 --- a/src/nativewindow/classes/jogamp/nativewindow/jawt/x11/X11SunJDKReflection.java +++ b/src/nativewindow/classes/jogamp/nativewindow/jawt/x11/X11SunJDKReflection.java @@ -87,7 +87,7 @@ public class X11SunJDKReflection { } try { - return ((Long) x11GraphicsDeviceGetDisplayMethod.invoke(device, null)).longValue(); + return ((Long) x11GraphicsDeviceGetDisplayMethod.invoke(device, (Object[])null)).longValue(); } catch (Exception e) { return 0; } @@ -110,7 +110,7 @@ public class X11SunJDKReflection { } try { - return ((Integer) x11GraphicsConfigGetVisualMethod.invoke(config, null)).intValue(); + return ((Integer) x11GraphicsConfigGetVisualMethod.invoke(config, (Object[])null)).intValue(); } catch (Exception e) { return 0; } diff --git a/src/newt/classes/jogamp/newt/WindowImpl.java b/src/newt/classes/jogamp/newt/WindowImpl.java index 8dd4bc8e2..79679b7b3 100644 --- a/src/newt/classes/jogamp/newt/WindowImpl.java +++ b/src/newt/classes/jogamp/newt/WindowImpl.java @@ -2172,7 +2172,7 @@ public abstract class WindowImpl implements Window, NEWTEventConsumer Class[] argTypes = null; try { Method m = windowClass.getDeclaredMethod("getCustomConstructorArgumentTypes", new Class[] {}); - argTypes = (Class[]) m.invoke(null, null); + argTypes = (Class[]) m.invoke(null, (Object[])null); } catch (Throwable t) {} return argTypes; } |