Fixed some bugs where the wrong directory structure was referenced.

Author: freemo

.gitignore

@@ -28,6 +28,7 @@ hs_err_pid*
 **/dist/
 **/include/
 **/nbproject/
+**/.idea/
 
 *.iml
 

src/cpp/JNIHelper.h

@@ -44,10 +44,10 @@
 #include "CLException.h"
 #define JavaLangPackage(name) "java/lang/" name
 #define JavaUtilPackage(name) "java/util/" name
-#define AparapiPackage(name) "com/aparapi/aparapi/" name
-#define AparapiDevicePackage(name) "com/aparapi/aparapi/device/" name
-#define AparapiOpenCLPackage(name) "com/aparapi/aparapi/internal/opencl/" name
-#define AparapiUtilPackage(name) "com/aparapi/aparapi/internal/util/" name
+#define AparapiPackage(name) "com/aparapi/" name
+#define AparapiDevicePackage(name) "com/aparapi/device/" name
+#define AparapiOpenCLPackage(name) "com/aparapi/internal/opencl/" name
+#define AparapiUtilPackage(name) "com/aparapi/internal/util/" name
 
 #define ProfileInfoClass AparapiPackage("ProfileInfo")
 #define OpenCLKernelClass AparapiOpenCLPackage("OpenCLKernel")

src/cpp/classtools.cpp

@@ -553,7 +553,7 @@ bool isKernel(char *_className, ByteBuffer *_byteBuffer){
       ClassConstantPoolEntry *superClassConstantPoolEntry = (ClassConstantPoolEntry*)constantPool[superClassConstantPoolIndex];
       UTF8ConstantPoolEntry *superClassUTF8ConstantPoolEntry = (UTF8ConstantPoolEntry*)constantPool[superClassConstantPoolEntry->getNameIndex()];
 
-      isAKernel= !strcmp((char *)(superClassUTF8ConstantPoolEntry->getUTF8Bytes()),"com/aparapi/aparapi/Kernel");
+      isAKernel= !strcmp((char *)(superClassUTF8ConstantPoolEntry->getUTF8Bytes()),"com/aparapi/Kernel");
 
 #ifdef SHOW
       fprintf(stdout, "Class name at super index is \"%s\"\n", superClassUTF8ConstantPoolEntry->getUTF8Bytes());

src/cpp/runKernel/Config.cpp

@@ -45,7 +45,7 @@ jboolean Config::getBoolean(JNIEnv *jenv, const char *fieldName){
 
 Config::Config(JNIEnv *jenv){
    enableVerboseJNI = false;
-   configClass = jenv->FindClass("com/aparapi/aparapi/internal/jni/ConfigJNI");
+   configClass = jenv->FindClass("com/aparapi/internal/jni/ConfigJNI");
    if (configClass == NULL ||  jenv->ExceptionCheck()) {
       jenv->ExceptionDescribe(); 
       jenv->ExceptionClear();