From 006f0ffdc63c35b0aed229b626db00c358c9399f Mon Sep 17 00:00:00 2001 From: Sven Gothel Date: Wed, 24 Aug 2011 01:54:31 +0200 Subject: Cleanup: Java Generics Use and Removed Unused Methods --- .../javax/media/opengl/GLDrawableFactory.java | 8 +++--- src/jogl/classes/javax/media/opengl/GLProfile.java | 30 +++++++++++----------- 2 files changed, 19 insertions(+), 19 deletions(-) (limited to 'src/jogl/classes/javax') 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/**/ glDrawableFactories = new ArrayList(); + protected static ArrayList glDrawableFactories = new ArrayList(); // 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; inull 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 getAvailableCapabilities(AbstractGraphicsDevice device) { device = validateDevice(device); if(null!=device) { return getAvailableCapabilitiesImpl(device); } return null; } - protected abstract List/*GLCapabilitiesImmutable*/ getAvailableCapabilitiesImpl(AbstractGraphicsDevice device); + protected abstract List 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 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 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 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 map = getProfileMap(device); for(int i=0; i()); // 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/**/ availCaps = desktopFactory.getAvailableCapabilities(device); + List availCaps = desktopFactory.getAvailableCapabilities(device); for(int i=0; i*/ availCaps = eglFactory.getAvailableCapabilities(device); + List availCaps = eglFactory.getAvailableCapabilities(device); for(int i=0; i*/ deviceConn2ProfileMap = new HashMap(); + private static /*final*/ HashMap> deviceConn2ProfileMap = + new HashMap>(); /** * This implementation support lazy initialization, while avoiding recursion/deadlocks.
@@ -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 getProfileMap(AbstractGraphicsDevice device) throws GLException { validateInitialization(); if(null==device) { device = defaultDevice; } String deviceKey = device.getUniqueID(); - HashMap map = (HashMap) deviceConn2ProfileMap.get(deviceKey); + HashMap 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/**/mappedProfiles) { + private static void setProfileMap(AbstractGraphicsDevice device, HashMap mappedProfiles) { validateInitialization(); synchronized ( deviceConn2ProfileMap ) { deviceConn2ProfileMap.put(device.getUniqueID(), mappedProfiles); -- cgit v1.2.3