Code Clean-Up based on our Recommended Settings (jogamp-scripting c47bc86ae2ee268a1f38c5580d11f93d7f8d6e74)

- Change non static accesses to static members using declaring type
    - Change indirect accesses to static members to direct accesses (accesses through subtypes)
    - Add final modifier to private fields
    - Add final modifier to method parameters
    - Add final modifier to local variables
    - Remove unnecessary casts
    - Remove unnecessary '$NON-NLS$' tags
    - Remove trailing white spaces on all lines

11 files changed, 249 insertions, 242 deletions

diff --git a/src/test/com/jogamp/openal/test/android/BaseActivity.java b/src/test/com/jogamp/openal/test/android/BaseActivity.java
index 9aec18a..b7324de 100644
--- a/src/test/com/jogamp/openal/test/android/BaseActivity.java
+++ b/src/test/com/jogamp/openal/test/android/BaseActivity.java
@@ -3,14 +3,14 @@
  *
  * Redistribution and use in source and binary forms, with or without modification, are
  * permitted provided that the following conditions are met:
- * 
+ *
  *    1. Redistributions of source code must retain the above copyright notice, this list of
  *       conditions and the following disclaimer.
- * 
+ *
  *    2. Redistributions in binary form must reproduce the above copyright notice, this list
  *       of conditions and the following disclaimer in the documentation and/or other materials
  *       provided with the distribution.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY JogAmp Community ``AS IS'' AND ANY EXPRESS OR IMPLIED
  * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
  * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JogAmp Community OR
@@ -20,7 +20,7 @@
  * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  * The views and conclusions contained in the software and documentation are those of the
  * authors and should not be interpreted as representing official policies, either expressed
  * or implied, of JogAmp Community.
@@ -31,39 +31,39 @@ import android.app.Activity;
 import android.os.Bundle;
 import android.util.Log;
 
-public class BaseActivity extends Activity {    
+public class BaseActivity extends Activity {
    boolean isDelegatedActivity;
    Activity rootActivity;
    boolean setThemeCalled = false;
-      
+
    public BaseActivity() {
        super();
        isDelegatedActivity = false;
        rootActivity = this;
    }
-   
-   public void setRootActivity(Activity rootActivity) {
+
+   public void setRootActivity(final Activity rootActivity) {
        this.rootActivity = rootActivity;
        this.isDelegatedActivity = this != rootActivity;
    }
-   
+
    public final boolean isDelegatedActivity() {
        return isDelegatedActivity;
    }
-   
+
    public final Activity getActivity() {
        return rootActivity;
-   }     
-   
+   }
+
    @Override
-   public void onCreate(Bundle savedInstanceState) {
+   public void onCreate(final Bundle savedInstanceState) {
        Log.d(MD.TAG, "onCreate");
        if(!isDelegatedActivity()) {
            super.onCreate(savedInstanceState);
        }
        jogamp.common.os.android.StaticContext.init(rootActivity.getApplicationContext());
    }
-   
+
    @Override
    public void onStart() {
      Log.d(MD.TAG, "onStart");
@@ -71,7 +71,7 @@ public class BaseActivity extends Activity {
          super.onStart();
      }
    }
-     
+
    @Override
    public void onRestart() {
      Log.d(MD.TAG, "onRestart");
@@ -100,7 +100,7 @@ public class BaseActivity extends Activity {
    public void onStop() {
      Log.d(MD.TAG, "onStop");
      if(!isDelegatedActivity()) {
-         super.onStop();  
+         super.onStop();
      }
    }
 
@@ -109,7 +109,7 @@ public class BaseActivity extends Activity {
      Log.d(MD.TAG, "onDestroy");
      jogamp.common.os.android.StaticContext.clear();
      if(!isDelegatedActivity()) {
-         super.onDestroy(); 
+         super.onDestroy();
      }
-   }   
+   }
 }
diff --git a/src/test/com/jogamp/openal/test/android/LauncherUtil.java b/src/test/com/jogamp/openal/test/android/LauncherUtil.java
index d416e5d..a0f53ac 100644
--- a/src/test/com/jogamp/openal/test/android/LauncherUtil.java
+++ b/src/test/com/jogamp/openal/test/android/LauncherUtil.java
@@ -3,14 +3,14 @@
  *
  * Redistribution and use in source and binary forms, with or without modification, are
  * permitted provided that the following conditions are met:
- * 
+ *
  *    1. Redistributions of source code must retain the above copyright notice, this list of
  *       conditions and the following disclaimer.
- * 
+ *
  *    2. Redistributions in binary form must reproduce the above copyright notice, this list
  *       of conditions and the following disclaimer in the documentation and/or other materials
  *       provided with the distribution.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY JogAmp Community ``AS IS'' AND ANY EXPRESS OR IMPLIED
  * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
  * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JogAmp Community OR
@@ -20,7 +20,7 @@
  * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  * The views and conclusions contained in the software and documentation are those of the
  * authors and should not be interpreted as representing official policies, either expressed
  * or implied, of JogAmp Community.
@@ -43,45 +43,45 @@ import android.util.Log;
  * Helper class to parse Uri's and programmatically add package names and properties to create an Uri or Intend.
  * <p>
  * The order of the Uri segments (any arguments) is preserved.
- * </p>  
+ * </p>
  */
 public class LauncherUtil {
-    
+
    /** Default launch mode. */
    public static final String LAUNCH_ACTIVITY_NORMAL = "org.jogamp.launcher.action.LAUNCH_ACTIVITY_NORMAL";
-   
+
    /** Transparent launch mode. Note: This seems to be required to achieve translucency, since setTheme(..) doesn't work. */
    public static final String LAUNCH_ACTIVITY_TRANSPARENT = "org.jogamp.launcher.action.LAUNCH_ACTIVITY_TRANSPARENT";
-   
+
    /** FIXME: TODO */
    public static final String LAUNCH_MAIN = "org.jogamp.launcher.action.LAUNCH_MAIN";
-   
+
    /** FIXME: TODO */
    public static final String LAUNCH_JUNIT = "org.jogamp.launcher.action.LAUNCH_JUNIT";
-   
+
    /** The protocol <code>launch</code> */
    public static final String SCHEME = "launch";
-   
+
    /** The host <code>jogamp.org</code> */
    public static final String HOST = "jogamp.org";
-   
+
    static final String SYS_PKG = "sys";
-   
+
    static final String USR_PKG = "pkg";
-   
+
    static final String ARG = "arg";
-   
+
    public static abstract class BaseActivityLauncher extends Activity {
        final OrderedProperties props = new OrderedProperties();
        final ArrayList<String> args = new ArrayList<String>();
-       /** 
+       /**
         * Returns the default {@link LauncherUtil#LAUNCH_ACTIVITY_NORMAL} action.
         * <p>
         * Should be overridden for other action, eg.  {@link LauncherUtil#LAUNCH_ACTIVITY_TRANSPARENT}.
         * </p>
         */
        public String getAction() { return LAUNCH_ACTIVITY_NORMAL; }
-       
+
        /**
         * Returns the properties, which are being propagated to the target activity.
         * <p>
@@ -89,58 +89,58 @@ public class LauncherUtil {
         * </p>
         */
        public final OrderedProperties getProperties() { return props; }
-       
+
        /**
         * Returns the commandline arguments, which are being propagated to the target activity.
         * <p>
         * Maybe be used to set custom commandline arguments.
         * </p>
         */
-       public final ArrayList<String> getArguments() { return args; } 
-       
+       public final ArrayList<String> getArguments() { return args; }
+
        /** Custom initialization hook which can be overriden to setup data, e.g. fill the properties retrieved by {@link #getProperties()}. */
        public void init() { }
-       
+
        /** Returns true if this launcher activity shall end after starting the downstream activity. Defaults to <code>true</code>, override to change behavior. */
        public boolean finishAfterDelegate() { return true; }
-       
+
        /** Must return the downstream Activity class name */
        public abstract String getActivityName();
-       
+
        /** Must return a list of required user packages, at least one containing the activity. */
        public abstract List<String> getUsrPackages();
-       
+
        /** Return a list of required system packages w/ native libraries, may return null or a zero sized list. */
        public abstract List<String> getSysPackages();
 
        @Override
-       public void onCreate(Bundle savedInstanceState) {
+       public void onCreate(final Bundle savedInstanceState) {
            super.onCreate(savedInstanceState);
-           
+
            init();
-           
+
            final DataSet data = new DataSet();
            data.setActivityName(getActivityName());
            data.addAllSysPackages(getSysPackages());
            data.addAllUsrPackages(getUsrPackages());
            data.addAllProperties(props);
            data.addAllArguments(args);
-           
+
            final Intent intent = LauncherUtil.getIntent(getAction(), data);
            Log.d(getClass().getSimpleName(), "Launching Activity: "+intent);
            startActivity (intent);
-           
+
            if(finishAfterDelegate()) {
                finish(); // done
            }
-       }        
+       }
    }
-   
+
    public static class OrderedProperties {
        HashMap<String, String> map = new HashMap<String, String>();
-       ArrayList<String> keyList = new ArrayList<String>(); 
-              
-       public final void setProperty(String key, String value) { 
+       ArrayList<String> keyList = new ArrayList<String>();
+
+       public final void setProperty(final String key, final String value) {
            if(key.equals(SYS_PKG)) {
                throw new IllegalArgumentException("Illegal property key, '"+SYS_PKG+"' is reserved");
            }
@@ -157,36 +157,36 @@ public class LauncherUtil {
            }
            keyList.add(key); // new key
        }
-       
-       public final void addAll(OrderedProperties props) {
-           Iterator<String> argKeys = props.keyList.iterator();
+
+       public final void addAll(final OrderedProperties props) {
+           final Iterator<String> argKeys = props.keyList.iterator();
            while(argKeys.hasNext()) {
                    final String key = argKeys.next();
                    setProperty(key, props.map.get(key));
-           }           
+           }
        }
-       
+
        public final void setSystemProperties() {
-           Iterator<String> argKeys = keyList.iterator();
+           final Iterator<String> argKeys = keyList.iterator();
            while(argKeys.hasNext()) {
                    final String key = argKeys.next();
                    System.setProperty(key, map.get(key));
            }
        }
        public final void clearSystemProperties() {
-           Iterator<String> argKeys = keyList.iterator();
+           final Iterator<String> argKeys = keyList.iterator();
            while(argKeys.hasNext()) {
                System.clearProperty(argKeys.next());
            }
        }
-       
-       public final String getProperty(String key) { return map.get(key); }
+
+       public final String getProperty(final String key) { return map.get(key); }
        public final Map<String, String> getProperties() { return map; }
-           
+
        /** Returns the list of property keys in the order, as they were added. */
-       public final List<String> getPropertyKeys() { return keyList; }       
+       public final List<String> getPropertyKeys() { return keyList; }
    }
-   
+
    /**
     * Data set to transfer from and to launch URI consisting out of:
     * <ul>
@@ -205,56 +205,56 @@ public class LauncherUtil {
        static final char ASSIG = '=';
        static final String COLSLASH2 = "://";
        static final String EMPTY = "";
-       
+
        String activityName = null;
        ArrayList<String> sysPackages = new ArrayList<String>();
        ArrayList<String> usrPackages = new ArrayList<String>();
        OrderedProperties properties = new OrderedProperties();
        ArrayList<String> arguments = new ArrayList<String>();
-       
-       public final void setActivityName(String name) { activityName = name; }
+
+       public final void setActivityName(final String name) { activityName = name; }
        public final String getActivityName() { return activityName; }
-              
-       public final void addSysPackage(String p) { 
-           sysPackages.add(p); 
-       }   
-       public final void addAllSysPackages(List<String> plist) { 
+
+       public final void addSysPackage(final String p) {
+           sysPackages.add(p);
+       }
+       public final void addAllSysPackages(final List<String> plist) {
            sysPackages.addAll(plist);
-       }   
+       }
        public final List<String> getSysPackages()  { return sysPackages; }
-       
-       public final void addUsrPackage(String p) { 
-           usrPackages.add(p); 
-       }   
-       public final void addAllUsrPackages(List<String> plist) { 
+
+       public final void addUsrPackage(final String p) {
+           usrPackages.add(p);
+       }
+       public final void addAllUsrPackages(final List<String> plist) {
            usrPackages.addAll(plist);
-       }   
+       }
        public final List<String> getUsrPackages()  { return usrPackages; }
-       
-       public final void setProperty(String key, String value) {
+
+       public final void setProperty(final String key, final String value) {
            properties.setProperty(key, value);
        }
-       public final void addAllProperties(OrderedProperties props) {
+       public final void addAllProperties(final OrderedProperties props) {
            properties.addAll(props);
        }
        public final void setSystemProperties() {
            properties.setSystemProperties();
-       }   
+       }
        public final void clearSystemProperties() {
            properties.clearSystemProperties();
-       }   
-       public final String getProperty(String key) { return properties.getProperty(key); }
+       }
+       public final String getProperty(final String key) { return properties.getProperty(key); }
        public final OrderedProperties getProperties() { return properties; }
        public final List<String> getPropertyKeys() { return properties.getPropertyKeys(); }
-       
-       public final void addArgument(String arg) { arguments.add(arg); }
-       public final void addAllArguments(List<String> args) {
+
+       public final void addArgument(final String arg) { arguments.add(arg); }
+       public final void addAllArguments(final List<String> args) {
            arguments.addAll(args);
        }
        public final ArrayList<String> getArguments() { return arguments; }
-       
+
        public final Uri getUri() {
-           StringBuilder sb = new StringBuilder();
+           final StringBuilder sb = new StringBuilder();
            sb.append(SCHEME).append(COLSLASH2).append(HOST).append(SLASH).append(getActivityName());
            boolean needsQMark = true;
            boolean needsSep = false;
@@ -284,7 +284,7 @@ public class LauncherUtil {
                    needsSep = true;
                }
            }
-           Iterator<String> propKeys = properties.keyList.iterator();
+           final Iterator<String> propKeys = properties.keyList.iterator();
            while(propKeys.hasNext()) {
                if( needsQMark ) {
                    sb.append(QMARK);
@@ -297,7 +297,7 @@ public class LauncherUtil {
                sb.append(key).append(ASSIG).append(properties.map.get(key));
                needsSep = true;
            }
-           Iterator<String> args = arguments.iterator();
+           final Iterator<String> args = arguments.iterator();
            while(args.hasNext()) {
                if( needsQMark ) {
                    sb.append(QMARK);
@@ -308,18 +308,18 @@ public class LauncherUtil {
                }
                sb.append(ARG).append(ASSIG).append(args.next());
                needsSep = true;
-           }           
+           }
            return Uri.parse(sb.toString());
        }
-       
-       public static final DataSet create(Uri uri) {
+
+       public static final DataSet create(final Uri uri) {
            if(!uri.getScheme().equals(SCHEME)) {
                return null;
            }
            if(!uri.getHost().equals(HOST)) {
                return null;
            }
-           DataSet data = new DataSet();
+           final DataSet data = new DataSet();
            {
                String an =  uri.getPath();
                if(SLASH == an.charAt(0)) {
@@ -330,16 +330,16 @@ public class LauncherUtil {
                }
                data.setActivityName(an);
            }
-           
+
            final String q = uri.getQuery();
            final int q_l = null != q ? q.length() : -1;
            int q_e = -1;
            while(q_e < q_l) {
-               int q_b = q_e + 1; // next term
+               final int q_b = q_e + 1; // next term
                q_e = q.indexOf(AMPER, q_b);
                if(0 == q_e) {
                    // single separator
-                   continue; 
+                   continue;
                }
                if(0 > q_e) {
                    // end
@@ -381,41 +381,41 @@ public class LauncherUtil {
            data.validate();
            return data;
        }
-       
+
        public final void validate() {
            if(null == activityName) {
                throw new RuntimeException("Activity is not NULL");
            }
        }
    }
-   
-   public final static Intent getIntent(String action, DataSet data) {
+
+   public final static Intent getIntent(final String action, final DataSet data) {
        data.validate();
        return new Intent(action, data.getUri());
    }
-   
+
    public static void main(String[] args) {
        if(args.length==0) {
            args = new String[] {
-               SCHEME+"://"+HOST+"/com.jogamp.TestActivity?"+SYS_PKG+"=jogamp.pack1&"+SYS_PKG+"=javax.pack2&"+USR_PKG+"=com.jogamp.pack3&"+USR_PKG+"=com.jogamp.pack4&jogamp.common.debug=true&com.jogamp.test=false",   
+               SCHEME+"://"+HOST+"/com.jogamp.TestActivity?"+SYS_PKG+"=jogamp.pack1&"+SYS_PKG+"=javax.pack2&"+USR_PKG+"=com.jogamp.pack3&"+USR_PKG+"=com.jogamp.pack4&jogamp.common.debug=true&com.jogamp.test=false",
                SCHEME+"://"+HOST+"/com.jogamp.TestActivity?"+SYS_PKG+"=jogamp.pack1&jogamp.common.debug=true&com.jogamp.test=false",
                SCHEME+"://"+HOST+"/com.jogamp.TestActivity?"+USR_PKG+"=jogamp.pack1&jogamp.common.debug=true&com.jogamp.test=false",
                SCHEME+"://"+HOST+"/com.jogamp.TestActivity?"+USR_PKG+"=jogamp.pack1&"+USR_PKG+"=com.jogamp.pack2",
-               SCHEME+"://"+HOST+"/com.jogamp.TestActivity?"+USR_PKG+"=jogamp.pack1&"+USR_PKG+"=javax.pack2&"+USR_PKG+"=com.jogamp.pack3&jogamp.common.debug=true&com.jogamp.test=false&"+ARG+"=arg1&"+ARG+"=arg2=arg2value&"+ARG+"=arg3",   
-               SCHEME+"://"+HOST+"/com.jogamp.TestActivity?"+USR_PKG+"=jogamp.pack1&jogamp.common.debug=true&com.jogamp.test=false&"+ARG+"=arg1&"+ARG+"=arg2=arg2value&"+ARG+"=arg3",   
-               SCHEME+"://"+HOST+"/com.jogamp.TestActivity?"+USR_PKG+"=jogamp.pack1&"+ARG+"=arg1&"+ARG+"=arg2=arg2value&"+ARG+"=arg3"   
+               SCHEME+"://"+HOST+"/com.jogamp.TestActivity?"+USR_PKG+"=jogamp.pack1&"+USR_PKG+"=javax.pack2&"+USR_PKG+"=com.jogamp.pack3&jogamp.common.debug=true&com.jogamp.test=false&"+ARG+"=arg1&"+ARG+"=arg2=arg2value&"+ARG+"=arg3",
+               SCHEME+"://"+HOST+"/com.jogamp.TestActivity?"+USR_PKG+"=jogamp.pack1&jogamp.common.debug=true&com.jogamp.test=false&"+ARG+"=arg1&"+ARG+"=arg2=arg2value&"+ARG+"=arg3",
+               SCHEME+"://"+HOST+"/com.jogamp.TestActivity?"+USR_PKG+"=jogamp.pack1&"+ARG+"=arg1&"+ARG+"=arg2=arg2value&"+ARG+"=arg3"
            };
        }
        int errors = 0;
        for(int i=0; i<args.length; i++) {
-           String uri_s = args[i];
-           Uri uri0 = Uri.parse(uri_s);
-           DataSet data = DataSet.create(uri0);
+           final String uri_s = args[i];
+           final Uri uri0 = Uri.parse(uri_s);
+           final DataSet data = DataSet.create(uri0);
            if(null == data) {
                errors++;
                System.err.println("Error: NULL JogAmpLauncherUtil: <"+uri_s+"> -> "+uri0+" -> NULL");
            } else {
-               Uri uri1 = data.getUri();
+               final Uri uri1 = data.getUri();
                if(!uri0.equals(uri1)) {
                    errors++;
                    System.err.println("Error: Not equal: <"+uri_s+"> -> "+uri0+" -> "+uri1);
@@ -426,5 +426,5 @@ public class LauncherUtil {
        }
        System.err.println("LauncherUtil Self Test: Errors: "+errors);
    }
-   
+
 }
diff --git a/src/test/com/jogamp/openal/test/android/MD.java b/src/test/com/jogamp/openal/test/android/MD.java
index 113203e..c7a6b68 100644
--- a/src/test/com/jogamp/openal/test/android/MD.java
+++ b/src/test/com/jogamp/openal/test/android/MD.java
@@ -3,14 +3,14 @@
  *
  * Redistribution and use in source and binary forms, with or without modification, are
  * permitted provided that the following conditions are met:
- * 
+ *
  *    1. Redistributions of source code must retain the above copyright notice, this list of
  *       conditions and the following disclaimer.
- * 
+ *
  *    2. Redistributions in binary form must reproduce the above copyright notice, this list
  *       of conditions and the following disclaimer in the documentation and/or other materials
  *       provided with the distribution.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY JogAmp Community ``AS IS'' AND ANY EXPRESS OR IMPLIED
  * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
  * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JogAmp Community OR
@@ -20,13 +20,15 @@
  * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  * The views and conclusions contained in the software and documentation are those of the
  * authors and should not be interpreted as representing official policies, either expressed
  * or implied, of JogAmp Community.
  */
 package com.jogamp.openal.test.android;
 
+import jogamp.common.os.PlatformPropsImpl;
+
 import com.jogamp.common.GlueGenVersion;
 import com.jogamp.common.os.Platform;
 import com.jogamp.common.util.VersionUtil;
@@ -34,20 +36,20 @@ import com.jogamp.openal.JoalVersion;
 
 public class MD {
    public static final String TAG = "JogAmp.JOAL";
-   
-   public static String getInfo() {        
-        StringBuilder sb = new StringBuilder();
-        
-        sb.append(VersionUtil.getPlatformInfo()).append(Platform.NEWLINE)
-              .append(GlueGenVersion.getInstance()).append(Platform.NEWLINE)
-              .append(JoalVersion.getInstance()).append(Platform.NEWLINE)
-              .append(Platform.NEWLINE);
-              
-        return sb.toString();       
+
+   public static String getInfo() {
+        final StringBuilder sb = new StringBuilder();
+
+        sb.append(VersionUtil.getPlatformInfo()).append(PlatformPropsImpl.NEWLINE)
+              .append(GlueGenVersion.getInstance()).append(PlatformPropsImpl.NEWLINE)
+              .append(JoalVersion.getInstance()).append(PlatformPropsImpl.NEWLINE)
+              .append(PlatformPropsImpl.NEWLINE);
+
+        return sb.toString();
    }
-   
-    public static void main(String args[]) {
-        
+
+    public static void main(final String args[]) {
+
         System.err.println(getInfo());
     }
 }
diff --git a/src/test/com/jogamp/openal/test/android/OpenALTestActivity.java b/src/test/com/jogamp/openal/test/android/OpenALTestActivity.java
index 960d447..e9d94a0 100644
--- a/src/test/com/jogamp/openal/test/android/OpenALTestActivity.java
+++ b/src/test/com/jogamp/openal/test/android/OpenALTestActivity.java
@@ -3,14 +3,14 @@
  *
  * Redistribution and use in source and binary forms, with or without modification, are
  * permitted provided that the following conditions are met:
- * 
+ *
  *    1. Redistributions of source code must retain the above copyright notice, this list of
  *       conditions and the following disclaimer.
- * 
+ *
  *    2. Redistributions in binary form must reproduce the above copyright notice, this list
  *       of conditions and the following disclaimer in the documentation and/or other materials
  *       provided with the distribution.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY JogAmp Community ``AS IS'' AND ANY EXPRESS OR IMPLIED
  * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
  * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JogAmp Community OR
@@ -20,7 +20,7 @@
  * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  * The views and conclusions contained in the software and documentation are those of the
  * authors and should not be interpreted as representing official policies, either expressed
  * or implied, of JogAmp Community.
@@ -34,26 +34,26 @@ import android.util.Log;
 
 public class OpenALTestActivity extends BaseActivity {
    static String TAG = "OpenALTestActivity";
-   
+
    OpenALTest demo = null;
-   
+
    @Override
-   public void onCreate(Bundle savedInstanceState) {
+   public void onCreate(final Bundle savedInstanceState) {
        Log.d(TAG, "onCreate - 0");
        super.onCreate(savedInstanceState);
-       
+
        demo = new OpenALTest();
        try {
            demo.init();
-       } catch (Exception e) {
+       } catch (final Exception e) {
            e.printStackTrace();
            demo.dispose();
            demo = null;
        }
-       
+
        Log.d(TAG, "onCreate - X");
    }
-   
+
    @Override
    public void onResume() {
      Log.d(MD.TAG, "onResume");
@@ -79,7 +79,7 @@ public class OpenALTestActivity extends BaseActivity {
          demo.dispose();
          demo = null;
      }
-     super.onDestroy(); 
-   }   
-   
+     super.onDestroy();
+   }
+
 }
diff --git a/src/test/com/jogamp/openal/test/android/OpenALTestActivityLauncher.java b/src/test/com/jogamp/openal/test/android/OpenALTestActivityLauncher.java
index 3ebbd80..6f28444 100644
--- a/src/test/com/jogamp/openal/test/android/OpenALTestActivityLauncher.java
+++ b/src/test/com/jogamp/openal/test/android/OpenALTestActivityLauncher.java
@@ -7,28 +7,28 @@ import com.jogamp.openal.test.android.LauncherUtil.OrderedProperties;
 
 public class OpenALTestActivityLauncher extends LauncherUtil.BaseActivityLauncher {
     static String demo = "com.jogamp.openal.test.android.OpenALTestActivity";
-    static String[] sys_pkgs = new String[] { "com.jogamp.common", "com.jogamp.openal" };    
+    static String[] sys_pkgs = new String[] { "com.jogamp.common", "com.jogamp.openal" };
     static String[] usr_pkgs = new String[] { "com.jogamp.openal.test" };
-    
+
     @Override
     public void init() {
-       final OrderedProperties props = getProperties();       
+       final OrderedProperties props = getProperties();
        props.setProperty("jogamp.debug.JNILibLoader", "true");
        props.setProperty("jogamp.debug.NativeLibrary", "true");
        props.setProperty("jogamp.debug.NativeLibrary.Lookup", "true");
        props.setProperty("jogamp.debug.IOUtil", "true");
     }
-    
+
     @Override
     public String getActivityName() {
         return demo;
     }
-    
+
     @Override
     public List<String> getSysPackages() {
         return Arrays.asList(sys_pkgs);
     }
-    
+
     @Override
     public List<String> getUsrPackages() {
         return Arrays.asList(usr_pkgs);
diff --git a/src/test/com/jogamp/openal/test/junit/ALExtLoopbackDeviceSOFTTest.java b/src/test/com/jogamp/openal/test/junit/ALExtLoopbackDeviceSOFTTest.java
index d539d43..c84b4e6 100644
--- a/src/test/com/jogamp/openal/test/junit/ALExtLoopbackDeviceSOFTTest.java
+++ b/src/test/com/jogamp/openal/test/junit/ALExtLoopbackDeviceSOFTTest.java
@@ -12,6 +12,9 @@ import org.junit.FixMethodOrder;
 import org.junit.Test;
 import org.junit.runners.MethodSorters;
 
+import com.jogamp.openal.ALCConstants;
+import com.jogamp.openal.ALConstants;
+import com.jogamp.openal.ALExtConstants;
 import com.jogamp.openal.ALFactory;
 import com.jogamp.openal.AL;
 import com.jogamp.openal.ALC;
@@ -37,12 +40,12 @@ public class ALExtLoopbackDeviceSOFTTest extends UITestCase {
         testAlCLoopbackDeviceSOFTImpl(3, 0.8f);
     }
 
-    void testAlCLoopbackDeviceSOFTImpl(int srcIdx, float expAccuracy) throws UnsupportedAudioFileException, IOException {
+    void testAlCLoopbackDeviceSOFTImpl(final int srcIdx, final float expAccuracy) throws UnsupportedAudioFileException, IOException {
     	final ALC alc = ALFactory.getALC();
         final AL al = ALFactory.getAL();
         final ALExt alext = ALFactory.getALExt();
 
-        System.out.println("Available null device OpenAL Extensions:"+alc.alcGetString(null, ALC.ALC_EXTENSIONS));
+        System.out.println("Available null device OpenAL Extensions:"+alc.alcGetString(null, ALCConstants.ALC_EXTENSIONS));
         if ( !alc.alcIsExtensionPresent(null, "ALC_SOFT_loopback") ) {
             System.out.println("No extension ALC_SOFT_loopback present");
             return;
@@ -52,15 +55,15 @@ public class ALExtLoopbackDeviceSOFTTest extends UITestCase {
         final boolean useShort;
         if( 0 == srcIdx ) {
             inputStream = ResourceLocation.getTestStream0();
-            fmtChannels = ALExt.AL_MONO_SOFT;
-            fmtData = ALExt.AL_BYTE_SOFT;
+            fmtChannels = ALExtConstants.AL_MONO_SOFT;
+            fmtData = ALExtConstants.AL_BYTE_SOFT;
             sampleSize = 8;
             channelCount = 1;
             useShort = false;
         } else if( 3 == srcIdx ) {
             inputStream = ResourceLocation.getTestStream3();
-            fmtChannels = ALExt.AL_STEREO_SOFT;
-            fmtData = ALExt.AL_SHORT_SOFT;
+            fmtChannels = ALExtConstants.AL_STEREO_SOFT;
+            fmtData = ALExtConstants.AL_SHORT_SOFT;
             sampleSize = 16;
             channelCount = 2;
             useShort = true;
@@ -99,18 +102,18 @@ public class ALExtLoopbackDeviceSOFTTest extends UITestCase {
                 Assert.assertTrue("Not supported: "+msg, supported);
 
                 context = alc.alcCreateContext(dev, new int[]{
-                        ALExt.ALC_FORMAT_CHANNELS_SOFT,
+                        ALExtConstants.ALC_FORMAT_CHANNELS_SOFT,
                         fmtChannels,
-                        ALExt.ALC_FORMAT_TYPE_SOFT,
+                        ALExtConstants.ALC_FORMAT_TYPE_SOFT,
                         fmtData,
-                        ALC.ALC_FREQUENCY,
+                        ALCConstants.ALC_FREQUENCY,
                         wd.freq,
                         0
                     }, 0);
 
                 final int alcDevError = alc.alcGetError(dev);
                 System.err.printf("CreatedSoftContext: alcError 0x%X, context %s%n", alcDevError, context);
-            } catch (Exception e) {
+            } catch (final Exception e) {
                 ex = e;
             }
             assertNull(ex);
@@ -120,26 +123,26 @@ public class ALExtLoopbackDeviceSOFTTest extends UITestCase {
             try {
                 final int dataSize = Math.min(4096, wd.size);
 
-                int[] source = { 0 };
+                final int[] source = { 0 };
                 al.alGenSources(1, source, 0);
-                assertEquals("Could not gen source", AL.AL_NO_ERROR, al.alGetError());
+                assertEquals("Could not gen source", ALConstants.AL_NO_ERROR, al.alGetError());
 
                 final int[] buffer = new int[1];
                 final int[] tmp = new int[1];
 
                 al.alGenBuffers(1, buffer, 0);
-                assertEquals("Could not generate AL buffer", AL.AL_NO_ERROR, al.alGetError());
+                assertEquals("Could not generate AL buffer", ALConstants.AL_NO_ERROR, al.alGetError());
 
                 al.alBufferData(buffer[0], wd.format, wd.data, dataSize, wd.freq);
-                assertEquals("Could not fill AL source buffer "+buffer[0]+", sz "+dataSize+", "+wd.data, AL.AL_NO_ERROR, al.alGetError());
-                al.alGetBufferi(buffer[0], AL.AL_SIZE, tmp, 0);
-                assertEquals("Could not get buffer size "+buffer[0], AL.AL_NO_ERROR, al.alGetError());
+                assertEquals("Could not fill AL source buffer "+buffer[0]+", sz "+dataSize+", "+wd.data, ALConstants.AL_NO_ERROR, al.alGetError());
+                al.alGetBufferi(buffer[0], ALConstants.AL_SIZE, tmp, 0);
+                assertEquals("Could not get buffer size "+buffer[0], ALConstants.AL_NO_ERROR, al.alGetError());
                 System.err.println("Buffer size "+tmp[0]+" of "+dataSize);
-                al.alSourcei(source[0], AL.AL_BUFFER, buffer[0]);
-                assertEquals("Could source buffer "+buffer[0], AL.AL_NO_ERROR, al.alGetError());
+                al.alSourcei(source[0], ALConstants.AL_BUFFER, buffer[0]);
+                assertEquals("Could source buffer "+buffer[0], ALConstants.AL_NO_ERROR, al.alGetError());
 
                 al.alSourcePlay(source[0]);
-                assertEquals("Could not play source "+source[0], AL.AL_NO_ERROR, al.alGetError());
+                assertEquals("Could not play source "+source[0], ALConstants.AL_NO_ERROR, al.alGetError());
 
                 final ByteBuffer bbSink = ByteBuffer.allocateDirect(dataSize).order(wd.data.order());
 
@@ -150,7 +153,7 @@ public class ALExtLoopbackDeviceSOFTTest extends UITestCase {
                 try {
                     final int samplesPerChannel = dataSize / ( ( sampleSize / 8 ) * channelCount );
                     alext.alcRenderSamplesSOFT(dev, bbSink, samplesPerChannel);
-                } catch (Exception e) {
+                } catch (final Exception e) {
                     ex = e;
                 }
                 assertNull(ex);
@@ -222,7 +225,7 @@ public class ALExtLoopbackDeviceSOFTTest extends UITestCase {
         System.out.println("end testAlCLoopbackDeviceSOFT");
     }
 
-    public static void main(String args[]) throws IOException {
+    public static void main(final String args[]) throws IOException {
         dumpSamples = true;
         org.junit.runner.JUnitCore.main(ALExtLoopbackDeviceSOFTTest.class.getName());
     }
diff --git a/src/test/com/jogamp/openal/test/junit/ALutWAVLoaderTest.java b/src/test/com/jogamp/openal/test/junit/ALutWAVLoaderTest.java
index 9a9eaef..29035da 100644
--- a/src/test/com/jogamp/openal/test/junit/ALutWAVLoaderTest.java
+++ b/src/test/com/jogamp/openal/test/junit/ALutWAVLoaderTest.java
@@ -23,11 +23,11 @@ public class ALutWAVLoaderTest extends UITestCase {
     @Test
     public void testALutLoadWAVFileStream() throws IOException {
         // variables to load into
-        int[] format = new int[1];
-        int[] size = new int[1];
-        ByteBuffer[] data = new ByteBuffer[1];
-        int[] freq = new int[1];
-        int[] loop = new int[1];
+        final int[] format = new int[1];
+        final int[] size = new int[1];
+        final ByteBuffer[] data = new ByteBuffer[1];
+        final int[] freq = new int[1];
+        final int[] loop = new int[1];
 
         ALut.alutLoadWAVFile(ResourceLocation.getTestStream0(), format, data, size, freq, loop);
         System.out.println("*** ALut.alutLoadWAV Stream0 size "+size[0]);
@@ -41,19 +41,19 @@ public class ALutWAVLoaderTest extends UITestCase {
 
     @Test
     public void testWAVDataLoadStream() throws IOException {
-    	WAVData wd0 = WAVData.loadFromStream(ResourceLocation.getTestStream0(), ResourceLocation.getTestStream0Size(), 1, 8, 22050, ByteOrder.LITTLE_ENDIAN, true);
+    	final WAVData wd0 = WAVData.loadFromStream(ResourceLocation.getTestStream0(), ResourceLocation.getTestStream0Size(), 1, 8, 22050, ByteOrder.LITTLE_ENDIAN, true);
     	System.out.println("*** WAVData.loadFrom Stream0 size "+wd0.data.limit());
     	assertEquals(wd0.data.limit(), ResourceLocation.getTestStream0Size());
 
-        WAVData wd1 = WAVData.loadFromStream(ResourceLocation.getTestStream1(), ResourceLocation.getTestStream1Size(), 2, 16, 44100, ByteOrder.BIG_ENDIAN, true);
+        final WAVData wd1 = WAVData.loadFromStream(ResourceLocation.getTestStream1(), ResourceLocation.getTestStream1Size(), 2, 16, 44100, ByteOrder.BIG_ENDIAN, true);
         System.out.println("*** WAVData.loadFrom Stream1 size "+wd1.data.limit());
         assertEquals(wd1.data.limit(), ResourceLocation.getTestStream1Size());
 
-        WAVData wd2 = WAVData.loadFromStream(ResourceLocation.getTestStream2(), ResourceLocation.getTestStream2Size(), 2, 16, 44100, ByteOrder.LITTLE_ENDIAN, true);
+        final WAVData wd2 = WAVData.loadFromStream(ResourceLocation.getTestStream2(), ResourceLocation.getTestStream2Size(), 2, 16, 44100, ByteOrder.LITTLE_ENDIAN, true);
         System.out.println("*** WAVData.loadFrom Stream2 size "+wd2.data.limit());
         assertEquals(wd2.data.limit(), ResourceLocation.getTestStream2Size());
 
-        WAVData wd3 = WAVData.loadFromStream(ResourceLocation.getTestStream3(), ResourceLocation.getTestStream3Size(), 2, 16, 44100, ByteOrder.LITTLE_ENDIAN, true);
+        final WAVData wd3 = WAVData.loadFromStream(ResourceLocation.getTestStream3(), ResourceLocation.getTestStream3Size(), 2, 16, 44100, ByteOrder.LITTLE_ENDIAN, true);
         System.out.println("*** WAVData.loadFrom Stream3 size "+wd3.data.limit());
         assertEquals(wd3.data.limit(), ResourceLocation.getTestStream3Size());
 
@@ -61,18 +61,18 @@ public class ALutWAVLoaderTest extends UITestCase {
 
     @Test
     public void testWAVLoaderLoadStream() throws IOException {
-    	WAVData wd0 = WAVLoader.loadFromStream(ResourceLocation.getTestStream0());
+    	final WAVData wd0 = WAVLoader.loadFromStream(ResourceLocation.getTestStream0());
     	System.out.println("*** WAVLoader.loadFrom Stream0 size "+wd0.data.limit());
         Assert.assertTrue("Stream0 size "+ResourceLocation.getTestStream0Size()+" < "+wd0.data.limit(), wd0.data.limit() <= ResourceLocation.getTestStream0Size());
 
-        WAVData wd3 = WAVLoader.loadFromStream(ResourceLocation.getTestStream3());
+        final WAVData wd3 = WAVLoader.loadFromStream(ResourceLocation.getTestStream3());
         System.out.println("*** WAVLoader.loadFrom Stream3 size "+wd3.data.limit());
         Assert.assertTrue("Stream3 size "+ResourceLocation.getTestStream3Size()+" < "+wd3.data.limit()+" .. "+wd3.data, wd3.data.limit() <= ResourceLocation.getTestStream3Size());
     }
 
     // TODO test * LoadFile
 
-    public static void main(String args[]) throws IOException {
+    public static void main(final String args[]) throws IOException {
         org.junit.runner.JUnitCore.main(ALutWAVLoaderTest.class.getName());
     }
 }
diff --git a/src/test/com/jogamp/openal/test/manual/OpenALTest.java b/src/test/com/jogamp/openal/test/manual/OpenALTest.java
index eac1d46..1981326 100644
--- a/src/test/com/jogamp/openal/test/manual/OpenALTest.java
+++ b/src/test/com/jogamp/openal/test/manual/OpenALTest.java
@@ -42,9 +42,11 @@ import com.jogamp.openal.AL;
 import com.jogamp.openal.ALC;
 import com.jogamp.openal.ALCcontext;
 import com.jogamp.openal.ALCdevice;
+import com.jogamp.openal.ALConstants;
 import com.jogamp.openal.ALFactory;
 import com.jogamp.openal.UnsupportedAudioFileException;
 import com.jogamp.openal.eax.EAX;
+import com.jogamp.openal.eax.EAXConstants;
 import com.jogamp.openal.eax.EAXFactory;
 import com.jogamp.openal.test.resources.ResourceLocation;
 import com.jogamp.openal.util.WAVData;
@@ -59,10 +61,10 @@ public class OpenALTest {
     private AL al = null;
     private int[] sources = null;
     private boolean initialized = false;
-    
-    public OpenALTest() {        
+
+    public OpenALTest() {
     }
-    
+
     public void init() throws UnsupportedAudioFileException, IOException {
         if( initialized ) {
             return;
@@ -71,12 +73,12 @@ public class OpenALTest {
         device = alc.alcOpenDevice(null);
         context = alc.alcCreateContext(device, null);
         alc.alcMakeContextCurrent(context);
-        al = ALFactory.getAL();        
+        al = ALFactory.getAL();
         System.out.println("output devices:");
         {
             final String[] outDevices = alc.alcGetDeviceSpecifiers();
             if( null != outDevices ) {
-                for (String name : outDevices) {
+                for (final String name : outDevices) {
                     System.out.println("    "+name);
                 }
             }
@@ -85,47 +87,47 @@ public class OpenALTest {
         {
             final String[] inDevices = alc.alcGetCaptureDeviceSpecifiers();
             if( null != inDevices ) {
-                for (String name : inDevices) {
+                for (final String name : inDevices) {
                     System.out.println("    "+name);
                 }
             }
         }
 
-        boolean eaxPresent = al.alIsExtensionPresent("EAX2.0");
-        EAX eax = ( eaxPresent ) ? EAXFactory.getEAX() : null;
+        final boolean eaxPresent = al.alIsExtensionPresent("EAX2.0");
+        final EAX eax = ( eaxPresent ) ? EAXFactory.getEAX() : null;
         System.err.println("EAX present:" + eaxPresent + ", EAX retrieved: "+ (null != eax));
 
-        int[] buffers = new int[1];
+        final int[] buffers = new int[1];
         al.alGenBuffers(1, buffers, 0);
 
         // WAVData wd = WAVData.loadFromStream(ResourceLocation.getTestStream0(), ResourceLocation.getTestStream0Size(), 1, 8, 22050, ByteOrder.LITTLE_ENDIAN, true);
         // WAVData wd = WAVData.loadFromStream(ResourceLocation.getTestStream1(), ResourceLocation.getTestStream1Size(), 2, 16, 44100, ByteOrder.BIG_ENDIAN, true);
-        WAVData wd = WAVData.loadFromStream(ResourceLocation.getTestStream2(), ResourceLocation.getTestStream2Size(), 2, 16, 44100, ByteOrder.LITTLE_ENDIAN, true);
+        final WAVData wd = WAVData.loadFromStream(ResourceLocation.getTestStream2(), ResourceLocation.getTestStream2Size(), 2, 16, 44100, ByteOrder.LITTLE_ENDIAN, true);
         // WAVData wd = WAVData.loadFromStream(ResourceLocation.getTestStream3(), ResourceLocation.getTestStream3Size(), 2, 16, 44100, ByteOrder.LITTLE_ENDIAN, true);
         System.out.println("*** size "+wd.data.limit());
-        
+
         al.alBufferData(buffers[0], wd.format, wd.data, wd.size, wd.freq);
-        
+
         sources = new int[1];
         al.alGenSources(1, sources, 0);
-        al.alSourcei(sources[0], AL.AL_BUFFER, buffers[0]);
+        al.alSourcei(sources[0], ALConstants.AL_BUFFER, buffers[0]);
 
-        int[] loopArray = new int[1];
-        al.alGetSourcei(sources[0], AL.AL_LOOPING, loopArray, 0);
-        System.err.println("Looping 1: " + (loopArray[0] == AL.AL_TRUE));
+        final int[] loopArray = new int[1];
+        al.alGetSourcei(sources[0], ALConstants.AL_LOOPING, loopArray, 0);
+        System.err.println("Looping 1: " + (loopArray[0] == ALConstants.AL_TRUE));
 
-        int[] loopBuffer = new int[1];
-        al.alGetSourcei(sources[0], AL.AL_LOOPING, loopBuffer, 0);
-        System.err.println("Looping 2: " + (loopBuffer[0] == AL.AL_TRUE));
+        final int[] loopBuffer = new int[1];
+        al.alGetSourcei(sources[0], ALConstants.AL_LOOPING, loopBuffer, 0);
+        System.err.println("Looping 2: " + (loopBuffer[0] == ALConstants.AL_TRUE));
 
         if (eaxPresent && null!=eax) {
-            IntBuffer env = Buffers.newDirectIntBuffer(1);
-            env.put(EAX.EAX_ENVIRONMENT_BATHROOM);
-            eax.setListenerProperty(EAX.DSPROPERTY_EAXLISTENER_ENVIRONMENT, env);
+            final IntBuffer env = Buffers.newDirectIntBuffer(1);
+            env.put(EAXConstants.EAX_ENVIRONMENT_BATHROOM);
+            eax.setListenerProperty(EAXConstants.DSPROPERTY_EAXLISTENER_ENVIRONMENT, env);
         }
         initialized = true;
     }
-    
+
     public void play() {
         if( !initialized ) {
             return;
@@ -134,31 +136,31 @@ public class OpenALTest {
         al.alSourceRewind(sources[0]);
         al.alSourcePlay(sources[0]);
     }
-    
-    public void play3f(float x, float y, float z) {
+
+    public void play3f(final float x, final float y, final float z) {
         if( !initialized ) {
             return;
         }
         System.out.println("play3f "+x+", "+y+", "+z);
         al.alSourceRewind(sources[0]);
         al.alSourcePlay(sources[0]);
-        al.alSource3f(sources[0], AL.AL_POSITION, x, y, z);
+        al.alSource3f(sources[0], ALConstants.AL_POSITION, x, y, z);
     }
-    
+
     public void pause() {
         if( !initialized ) {
             return;
         }
         al.alSourcePause(sources[0]);
     }
-    
+
     public void dispose() {
         if( !initialized ) {
             return;
         }
         if( null != sources ) {
             al.alSourceStop(sources[0]);
-            al.alDeleteSources(1, sources, 0);            
+            al.alDeleteSources(1, sources, 0);
             sources = null;
         }
         if( null != context ) {
@@ -171,11 +173,11 @@ public class OpenALTest {
         }
         initialized = false;
     }
-    
-    public static void main(String[] args) throws InterruptedException, UnsupportedAudioFileException, IOException {
-        OpenALTest demo = new OpenALTest();
+
+    public static void main(final String[] args) throws InterruptedException, UnsupportedAudioFileException, IOException {
+        final OpenALTest demo = new OpenALTest();
         demo.init();
-      
+
         demo.play();
         Thread.sleep(5000);
 
@@ -187,7 +189,7 @@ public class OpenALTest {
 
         demo.play3f(0f, 0f, 0f);
         Thread.sleep(5000);
-        
+
         demo.dispose();
     }
 }
diff --git a/src/test/com/jogamp/openal/test/manual/Sound3DTest.java b/src/test/com/jogamp/openal/test/manual/Sound3DTest.java
index 35bc602..27a4baa 100644
--- a/src/test/com/jogamp/openal/test/manual/Sound3DTest.java
+++ b/src/test/com/jogamp/openal/test/manual/Sound3DTest.java
@@ -48,27 +48,27 @@ import com.jogamp.openal.test.resources.ResourceLocation;
  */
 public class Sound3DTest {
 
-    public static float lerp(float v1, float v2, float t) {
+    public static float lerp(final float v1, final float v2, final float t) {
         float result = 0;
         result = v1 + ((v2 - v1) * t);
         return result;
     }
 
-    public static void main(String[] args) throws IOException, InterruptedException, UnsupportedAudioFileException {
+    public static void main(final String[] args) throws IOException, InterruptedException, UnsupportedAudioFileException {
 
         AudioSystem3D.init();
 
         // create the initial context - this can be collapsed into the init.
-        Device device = AudioSystem3D.openDevice(null);
-        Context context = AudioSystem3D.createContext(device);
+        final Device device = AudioSystem3D.openDevice(null);
+        final Context context = AudioSystem3D.createContext(device);
         AudioSystem3D.makeContextCurrent(context);
 
         // get the listener object
-        Listener listener = AudioSystem3D.getListener();
+        final Listener listener = AudioSystem3D.getListener();
         listener.setPosition(0, 0, 0);
 
         // load a source and play it
-        Source source1 = AudioSystem3D.loadSource(ResourceLocation.getTestStream0());
+        final Source source1 = AudioSystem3D.loadSource(ResourceLocation.getTestStream0());
         source1.setPosition(0, 0, 0);
         source1.setLooping(true);
         source1.play();
@@ -80,16 +80,16 @@ public class Sound3DTest {
 
         // move the listener
         for (int i = 0; i < 1000; i++) {
-            float t = ((float) i) / 1000f;
-            float lp = lerp(0f, 2f, t);
+            final float t = (i) / 1000f;
+            final float lp = lerp(0f, 2f, t);
             listener.setPosition(lp, lp, lp);
             Thread.sleep(10);
         }
 
         // fade listener out.
         for (int i = 0; i < 1000; i++) {
-            float t = ((float) i) / 1000f;
-            float lp = lerp(1f, 0f, t);
+            final float t = (i) / 1000f;
+            final float lp = lerp(1f, 0f, t);
             listener.setGain(lp);
             Thread.sleep(10);
         }
diff --git a/src/test/com/jogamp/openal/test/resources/ResourceLocation.java b/src/test/com/jogamp/openal/test/resources/ResourceLocation.java
index ba4ea99..f872d1d 100644
--- a/src/test/com/jogamp/openal/test/resources/ResourceLocation.java
+++ b/src/test/com/jogamp/openal/test/resources/ResourceLocation.java
@@ -22,7 +22,7 @@ public class ResourceLocation {
     /** CDR 44100Hz, 2 channels, S16_LE */
     public static final String aa_wav = "aa.wav";
     public static final int aa_wav_size = 846748;
-    
+
     static final ResourceLocation rl;
 
     static {
@@ -37,21 +37,21 @@ public class ResourceLocation {
     public static int getTestStream0Size() {
         return lewiscarrol_wav_size;
     }
-    /** CDR 44100Hz, 2 channels, S16_BE */ 
+    /** CDR 44100Hz, 2 channels, S16_BE */
     public static InputStream getTestStream1() {
         return getInputStream(aa_cdr, true);
     }
     public static int getTestStream1Size() {
         return aa_cdr_size;
     }
-    /** CDR 44100Hz, 2 channels, S16_LE */ 
+    /** CDR 44100Hz, 2 channels, S16_LE */
     public static InputStream getTestStream2() {
         return getInputStream(aa_cd, true);
     }
     public static int getTestStream2Size() {
         return aa_cd_size;
     }
-    /** WAV 44100Hz, 2 channels, S16_LE */ 
+    /** WAV 44100Hz, 2 channels, S16_LE */
     public static InputStream getTestStream3() {
         return getInputStream(aa_wav, true);
     }
@@ -59,24 +59,24 @@ public class ResourceLocation {
         return aa_wav_size;
     }
 
-    public static InputStream getInputStream(String fileName) {
+    public static InputStream getInputStream(final String fileName) {
         return getInputStream(fileName, false);
     }
 
-    public static InputStream getInputStream(String fileName, boolean throwException) {
-        URLConnection conn = IOUtil.getResource(rl.getClass(), fileName);        
+    public static InputStream getInputStream(final String fileName, final boolean throwException) {
+        final URLConnection conn = IOUtil.getResource(rl.getClass(), fileName);
         if (conn == null) {
             return null;
         }
         InputStream stream = null;
         try {
             stream = new BufferedInputStream(conn.getInputStream());
-        } catch (IOException e) {
+        } catch (final IOException e) {
             if(throwException && null == stream) {
                 throw new RuntimeException("File '"+fileName+"' not found: "+e.getMessage());
             } else {
                 System.err.println("File '"+fileName+"' not found");
-                e.printStackTrace();                
+                e.printStackTrace();
             }
         }
         return stream;
diff --git a/src/test/com/jogamp/openal/test/util/UITestCase.java b/src/test/com/jogamp/openal/test/util/UITestCase.java
index 73e6925..72659f0 100644
--- a/src/test/com/jogamp/openal/test/util/UITestCase.java
+++ b/src/test/com/jogamp/openal/test/util/UITestCase.java
@@ -78,7 +78,7 @@ public abstract class UITestCase {
         return testSupported;
     }
 
-    public static void setTestSupported(boolean v) {
+    public static void setTestSupported(final boolean v) {
         System.err.println("setTestSupported: "+v);
         testSupported = v;
     }
@@ -88,7 +88,7 @@ public abstract class UITestCase {
             int ml = 0;
             final TestClass tc = new TestClass(getClass());
             final List<FrameworkMethod> testMethods = tc.getAnnotatedMethods(org.junit.Test.class);
-            for(Iterator<FrameworkMethod> iter=testMethods.iterator(); iter.hasNext(); ) {
+            for(final Iterator<FrameworkMethod> iter=testMethods.iterator(); iter.hasNext(); ) {
                 final int l = iter.next().getName().length();
                 if( ml < l ) { ml = l; }
             }
@@ -101,11 +101,11 @@ public abstract class UITestCase {
         return _unitTestName.getMethodName();
     }
 
-    public final String getSimpleTestName(String separator) {
+    public final String getSimpleTestName(final String separator) {
         return getClass().getSimpleName()+separator+getTestMethodName();
     }
 
-    public final String getFullTestName(String separator) {
+    public final String getFullTestName(final String separator) {
         return getClass().getName()+separator+getTestMethodName();
     }
 
@@ -137,12 +137,12 @@ public abstract class UITestCase {
         System.err.println("++++ UITestCase.tearDown: "+getFullTestName(" - "));
     }
 
-    public static void waitForKey(String preMessage) {
-        BufferedReader stdin = new BufferedReader(new InputStreamReader(System.in));
+    public static void waitForKey(final String preMessage) {
+        final BufferedReader stdin = new BufferedReader(new InputStreamReader(System.in));
         System.err.println(preMessage+"> Press enter to continue");
         try {
             System.err.println(stdin.readLine());
-        } catch (IOException e) { }
+        } catch (final IOException e) { }
     }
 
     static final String unsupportedTestMsg = "Test not supported on this platform.";