1 files changed, 19 insertions, 18 deletions

diff --git a/src/com/jogamp/opencl/impl/CLTLInfoAccessor.java b/src/com/jogamp/opencl/impl/CLTLInfoAccessor.java
index 28115305..f1419c7b 100644
--- a/src/com/jogamp/opencl/impl/CLTLInfoAccessor.java
+++ b/src/com/jogamp/opencl/impl/CLTLInfoAccessor.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.
@@ -28,15 +28,16 @@
 
 package com.jogamp.opencl.impl;
 
-import com.jogamp.opencl.spi.CLInfoAccessor;
-import com.jogamp.common.nio.PointerBuffer;
-import com.jogamp.common.os.Platform;
-import com.jogamp.opencl.util.CLUtil;
 import java.nio.Buffer;
 import java.nio.ByteBuffer;
 
-import static com.jogamp.common.nio.Buffers.*;
-import static com.jogamp.opencl.CLException.*;
+import com.jogamp.common.nio.Buffers;
+import com.jogamp.common.nio.PointerBuffer;
+import com.jogamp.common.os.Platform;
+import com.jogamp.common.util.Bitstream;
+import com.jogamp.opencl.CLException;
+import com.jogamp.opencl.spi.CLInfoAccessor;
+import com.jogamp.opencl.util.CLUtil;
 
 /**
  * Internal utility for common OpenCL clGetFooInfo calls.
@@ -51,7 +52,7 @@ public abstract class CLTLInfoAccessor implements CLInfoAccessor {
 
         @Override
         protected ByteBuffer initialValue() {
-            return newDirectByteBuffer(BB_SIZE);
+            return Buffers.newDirectByteBuffer(BB_SIZE);
         }
 
     };
@@ -77,23 +78,23 @@ public abstract class CLTLInfoAccessor implements CLInfoAccessor {
 
         ByteBuffer buffer = getBB(8).putLong(0, 0);
         int ret = getInfo(key, 8, buffer, null);
-        checkForError(ret, "error while asking for info value");
+        CLException.checkForError(ret, "error while asking for info value");
 
         return buffer.getLong(0);
     }
 
     @Override
     public final String getString(int key) {
-        
+
         PointerBuffer sizeBuffer = getNSB();
         int ret = getInfo(key, 0, null, sizeBuffer);
-        checkForError(ret, "error while asking for info string");
+        CLException.checkForError(ret, "error while asking for info string");
 
         int clSize = (int)sizeBuffer.get(0);
         ByteBuffer buffer = getBB(clSize);
 
         ret = getInfo(key, buffer.capacity(), buffer, null);
-        checkForError(ret, "error while asking for info string");
+        CLException.checkForError(ret, "error while asking for info string");
 
         byte[] array = new byte[clSize];
         buffer.get(array).rewind();
@@ -104,10 +105,10 @@ public abstract class CLTLInfoAccessor implements CLInfoAccessor {
 
     @Override
     public final int[] getInts(int key, 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);
-        checkForError(ret, "error while asking for info value");
+        CLException.checkForError(ret, "error while asking for info value");
 
         int[] array = new int[n];
         for(int i = 0; i < array.length; i++) {
@@ -124,7 +125,7 @@ public abstract class CLTLInfoAccessor implements CLInfoAccessor {
 
     protected ByteBuffer getBB(int minCapacity) {
         if(minCapacity > BB_SIZE) {
-            return newDirectByteBuffer(minCapacity);
+            return Buffers.newDirectByteBuffer(minCapacity);
         }else{
             return localBB.get();
         }