Fix/Syn with JOGL 774138544e1eec3330309ad682fa05154a07ab8d ; Notably add: Applet's with native NEWT support, ie jogl-newt-applet-runner-gears.html

7 files changed, 47 insertions, 25 deletions

diff --git a/src/demos/j2d/CustomText.java b/src/demos/j2d/CustomText.java
index 86a423f..5918dc9 100755
--- a/src/demos/j2d/CustomText.java
+++ b/src/demos/j2d/CustomText.java
@@ -86,10 +86,14 @@ import javax.swing.JPanel;
     to do text filled with a linear Java 2D gradient. */
 
 public class CustomText extends Demo {
-  static {
-    GLProfile.initSingleton();
-  }
   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);
+
     JFrame frame = new JFrame("Custom Text");
     frame.getContentPane().setLayout(new BorderLayout());
 
diff --git a/src/demos/j2d/FlyingText.java b/src/demos/j2d/FlyingText.java
index d5a83a6..929803e 100755
--- a/src/demos/j2d/FlyingText.java
+++ b/src/demos/j2d/FlyingText.java
@@ -87,11 +87,14 @@ import javax.swing.event.ChangeListener;
     shadow effect. */
 
 public class FlyingText extends Demo {
-  static {
-    GLProfile.initSingleton();
-  }
-
   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);
+
     JFrame frame = new JFrame("Flying Text");
     frame.getContentPane().setLayout(new BorderLayout());
 
diff --git a/src/demos/j2d/TestOverlay.java b/src/demos/j2d/TestOverlay.java
index 28c30fa..eda3e0a 100755
--- a/src/demos/j2d/TestOverlay.java
+++ b/src/demos/j2d/TestOverlay.java
@@ -66,10 +66,14 @@ import com.jogamp.opengl.util.Animator;
     with moving Java 2D-rendered text on top. */
 
 public class TestOverlay implements GLEventListener {
-  static {
-    GLProfile.initSingleton();
-  }
   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);
+
     Frame frame = new Frame("Java 2D Overlay Test");
     GLCapabilities caps = new GLCapabilities(null);
     caps.setAlphaBits(8);
diff --git a/src/demos/j2d/TestTextRenderer.java b/src/demos/j2d/TestTextRenderer.java
index d5ec735..53042dd 100755
--- a/src/demos/j2d/TestTextRenderer.java
+++ b/src/demos/j2d/TestTextRenderer.java
@@ -64,11 +64,14 @@ import com.jogamp.opengl.util.Animator;
     with moving Java 2D-rendered text on top. */
 
 public class TestTextRenderer implements GLEventListener {
-  static {
-    GLProfile.initSingleton();
-  }
-
   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);
+
     Frame frame = new Frame("Text Renderer Test");
     GLCapabilities caps = new GLCapabilities(null);
     caps.setAlphaBits(8);
diff --git a/src/demos/j2d/TestTextureRenderer.java b/src/demos/j2d/TestTextureRenderer.java
index 87baa1d..cedee83 100755
--- a/src/demos/j2d/TestTextureRenderer.java
+++ b/src/demos/j2d/TestTextureRenderer.java
@@ -70,11 +70,13 @@ import com.jogamp.opengl.util.Animator;
     underneath with moving Java 2D-rendered text on top. */
 
 public class TestTextureRenderer implements GLEventListener {
-  static {
-    GLProfile.initSingleton();
-  }
-
   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);
 
     Frame frame = new Frame("Java 2D Renderer Test");
     GLCapabilities caps = new GLCapabilities(GLProfile.get(GLProfile.GL2));
diff --git a/src/demos/j2d/TextCube.java b/src/demos/j2d/TextCube.java
index 3433463..4587e10 100755
--- a/src/demos/j2d/TextCube.java
+++ b/src/demos/j2d/TextCube.java
@@ -65,9 +65,6 @@ import com.jogamp.opengl.util.Animator;
 /** Shows how to place 2D text in 3D using the TextRenderer. */
 
 public class TextCube extends Demo {
-  static {
-    GLProfile.initSingleton();
-  }
   private float xAng;
   private float yAng;
   private GLU glu = new GLU();
@@ -77,6 +74,13 @@ public class TextCube extends Demo {
   private float textScaleFactor;
 
   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);
+
     Frame frame = new Frame("Text Cube");
     frame.setLayout(new BorderLayout());
 
diff --git a/src/demos/j2d/TextFlow.java b/src/demos/j2d/TextFlow.java
index 32c7600..f0f29f8 100755
--- a/src/demos/j2d/TextFlow.java
+++ b/src/demos/j2d/TextFlow.java
@@ -74,11 +74,13 @@ import com.jogamp.opengl.util.Animator;
     screen. */
 
 public class TextFlow extends Demo {
-  static {
-    GLProfile.initSingleton();
-  }
-
   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);
 
     Frame frame = new Frame("Text Flow");
     frame.setLayout(new BorderLayout());