summaryrefslogtreecommitdiffstats
path: root/src/demos/multisample/Multisample.java
diff options
context:
space:
mode:
authorSven Gothel <sgothel@jausoft.com>2012-06-21 20:58:04 +0200
committerSven Gothel <sgothel@jausoft.com>2012-06-21 20:58:04 +0200
commitbe0ebf39ac48e904803ad35ad280dc6ecde03119 (patch)
tree877e5b6cb721d182cf6f5b6c7bb2d6d34dcef0fd /src/demos/multisample/Multisample.java
parent9c2d74736fdd723267aaf6f7a5018dd1bc882775 (diff)
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
Diffstat (limited to 'src/demos/multisample/Multisample.java')
-rwxr-xr-xsrc/demos/multisample/Multisample.java11
1 files changed, 3 insertions, 8 deletions
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);
}