NewtVersionActivity: Remove 'gears' test; Version Info: Drop NativeWindow/Newt Version since we use *all* targets

5 files changed, 20 insertions, 22 deletions

diff --git a/src/jogl/classes/com/jogamp/opengl/JoglVersion.java b/src/jogl/classes/com/jogamp/opengl/JoglVersion.java
index ea70017cf..d162f2bd8 100644
--- a/src/jogl/classes/com/jogamp/opengl/JoglVersion.java
+++ b/src/jogl/classes/com/jogamp/opengl/JoglVersion.java
@@ -111,7 +111,7 @@ public class JoglVersion extends JogampVersion {
     public static void main(String args[]) {
         System.err.println(VersionUtil.getPlatformInfo());
         System.err.println(GlueGenVersion.getInstance());
-        System.err.println(NativeWindowVersion.getInstance());
+        // System.err.println(NativeWindowVersion.getInstance());
         System.err.println(JoglVersion.getInstance());
     }
 }
diff --git a/src/jogl/classes/javax/media/opengl/awt/GLCanvas.java b/src/jogl/classes/javax/media/opengl/awt/GLCanvas.java
index c14142ad2..d861bd7f2 100644
--- a/src/jogl/classes/javax/media/opengl/awt/GLCanvas.java
+++ b/src/jogl/classes/javax/media/opengl/awt/GLCanvas.java
@@ -1038,7 +1038,7 @@ public class GLCanvas extends Canvas implements AWTGLAutoDrawable, WindowClosing
   public static void main(String args[]) {
     System.err.println(VersionUtil.getPlatformInfo());
     System.err.println(GlueGenVersion.getInstance());
-    System.err.println(NativeWindowVersion.getInstance());
+    // System.err.println(NativeWindowVersion.getInstance());
     System.err.println(JoglVersion.getInstance());
 
     GLProfile.initSingleton(false);
diff --git a/src/newt/classes/com/jogamp/newt/opengl/GLWindow.java b/src/newt/classes/com/jogamp/newt/opengl/GLWindow.java
index 95c994d6e..1cc2298ed 100644
--- a/src/newt/classes/com/jogamp/newt/opengl/GLWindow.java
+++ b/src/newt/classes/com/jogamp/newt/opengl/GLWindow.java
@@ -872,7 +872,7 @@ public class GLWindow implements GLAutoDrawable, Window, NEWTEventConsumer, FPSC
     public static void main(String args[]) {
         System.err.println(VersionUtil.getPlatformInfo());
         System.err.println(GlueGenVersion.getInstance());
-        System.err.println(NativeWindowVersion.getInstance());
+        // System.err.println(NativeWindowVersion.getInstance());
         System.err.println(JoglVersion.getInstance());
         System.err.println(NewtVersion.getInstance());
 
diff --git a/src/newt/classes/jogamp/newt/driver/android/NewtVersionActivity.java b/src/newt/classes/jogamp/newt/driver/android/NewtVersionActivity.java
index 4c9ccfbcd..5842a285d 100644
--- a/src/newt/classes/jogamp/newt/driver/android/NewtVersionActivity.java
+++ b/src/newt/classes/jogamp/newt/driver/android/NewtVersionActivity.java
@@ -27,31 +27,21 @@
  */
 package jogamp.newt.driver.android;
 
-import javax.media.opengl.GLCapabilities;
-import javax.media.opengl.GLProfile;
-
-import com.jogamp.newt.NewtFactory;
-import com.jogamp.newt.Display;
-import com.jogamp.newt.Screen;
-import com.jogamp.newt.ScreenMode;
-import com.jogamp.newt.Window;
-import com.jogamp.newt.event.ScreenModeListener;
+import com.jogamp.common.GlueGenVersion;
+import com.jogamp.common.os.Platform;
+import com.jogamp.common.util.VersionUtil;
 import com.jogamp.newt.opengl.GLWindow;
-import jogamp.newt.driver.android.test.GearsGL2ES1;
+import com.jogamp.opengl.JoglVersion;
 import com.jogamp.opengl.util.Animator;
 
-import jogamp.newt.driver.android.AndroidWindow;
-
-import android.app.Activity;
-import android.content.res.Configuration;
 import android.os.Bundle;
 import android.util.Log;
-import android.view.SurfaceView;
-import android.view.View;
+import android.widget.TextView;
 
 public class NewtVersionActivity extends NewtBaseActivity {
    GLWindow glWindow = null;
    Animator animator = null;
+   TextView tv = null;
    
    @Override
    public void onCreate(Bundle savedInstanceState) {
@@ -64,12 +54,16 @@ public class NewtVersionActivity extends NewtBaseActivity {
        System.setProperty("jogamp.debug.NativeLibrary", "true");
        // System.setProperty("jogamp.debug.NativeLibrary.Lookup", "true");
        
+       tv = new TextView(this);
+       tv.setText(VersionUtil.getPlatformInfo()+Platform.NEWLINE+GlueGenVersion.getInstance()+Platform.NEWLINE+JoglVersion.getInstance()+Platform.NEWLINE);               
+       setContentView(tv);
+       /**
        // create GLWindow (-> incl. underlying NEWT Display, Screen & Window)
        GLCapabilities caps = new GLCapabilities(GLProfile.get(GLProfile.GLES1));
        glWindow = GLWindow.create(caps);
        setContentView(glWindow);
        
-       glWindow.addGLEventListener(new GearsGL2ES1(1));
+       glWindow.addGLEventListener(new GearsES1(1));
        glWindow.getWindow().getScreen().addScreenModeListener(new ScreenModeListener() {
         public void screenModeChangeNotify(ScreenMode sm) { }
         public void screenModeChanged(ScreenMode sm, boolean success) {
@@ -78,7 +72,7 @@ public class NewtVersionActivity extends NewtBaseActivity {
        });
        glWindow.setVisible(true);
        animator = new Animator(glWindow);
-       animator.setUpdateFPSFrames(60, System.err);
+       animator.setUpdateFPSFrames(60, System.err); */
        
        Log.d(MD.TAG, "onCreate - X");
    }
diff --git a/src/newt/classes/jogamp/newt/driver/awt/opengl/VersionApplet.java b/src/newt/classes/jogamp/newt/driver/awt/opengl/VersionApplet.java
index 1cff76872..ae0a790dd 100644
--- a/src/newt/classes/jogamp/newt/driver/awt/opengl/VersionApplet.java
+++ b/src/newt/classes/jogamp/newt/driver/awt/opengl/VersionApplet.java
@@ -86,17 +86,21 @@ public class VersionApplet extends Applet {
     System.err.println(s);
     tareaVersion.append(s);
 
+    /*
     s = NativeWindowVersion.getInstance().toString();
     System.err.println(s);
-    tareaVersion.append(NativeWindowVersion.getInstance().toString());
+    tareaVersion.append(NativeWindowVersion.getInstance().toString()); 
+    */
 
     s = JoglVersion.getInstance().toString();
     System.err.println(s);
     tareaVersion.append(s);
 
+    /*
     s = NewtVersion.getInstance().toString();
     System.err.println(s);
     tareaVersion.append(s);
+    */
 
     tareaCaps = new TextArea(120, 20);
     GLDrawableFactory factory = GLDrawableFactory.getFactory(glp);