New JNI bindings

jni/JniLogSystem.cpp

 /*
  * This file is part of Adblock Plus <http://adblockplus.org/>,
  * Copyright (C) 2006-2014 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * Adblock Plus is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with Adblock Plus.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "JniCallbacks.h"
 
-AdblockPlus::Android::JniLogSystemCallback::JniLogSystemCallback(JNIEnv* env, jobject callbackObject) :
-    JniCallbackBase(env, callbackObject), AdblockPlus::LogSystem()
+static jlong JNICALL JniCtor(JNIEnv* env, jclass clazz, jobject callbackObject)
 {
-  m_LogLevelClass.reset(new JniGlobalReference<jclass>(env, env->FindClass(PKG("LogSystem$LogLevel"))));
+  try
+  {
+    return JniPtrToLong(new JniLogSystemCallback(env, callbackObject));
+  }
+  CATCH_THROW_AND_RETURN(env, 0)
 }
 
-AdblockPlus::Android::JniLogSystemCallback::~JniLogSystemCallback()
+static void JNICALL JniDtor(JNIEnv* env, jclass clazz, jlong ptr)
 {
+  delete JniLongToTypePtr<JniLogSystemCallback>(ptr);
 }
 
-void AdblockPlus::Android::JniLogSystemCallback::operator()(AdblockPlus::LogSystem::LogLevel logLevel, const std::string& message,
-    const std::string& source)
+JniLogSystemCallback::JniLogSystemCallback(JNIEnv* env, jobject callbackObject)
+  : JniCallbackBase(env, callbackObject), AdblockPlus::LogSystem()
 {
-  AdblockPlus::Android::JNIEnvAcquire env(GetJavaVM());
+  logLevelClass.reset(new JniGlobalReference<jclass>(env, env->FindClass(PKG("LogSystem$LogLevel"))));
+}
+
+void JniLogSystemCallback::operator()(AdblockPlus::LogSystem::LogLevel logLevel, const std::string& message, const std::string& source)
+{
+  JNIEnvAcquire env(GetJavaVM());
 
   jclass clazz = env->GetObjectClass(GetCallbackObject());
   jmethodID method = env->GetMethodID(clazz, "logCallback", "(" TYP("LogSystem$LogLevel") "Ljava/lang/String;Ljava/lang/String;)V");
 
   // TODO: Set log level from Java and handle it here (to reduce C++->Java calls)
 
   if (method)
   {
     const char* enumName = 0;
 
@@ skipping 10 matching lines @@
       enumName = "INFO";
       break;
     case AdblockPlus::LogSystem::LOG_LEVEL_WARN:
       enumName = "WARN";
       break;
     case AdblockPlus::LogSystem::LOG_LEVEL_ERROR:
       enumName = "ERROR";
       break;
     }
 
-    jclass enumClass = m_LogLevelClass->get();
+    jclass enumClass = logLevelClass->Get();
     if (enumClass)
     {
       jfieldID enumField = env->GetStaticFieldID(enumClass, enumName, TYP("LogSystem$LogLevel"));
       jobject jLogLevel = env->GetStaticObjectField(enumClass, enumField);
 
       jstring jMessage = env->NewStringUTF(message.c_str());
       jstring jSource = env->NewStringUTF(source.c_str());
 
       env->CallVoidMethod(GetCallbackObject(), method, jLogLevel, jMessage, jSource);
     }
 
     CheckAndLogJavaException(*env);
   }
 }
 
-static jlong JNICALL JniCtor(JNIEnv* env, jclass clazz, jobject callbackObject)
-{
-  TRY
-  {
-    return AdblockPlus::Android::JniPtr2Long(new AdblockPlus::Android::JniLogSystemCallback(env, callbackObject));
-  }
-  CATCH_THROW_AND_RETURN(env, 0)
-}
-
-static void JNICALL JniDtor(JNIEnv* env, jclass clazz, jlong ptr)
-{
-  delete AdblockPlus::Android::JniLong2TypePtr<AdblockPlus::Android::JniLogSystemCallback>(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_LogSystem_registerNatives(JNIEnv *env, jclass clazz)
+extern "C" JNIEXPORT void JNICALL Java_org_adblockplus_libadblockplus_LogSystem_registerNatives(JNIEnv *env, jclass clazz)
 {
   env->RegisterNatives(clazz, methods, sizeof(methods) / sizeof(methods[0]));
 }