GraphUI Shape: 'int name' -> 'int id' and add 'String name', change get/set methods accordingly

4 files changed, 13 insertions, 9 deletions

diff --git a/make/scripts/tests-win.bat b/make/scripts/tests-win.bat
index ca8ec5231..d087f61e2 100755
--- a/make/scripts/tests-win.bat
+++ b/make/scripts/tests-win.bat
@@ -70,7 +70,7 @@ REM scripts\java-win.bat com.jogamp.opengl.test.junit.jogl.tile.TestTiledPrintin
 REM scripts\java-win.bat com.jogamp.opengl.test.junit.jogl.acore.TestGLCapabilities01NEWT %*
 REM scripts\java-win.bat com.jogamp.opengl.test.junit.jogl.acore.TestShutdownCompleteNEWT %*
 REM scripts\java-win.bat com.jogamp.opengl.test.junit.jogl.acore.TestShutdownCompleteAWT %*
-scripts\java-win.bat com.jogamp.opengl.test.junit.jogl.acore.TestDestroyGLAutoDrawableNewtAWT %*
+REM scripts\java-win.bat com.jogamp.opengl.test.junit.jogl.acore.TestDestroyGLAutoDrawableNewtAWT %*
 REM scripts\java-win.bat com.jogamp.opengl.test.junit.jogl.offscreen.TestOffscreen01GLPBufferNEWT -time 5000
 
 REM scripts\java-win.bat com.jogamp.opengl.test.junit.jogl.acore.TestSharedContextListNEWT %*
@@ -269,7 +269,7 @@ REM scripts\java-win.bat com.jogamp.opengl.demos.graph.ui.UISceneDemo02 %*
 REM scripts\java-win.bat com.jogamp.opengl.demos.graph.ui.UISceneDemo03 %*
 REM scripts\java-win.bat com.jogamp.opengl.demos.graph.ui.UISceneDemo10 %*
 REM scripts\java-win.bat com.jogamp.opengl.demos.graph.ui.UISceneDemo11 %*
-REM scripts\java-win.bat com.jogamp.opengl.demos.graph.ui.UISceneDemo20 %*
+scripts\java-win.bat com.jogamp.opengl.demos.graph.ui.UISceneDemo20 %*
 
 REM scripts\java-win.bat com.jogamp.opengl.demos.av.MovieCube %*
 REM scripts\java-win.bat com.jogamp.opengl.demos.av.MovieSimple %*
diff --git a/make/scripts/tests-x64-dbg.bat b/make/scripts/tests-x64-dbg.bat
index 25cfc5761..f334b282a 100755
--- a/make/scripts/tests-x64-dbg.bat
+++ b/make/scripts/tests-x64-dbg.bat
@@ -1,11 +1,11 @@
 

-set TEMP=\\jordan\data\Incoming\windows\temp

-set TMP=\\jordan\data\Incoming\windows\temp

+REM set TEMP=\\jordan\data\Incoming\windows\temp

+REM set TMP=\\jordan\data\Incoming\windows\temp

 REM set TEMP=C:\Documents and Settings\jogamp\temp

 REM set TMP=C:\Documents and Settings\jogamp\temp

 

-set LIBGL_DEBUG=verbose

-set MESA_DEBUG=true

+REM set LIBGL_DEBUG=verbose

+REM set MESA_DEBUG=true

 set LIBGL_ALWAYS_SOFTWARE=true

 REM set INTEL_DEBUG="buf bat"

 REM set INTEL_STRICT_CONFORMANCE=1

@@ -109,7 +109,8 @@ REM set MODULE_ARGS=--add-opens java.base/java.lang=ALL-UNNAMED --add-opens java
 set MODULE_ARGS=--add-opens java.desktop/sun.awt=ALL-UNNAMED --add-opens java.desktop/sun.awt.windows=ALL-UNNAMED --add-opens java.desktop/sun.java2d=ALL-UNNAMED

 

 REM set X_ARGS="-Dsun.java2d.noddraw=true" "-Dsun.awt.noerasebackground=true" %MODULE_ARGS%

-set X_ARGS="-Dsun.java2d.noddraw=true" %MODULE_ARGS%

+REM set X_ARGS="-Dsun.java2d.noddraw=true" %MODULE_ARGS%

+set X_ARGS="-Xcheck:jni" "-Dsun.java2d.noddraw=true" "-Djava.awt.headless=true" %MODULE_ARGS%

 

 scripts\tests-win.bat %*

 

diff --git a/make/scripts/tests-x64.bat b/make/scripts/tests-x64.bat
index 728dd6ba2..807eae50a 100755
--- a/make/scripts/tests-x64.bat
+++ b/make/scripts/tests-x64.bat
@@ -34,6 +34,9 @@ REM set MODULE_ARGS=--add-opens java.base/java.lang=ALL-UNNAMED --add-opens java
 set MODULE_ARGS=--add-opens java.desktop/sun.awt=ALL-UNNAMED --add-opens java.desktop/sun.awt.windows=ALL-UNNAMED --add-opens java.desktop/sun.java2d=ALL-UNNAMED

 REM set X_ARGS="-Dsun.java2d.noddraw=true" "-Dsun.awt.noerasebackground=true" %MODULE_ARGS%

 set X_ARGS="-Dsun.java2d.noddraw=true" %MODULE_ARGS%

+REM set X_ARGS="-Xcheck:jni" "-verbose:jni" "-Dsun.java2d.noddraw=true" "-Djava.awt.headless=true" %MODULE_ARGS%

+REM set X_ARGS="-Xcheck:jni" "-Dsun.java2d.noddraw=true" "-Djava.awt.headless=true" %MODULE_ARGS%

+

 

 scripts\tests-win.bat %*

 

diff --git a/make/scripts/tests.sh b/make/scripts/tests.sh
index dc36d7a48..1c5dcbbde 100644
--- a/make/scripts/tests.sh
+++ b/make/scripts/tests.sh
@@ -1017,8 +1017,8 @@ function testawtswt() {
 #testnoawt com.jogamp.opengl.demos.graph.ui.UISceneDemo03 $*
 #testnoawt com.jogamp.opengl.demos.graph.ui.UISceneDemo10 $*
 #testnoawt com.jogamp.opengl.demos.graph.ui.UISceneDemo11 $*
-#testnoawt com.jogamp.opengl.demos.graph.ui.UISceneDemo20 $*
-testawt com.jogamp.opengl.test.junit.jogl.acore.TestDestroyGLAutoDrawableNewtAWT $*
+testnoawt com.jogamp.opengl.demos.graph.ui.UISceneDemo20 $*
+#testawt com.jogamp.opengl.test.junit.jogl.acore.TestDestroyGLAutoDrawableNewtAWT $*
 #testnoawt com.jogamp.opengl.demos.av.MovieSimple $*
 #testnoawt com.jogamp.opengl.demos.av.MovieCube $*
 #testnoawt com.jogamp.opengl.demos.graph.ui.UIMediaGrid00 $*