NativeWindow minor edits: Remove warnings (generics, imports, ..)

4 files changed, 30 insertions, 26 deletions

diff --git a/src/nativewindow/classes/javax/media/nativewindow/GraphicsConfigurationFactory.java b/src/nativewindow/classes/javax/media/nativewindow/GraphicsConfigurationFactory.java
index fa3923dcf..e510c0b78 100644
--- a/src/nativewindow/classes/javax/media/nativewindow/GraphicsConfigurationFactory.java
+++ b/src/nativewindow/classes/javax/media/nativewindow/GraphicsConfigurationFactory.java
@@ -60,9 +60,9 @@ import java.util.Map;
 public abstract class GraphicsConfigurationFactory {
     protected static final boolean DEBUG = Debug.debug("GraphicsConfiguration");
 
-    private static Map/*<Class, NativeWindowFactory>*/ registeredFactories =
-        Collections.synchronizedMap(new HashMap());
-    private static Class abstractGraphicsDeviceClass;
+    private static Map<Class<?>, GraphicsConfigurationFactory> registeredFactories =
+        Collections.synchronizedMap(new HashMap<Class<?>, GraphicsConfigurationFactory>());
+    private static Class<?> abstractGraphicsDeviceClass;
 
     static {
         initialize();
@@ -122,7 +122,7 @@ public abstract class GraphicsConfigurationFactory {
      *
      * @throws IllegalArgumentException if the given class does not implement AbstractGraphicsDevice
      */
-    public static GraphicsConfigurationFactory getFactory(Class abstractGraphicsDeviceImplementor)
+    public static GraphicsConfigurationFactory getFactory(Class<?> abstractGraphicsDeviceImplementor)
         throws IllegalArgumentException, NativeWindowException
     {
         if (!(abstractGraphicsDeviceClass.isAssignableFrom(abstractGraphicsDeviceImplementor))) {
@@ -130,10 +130,9 @@ public abstract class GraphicsConfigurationFactory {
         }
 
         GraphicsConfigurationFactory factory = null;
-        Class clazz = abstractGraphicsDeviceImplementor;
+        Class<?> clazz = abstractGraphicsDeviceImplementor;
         while (clazz != null) {
-            factory =
-                (GraphicsConfigurationFactory) registeredFactories.get(clazz);
+            factory = registeredFactories.get(clazz);
             if (factory != null) {
                 if(DEBUG) {
                     System.err.println("GraphicsConfigurationFactory.getFactory() "+abstractGraphicsDeviceImplementor+" -> "+factory);
@@ -143,7 +142,7 @@ public abstract class GraphicsConfigurationFactory {
             clazz = clazz.getSuperclass();
         }
         // Return the default
-        factory = (GraphicsConfigurationFactory)registeredFactories.get(abstractGraphicsDeviceClass);
+        factory = registeredFactories.get(abstractGraphicsDeviceClass);
         if(DEBUG) {
             System.err.println("GraphicsConfigurationFactory.getFactory() DEFAULT "+abstractGraphicsDeviceClass+" -> "+factory);
         }
@@ -157,7 +156,7 @@ public abstract class GraphicsConfigurationFactory {
      *
      * @throws IllegalArgumentException if the given class does not implement AbstractGraphicsDevice
      */
-    protected static void registerFactory(Class abstractGraphicsDeviceImplementor, GraphicsConfigurationFactory factory)
+    protected static void registerFactory(Class<?> abstractGraphicsDeviceImplementor, GraphicsConfigurationFactory factory)
         throws IllegalArgumentException
     {
         if (!(abstractGraphicsDeviceClass.isAssignableFrom(abstractGraphicsDeviceImplementor))) {
diff --git a/src/nativewindow/classes/javax/media/nativewindow/NativeWindowFactory.java b/src/nativewindow/classes/javax/media/nativewindow/NativeWindowFactory.java
index ef8876f50..60ce07f09 100644
--- a/src/nativewindow/classes/javax/media/nativewindow/NativeWindowFactory.java
+++ b/src/nativewindow/classes/javax/media/nativewindow/NativeWindowFactory.java
@@ -33,15 +33,20 @@
 
 package javax.media.nativewindow;
 
-import java.security.*;
-import java.util.*;
-
-import com.jogamp.common.util.*;
-import com.jogamp.common.os.Platform;
-
-import jogamp.nativewindow.*;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Method;
+import java.security.AccessControlContext;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+
+import jogamp.nativewindow.Debug;
+import jogamp.nativewindow.NativeWindowFactoryImpl;
+
+import com.jogamp.common.os.Platform;
+import com.jogamp.common.util.ReflectionUtil;
 
 /** Provides a pluggable mechanism for arbitrary window toolkits to
     adapt their components to the {@link NativeWindow} interface,
diff --git a/src/nativewindow/classes/jogamp/nativewindow/jawt/x11/X11JAWTWindow.java b/src/nativewindow/classes/jogamp/nativewindow/jawt/x11/X11JAWTWindow.java
index 562a9339a..16dcf11fe 100644
--- a/src/nativewindow/classes/jogamp/nativewindow/jawt/x11/X11JAWTWindow.java
+++ b/src/nativewindow/classes/jogamp/nativewindow/jawt/x11/X11JAWTWindow.java
@@ -60,7 +60,7 @@ public class X11JAWTWindow extends JAWTWindow {
   }
 
   protected void validateNative() throws NativeWindowException {
-    AWTGraphicsDevice awtDevice = (AWTGraphicsDevice) config.getScreen().getDevice();
+    final AWTGraphicsDevice awtDevice = (AWTGraphicsDevice) config.getScreen().getDevice();
 
     if(awtDevice.getHandle() != 0) {
         // subtype and handle set already, done
diff --git a/src/nativewindow/classes/jogamp/nativewindow/jawt/x11/X11SunJDKReflection.java b/src/nativewindow/classes/jogamp/nativewindow/jawt/x11/X11SunJDKReflection.java
index b576b0c6b..6dbf36612 100644
--- a/src/nativewindow/classes/jogamp/nativewindow/jawt/x11/X11SunJDKReflection.java
+++ b/src/nativewindow/classes/jogamp/nativewindow/jawt/x11/X11SunJDKReflection.java
@@ -55,14 +55,14 @@ import javax.media.nativewindow.awt.AWTGraphicsConfiguration;
     the purposes of correctly enumerating the available visuals. */
 
 public class X11SunJDKReflection {
-  private static Class   x11GraphicsDeviceClass;
-  private static Method  x11GraphicsDeviceGetDisplayMethod;
-  private static Class   x11GraphicsConfigClass;
-  private static Method  x11GraphicsConfigGetVisualMethod;
-  private static boolean initted;
+  private static Class<?> x11GraphicsDeviceClass;
+  private static Method   x11GraphicsDeviceGetDisplayMethod;
+  private static Class<?> x11GraphicsConfigClass;
+  private static Method   x11GraphicsConfigGetVisualMethod;
+  private static boolean initialized;
 
   static {
-    AccessController.doPrivileged(new PrivilegedAction() {
+    AccessController.doPrivileged(new PrivilegedAction<Object>() {
         public Object run() {
           try {
             x11GraphicsDeviceClass = Class.forName("sun.awt.X11GraphicsDevice");
@@ -72,7 +72,7 @@ public class X11SunJDKReflection {
             x11GraphicsConfigClass = Class.forName("sun.awt.X11GraphicsConfig");
             x11GraphicsConfigGetVisualMethod = x11GraphicsConfigClass.getDeclaredMethod("getVisual", new Class[] {});
             x11GraphicsConfigGetVisualMethod.setAccessible(true);
-            initted = true;
+            initialized = true;
           } catch (Exception e) {
             // Either not a Sun JDK or the interfaces have changed since 1.4.2 / 1.5
           }
@@ -82,7 +82,7 @@ public class X11SunJDKReflection {
   }
 
   public static long graphicsDeviceGetDisplay(GraphicsDevice device) {
-    if (!initted) {
+    if (!initialized) {
       return 0;
     }
 
@@ -105,7 +105,7 @@ public class X11SunJDKReflection {
   }
 
   public static int graphicsConfigurationGetVisualID(GraphicsConfiguration config) {
-    if (!initted) {
+    if (!initialized) {
       return 0;
     }