summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--jnlp-files/jogl-applet-runner-newt-GraphTextDemo01-applet3-napplet.html4
-rw-r--r--jnlp-files/jogl-applet-runner-newt-GraphUISceneDemo01-applet3-napplet.html4
-rw-r--r--jnlp-files/jogl-applet-runner-newt-MovieCube-applet3-napplet.html4
-rw-r--r--jnlp-files/jogl-applet-runner-newt-gears-applet3-napplet.html8
-rw-r--r--jnlp-files/jogl-applet-runner-newt-gears-applet3-special-napplet.html4
-rw-r--r--jnlp-files/jogl-applet-version-applet3-napplet.html8
-rw-r--r--make/build-common.xml6
-rw-r--r--src/newt/classes/com/jogamp/newt/util/applet3/JOGLNewtApplet3Run.java (renamed from src/newt/classes/com/jogamp/newt/util/applet/JOGLNewtApplet3Run.java)3
-rw-r--r--src/newt/classes/com/jogamp/newt/util/applet3/VersionApplet3.java (renamed from src/newt/classes/com/jogamp/newt/util/applet/VersionApplet3.java)2
-rw-r--r--src/test/com/jogamp/opengl/test/junit/jogl/acore/TestVersionSemanticsNOUI.java9
10 files changed, 29 insertions, 23 deletions
diff --git a/jnlp-files/jogl-applet-runner-newt-GraphTextDemo01-applet3-napplet.html b/jnlp-files/jogl-applet-runner-newt-GraphTextDemo01-applet3-napplet.html
index 0ff71c9f7..fa734ad1c 100644
--- a/jnlp-files/jogl-applet-runner-newt-GraphTextDemo01-applet3-napplet.html
+++ b/jnlp-files/jogl-applet-runner-newt-GraphTextDemo01-applet3-napplet.html
@@ -12,7 +12,7 @@ JOGL Applet3 Graph Text Demo 01
<P>
<object classid="clsid:8AD9C840-044E-11D1-B3E9-00805F499D93"
width="800" height="400">
- <param name="code" value="com.jogamp.newt.util.applet.JOGLNewtApplet3Run">
+ <param name="code" value="com.jogamp.newt.util.applet3.JOGLNewtApplet3Run">
<param name="archive" value="jar/gluegen-rt.jar,
jar/jogl-all-noawt.jar,
jar/jogl-test.jar">
@@ -25,7 +25,7 @@ JOGL Applet3 Graph Text Demo 01
<param name="gl_debug" value="false">
<param name="gl_trace" value="false">
<comment>
- <embed code="com.jogamp.newt.util.applet.JOGLNewtApplet3Run"
+ <embed code="com.jogamp.newt.util.applet3.JOGLNewtApplet3Run"
width="800" height="400"
type="application/x-java-applet;version=1.6"
pluginspage="http://java.sun.com/javase/downloads/ea.jsp"
diff --git a/jnlp-files/jogl-applet-runner-newt-GraphUISceneDemo01-applet3-napplet.html b/jnlp-files/jogl-applet-runner-newt-GraphUISceneDemo01-applet3-napplet.html
index a1f899701..27ca2321b 100644
--- a/jnlp-files/jogl-applet-runner-newt-GraphUISceneDemo01-applet3-napplet.html
+++ b/jnlp-files/jogl-applet-runner-newt-GraphUISceneDemo01-applet3-napplet.html
@@ -12,7 +12,7 @@ JOGL Applet3 Graph UI-Scene Demo 01
<P>
<object classid="clsid:8AD9C840-044E-11D1-B3E9-00805F499D93"
width="640" height="480">
- <param name="code" value="com.jogamp.newt.util.applet.JOGLNewtApplet3Run">
+ <param name="code" value="com.jogamp.newt.util.applet3.JOGLNewtApplet3Run">
<param name="archive" value="jar/gluegen-rt.jar,
jar/joal.jar,
jar/jogl-all-noawt.jar,
@@ -25,7 +25,7 @@ JOGL Applet3 Graph UI-Scene Demo 01
<param name="gl_debug" value="false">
<param name="gl_trace" value="false">
<comment>
- <embed code="com.jogamp.newt.util.applet.JOGLNewtApplet3Run"
+ <embed code="com.jogamp.newt.util.applet3.JOGLNewtApplet3Run"
width="640" height="480"
type="application/x-java-applet;version=1.6"
pluginspage="http://java.sun.com/javase/downloads/ea.jsp"
diff --git a/jnlp-files/jogl-applet-runner-newt-MovieCube-applet3-napplet.html b/jnlp-files/jogl-applet-runner-newt-MovieCube-applet3-napplet.html
index ac7e582f3..30513c9a1 100644
--- a/jnlp-files/jogl-applet-runner-newt-MovieCube-applet3-napplet.html
+++ b/jnlp-files/jogl-applet-runner-newt-MovieCube-applet3-napplet.html
@@ -12,7 +12,7 @@ JogAmp's Applet3 MovieCube - GLMediaPlayer Demo 01
<P>
<object classid="clsid:8AD9C840-044E-11D1-B3E9-00805F499D93"
width="800" height="600">
- <param name="code" value="com.jogamp.newt.util.applet.JOGLNewtApplet3Run">
+ <param name="code" value="com.jogamp.newt.util.applet3.JOGLNewtApplet3Run">
<param name="archive" value="jar/gluegen-rt.jar,
jar/joal.jar,
jar/jogl-all-noawt.jar,
@@ -23,7 +23,7 @@ JogAmp's Applet3 MovieCube - GLMediaPlayer Demo 01
<param name="gl_debug" value="false">
<param name="gl_trace" value="false">
<comment>
- <embed code="com.jogamp.newt.util.applet.JOGLNewtApplet3Run"
+ <embed code="com.jogamp.newt.util.applet3.JOGLNewtApplet3Run"
width="800" height="600"
type="application/x-java-applet;version=1.6"
pluginspage="http://java.sun.com/javase/downloads/ea.jsp"
diff --git a/jnlp-files/jogl-applet-runner-newt-gears-applet3-napplet.html b/jnlp-files/jogl-applet-runner-newt-gears-applet3-napplet.html
index ef287c79d..6fae7cbb1 100644
--- a/jnlp-files/jogl-applet-runner-newt-gears-applet3-napplet.html
+++ b/jnlp-files/jogl-applet-runner-newt-gears-applet3-napplet.html
@@ -25,7 +25,7 @@ JOGL NEWT Applet3 Runner Special Keys:<br>
<p>
<object classid="clsid:8AD9C840-044E-11D1-B3E9-00805F499D93"
width="200" height="200">
- <param name="code" value="com.jogamp.newt.util.applet.JOGLNewtApplet3Run">
+ <param name="code" value="com.jogamp.newt.util.applet3.JOGLNewtApplet3Run">
<param name="archive" value="jar/gluegen-rt.jar,
jar/jogl-all-noawt.jar,
jar/jogl-test.jar">
@@ -35,7 +35,7 @@ JOGL NEWT Applet3 Runner Special Keys:<br>
<param name="gl_debug" value="false">
<param name="gl_trace" value="false">
<comment>
- <embed code="com.jogamp.newt.util.applet.JOGLNewtApplet3Run"
+ <embed code="com.jogamp.newt.util.applet3.JOGLNewtApplet3Run"
width="200" height="200"
type="application/x-java-applet;version=1.6"
pluginspage="http://java.sun.com/javase/downloads/ea.jsp"
@@ -61,7 +61,7 @@ The applet above is instantiated with the following code:
<pre>
&lt;object classid="clsid:8AD9C840-044E-11D1-B3E9-00805F499D93"
width="200" height="200"&gt;
- &lt;param name="code" value="com.jogamp.newt.util.applet.JOGLNewtApplet3Run"&gt;
+ &lt;param name="code" value="com.jogamp.newt.util.applet3.JOGLNewtApplet3Run"&gt;
&lt;param name="archive" value="jar/gluegen-rt.jar,
jar/jogl-all-noawt.jar,
jar/jogl-test.jar"&gt;
@@ -71,7 +71,7 @@ The applet above is instantiated with the following code:
&lt;param name="gl_debug" value="false"&gt;
&lt;param name="gl_trace" value="false"&gt;
&lt;comment&gt;
- &lt;embed code="com.jogamp.newt.util.applet.JOGLNewtApplet3Run"
+ &lt;embed code="com.jogamp.newt.util.applet3.JOGLNewtApplet3Run"
width="200" height="200"
type="application/x-java-applet;version=1.6"
pluginspage="http://java.sun.com/javase/downloads/ea.jsp"
diff --git a/jnlp-files/jogl-applet-runner-newt-gears-applet3-special-napplet.html b/jnlp-files/jogl-applet-runner-newt-gears-applet3-special-napplet.html
index 821d8f4dc..5fad94adb 100644
--- a/jnlp-files/jogl-applet-runner-newt-gears-applet3-special-napplet.html
+++ b/jnlp-files/jogl-applet-runner-newt-gears-applet3-special-napplet.html
@@ -9,7 +9,7 @@
JOGL NEWT JNLP Applet3 Runner Special Keys:
<object classid="clsid:8AD9C840-044E-11D1-B3E9-00805F499D93"
width="1" height="1">
- <param name="code" value="com.jogamp.newt.util.applet.JOGLNewtApplet3Run">
+ <param name="code" value="com.jogamp.newt.util.applet3.JOGLNewtApplet3Run">
<param name="archive" value="jar/gluegen-rt.jar,
jar/jogl-all-noawt.jar,
jar/jogl-test.jar">
@@ -26,7 +26,7 @@ JOGL NEWT JNLP Applet3 Runner Special Keys:
<param name="gl_debug" value="false">
<param name="gl_trace" value="false">
<comment>
- <embed code="com.jogamp.newt.util.applet.JOGLNewtApplet3Run"
+ <embed code="com.jogamp.newt.util.applet3.JOGLNewtApplet3Run"
width="1" height="1"
type="application/x-java-applet;version=1.6"
pluginspage="http://java.sun.com/javase/downloads/ea.jsp"
diff --git a/jnlp-files/jogl-applet-version-applet3-napplet.html b/jnlp-files/jogl-applet-version-applet3-napplet.html
index 1fc12f781..d10e1dc5b 100644
--- a/jnlp-files/jogl-applet-version-applet3-napplet.html
+++ b/jnlp-files/jogl-applet-version-applet3-napplet.html
@@ -14,11 +14,11 @@ and your platform.
<object classid="clsid:8AD9C840-044E-11D1-B3E9-00805F499D93"
width="800" height="600">
- <param name="code" value="com.jogamp.newt.util.applet.VersionApplet3">
+ <param name="code" value="com.jogamp.newt.util.applet3.VersionApplet3">
<param name="archive" value="jar/gluegen-rt.jar,
jar/jogl-all-noawt.jar">
<comment>
- <embed code="com.jogamp.newt.util.applet.VersionApplet3"
+ <embed code="com.jogamp.newt.util.applet3.VersionApplet3"
width="800" height="600"
type="application/x-java-applet;version=1.6"
pluginspage="http://java.sun.com/javase/downloads/ea.jsp"
@@ -37,11 +37,11 @@ The applet3 above is instantiated with the following code:
<pre>
&lt;object classid="clsid:8AD9C840-044E-11D1-B3E9-00805F499D93"
width="800" height="600"&gt;
- &lt;param name="code" value="com.jogamp.newt.util.applet.VersionApplet3"&gt;
+ &lt;param name="code" value="com.jogamp.newt.util.applet3.VersionApplet3"&gt;
&lt;param name="archive" value="jar/gluegen-rt.jar,
jar/jogl-all-noawt.jar"&gt;
&lt;comment&gt;
- &lt;embed code="com.jogamp.newt.util.applet.VersionApplet3"
+ &lt;embed code="com.jogamp.newt.util.applet3.VersionApplet3"
width="800" height="600"
type="application/x-java-applet;version=1.6"
pluginspage="http://java.sun.com/javase/downloads/ea.jsp"
diff --git a/make/build-common.xml b/make/build-common.xml
index 1d408a057..88c876e5d 100644
--- a/make/build-common.xml
+++ b/make/build-common.xml
@@ -180,7 +180,10 @@
<echo message="swt.jar=${swt.jar}" />
<property name="plugin3.jar" value="${project.root}/make/lib/plugin3/plugin3-public.jar"/>
- <echo message="plugin3.jar=${plugin3.jar}" />
+ <condition property="plugin3-jars.available">
+ <available file="${plugin3.jar}"/>
+ </condition>
+ <echo message="plugin3-jars.available: ${plugin3-jars.available} ${plugin3.jar}" />
<condition property="isSWTRuntimeAvailable">
<or>
@@ -241,6 +244,7 @@
<condition property="oculusvr.sdk.available">
<available file="${rel.oculusvr.sdk}/LibOVR/Include/OVR_CAPI.h"/>
</condition>
+ <echo message="oculusvr.sdk.available: ${oculusvr.sdk.available}" />
<property name="results.test" value="${build}/test/results" />
<property name="build.test" value="${build}/test/build" />
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 {
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-02 20:42:43 +0000