#2562 Ensure all thread warden calls are asserts so can all be optised out

Author: richardTingle

jme3-core/src/main/java/com/jme3/app/SimpleApplication.java

@@ -198,8 +198,10 @@ protected BitmapFont loadGuiFont() {
     public void initialize() {
         super.initialize();
 
-        SceneGraphThreadWarden.setup(rootNode);
-        SceneGraphThreadWarden.setup(guiNode);
+        //noinspection AssertWithSideEffects
+        assert SceneGraphThreadWarden.setup(rootNode);
+        //noinspection AssertWithSideEffects
+        assert SceneGraphThreadWarden.setup(guiNode);
 
         // Several things rely on having this
         guiFont = loadGuiFont();
@@ -246,7 +248,8 @@ public void initialize() {
 
     @Override
     public void stop(boolean waitFor) {
-        SceneGraphThreadWarden.reset();
+        //noinspection AssertWithSideEffects
+        assert SceneGraphThreadWarden.reset();
         super.stop(waitFor);
     }
 

jme3-core/src/main/java/com/jme3/scene/Geometry.java

@@ -184,7 +184,7 @@ public void setIgnoreTransform(boolean ignoreTransform) {
      */
     @Override
     public void setLodLevel(int lod) {
-        SceneGraphThreadWarden.assertOnCorrectThread(this);
+        assert SceneGraphThreadWarden.assertOnCorrectThread(this);
         if (mesh.getNumLodLevels() == 0) {
             throw new IllegalStateException("LOD levels are not set on this mesh");
         }
@@ -241,7 +241,7 @@ public int getTriangleCount() {
      * @throws IllegalArgumentException If mesh is null
      */
     public void setMesh(Mesh mesh) {
-        SceneGraphThreadWarden.assertOnCorrectThread(this);
+        assert SceneGraphThreadWarden.assertOnCorrectThread(this);
         if (mesh == null) {
             throw new IllegalArgumentException();
         }
@@ -272,7 +272,7 @@ public Mesh getMesh() {
      */
     @Override
     public void setMaterial(Material material) {
-        SceneGraphThreadWarden.assertOnCorrectThread(this);
+        assert SceneGraphThreadWarden.assertOnCorrectThread(this);
         this.material = material;
         nbSimultaneousGPUMorph = -1;
         if (isGrouped()) {

jme3-core/src/main/java/com/jme3/scene/threadwarden/SceneGraphThreadWarden.java

@@ -43,16 +43,18 @@ public class SceneGraphThreadWarden {
      * @param rootNode the root node of the scene graph. This is used to determine if a spatial is a child of the root node.
      *                 (Can add multiple "root" nodes, e.g. gui nodes or overlay nodes)
      */
-    public static void setup(Node rootNode){
+    public static boolean setup(Node rootNode){
         if(checksDisabled()){
-            return;
+            return true;
         }
         Thread thisThread = Thread.currentThread();
         if(mainThread != null && mainThread != thisThread ){
             throw new IllegalStateException("The main thread has already been set to " + mainThread.getName() + " but now it's being set to " + Thread.currentThread().getName());
         }
         mainThread = thisThread;
         setTreeRestricted(rootNode);
+
+        return true; // return true so can be a "side effect" of an assert
     }
 
     /**
@@ -116,10 +118,11 @@ public static boolean updateRequirement(Spatial spatial, Node newParent){
         return true; // return true so can be a "side effect" of an assert
     }
 
-    public static void reset(){
+    public static boolean reset(){
         spatialsThatAreMainThreadReserved.clear();
         mainThread = null;
         THREAD_WARDEN_ENABLED = !Boolean.getBoolean("nothreadwarden");
+        return true; // return true so can be a "side effect" of an assert
     }
 
     private static boolean checksDisabled(){