Bug 1154 - Make plugin3-public.jar optional: Part 1 / 2 (Relocate Applet3 classes)

3 files changed, 8 insertions, 6 deletions

diff --git a/src/newt/classes/com/jogamp/newt/util/applet/JOGLNewtApplet3Run.java b/src/newt/classes/com/jogamp/newt/util/applet3/JOGLNewtApplet3Run.java
index 6ea63f69c..9b9b7d532 100644
--- a/src/newt/classes/com/jogamp/newt/util/applet/JOGLNewtApplet3Run.java
+++ b/src/newt/classes/com/jogamp/newt/util/applet3/JOGLNewtApplet3Run.java
@@ -25,7 +25,7 @@
  * authors and should not be interpreted as representing official policies, either expressed
  * or implied, of JogAmp Community.
  */
-package com.jogamp.newt.util.applet;
+package com.jogamp.newt.util.applet3;
 
 import java.util.Locale;
 
@@ -48,6 +48,7 @@ import com.jogamp.nativewindow.UpstreamWindowHookMutableSizePos;
 import com.jogamp.newt.NewtFactory;
 import com.jogamp.newt.Window;
 import com.jogamp.newt.opengl.GLWindow;
+import com.jogamp.newt.util.applet.JOGLNewtAppletBase;
 
 /**
  * Simple GLEventListener deployment as an applet using JOGL. This demo must be
diff --git a/src/newt/classes/com/jogamp/newt/util/applet/VersionApplet3.java b/src/newt/classes/com/jogamp/newt/util/applet3/VersionApplet3.java
index 518337d20..c864805ab 100644
--- a/src/newt/classes/com/jogamp/newt/util/applet/VersionApplet3.java
+++ b/src/newt/classes/com/jogamp/newt/util/applet3/VersionApplet3.java
@@ -1,4 +1,4 @@
-package com.jogamp.newt.util.applet;
+package com.jogamp.newt.util.applet3;
 
 import com.jogamp.plugin.applet.Applet3;
 import com.jogamp.plugin.applet.Applet3Context;
diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestVersionSemanticsNOUI.java b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestVersionSemanticsNOUI.java
index 7b8fa077a..bbbd92e5e 100644
--- a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestVersionSemanticsNOUI.java
+++ b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestVersionSemanticsNOUI.java
@@ -56,12 +56,13 @@ public class TestVersionSemanticsNOUI extends SingletonJunitCase {
     static final VersionNumberString curVersionNumber = new VersionNumberString(curVersion.getImplementationVersion());
 
     static final Set<String> excludesDefault;
-    static final Set<String> excludesStereoPackage;
+    static final Set<String> excludesStereoPackageAndAppletUtils;
     static {
         excludesDefault = new HashSet<String>();
         excludesDefault.add("^\\Qjogamp/\\E.*$");
-        excludesStereoPackage = new HashSet<String>(excludesDefault);
-        excludesStereoPackage.add("^\\Qcom/jogamp/opengl/util/stereo/\\E.*$");
+        excludesStereoPackageAndAppletUtils = new HashSet<String>(excludesDefault);
+        excludesStereoPackageAndAppletUtils.add("^\\Qcom/jogamp/opengl/util/stereo/\\E.*$");
+        excludesStereoPackageAndAppletUtils.add("^\\Qcom/jogamp/newt/util/applet/\\E.*$");
     }
 
 
@@ -138,7 +139,7 @@ public class TestVersionSemanticsNOUI extends SingletonJunitCase {
         VersionSemanticsUtil.testVersion(diffCriteria, expectedCompatibilityType,
                                          previousJar, preVersionNumber,
                                          curVersion.getClass(), currentCL, curVersionNumber,
-                                         excludesStereoPackage);
+                                         excludesStereoPackageAndAppletUtils);
     }
 
     public static void main(final String args[]) throws IOException {