From be0ebf39ac48e904803ad35ad280dc6ecde03119 Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Thu, 21 Jun 2012 20:58:04 +0200
Subject: Remove GLProfile.initSingleton(..) calls and JNLP argument
 'NotFirstUIActionOnProcess'; Adapt to CapabilitiesChooser API/generics
 change; Misc

- Remove GLProfile.initSingleton(..) calls and JNLP argument 'NotFirstUIActionOnProcess'

- Adapt to CapabilitiesChooser API/generics change

- Cleanup some generics use .. etc
---
 src/demos/multisample/Multisample.java | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

(limited to 'src/demos/multisample')

diff --git a/src/demos/multisample/Multisample.java b/src/demos/multisample/Multisample.java
index 5b5d6b2..6c2624b 100755
--- a/src/demos/multisample/Multisample.java
+++ b/src/demos/multisample/Multisample.java
@@ -42,6 +42,8 @@ package demos.multisample;
 import java.util.List;
 import java.awt.*;
 import java.awt.event.*;
+
+import javax.media.nativewindow.CapabilitiesImmutable;
 import javax.media.opengl.*;
 import javax.media.opengl.awt.GLCanvas;
 
@@ -51,7 +53,7 @@ public class Multisample {
   // Simple class to warn if results are not going to be as expected
   static class MultisampleChooser extends DefaultGLCapabilitiesChooser {
     public int chooseCapabilities(GLCapabilities desired,
-                                  List/*<GLCapabilitiesImmutable>*/ available,
+                                  List<? extends CapabilitiesImmutable> available,
                                   int windowSystemRecommendedChoice) {
       boolean anyHaveSampleBuffers = false;
       for (int i = 0; i < available.size(); i++) {
@@ -75,13 +77,6 @@ public class Multisample {
   }
 
   public static void main(String[] args) {
-    // set argument 'NotFirstUIActionOnProcess' in the JNLP's application-desc tag for example
-    // <application-desc main-class="demos.j2d.TextCube"/>
-    //   <argument>NotFirstUIActionOnProcess</argument> 
-    // </application-desc>
-    boolean firstUIActionOnProcess = 0==args.length || !args[0].equals("NotFirstUIActionOnProcess") ;
-    GLProfile.initSingleton(firstUIActionOnProcess);
-
     new Multisample().run(args);
   }
 
-- 
cgit v1.2.3