Relocated VersionApplet

6 files changed, 8 insertions, 18 deletions

diff --git a/jnlp-files/jogl-applet-version-jnlp.html b/jnlp-files/jogl-applet-version-jnlp.html
index 9b9e57aec..316ce2fcc 100644
--- a/jnlp-files/jogl-applet-version-jnlp.html
+++ b/jnlp-files/jogl-applet-version-jnlp.html
@@ -22,7 +22,7 @@ JNLP Applet with AppletLauncher fallback version.
                JOGL_CODEBASE_TAG/jar/jogl.all.jar,
                JOGL_CODEBASE_TAG/jar/gluegen-rt.jar">
    <param name="codebase_lookup" value="false">
-   <param name="subapplet.classname" value="jogamp.newt.driver.awt.opengl.VersionApplet">
+   <param name="subapplet.classname" value="jogamp.opengl.awt.VersionApplet">
    <param name="subapplet.displayname" value="JOGL Applet Version">
    <!-- param name="noddraw.check" value="true" -->
    <param name="progressbar" value="true">
diff --git a/jnlp-files/jogl-applet-version-lancheronly.html b/jnlp-files/jogl-applet-version-lancheronly.html
index 4bcf64081..a897b9024 100644
--- a/jnlp-files/jogl-applet-version-lancheronly.html
+++ b/jnlp-files/jogl-applet-version-lancheronly.html
@@ -22,7 +22,7 @@ AppletLauncher only version.
                JOGL_CODEBASE_TAG/jar/jogl.all.jar,
                JOGL_CODEBASE_TAG/jar/gluegen-rt.jar">
    <param name="codebase_lookup" value="false">
-   <param name="subapplet.classname" value="jogamp.newt.driver.awt.opengl.VersionApplet">
+   <param name="subapplet.classname" value="jogamp.opengl.awt.VersionApplet">
    <param name="subapplet.displayname" value="JOGL Applet Version">
    <!-- param name="noddraw.check" value="true" -->
    <param name="progressbar" value="true">
diff --git a/jnlp-files/jogl-applet-version.jnlp b/jnlp-files/jogl-applet-version.jnlp
index 8afb684ba..a06ea83e2 100644
--- a/jnlp-files/jogl-applet-version.jnlp
+++ b/jnlp-files/jogl-applet-version.jnlp
@@ -17,7 +17,7 @@
 
   <applet-desc 
       name="Version-Applet"
-      main-class="jogamp.newt.driver.awt.opengl.VersionApplet"
+      main-class="jogamp.opengl.awt.VersionApplet"
       width="800" 
       height="600">
   </applet-desc>
diff --git a/jnlp-files/jogl-application-version.jnlp b/jnlp-files/jogl-application-version.jnlp
index b949b69aa..3b3cb07c9 100644
--- a/jnlp-files/jogl-application-version.jnlp
+++ b/jnlp-files/jogl-application-version.jnlp
@@ -15,5 +15,5 @@
       <extension name="jogl-all-awt" href="JOGL_CODEBASE_TAG/jogl-all-awt.jnlp" />
     </resources>
 
-  <application-desc main-class="jogamp.newt.driver.awt.opengl.VersionApplet"/>
+  <application-desc main-class="jogamp.opengl.awt.VersionApplet"/>
 </jnlp>
diff --git a/jnlp-files/jogl-javaws-version.jnlp b/jnlp-files/jogl-javaws-version.jnlp
index 8d0160f85..10f228cca 100755
--- a/jnlp-files/jogl-javaws-version.jnlp
+++ b/jnlp-files/jogl-javaws-version.jnlp
@@ -15,5 +15,5 @@
       <extension name="jogl-all-awt" href="JOGL_CODEBASE_TAG/jogl-all-awt.jnlp" />
     </resources>
 
-  <application-desc main-class="jogamp.newt.driver.awt.opengl.VersionApplet"/>
+  <application-desc main-class="jogamp.opengl.awt.VersionApplet"/>
 </jnlp>
diff --git a/src/newt/classes/jogamp/newt/driver/awt/opengl/VersionApplet.java b/src/jogl/classes/jogamp/opengl/awt/VersionApplet.java
index edcb91378..5856bf3a0 100644
--- a/src/newt/classes/jogamp/newt/driver/awt/opengl/VersionApplet.java
+++ b/src/jogl/classes/jogamp/opengl/awt/VersionApplet.java
@@ -1,4 +1,4 @@
-package jogamp.newt.driver.awt.opengl;
+package jogamp.opengl.awt;
 
 import java.applet.Applet;
 import java.awt.BorderLayout;
@@ -23,14 +23,10 @@ import javax.media.opengl.GLEventListener;
 import com.jogamp.common.GlueGenVersion;
 import com.jogamp.common.os.Platform;
 import com.jogamp.common.util.VersionUtil;
-import com.jogamp.nativewindow.NativeWindowVersion;
-import com.jogamp.newt.NewtVersion;
 import com.jogamp.opengl.JoglVersion;
 
+@SuppressWarnings("serial")
 public class VersionApplet extends Applet {
-  static {
-    // redundant, since implicit (false): GLProfile.initSingleton(false);
-  }
   TextArea tareaVersion;
   TextArea tareaCaps;
   GLCanvas canvas;
@@ -96,15 +92,9 @@ public class VersionApplet extends Applet {
     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);
-    List/*<GLCapabilitiesImmutable>*/ availCaps = factory.getAvailableCapabilities(null);
+    List<GLCapabilitiesImmutable> availCaps = factory.getAvailableCapabilities(null);
     for(int i=0; i<availCaps.size(); i++) {
         s = ((GLCapabilitiesImmutable) availCaps.get(i)).toString();
         System.err.println(s);