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

2 files changed, 30 insertions, 30 deletions

diff --git a/src/com/jogamp/opencl/impl/CLTLAccessorFactory.java b/src/com/jogamp/opencl/impl/CLTLAccessorFactory.java
index e0bd7bd5..8422c4ad 100644
--- a/src/com/jogamp/opencl/impl/CLTLAccessorFactory.java
+++ b/src/com/jogamp/opencl/impl/CLTLAccessorFactory.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.
@@ -50,12 +50,12 @@ import static com.jogamp.opencl.CLException.*;
 public class CLTLAccessorFactory implements CLAccessorFactory {
 
     @Override
-    public CLInfoAccessor createDeviceInfoAccessor(CLDeviceBinding cl, long id) {
+    public CLInfoAccessor createDeviceInfoAccessor(final CLDeviceBinding cl, final long id) {
         return new CLDeviceInfoAccessor(cl, id);
     }
 
     @Override
-    public CLPlatformInfoAccessor createPlatformInfoAccessor(CL cl, long id) {
+    public CLPlatformInfoAccessor createPlatformInfoAccessor(final CL cl, final long id) {
         return new CLTLPlatformInfoAccessor(cl, id);
     }
 
@@ -64,13 +64,13 @@ public class CLTLAccessorFactory implements CLAccessorFactory {
         private final CLDeviceBinding cl;
         private final long ID;
 
-        private CLDeviceInfoAccessor(CLDeviceBinding cl, long id) {
+        private CLDeviceInfoAccessor(final CLDeviceBinding cl, final long id) {
             this.cl = cl;
             this.ID = id;
         }
 
         @Override
-        public int getInfo(int name, long valueSize, Buffer value, PointerBuffer valueSizeRet) {
+        public int getInfo(final int name, final long valueSize, final Buffer value, final PointerBuffer valueSizeRet) {
             return cl.clGetDeviceInfo(ID, name, valueSize, value, valueSizeRet);
         }
 
@@ -81,34 +81,34 @@ public class CLTLAccessorFactory implements CLAccessorFactory {
         private final long ID;
         private final CL cl;
 
-        private CLTLPlatformInfoAccessor(CL cl, long id) {
+        private CLTLPlatformInfoAccessor(final CL cl, final long id) {
             this.ID = id;
             this.cl = cl;
         }
 
         @Override
-        public int getInfo(int name, long valueSize, Buffer value, PointerBuffer valueSizeRet) {
+        public int getInfo(final int name, final long valueSize, final Buffer value, final PointerBuffer valueSizeRet) {
             return cl.clGetPlatformInfo(ID, name, valueSize, value, valueSizeRet);
         }
 
         @Override
-        public long[] getDeviceIDs(long type) {
+        public long[] getDeviceIDs(final long type) {
 
-            IntBuffer buffer = getBB(4).asIntBuffer();
+            final IntBuffer buffer = getBB(4).asIntBuffer();
             int ret = cl.clGetDeviceIDs(ID, type, 0, null, buffer);
-            int count = buffer.get(0);
+            final int count = buffer.get(0);
 
             // return an empty buffer rather than throwing an exception
-            if(ret == CL.CL_DEVICE_NOT_FOUND || count == 0) {
+            if(ret == CLDeviceBinding.CL_DEVICE_NOT_FOUND || count == 0) {
                 return new long[0];
             }else{
                 checkForError(ret, "error while enumerating devices");
 
-                PointerBuffer deviceIDs = PointerBuffer.wrap(getBB(count*PointerBuffer.ELEMENT_SIZE));
+                final PointerBuffer deviceIDs = PointerBuffer.wrap(getBB(count*PointerBuffer.ELEMENT_SIZE));
                 ret = cl.clGetDeviceIDs(ID, type, count, deviceIDs, null);
                 checkForError(ret, "error while enumerating devices");
 
-                long[] ids = new long[count];
+                final long[] ids = new long[count];
                 for (int i = 0; i < ids.length; i++) {
                     ids[i] = deviceIDs.get(i);
                 }
diff --git a/src/com/jogamp/opencl/impl/CLTLInfoAccessor.java b/src/com/jogamp/opencl/impl/CLTLInfoAccessor.java
index f1419c7b..2cdec77b 100644
--- a/src/com/jogamp/opencl/impl/CLTLInfoAccessor.java
+++ b/src/com/jogamp/opencl/impl/CLTLInfoAccessor.java
@@ -66,7 +66,7 @@ public abstract class CLTLInfoAccessor implements CLInfoAccessor {
     };
 
     @Override
-    public final long getUInt32Long(int key) {
+    public final long getUInt32Long(final int key) {
         final ByteBuffer buffer = getBB(4).putInt(0, 0);
         final int ret = getInfo(key, 4, buffer, null);
         CLException.checkForError(ret, "error while asking for info value");
@@ -74,29 +74,29 @@ public abstract class CLTLInfoAccessor implements CLInfoAccessor {
     }
 
     @Override
-    public final long getLong(int key) {
+    public final long getLong(final int key) {
 
-        ByteBuffer buffer = getBB(8).putLong(0, 0);
-        int ret = getInfo(key, 8, buffer, null);
+        final ByteBuffer buffer = getBB(8).putLong(0, 0);
+        final int ret = getInfo(key, 8, buffer, null);
         CLException.checkForError(ret, "error while asking for info value");
 
         return buffer.getLong(0);
     }
 
     @Override
-    public final String getString(int key) {
+    public final String getString(final int key) {
 
-        PointerBuffer sizeBuffer = getNSB();
+        final PointerBuffer sizeBuffer = getNSB();
         int ret = getInfo(key, 0, null, sizeBuffer);
         CLException.checkForError(ret, "error while asking for info string");
 
-        int clSize = (int)sizeBuffer.get(0);
-        ByteBuffer buffer = getBB(clSize);
+        final int clSize = (int)sizeBuffer.get(0);
+        final ByteBuffer buffer = getBB(clSize);
 
         ret = getInfo(key, buffer.capacity(), buffer, null);
         CLException.checkForError(ret, "error while asking for info string");
 
-        byte[] array = new byte[clSize];
+        final byte[] array = new byte[clSize];
         buffer.get(array).rewind();
 
         return CLUtil.clString2JavaString(array, clSize);
@@ -104,13 +104,13 @@ public abstract class CLTLInfoAccessor implements CLInfoAccessor {
     }
 
     @Override
-    public final int[] getInts(int key, int n) {
+    public final int[] getInts(final int key, final int n) {
         // FIXME: Really 8 bytes per int on 64bit platforms ?
-        ByteBuffer buffer = getBB(n * (Platform.is32Bit()?4:8));
-        int ret = getInfo(key, buffer.capacity(), buffer, null);
+        final ByteBuffer buffer = getBB(n * (Platform.is32Bit()?4:8));
+        final int ret = getInfo(key, buffer.capacity(), buffer, null);
         CLException.checkForError(ret, "error while asking for info value");
 
-        int[] array = new int[n];
+        final int[] array = new int[n];
         for(int i = 0; i < array.length; i++) {
             if(Platform.is32Bit()) {
                 array[i] = buffer.getInt();
@@ -123,7 +123,7 @@ public abstract class CLTLInfoAccessor implements CLInfoAccessor {
         return array;
     }
 
-    protected ByteBuffer getBB(int minCapacity) {
+    protected ByteBuffer getBB(final int minCapacity) {
         if(minCapacity > BB_SIZE) {
             return Buffers.newDirectByteBuffer(minCapacity);
         }else{