Cleanup: Java Generics Use and Removed Unused Methods

2 files changed, 19 insertions, 19 deletions

diff --git a/src/jogl/classes/javax/media/opengl/GLDrawableFactory.java b/src/jogl/classes/javax/media/opengl/GLDrawableFactory.java
index 1340b661d..9bb9480c7 100644
--- a/src/jogl/classes/javax/media/opengl/GLDrawableFactory.java
+++ b/src/jogl/classes/javax/media/opengl/GLDrawableFactory.java
@@ -96,7 +96,7 @@ public abstract class GLDrawableFactory {
   static final String macosxFactoryClassNameCGL = "jogamp.opengl.macosx.cgl.MacOSXCGLDrawableFactory";
   static final String macosxFactoryClassNameAWTCGL = "jogamp.opengl.macosx.cgl.awt.MacOSXAWTCGLDrawableFactory";
 
-  protected static ArrayList/*<GLDrawableFactoryImpl>*/ glDrawableFactories = new ArrayList();
+  protected static ArrayList<GLDrawableFactory> glDrawableFactories = new ArrayList<GLDrawableFactory>();
 
   // Shutdown hook mechanism for the factory
   private static boolean factoryShutdownHookRegistered = false;
@@ -197,7 +197,7 @@ public abstract class GLDrawableFactory {
   private static void shutdownImpl() {
     synchronized(glDrawableFactories) {
         for(int i=0; i<glDrawableFactories.size(); i++) {
-            GLDrawableFactory factory = (GLDrawableFactory) glDrawableFactories.get(i);
+            GLDrawableFactory factory = glDrawableFactories.get(i);
             factory.shutdownInstance();
         }
         glDrawableFactories.clear();
@@ -340,14 +340,14 @@ public abstract class GLDrawableFactory {
    * @param device which {@link javax.media.nativewindow.AbstractGraphicsDevice#getConnection() connection} denotes the shared the target device, may be <code>null</code> for the platform's default device.
    * @return A list of {@link javax.media.opengl.GLCapabilitiesImmutable}'s, maybe empty if none is available.
    */
-  public final List/*GLCapabilitiesImmutable*/ getAvailableCapabilities(AbstractGraphicsDevice device) {
+  public final List<GLCapabilitiesImmutable> getAvailableCapabilities(AbstractGraphicsDevice device) {
       device = validateDevice(device);
       if(null!=device) {
         return getAvailableCapabilitiesImpl(device);
       }
       return null;
   }
-  protected abstract List/*GLCapabilitiesImmutable*/ getAvailableCapabilitiesImpl(AbstractGraphicsDevice device);
+  protected abstract List<GLCapabilitiesImmutable> getAvailableCapabilitiesImpl(AbstractGraphicsDevice device);
 
   //----------------------------------------------------------------------
   // Methods to create high-level objects
diff --git a/src/jogl/classes/javax/media/opengl/GLProfile.java b/src/jogl/classes/javax/media/opengl/GLProfile.java
index 0f502ce32..1fd699dfd 100644
--- a/src/jogl/classes/javax/media/opengl/GLProfile.java
+++ b/src/jogl/classes/javax/media/opengl/GLProfile.java
@@ -153,7 +153,6 @@ public class GLProfile {
      * @return true if the profile is available for the device, otherwise false.
      */
     public static boolean isAvailable(AbstractGraphicsDevice device, String profile) {
-        HashMap profileMap = null;
         try {
             return null != getProfileMap(device).get(profile);
         } catch (GLException gle) { /* profiles for device n/a */ }
@@ -246,13 +245,13 @@ public class GLProfile {
         }
 
         sb.append("], Profiles[");
-        HashMap profileMap = null;
+        HashMap<String /*GLProfile_name*/, GLProfile> profileMap = null;
         try {
             profileMap = getProfileMap(device);
         } catch (GLException gle) { /* profiles for device n/a */ }
         if(null != profileMap) {
-            for(Iterator i=profileMap.values().iterator(); i.hasNext(); ) {
-                sb.append(((GLProfile)i.next()).toString());
+            for(Iterator<GLProfile> i=profileMap.values().iterator(); i.hasNext(); ) {
+                sb.append(i.next().toString());
                 sb.append(", ");
             }
             sb.append(", default ");
@@ -610,8 +609,8 @@ public class GLProfile {
         if(null==profile || profile.equals("GL")) {
             profile = GL_DEFAULT;
         }
-        final HashMap glpMap = getProfileMap(device);
-        final GLProfile glp = (GLProfile) glpMap.get(profile);
+        final HashMap<String /*GLProfile_name*/, GLProfile> glpMap = getProfileMap(device);
+        final GLProfile glp = glpMap.get(profile);
         if(null == glp) {
             throw new GLException("Profile "+profile+" is not available on "+device+", but: "+glpMap.values());
         }
@@ -640,10 +639,10 @@ public class GLProfile {
     public static GLProfile get(AbstractGraphicsDevice device, String[] profiles)
         throws GLException
     {
-        HashMap map = getProfileMap(device);
+        HashMap<String /*GLProfile_name*/, GLProfile> map = getProfileMap(device);
         for(int i=0; i<profiles.length; i++) {
             String profile = profiles[i];
-            GLProfile glProfile = (GLProfile) map.get(profile);
+            GLProfile glProfile = map.get(profile);
             if(null!=glProfile) {
                 return glProfile;
             }
@@ -1372,7 +1371,7 @@ public class GLProfile {
             }
             addedEGLProfile = computeProfileMap(device, false /* desktopCtxUndef*/, false /* esCtxUndef */);
         } else {
-            setProfileMap(device, new HashMap()); // empty
+            setProfileMap(device, new HashMap<String /*GLProfile_name*/, GLProfile>()); // empty
             if(DEBUG) {
                 System.err.println("GLProfile: device could not be initialized: "+device);
                 System.err.println("GLProfile: compatible w/ desktop: "+deviceIsDesktopCompatible+
@@ -1393,13 +1392,13 @@ public class GLProfile {
             System.err.println("GLProfile.initProfilesForDevice: "+device.getConnection()+": "+glAvailabilityToString(device));
             if(addedDesktopProfile) {
                 dumpGLInfo(desktopFactory, device);
-                List/*<GLCapabilitiesImmutable>*/ availCaps = desktopFactory.getAvailableCapabilities(device);
+                List<GLCapabilitiesImmutable> availCaps = desktopFactory.getAvailableCapabilities(device);
                 for(int i=0; i<availCaps.size(); i++) {
                     System.err.println(availCaps.get(i));
                 }
             } else if(addedEGLProfile) {
                 dumpGLInfo(eglFactory, device);
-                List/*<GLCapabilitiesImmutable>*/ availCaps = eglFactory.getAvailableCapabilities(device);
+                List<GLCapabilitiesImmutable> availCaps = eglFactory.getAvailableCapabilities(device);
                 for(int i=0; i<availCaps.size(); i++) {
                     System.err.println(availCaps.get(i));
                 }
@@ -1587,7 +1586,8 @@ public class GLProfile {
         }
     }
 
-    private static /*final*/ HashMap/*<device_connection, HashMap<GL-String, GLProfile>*/ deviceConn2ProfileMap = new HashMap();
+    private static /*final*/ HashMap<String /*device_connection*/, HashMap<String /*GLProfile_name*/, GLProfile>> deviceConn2ProfileMap = 
+                new HashMap<String /*device_connection*/, HashMap<String /*GLProfile_name*/, GLProfile>>();
 
     /**
      * This implementation support lazy initialization, while avoiding recursion/deadlocks.<br>
@@ -1599,13 +1599,13 @@ public class GLProfile {
      * @return the GLProfile HashMap if exists, otherwise null 
      * @throws GLException if no profile for the given device is available.
      */
-    private static HashMap getProfileMap(AbstractGraphicsDevice device) throws GLException {
+    private static HashMap<String /*GLProfile_name*/, GLProfile> getProfileMap(AbstractGraphicsDevice device) throws GLException {
         validateInitialization();
         if(null==device) {
             device = defaultDevice;
         }
         String deviceKey = device.getUniqueID();
-        HashMap map = (HashMap) deviceConn2ProfileMap.get(deviceKey);
+        HashMap<String /*GLProfile_name*/, GLProfile> map = deviceConn2ProfileMap.get(deviceKey);
         if( null == map ) {
             if( !initProfilesForDevice(device) ) {
                 throw new GLException("No Profile available for "+device);
@@ -1617,7 +1617,7 @@ public class GLProfile {
         return map;
     }
 
-    private static void setProfileMap(AbstractGraphicsDevice device, HashMap/*<GL-String, GLProfile>*/mappedProfiles) {
+    private static void setProfileMap(AbstractGraphicsDevice device, HashMap<String /*GLProfile_name*/, GLProfile> mappedProfiles) {
         validateInitialization();
         synchronized ( deviceConn2ProfileMap ) {
             deviceConn2ProfileMap.put(device.getUniqueID(), mappedProfiles);