New JNI bindings

jni/JniEventCallback.cpp

Index: jni/JniEventCallback.cpp
diff --git a/jni/JniEventCallback.cpp b/jni/JniEventCallback.cpp
index 530d5289fb7d87e8c707de388a3685625475a6be..4195639bfef05e10d4ec7981c6beabbf89b04e52 100644
--- a/jni/JniEventCallback.cpp
+++ b/jni/JniEventCallback.cpp
@@ -17,25 +17,25 @@
 
 #include "JniCallbacks.h"
 
-AdblockPlus::Android::JniEventCallback::JniEventCallback(JNIEnv* env, jobject callbackObject) :
-    JniCallbackBase(env, callbackObject)
+JniEventCallback::JniEventCallback(JNIEnv* env, jobject callbackObject)
+  : JniCallbackBase(env, callbackObject)
 {
 }
 
-AdblockPlus::Android::JniEventCallback::~JniEventCallback()
+JniEventCallback::~JniEventCallback()
 {
 }
 
-void AdblockPlus::Android::JniEventCallback::Callback(AdblockPlus::JsValueList& params)
+void JniEventCallback::Callback(AdblockPlus::JsValueList& params)
 {
-  AdblockPlus::Android::JNIEnvAcquire env(GetJavaVM());
+  JNIEnvAcquire env(GetJavaVM());
 
   jclass clazz = env->GetObjectClass(GetCallbackObject());
   jmethodID method = env->GetMethodID(clazz, "eventCallback", "(Ljava/util/List;)V");
 
   if (method)
   {
-    jobject jsList = AdblockPlus::Android::JniJsValueList2ArrayList(*env, params);
+    jobject jsList = JniJsValueList2ArrayList(*env, params);
     env->CallVoidMethod(GetCallbackObject(), method, jsList);
   }
 }
@@ -44,20 +44,21 @@ static jlong JNICALL JniCtor(JNIEnv* env, jclass clazz, jobject callbackObject)
 {
   TRY
   {
-    return AdblockPlus::Android::JniPtr2Long(new AdblockPlus::Android::JniEventCallback(env, callbackObject));
+    return JniPtrToLong(new JniEventCallback(env, callbackObject));
   }
   CATCH_THROW_AND_RETURN(env, 0)
 }
 
 static void JNICALL JniDtor(JNIEnv* env, jclass clazz, jlong ptr)
 {
-  delete AdblockPlus::Android::JniLong2TypePtr<AdblockPlus::Android::JniEventCallback>(ptr);
+  delete JniLongToTypePtr<JniEventCallback>(ptr);
 }
 
 static JNINativeMethod methods[] =
 {
-{ (char*)"ctor", (char*)"(Ljava/lang/Object;)J", (void*)JniCtor },
-{ (char*)"dtor", (char*)"(J)V", (void*)JniDtor }, };
+  { (char*)"ctor", (char*)"(Ljava/lang/Object;)J", (void*)JniCtor },
+  { (char*)"dtor", (char*)"(J)V", (void*)JniDtor }
+};
 
 extern "C" JNIEXPORT void JNICALL Java_org_adblockplus_android_api_EventCallback_registerNatives(JNIEnv *env, jclass clazz)
 {