SharedResourceRunner: Use generics ; X11GLXDrawableFactory.SharedRunnable shutdown: don't attempt to close Display device.

1 files changed, 4 insertions, 5 deletions

diff --git a/src/jogl/classes/jogamp/opengl/SharedResourceRunner.java b/src/jogl/classes/jogamp/opengl/SharedResourceRunner.java
index 5979056f3..e24a9f8ed 100644
--- a/src/jogl/classes/jogamp/opengl/SharedResourceRunner.java
+++ b/src/jogl/classes/jogamp/opengl/SharedResourceRunner.java
@@ -50,7 +50,7 @@ public class SharedResourceRunner implements Runnable {
 
         Resource mapPut(String connection, Resource resource);
         Resource mapGet(String connection);
-        Collection/*<Resource>*/ mapValues();
+        Collection<Resource> mapValues();
     }
 
     Implementation impl = null;
@@ -246,10 +246,9 @@ public class SharedResourceRunner implements Runnable {
     }
 
     private void releaseSharedResources() {
-        Collection/*<Resource>*/ sharedResources = impl.mapValues();
-        for (Iterator iter = sharedResources.iterator(); iter.hasNext();) {
-            Resource sr = (Resource) iter.next();
-            impl.releaseSharedResource(sr);
+        Collection<Resource> sharedResources = impl.mapValues();
+        for (Iterator<Resource> iter = sharedResources.iterator(); iter.hasNext();) {
+            impl.releaseSharedResource(iter.next());
         }
         impl.clear();
     }