From 1c05c85e1ccc480da227cd6aa4718efd386e1e35 Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Thu, 21 Jun 2012 20:14:46 +0200
Subject: JOGL CapabilitiesChooser-API and impl.: Cleanup using generics: 'List
 l' -> 'List<? extends CapabilitiesImmutable> l'

---
 .../classes/javax/media/nativewindow/CapabilitiesChooser.java         | 2 +-
 .../classes/javax/media/nativewindow/DefaultCapabilitiesChooser.java  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/nativewindow/classes')

diff --git a/src/nativewindow/classes/javax/media/nativewindow/CapabilitiesChooser.java b/src/nativewindow/classes/javax/media/nativewindow/CapabilitiesChooser.java
index a306363dc..e1fdf4938 100644
--- a/src/nativewindow/classes/javax/media/nativewindow/CapabilitiesChooser.java
+++ b/src/nativewindow/classes/javax/media/nativewindow/CapabilitiesChooser.java
@@ -65,6 +65,6 @@ public interface CapabilitiesChooser {
       choice to some other CapabilitiesChooser object.
   */
   public int chooseCapabilities(CapabilitiesImmutable desired,
-                                List /*<CapabilitiesImmutable>*/ available,
+                                List<? extends CapabilitiesImmutable> available,
                                 int windowSystemRecommendedChoice);
 }
diff --git a/src/nativewindow/classes/javax/media/nativewindow/DefaultCapabilitiesChooser.java b/src/nativewindow/classes/javax/media/nativewindow/DefaultCapabilitiesChooser.java
index 48c4d31ce..9d4b112b1 100644
--- a/src/nativewindow/classes/javax/media/nativewindow/DefaultCapabilitiesChooser.java
+++ b/src/nativewindow/classes/javax/media/nativewindow/DefaultCapabilitiesChooser.java
@@ -69,7 +69,7 @@ public class DefaultCapabilitiesChooser implements CapabilitiesChooser {
   private static final boolean DEBUG = Debug.isPropertyDefined("nativewindow.debug.CapabilitiesChooser", true); 
 
   public int chooseCapabilities(final CapabilitiesImmutable desired,
-                                final List /*<CapabilitiesImmutable>*/ available,
+                                final List<? extends CapabilitiesImmutable> available,
                                 final int windowSystemRecommendedChoice) {
     if (DEBUG) {
       System.err.println("Desired: " + desired);
@@ -99,7 +99,7 @@ public class DefaultCapabilitiesChooser implements CapabilitiesChooser {
     }
     // Compute score for each
     for (int i = 0; i < availnum; i++) {
-      CapabilitiesImmutable cur = (CapabilitiesImmutable) available.get(i);
+      final CapabilitiesImmutable cur = available.get(i);
       if (cur == null) {
         continue;
       }
-- 
cgit v1.2.3