Bug 1392: Simplify CapabilitiesFilter: Criteria -> Test, remove RemovalCriteria as all Test definitions may be used for anything.

2 files changed, 11 insertions, 11 deletions

diff --git a/src/jogl/classes/com/jogamp/opengl/GLCapabilitiesFilter.java b/src/jogl/classes/com/jogamp/opengl/GLCapabilitiesFilter.java
index d2479f47d..0d713d33b 100644
--- a/src/jogl/classes/com/jogamp/opengl/GLCapabilitiesFilter.java
+++ b/src/jogl/classes/com/jogamp/opengl/GLCapabilitiesFilter.java
@@ -39,18 +39,18 @@ import com.jogamp.nativewindow.CapabilitiesFilter;
 public class GLCapabilitiesFilter extends CapabilitiesFilter {
     protected GLCapabilitiesFilter() {}
 
-    public static class RemoveLessDepthBits<C extends GLCapabilitiesImmutable> implements RemovalCriteria<C> {
+    public static class TestLessDepthBits<C extends GLCapabilitiesImmutable> implements Test<C> {
         final int minDepthBits;
-        public RemoveLessDepthBits(final int minDepthBits) {
+        public TestLessDepthBits(final int minDepthBits) {
             this.minDepthBits = minDepthBits;
         }
         public final boolean match(final C cap) {
             return cap.getDepthBits() < minDepthBits;
         }
     }
-    public static class RemoveMoreDepthBits<C extends GLCapabilitiesImmutable> implements RemovalCriteria<C> {
+    public static class TestMoreDepthBits<C extends GLCapabilitiesImmutable> implements Test<C> {
         final int maxDepthBits;
-        public RemoveMoreDepthBits(final int maxDepthBits) {
+        public TestMoreDepthBits(final int maxDepthBits) {
             this.maxDepthBits = maxDepthBits;
         }
         public final boolean match(final C cap) {
@@ -66,8 +66,8 @@ public class GLCapabilitiesFilter extends CapabilitiesFilter {
      */
     public static <C extends GLCapabilitiesImmutable> ArrayList<C> removeLessDepthBits(final ArrayList<C> availableCaps,
                                                                       final int minDepthBits) {
-        final ArrayList<RemovalCriteria<C>> criteria = new ArrayList<RemovalCriteria<C>>();
-        criteria.add(new RemoveLessDepthBits<C>(minDepthBits));
+        final ArrayList<Test<C>> criteria = new ArrayList<Test<C>>();
+        criteria.add(new TestLessDepthBits<C>(minDepthBits));
         return CapabilitiesFilter.removeMatching(availableCaps, criteria);
     }
 }
diff --git a/src/jogl/classes/jogamp/opengl/egl/EGLGraphicsConfigurationFactory.java b/src/jogl/classes/jogamp/opengl/egl/EGLGraphicsConfigurationFactory.java
index 98d16a0d2..929be16e3 100644
--- a/src/jogl/classes/jogamp/opengl/egl/EGLGraphicsConfigurationFactory.java
+++ b/src/jogl/classes/jogamp/opengl/egl/EGLGraphicsConfigurationFactory.java
@@ -48,7 +48,7 @@ import com.jogamp.nativewindow.CapabilitiesImmutable;
 import com.jogamp.nativewindow.GraphicsConfigurationFactory;
 import com.jogamp.nativewindow.NativeWindowFactory;
 import com.jogamp.nativewindow.VisualIDHolder;
-import com.jogamp.nativewindow.CapabilitiesFilter.RemovalCriteria;
+import com.jogamp.nativewindow.CapabilitiesFilter.Test;
 import com.jogamp.nativewindow.VisualIDHolder.VIDType;
 import com.jogamp.opengl.GLCapabilities;
 import com.jogamp.opengl.GLCapabilitiesChooser;
@@ -440,16 +440,16 @@ public class EGLGraphicsConfigurationFactory extends GLGraphicsConfigurationFact
         }
         // Filter availableCaps
         {
-            final ArrayList<RemovalCriteria<GLCapabilitiesImmutable>> criteria = new ArrayList<RemovalCriteria<GLCapabilitiesImmutable>>();
+            final ArrayList<Test<GLCapabilitiesImmutable>> criteria = new ArrayList<Test<GLCapabilitiesImmutable>>();
             if( !skipCapsChooser && isPBufferOrBitmap && GLRendererQuirks.exist(glrq, GLRendererQuirks.No10BitColorCompOffscreen) ) {
-                criteria.add(new CapabilitiesFilter.RemoveMoreColorCompBits<GLCapabilitiesImmutable>(8));
+                criteria.add(new CapabilitiesFilter.TestMoreColorCompBits<GLCapabilitiesImmutable>(8));
             }
             if( VisualIDHolder.VID_UNDEFINED != nativeVisualID) {
-                criteria.add(new CapabilitiesFilter.RemoveUnmatchedNativeVisualID<GLCapabilitiesImmutable>(nativeVisualID));
+                criteria.add(new CapabilitiesFilter.TestUnmatchedNativeVisualID<GLCapabilitiesImmutable>(nativeVisualID));
             }
             if( 0 < capsChosen.getDepthBits() ) {
                 // Hack for HiSilicon/Vivante/Immersion.16 Renderer ..
-                criteria.add(new GLCapabilitiesFilter.RemoveLessDepthBits<GLCapabilitiesImmutable>(1));
+                criteria.add(new GLCapabilitiesFilter.TestLessDepthBits<GLCapabilitiesImmutable>(1));
             }
             if( criteria.size() > 0 ) {
                 final ArrayList<GLCapabilitiesImmutable> removedCaps = CapabilitiesFilter.removeMatching(availableCaps, criteria);