Findbugs.static_final_immutable: Use final qualifier for static immutable instances.

10 files changed, 45 insertions, 45 deletions

diff --git a/src/test/com/jogamp/opengl/test/bugs/Bug735Inv0AppletAWT.java b/src/test/com/jogamp/opengl/test/bugs/Bug735Inv0AppletAWT.java
index 7b8313b7f..c463ede2a 100644
--- a/src/test/com/jogamp/opengl/test/bugs/Bug735Inv0AppletAWT.java
+++ b/src/test/com/jogamp/opengl/test/bugs/Bug735Inv0AppletAWT.java
@@ -47,14 +47,14 @@ import com.jogamp.opengl.util.glsl.ShaderState;
  */
 @SuppressWarnings("serial")
 public class Bug735Inv0AppletAWT extends Applet implements Runnable {
-  static public int AWT  = 0;
-  static public int NEWT = 1;
-
-  static public int APPLET_WIDTH  = 500;
-  static public int APPLET_HEIGHT = 290;
-  static public int TARGET_FPS    = 120;
-  static public int TOOLKIT       = NEWT;
-  static public boolean MANUAL_FRAME_HANDLING = true;
+  static public final int AWT  = 0;
+  static public final int NEWT = 1;
+
+  static public final int APPLET_WIDTH  = 500;
+  static public final int APPLET_HEIGHT = 290;
+  static public final int TARGET_FPS    = 120;
+  static public final int TOOLKIT       = NEWT;
+  static public final boolean MANUAL_FRAME_HANDLING = true;
 
   //////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/test/com/jogamp/opengl/test/bugs/Bug735Inv1AppletAWT.java b/src/test/com/jogamp/opengl/test/bugs/Bug735Inv1AppletAWT.java
index 377f5e7ef..580f3caea 100644
--- a/src/test/com/jogamp/opengl/test/bugs/Bug735Inv1AppletAWT.java
+++ b/src/test/com/jogamp/opengl/test/bugs/Bug735Inv1AppletAWT.java
@@ -49,14 +49,14 @@ import com.jogamp.opengl.util.glsl.ShaderState;
  */
 @SuppressWarnings("serial")
 public class Bug735Inv1AppletAWT extends Applet implements Runnable {
-  static public int AWT  = 0;
-  static public int NEWT = 1;
-
-  static public int APPLET_WIDTH  = 500;
-  static public int APPLET_HEIGHT = 290;
-  static public int TARGET_FPS    = 120;
-  static public int TOOLKIT       = NEWT;
-  static public boolean MANUAL_FRAME_HANDLING = true;
+  static public final int AWT  = 0;
+  static public final int NEWT = 1;
+
+  static public final int APPLET_WIDTH  = 500;
+  static public final int APPLET_HEIGHT = 290;
+  static public final int TARGET_FPS    = 120;
+  static public final int TOOLKIT       = NEWT;
+  static public final boolean MANUAL_FRAME_HANDLING = true;
 
   //////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/test/com/jogamp/opengl/test/bugs/Bug735Inv2AppletAWT.java b/src/test/com/jogamp/opengl/test/bugs/Bug735Inv2AppletAWT.java
index 109bb1a42..1128c7680 100644
--- a/src/test/com/jogamp/opengl/test/bugs/Bug735Inv2AppletAWT.java
+++ b/src/test/com/jogamp/opengl/test/bugs/Bug735Inv2AppletAWT.java
@@ -43,14 +43,14 @@ import com.jogamp.opengl.test.junit.util.UITestCase;
  */
 @SuppressWarnings("serial")
 public class Bug735Inv2AppletAWT extends Applet implements Runnable {
-  static public int AWT  = 0;
-  static public int NEWT = 1;
-
-  static public int APPLET_WIDTH  = 500;
-  static public int APPLET_HEIGHT = 290;
-  static public int TARGET_FPS    = 120;
-  static public int TOOLKIT       = NEWT;
-  static public boolean IGNORE_AWT_REPAINT = false;
+  static public final int AWT  = 0;
+  static public final int NEWT = 1;
+
+  static public final int APPLET_WIDTH  = 500;
+  static public final int APPLET_HEIGHT = 290;
+  static public final int TARGET_FPS    = 120;
+  static public final int TOOLKIT       = NEWT;
+  static public final boolean IGNORE_AWT_REPAINT = false;
   static public boolean USE_ECT = false;
   static public int SWAP_INTERVAL = 1;
 
diff --git a/src/test/com/jogamp/opengl/test/bugs/Bug735Inv3AppletAWT.java b/src/test/com/jogamp/opengl/test/bugs/Bug735Inv3AppletAWT.java
index 883a40345..83db15cf3 100644
--- a/src/test/com/jogamp/opengl/test/bugs/Bug735Inv3AppletAWT.java
+++ b/src/test/com/jogamp/opengl/test/bugs/Bug735Inv3AppletAWT.java
@@ -46,13 +46,13 @@ import com.jogamp.opengl.util.AnimatorBase;
  */
 @SuppressWarnings("serial")
 public class Bug735Inv3AppletAWT extends Applet {
-  static public int AWT  = 0;
-  static public int NEWT = 1;
+  static public final int AWT  = 0;
+  static public final int NEWT = 1;
 
-  static public int APPLET_WIDTH  = 500;
-  static public int APPLET_HEIGHT = 290;
-  static public int TOOLKIT       = NEWT;
-  static public boolean IGNORE_AWT_REPAINT = false;
+  static public final int APPLET_WIDTH  = 500;
+  static public final int APPLET_HEIGHT = 290;
+  static public final int TOOLKIT       = NEWT;
+  static public final boolean IGNORE_AWT_REPAINT = false;
   static public boolean USE_ECT = false;
   static public int SWAP_INTERVAL = 1;
 
diff --git a/src/test/com/jogamp/opengl/test/bugs/Bug735Inv4AWT.java b/src/test/com/jogamp/opengl/test/bugs/Bug735Inv4AWT.java
index c9df683b1..a3fd3fa21 100644
--- a/src/test/com/jogamp/opengl/test/bugs/Bug735Inv4AWT.java
+++ b/src/test/com/jogamp/opengl/test/bugs/Bug735Inv4AWT.java
@@ -44,13 +44,13 @@ import com.jogamp.opengl.util.AnimatorBase;
  * </pre>
  */
 public class Bug735Inv4AWT {
-  static public int AWT  = 0;
-  static public int NEWT = 1;
+  static public final int AWT  = 0;
+  static public final int NEWT = 1;
 
-  static public int APPLET_WIDTH  = 500;
-  static public int APPLET_HEIGHT = 290;
-  static public int TOOLKIT       = NEWT;
-  static public boolean IGNORE_AWT_REPAINT = false;
+  static public final int APPLET_WIDTH  = 500;
+  static public final int APPLET_HEIGHT = 290;
+  static public final int TOOLKIT       = NEWT;
+  static public final boolean IGNORE_AWT_REPAINT = false;
   static public boolean USE_ECT = false;
   static public int SWAP_INTERVAL = 1;
 
diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestSharedContextNewtAWTBug523.java b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestSharedContextNewtAWTBug523.java
index a1a33531a..d1155bd30 100644
--- a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestSharedContextNewtAWTBug523.java
+++ b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestSharedContextNewtAWTBug523.java
@@ -155,12 +155,12 @@ public class TestSharedContextNewtAWTBug523 extends UITestCase {
         boolean useShared;
         int canvasWidth;
         int canvasHeight;
-        private final float boundsRadius = 2f;
+        private static final float boundsRadius = 2f;
         private float viewDistance;
-        private float viewDistanceFactor = 1.0f;
+        private static float viewDistanceFactor = 1.0f;
         private float xAxisRotation;
         private float yAxisRotation;
-        private final float viewFovDegrees = 15f;
+        private static final float viewFovDegrees = 15f;
 
         // Buffer objects can be shared across canvas instances, if those canvases are initialized with the same GLContext.
         // If we run with sharedBufferObjects true, then the tests will use these shared buffer objects.
diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/demos/es1/OlympicES1.java b/src/test/com/jogamp/opengl/test/junit/jogl/demos/es1/OlympicES1.java
index eae4d41e3..9f5940b53 100644
--- a/src/test/com/jogamp/opengl/test/junit/jogl/demos/es1/OlympicES1.java
+++ b/src/test/com/jogamp/opengl/test/junit/jogl/demos/es1/OlympicES1.java
@@ -30,8 +30,8 @@ public class OlympicES1 implements GLEventListener
     private boolean debug = false ;
     private boolean trace = false ;
 
-    // private static final double M_PI= 3.141592654;
-    private static final double M_2PI= 2*3.141592654;
+    // private static final double M_PI= Math.PI;
+    private static final double M_2PI = 2.0*Math.PI;
 
     private static final int
     // XSIZE=   100,
diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/LandscapeES2.java b/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/LandscapeES2.java
index c341c6de6..72524aa67 100644
--- a/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/LandscapeES2.java
+++ b/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/LandscapeES2.java
@@ -46,7 +46,7 @@ public class LandscapeES2 implements GLEventListener {
     private int swapInterval = 0;
     private boolean verbose = true;
 
-    static public int TARGET_FPS    = 120;
+    static public final int TARGET_FPS    = 120;
     private long millisOffset;
     private int frameCount;
     private float frameRate;
diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/shader/RedSquareShader.java b/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/shader/RedSquareShader.java
index 178887059..9284ec48e 100644
--- a/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/shader/RedSquareShader.java
+++ b/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/shader/RedSquareShader.java
@@ -29,7 +29,7 @@
 package com.jogamp.opengl.test.junit.jogl.demos.es2.shader;
 
 public class RedSquareShader {
-    public static String VERTEX_SHADER_TEXT =
+    public static final String VERTEX_SHADER_TEXT =
                 " #ifdef GL_ES\n" +
                 "  precision mediump float;\n" +
                 "  precision mediump int;\n" +
@@ -51,7 +51,7 @@ public class RedSquareShader {
                 "  gl_Position = mgl_PMVMatrix[0] * mgl_PMVMatrix[1] * mgl_Vertex;\n" +
                 "}\n" ;
 
-    public static String FRAGMENT_SHADER_TEXT =
+    public static final String FRAGMENT_SHADER_TEXT =
                 " #ifdef GL_ES\n" +
                 "  precision mediump float;\n" +
                 "  precision mediump int;\n" +
diff --git a/src/test/com/jogamp/opengl/test/junit/newt/event/BaseNewtEventModifiers.java b/src/test/com/jogamp/opengl/test/junit/newt/event/BaseNewtEventModifiers.java
index 27d095a11..a2fd7b08c 100644
--- a/src/test/com/jogamp/opengl/test/junit/newt/event/BaseNewtEventModifiers.java
+++ b/src/test/com/jogamp/opengl/test/junit/newt/event/BaseNewtEventModifiers.java
@@ -72,7 +72,7 @@ public abstract class BaseNewtEventModifiers extends UITestCase {
     protected static final int MS_ROBOT_POST_TEST_DELAY = 100;
 
     protected static final boolean _debug = true ;
-    protected static PrintStream _debugPrintStream = System.err ;
+    protected static final PrintStream _debugPrintStream = System.err ;
 
     ////////////////////////////////////////////////////////////////////////////